From b52d80b89873c79f06fce15c30640ed39839221c Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 25 May 2019 13:18:19 +0200
Subject: [PATCH 001/794] pkgs.nixos: Expose configuration directly

The pkgs.nixos used to only expose system.build, which kind of made
sense in theory, but asking everyone to write modules when to want
to pull something out of a NixOS configuration is just not realistic.
In fact it's very inconvenient when you're trying to debug something.

This adds the config, options and anything that eval-config.nix
produces. Although this introduces the potential for attributes
of eval-config.nix output to shadow system.build, I don't expect
naming collisions to be commonplace, or to remain undetected during
evaluation. Also such an error should be easy to resolve, by explicitly
querying (pkgs.nixos {}).config.system.build.X, or by renaming X
to something other than config, options, extraArgs.
---
 pkgs/top-level/all-packages.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b76d509ea1..b2439b38771 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23286,6 +23286,8 @@ in
                 initialRamdisk.
                 The result can be extended in the modules by defining
                 extra attributes in system.build.
+                Alternatively, you may use the result's config and
+                options attributes to query any option.
 
      Example:
 
@@ -23323,10 +23325,13 @@ in
      Note that you will need to have called Nixpkgs with the system
      parameter set to the right value for your deployment target.
   */
-  nixos = configuration:
-    (import (pkgs.path + "/nixos/lib/eval-config.nix") {
-      inherit (pkgs.stdenv.hostPlatform) system;
-      modules = [(
+  nixos =
+    configuration:
+      let
+        c = import (pkgs.path + "/nixos/lib/eval-config.nix") {
+              inherit (pkgs.stdenv.hostPlatform) system;
+              modules =
+                [(
                   { lib, ... }: {
                     config.nixpkgs.pkgs = lib.mkDefault pkgs;
                   }
@@ -23335,7 +23340,9 @@ in
                   then configuration
                   else [configuration]
                 );
-    }).config.system.build;
+            };
+      in
+        c.config.system.build // c;
 
 
   /*

From c3865335fbdf8c4619d414355188523ce332ad75 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 10 Jun 2019 18:27:46 +0300
Subject: [PATCH 002/794] auditd service: make more useful

Enable kernel audit and install userspace utilities by default.
---
 nixos/modules/security/auditd.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
index 6abac244dac..9d26cfbcfb1 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixos/modules/security/auditd.nix
@@ -6,6 +6,10 @@ with lib;
   options.security.auditd.enable = mkEnableOption "the Linux Audit daemon";
 
   config = mkIf config.security.auditd.enable {
+    boot.kernelParams = [ "audit=1" ];
+
+    environment.systemPackages = [ pkgs.audit ];
+
     systemd.services.auditd = {
       description = "Linux Audit daemon";
       wantedBy = [ "basic.target" ];

From aafffb261429688e93a88269bdb03c0cbf884085 Mon Sep 17 00:00:00 2001
From: Bruno Bzeznik <Bruno.Bzeznik@imag.fr>
Date: Fri, 14 Jun 2019 16:31:39 +0200
Subject: [PATCH 003/794] trimal: init at 1.4.1

---
 .../science/biology/trimal/default.nix        | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100755 pkgs/applications/science/biology/trimal/default.nix

diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/applications/science/biology/trimal/default.nix
new file mode 100755
index 00000000000..d4e8fee7bc3
--- /dev/null
+++ b/pkgs/applications/science/biology/trimal/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "trimal";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "scapella";
+    rev = "v${version}";
+    sha256 = "0isc7s3514di4z953xq53ncjkbi650sh4q9yyw5aag1n9hqnh7k0";
+  };
+
+  postUnpack = ''
+    sourceRoot=''${sourceRoot}/source
+    echo Source root reset to ''${sourceRoot}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a trimal readal statal $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool for the automated removal of spurious sequences or poorly aligned regions from a multiple sequence alignment";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    homepage = http://trimal.cgenomics.org;
+    maintainers = [ maintainers.bzizou ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a9a1c54b3a..f3bcadfe1e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21971,6 +21971,8 @@ in
 
   seaview = callPackage ../applications/science/biology/seaview { };
 
+  trimal = callPackage ../applications/science/biology/trimal { };
+
   varscan = callPackage ../applications/science/biology/varscan { };
 
   hmmer = callPackage ../applications/science/biology/hmmer { };

From 59e9e56f92df9218919a9201af9b32d18b46a8db Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sat, 20 Jul 2019 21:05:34 +0900
Subject: [PATCH 004/794] pyscard: fix darwin build, remove pcsc library mixing

This should be built against a single version of PCSC: either the one
from pcsclite, or the one from Apple's PCSC framework.
---
 .../python-modules/pyscard/default.nix        | 40 ++++++++++++-------
 .../pyscard/ignore-macos-bug.patch            | 22 ++++++++++
 2 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyscard/ignore-macos-bug.patch

diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index bab8e502b9c..06e2690c111 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,5 +1,13 @@
 { stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }:
 
+let
+  # Package does not support configuring the pcsc library.
+  withApplePCSC = stdenv.isDarwin;
+
+  inherit (stdenv.lib) getLib getDev optionalString optionals;
+  inherit (stdenv.hostPlatform.extensions) sharedLibrary;
+in
+
 buildPythonPackage rec {
   version = "1.9.8";
   pname = "pyscard";
@@ -9,24 +17,28 @@ buildPythonPackage rec {
     sha256 = "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm";
   };
 
-  postPatch = ''
-    sed -e 's!"libpcsclite\.so\.1"!"${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1"!' \
-        -i smartcard/scard/winscarddll.c
+  postPatch = if withApplePCSC then ''
+    substituteInPlace smartcard/scard/winscarddll.c \
+      --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \
+                "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
+  '' else ''
+    substituteInPlace smartcard/scard/winscarddll.c \
+      --replace "libpcsclite.so.1" \
+                "${getLib pcsclite}/lib/libpcsclite${sharedLibrary}"
   '';
 
-  NIX_CFLAGS_COMPILE = "-isystem ${stdenv.lib.getDev pcsclite}/include/PCSC/";
+  NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC)
+    "-I ${getDev pcsclite}/include/PCSC";
 
-  patches = [
-    # Fixes darwin tests
-    # See: https://github.com/LudovicRousseau/pyscard/issues/77
-    (fetchpatch {
-      url = "https://github.com/LudovicRousseau/pyscard/commit/62e675028086c75656444cc21d563d9f08ebf8e7.patch";
-      sha256 = "1lr55npcpc8j750vf7vaisqyk18d5f00l7nii2lvawg4sssjaaf7";
-    })
-  ];
+  # The error message differs depending on the macOS host version.
+  # Since Nix reports a constant host version, but proxies to the
+  # underlying library, it's not possible to determine the correct
+  # expected error message.  This patch allows both errors to be
+  # accepted.
+  # See: https://github.com/LudovicRousseau/pyscard/issues/77
+  patches = optionals withApplePCSC [ ./ignore-macos-bug.patch ];
 
-  propagatedBuildInputs = [ pcsclite ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin PCSC;
+  propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ];
   nativeBuildInputs = [ swig ];
 
   meta = {
diff --git a/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch b/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch
new file mode 100644
index 00000000000..62b20477c9f
--- /dev/null
+++ b/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch
@@ -0,0 +1,22 @@
+diff --git a/test/test_SCardGetErrorMessage.py b/test/test_SCardGetErrorMessage.py
+old mode 100644
+new mode 100755
+index c6fe755..c1217f5
+--- a/test/test_SCardGetErrorMessage.py
++++ b/test/test_SCardGetErrorMessage.py
+@@ -29,12 +29,10 @@ class TestError(unittest.TestCase):
+         self.assertEqual(res, expected)
+ 
+         res = SCardGetErrorMessage(1)
++        expected = "Unknown error: 0x00000001"
+         # macOS bug not yet fixed
+-        if get_platform().startswith('macosx-') and get_platform() < 'macosx-10.13':
+-            expected = "Unkown error: 0x00000001"
+-        else:
+-            expected = "Unknown error: 0x00000001"
+-        self.assertEqual(res, expected)
++        macos_bug_expected = "Unkown error: 0x00000001"
++        self.assertIn(res, [expected, macos_bug_expected])
+ 
+ 
+ if __name__ == '__main__':

From 55bbc807eb0d8d1ac00168eda0e760333327d91e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 24 Jul 2019 19:55:25 -0500
Subject: [PATCH 005/794] dhcpcd: 7.2.3 -> 8.0.1

https://roy.marples.name/blog/dhcpcd-8-0-0-released
https://roy.marples.name/blog/dhcpcd-8-0-1-released
---
 pkgs/tools/networking/dhcpcd/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 6d14789e7f4..18682e3bd76 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -3,11 +3,12 @@
 stdenv.mkDerivation rec {
   # when updating this to >=7, check, see previous reverts:
   # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
-  name = "dhcpcd-7.2.3";
+  pname = "dhcpcd";
+  version = "8.0.1";
 
   src = fetchurl {
-    url = "mirror://roy/dhcpcd/${name}.tar.xz";
-    sha256 = "0vjnd27y6jm5q2v7fkyxmsn77dcpvpzyzb5bq9lfkas8flbkiavl";
+    url = "mirror://roy/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "0cd9vcyc9bisxzb56z2yrpiy7678bgzl7hzy2i3v8hddynz4y7q3";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -27,14 +28,14 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
   ];
 
-  makeFlags = "PREFIX=\${out}";
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   # Hack to make installation succeed.  dhcpcd will still use /var/db
   # at runtime.
-  installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc";
+  installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ];
 
   # Check that the udev plugin got built.
-  postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]";
+  postInstall = stdenv.lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
 
   meta = with stdenv.lib; {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";

From e712667ffd386a63f8d84a30e105f44b9ffa428c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 6 Jul 2019 09:10:56 +0800
Subject: [PATCH 006/794] kodi: 18.1 -> 18.3

---
 pkgs/applications/video/kodi/default.nix | 63 ++++++++++++++++++------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index e5844eb827d..73bcdadbc59 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
+{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
 , pkgconfig, cmake, gnumake, yasm, python2Packages
 , libgcrypt, libgpgerror, libunistring
 , boost, avahi, lame, autoreconfHook
@@ -42,21 +42,36 @@ assert usbSupport   -> libusb != null && ! udevSupport; # libusb won't be used i
 assert vdpauSupport -> libvdpau != null;
 assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;
 
-# TODO for Kodi 18.0
-# - check if dbus support PR has been merged and add dbus as a buildInput
-
 let
-  kodiReleaseDate = "20190129";
-  kodiVersion = "18.1";
+  kodiReleaseDate = "20190627";
+  kodiVersion = "18.3";
   rel = "Leia";
 
   kodi_src = fetchFromGitHub {
     owner  = "xbmc";
     repo   = "xbmc";
     rev    = "${kodiVersion}-${rel}";
-    sha256 = "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc";
+    sha256 = "18fbl5hs3aqccrn0m3x7hp95wlafjav0yvrwmb5q3gj24mwf6jld";
   };
 
+  cmakeProto = fetchurl {
+    url = "https://raw.githubusercontent.com/pramsey/libght/ca9b1121c352ea10170636e170040e1af015bad1/cmake/modules/CheckPrototypeExists.cmake";
+    sha256  = "1zai82gm5x55n3xvdv7mns3ja6a2k81x9zz0nk42j6s2yb0fkjxh";
+  };
+
+  cmakeProtoPatch = ''
+    # get rid of windows headers as they will otherwise be found first
+    rm -rf msvc
+
+    cp ${cmakeProto} cmake/${cmakeProto.name}
+    # we need to enable support for C++ for check_prototype_exists to do its thing
+    substituteInPlace CMakeLists.txt --replace 'LANGUAGES C' 'LANGUAGES C CXX'
+    if [ -f cmake/CheckHeadersSTDC.cmake ]; then
+      sed -i cmake/CheckHeadersSTDC.cmake \
+        -e '7iinclude(CheckPrototypeExists)'
+    fi
+  '';
+
   kodiDependency = { name, version, rev, sha256, ... } @attrs:
     let
       attrs' = builtins.removeAttrs attrs ["name" "version" "rev" "sha256"];
@@ -83,16 +98,25 @@ let
     nativeBuildInputs = [ cmake nasm pkgconfig ];
   };
 
-  # we should be able to build these externally and have kodi reference them as buildInputs.
-  # Doesn't work ATM though so we just use them for the src
-
+  # We can build these externally but FindLibDvd.cmake forces us to build it
+  # them, so we currently just use them for the src.
   libdvdcss = kodiDependency rec {
     name              = "libdvdcss";
     version           = "1.4.2";
     rev               = "${version}-${rel}-Beta-5";
     sha256            = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";
-    buildInputs       = [ libdvdread ];
-    nativeBuildInputs = [ autoreconfHook pkgconfig ];
+    buildInputs       = [ linuxHeaders ];
+    nativeBuildInputs = [ cmake pkgconfig ];
+    postPatch = ''
+      rm -rf msvc
+
+      substituteInPlace config.h.cm \
+        --replace '#cmakedefine O_BINARY "''${O_BINARY}"' '#define O_BINARY 0'
+    '';
+    cmakeFlags = [
+      "-DBUILD_SHARED_LIBS=1"
+      "-DHAVE_LINUX_DVD_STRUCT=1"
+    ];
   };
 
   libdvdnav = kodiDependency rec {
@@ -100,8 +124,12 @@ let
     version           = "6.0.0";
     rev               = "${version}-${rel}-Alpha-3";
     sha256            = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";
-    buildInputs       = [ libdvdread ];
-    nativeBuildInputs = [ autoreconfHook pkgconfig ];
+    buildInputs       = [ libdvdcss libdvdread ];
+    nativeBuildInputs = [ cmake pkgconfig ];
+    postPatch         = cmakeProtoPatch;
+    postInstall = ''
+      mv $out/lib/liblibdvdnav.so $out/lib/libdvdnav.so
+    '';
   };
 
   libdvdread = kodiDependency rec {
@@ -109,7 +137,10 @@ let
     version           = "6.0.0";
     rev               = "${version}-${rel}-Alpha-3";
     sha256            = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";
-    nativeBuildInputs = [ autoreconfHook pkgconfig ];
+    buildInputs       = [ libdvdcss ];
+    nativeBuildInputs = [ cmake pkgconfig ];
+    configureFlags    = [ "--with-libdvdcss" ];
+    postPatch         = cmakeProtoPatch;
   };
 
 in stdenv.mkDerivation rec {
@@ -160,7 +191,7 @@ in stdenv.mkDerivation rec {
       makeWrapper
       which
       pkgconfig gnumake
-      autoconf automake libtool # still needed for some components. Check if that is the case with 18.0
+      autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
     ] ++ lib.optional useWayland [ wayland-protocols ];
 
     cmakeFlags = [

From a8e9dc728b4afdb0b8d74b652bee0b563673a1cc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 30 Jul 2019 17:30:15 -0500
Subject: [PATCH 007/794] dhcpcd: 8.0.1 -> 8.0.2

https://roy.marples.name/blog/dhcpcd-8-0-2-released

> I don't anticipate any more releases for a while as this is looking
really good now!
---
 pkgs/tools/networking/dhcpcd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 18682e3bd76..f0ae7e014be 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   # when updating this to >=7, check, see previous reverts:
   # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
   pname = "dhcpcd";
-  version = "8.0.1";
+  version = "8.0.2";
 
   src = fetchurl {
     url = "mirror://roy/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0cd9vcyc9bisxzb56z2yrpiy7678bgzl7hzy2i3v8hddynz4y7q3";
+    sha256 = "0p3sc9yfb40fn1z8rvvxqd0jpxsxm1967pp6w77x4v2lc7anm8ik";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 9fe10288f01984963faf47e21bf1bae4d7d37962 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Thu, 20 Jun 2019 17:15:33 +0000
Subject: [PATCH 008/794] openssh: use ssh-keysign from PATH

ssh-keysign is used for host-based authentication, and is designed to be used
as SUID-root program. OpenSSH defaults to referencing it from libexec, which
cannot be made SUID in Nix.
---
 pkgs/tools/networking/openssh/default.nix     |  2 ++
 .../networking/openssh/ssh-keysign.patch      | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/networking/openssh/ssh-keysign.patch

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 6ce574b9cdc..24adb554bc1 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
         url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch;
         sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds";
       })
+
+      ./ssh-keysign.patch
     ]
     ++ optional withGssapiPatches (assert withKerberos; gssapiPatch);
 
diff --git a/pkgs/tools/networking/openssh/ssh-keysign.patch b/pkgs/tools/networking/openssh/ssh-keysign.patch
new file mode 100644
index 00000000000..7258f4a4db1
--- /dev/null
+++ b/pkgs/tools/networking/openssh/ssh-keysign.patch
@@ -0,0 +1,29 @@
+diff --git a/pathnames.h b/pathnames.h
+index cb44caa4..354fdf05 100644
+--- a/pathnames.h
++++ b/pathnames.h
+@@ -124,7 +124,7 @@
+ 
+ /* Location of ssh-keysign for hostbased authentication */
+ #ifndef _PATH_SSH_KEY_SIGN
+-#define _PATH_SSH_KEY_SIGN		"/usr/libexec/ssh-keysign"
++#define _PATH_SSH_KEY_SIGN		"ssh-keysign"
+ #endif
+ 
+ /* Location of ssh-pkcs11-helper to support keys in tokens */
+diff --git a/sshconnect2.c b/sshconnect2.c
+index dffee90b..e9a86e59 100644
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -1879,7 +1879,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp,
+ 		closefrom(sock + 1);
+ 		debug3("%s: [child] pid=%ld, exec %s",
+ 		    __func__, (long)getpid(), _PATH_SSH_KEY_SIGN);
+-		execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL);
++		execlp(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL);
+ 		fatal("%s: exec(%s): %s", __func__, _PATH_SSH_KEY_SIGN,
+ 		    strerror(errno));
+ 	}
+-- 
+2.22.0
+

From 396e3a6b3cf11578b1005fd6ad0513d6edaba46b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 2 Aug 2019 11:16:32 +0100
Subject: [PATCH 009/794] libdrm: cross-compile fix

---
 .../libdrm/cross-build-nm-path.patch          | 48 +++++++++++++++++++
 pkgs/development/libraries/libdrm/default.nix |  6 ++-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libdrm/cross-build-nm-path.patch

diff --git a/pkgs/development/libraries/libdrm/cross-build-nm-path.patch b/pkgs/development/libraries/libdrm/cross-build-nm-path.patch
new file mode 100644
index 00000000000..478534e65e5
--- /dev/null
+++ b/pkgs/development/libraries/libdrm/cross-build-nm-path.patch
@@ -0,0 +1,48 @@
+From 9e05fece7918edce9c6aa5a1f1ea375108e5b2be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Fri, 2 Aug 2019 10:26:37 +0100
+Subject: [PATCH] meson: support for custom nm path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When cross-compiling target toolchains i.e. binutils are often
+prefixed by its target architecture. This patch gives the user
+to option to specify the nm used during the build process.
+
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ meson.build       | 2 +-
+ meson_options.txt | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e292554a..64607139 100644
+--- a/meson.build
++++ b/meson.build
+@@ -327,7 +327,7 @@ pkg.generate(
+ )
+ 
+ env_test = environment()
+-env_test.set('NM', find_program('nm').path())
++env_test.set('NM', find_program(get_option('nm-path')).path())
+ 
+ if with_libkms
+   subdir('libkms')
+diff --git a/meson_options.txt b/meson_options.txt
+index 8af33f1c..b4f46a52 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -141,3 +141,9 @@ option(
+   value : false,
+   description : 'Enable support for using udev instead of mknod.',
+ )
++option(
++  'nm-path',
++  type : 'string',
++  description : 'path to nm',
++  value : 'nm'
++)
+-- 
+2.22.0
+
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index bdc191fe8a3..29d59659f90 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig meson ninja ];
   buildInputs = [ libpthreadstubs libpciaccess valgrind-light ];
 
+  patches = [ ./cross-build-nm-path.patch ];
+
   postPatch = ''
     for a in */*-symbol-check ; do
       patchShebangs $a
@@ -21,7 +23,9 @@ stdenv.mkDerivation rec {
   '';
 
   mesonFlags =
-    [ "-Dinstall-test-programs=true" ]
+    [
+      "-Dnm-path=${stdenv.cc.targetPrefix}nm"
+      "-Dinstall-test-programs=true" ]
     ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
       [ "-Dtegra=true" "-Detnaviv=true" ]
     ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"

From 8a604d2dbcceaac27654e3b1573f53ed47c3345f Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Sat, 3 Aug 2019 08:27:50 +0200
Subject: [PATCH 010/794] fribidi: fix cross compilation (#64655)

---
 pkgs/development/libraries/fribidi/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index b60f4be245e..9798347eadd 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchurl
 , fetchpatch
-
 , meson
 , ninja
 , pkgconfig
@@ -10,7 +9,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fribidi";
   version = "1.0.5";
 
@@ -18,7 +16,7 @@ stdenv.mkDerivation rec {
 
   # NOTE: 2018-06-06 v1.0.5: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
   src = fetchurl {
-    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
+    url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2";
     sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a";
   };
 
@@ -33,10 +31,11 @@ stdenv.mkDerivation rec {
     patchShebangs test
   '';
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ meson ninja pkgconfig ]
+    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-  checkInptus = [ python3 ];
+  doCheck = true;
+  checkInputs = [ python3 ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/fribidi/fribidi;

From 3c85b7155a47a588d6cb2f388d241a1a25682411 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 3 Aug 2019 09:38:27 -0700
Subject: [PATCH 011/794] rust-cbindgen: 0.8.7 -> 0.9.0

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

diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index ca4b6825a38..945b78caccc 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rust-cbindgen-${version}";
-  version = "0.8.7";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "eqrion";
     repo = "cbindgen";
     rev = "v${version}";
-    sha256 = "040rivayr0dgmrhlly5827c850xbr0j5ngiy6rvwyba5j9iv2x0y";
+    sha256 = "1sh9kll3ky0d6chp7l7z8j91ckibxkfhi0v7imz2fgzzy2lbqy88";
   };
 
-  cargoSha256 = "1nig4891p7ii4z4f4j4d4pxx39f501g7yrsygqbpkr1nrgjip547";
+  cargoSha256 = "1cn84xai1n0f8xwwwwig93dawk73g1w6n6zm4axg5zl4vrmq4j6w";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 5c0cdcfad269487d063a7dccd597781174c0b8a7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 20:19:16 -0700
Subject: [PATCH 012/794] cmakeWithGui: 3.14.5 -> 3.15.1

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

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 4761d8dc5b1..5bad0100a03 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
           + lib.optionalString useNcurses "-cursesUI"
           + lib.optionalString withQt5 "-qt5UI"
           + lib.optionalString useQt4 "-qt4UI";
-  version = "3.14.5";
+  version = "3.15.1";
 
   src = fetchurl {
     url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
     # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
-    sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06";
+    sha256 = "1xyprly3sf4wi0n1x79k4n22yxm6pb7fv70gqr9lvc7qv14cbphq";
   };
 
   patches = [

From f2d6a195a1360e50b05ab896a641115d78ef9c3b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 05:01:58 -0700
Subject: [PATCH 013/794] glib: 2.60.4 -> 2.60.6

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

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index ecbcbea1394..1363fcabdc3 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -46,7 +46,7 @@ let
   '';
 
   binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
-  version = "2.60.4";
+  version = "2.60.6";
 in
 
 stdenv.mkDerivation rec {
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b";
+    sha256 = "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch

From 93d6d032f2067deafbf168dbcfbb380bbec032a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 06:31:31 -0700
Subject: [PATCH 014/794] jsoncpp: 1.9.0 -> 1.9.1

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

diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index fa2b45ae948..c62f1e2de3f 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jsoncpp";
-  version = "1.9.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "open-source-parsers";
     repo = "jsoncpp";
     rev = version;
-    sha256 = "10wnwlq92gp32f5p55kjcc12jfsl0yq6f2y4abb0si6wym12krw9";
+    sha256 = "00g356iv3kcp0gadj7gbyzf9jn9avvx9vxbxc7c2i5nnry8z72wj";
   };
 
   /* During darwin bootstrap, we have a cp that doesn't understand the

From 403d64a705300180517241691266bcb68beb8748 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 23:30:44 -0700
Subject: [PATCH 015/794] libsForQt5.phonon: 4.10.2 -> 4.10.3

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

diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 4d68d3718c0..2dd0cc10c94 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -6,7 +6,7 @@
 with lib;
 
 let
-  v = "4.10.2";
+  v = "4.10.3";
 
   soname = if withQt5 then "phonon4qt5" else "phonon";
   buildsystemdir = "share/cmake/${soname}";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
-    sha256 = "02c8fyyvg5qb0lxwxmnxc5grkg6p3halakjf02vmwmvqaycb3v9l";
+    sha256 = "15f2vndpqfcivifzl1s07r0wkavpfrjln1p46cwfk85gd5b192rf";
   };
 
   buildInputs =

From 27a71a19ed6748177c073fe8dfad95849e9f5058 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 3 Aug 2019 11:09:41 -0400
Subject: [PATCH 016/794] gtk3: defines for debugging, disable cast checks

Because we're using plain buildtype these have to be
passed manually.

See: https://gitlab.gnome.org/GNOME/gtk/blob/3.24.10/meson.build#L59

With autotools the mapping for the the options to the defines was:

yes:     G_ENABLE_DEBUG G_ENABLE_CONSISTENCY_CHECKS
minimum: G_ENABLE_DEBUG G_DISABLE_CAST_CHECKS
no:      G_DISABLE_CAST_CHECKS G_DISABLE_ASSERT G_DISABLE_CHECKS

So we're passing the exact ones that would've been used for minimum.

Additionally it isn't a good idea to pass the equivalents used for "no"
as it eliminates G_ENABLE_DEBUG which disables pre-condition checks and
assertions. The actual option only existed to serve people who needed a
specific build of GTK for very specific environments. And now they are
much better served with meson's plain buildtype and figuring out what to
pass themselves.
---
 pkgs/development/libraries/gtk+/3.x.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 94b745794f1..40be17fcac7 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -77,6 +77,13 @@ stdenv.mkDerivation rec {
     "-Dtests=false"
   ];
 
+  # These are the defines that'd you'd get with --enable-debug=minimum (default).
+  # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
+  NIX_CFLAGS_COMPILE = [
+    "-DG_ENABLE_DEBUG"
+    "-DG_DISABLE_CAST_CHECKS"
+  ];
+
   postPatch = ''
     files=(
       build-aux/meson/post-install.py

From 60266eb504938631d2162a1fba3044eaa0d62d91 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 3 Aug 2019 11:10:41 -0400
Subject: [PATCH 017/794] glib: add cflag G_DISABLE_CAST_CHECKS

This is what would have been passed before with the release
buildtype.

See: https://gitlab.gnome.org/GNOME/glib/blob/2.60.4/meson.build#L208
---
 pkgs/development/libraries/glib/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index ecbcbea1394..ed7c66946fa 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -98,8 +98,12 @@ stdenv.mkDerivation rec {
 
   LC_ALL = "en_US.UTF-8";
 
-  NIX_CFLAGS_COMPILE = (optional stdenv.isSunOS "-DBSD_COMP")
-    ++ [ "-Wno-error=nonnull" ];
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=nonnull"
+    # Default for release buildtype but passed manually because
+    # we're using plain
+    "-DG_DISABLE_CAST_CHECKS"
+  ] ++ optional stdenv.isSunOS "-DBSD_COMP";
 
   postPatch = ''
     # substitute fix-gio-launch-desktop-path.patch

From c7c727fa9382e4f4cc69b63642585f96890add83 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 06:13:01 -0400
Subject: [PATCH 018/794] gnome3.gnome-settings-daemon: add cflag
 G_DISABLE_CAST_CHECKS

This is what would have been passed before with the release
buildtype.

See: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/blob/GNOME_SETTINGS_DAEMON_3_32_1/meson.build#L73
---
 .../desktops/gnome-3/core/gnome-settings-daemon/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 6929f821e37..b9f33ce73a8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -95,6 +95,12 @@ stdenv.mkDerivation rec {
     "-Dudev_dir=${placeholder "out"}/lib/udev"
   ];
 
+  NIX_CFLAGS_COMPILE = [
+    # Default for release buildtype but passed manually because
+    # we're using plain
+    "-DG_DISABLE_CAST_CHECKS"
+  ];
+
   # So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper
   postFixup = ''
     mkdir -p $out/bin/gnome-settings-daemon

From 3b085b45b903bd00d37be4fd8e28e4346aa0fd92 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 4 Aug 2019 09:50:13 -0400
Subject: [PATCH 019/794] pantheon.elementary-settings-daemon: add cflag
 G_DISABLE_CAST_CHECKS

Mirror c7c727fa9382e4f4cc69b63642585f96890add83.
---
 .../services/elementary-settings-daemon/default.nix         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index d8514c51f4f..b4391b2e1b0 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -150,6 +150,12 @@ stdenv.mkDerivation rec {
     "-Dudev_dir=${placeholder "out"}/lib/udev"
   ];
 
+  NIX_CFLAGS_COMPILE = [
+    # Default for release buildtype but passed manually because
+    # we're using plain
+    "-DG_DISABLE_CAST_CHECKS"
+  ];
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = projectName;

From f2eddec042da1d6bf38106565f0ee5c33c23c062 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 06:19:44 -0400
Subject: [PATCH 020/794] glib: drop define BSD_COMP

I fail to see where or for what it is useful for.
---
 pkgs/development/libraries/glib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index ed7c66946fa..7b226f9fc80 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
     # Default for release buildtype but passed manually because
     # we're using plain
     "-DG_DISABLE_CAST_CHECKS"
-  ] ++ optional stdenv.isSunOS "-DBSD_COMP";
+  ];
 
   postPatch = ''
     # substitute fix-gio-launch-desktop-path.patch

From 3c72fa7dda961613ea48fa3ebaf23fa18e3be8e4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 1 Jul 2019 04:59:35 -0700
Subject: [PATCH 021/794] enchant: 2.2.3 -> 2.2.4

Clean up the expression and prepare for tests. Unfortunately, I could not get them pass.
---
 pkgs/development/libraries/enchant/2.x.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 8b559bd03c8..3f46390c12b 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
+{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell, unittest-cpp }:
 
-let
-  version = "2.2.3";
+stdenv.mkDerivation rec {
   pname = "enchant";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "2.2.4";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b";
+    url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
+    sha256 = "1p6a3qmrh8bjzds6x7rg9da0ir44gg804jzkf634h39wsa4vdmpm";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ glib hunspell ];
+  checkInputs = [ unittest-cpp ];
   propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file
 
-  doCheck = false; # fails to compile with with "UnitTest++.h: No such file or directory"
+  enableParallelBuilding = true;
+
+  doCheck = false; # https://github.com/AbiWord/enchant/issues/219
 
   meta = with stdenv.lib; {
     description = "Generic spell checking library";

From 6039f911b27aa1ec0a8e114bb09872f6b5e087d2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 04:03:00 -0700
Subject: [PATCH 022/794] gnome3.vala: 0.44.5 -> 0.44.6

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

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 353963007d4..b77e6442362 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -129,8 +129,8 @@ in rec {
   };
 
   vala_0_44 = generic {
-    version = "0.44.5";
-    sha256 = "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv";
+    version = "0.44.6";
+    sha256 = "0fkrrpnisgq3y816piyr7hm2b94jaj7ki9y974galq3lmxb1g7xb";
   };
 
   vala = vala_0_44;

From 6d1a5723d2c9e9e4d2a4632b1ba7566a1a894b61 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 6 Aug 2019 11:00:19 -0400
Subject: [PATCH 023/794] vala_0_40: 0.40.15 -> 0.40.16

https://gitlab.gnome.org/GNOME/vala/raw/0.40.16/NEWS
---
 pkgs/development/compilers/vala/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 353963007d4..497f2316cb0 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -119,8 +119,8 @@ in rec {
   };
 
   vala_0_40 = generic {
-    version = "0.40.15";
-    sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19";
+    version = "0.40.16";
+    sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b";
   };
 
   vala_0_42 = generic {

From 469d17a3f0d8089cd14435b87d3886f1eeac27ec Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 6 Aug 2019 14:42:51 -0500
Subject: [PATCH 024/794] Revert "Revert "qt 5.12.0 -> 5.12.3""

This reverts commit bf39fc17d46b48e3883dd646bc0ecc0ccfb67df4.
---
 .../libraries/qt-5/5.12/default.nix           |   1 -
 pkgs/development/libraries/qt-5/5.12/fetch.sh |   2 +-
 .../libraries/qt-5/5.12/qtbase.patch          |  49 +--
 .../qt-5/5.12/qtwebengine-CVE-2019-5786.patch |  26 --
 pkgs/development/libraries/qt-5/5.12/srcs.nix | 320 +++++++++---------
 .../libraries/qt-5/modules/qtbase.nix         |  31 +-
 pkgs/top-level/all-packages.nix               |   2 +-
 7 files changed, 216 insertions(+), 215 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch

diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 1bc63d0e2b9..7b4addd9161 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -59,7 +59,6 @@ let
     qtserialport = [ ./qtserialport.patch ];
     qtwebengine = [
       ./qtwebengine-no-build-skip.patch
-      ./qtwebengine-CVE-2019-5786.patch
     ]
       ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
     qtwebkit = [ ./qtwebkit.patch ]
diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh
index aa3a0fe9489..a4d2fc82ff2 100644
--- a/pkgs/development/libraries/qt-5/5.12/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ )
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/ )
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
index aa987acbe92..a3b4e438fe8 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
@@ -2,7 +2,7 @@ diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
 index 61bea952b2..9909dae726 100644
 --- a/mkspecs/common/mac.conf
 +++ b/mkspecs/common/mac.conf
-@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL     = \
+@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL     = \
  
  QMAKE_FIX_RPATH         = install_name_tool -id
  
@@ -90,7 +90,7 @@ index 2ed708e085..05e60ff45f 100644
      INSTALLS += cmake_qt5_plugin_file
  
      return()
-@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) {
+@@ -318,7 +293,7 @@ exists($$cmake_macros_file.input) {
      cmake_qt5_module_files.files += $$cmake_macros_file.output
  }
  
@@ -263,15 +263,14 @@ diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/defaul
 index 99f68b78f5..dde69cb7c2 100644
 --- a/mkspecs/features/mac/default_post.prf
 +++ b/mkspecs/features/mac/default_post.prf
-@@ -63,199 +63,3 @@ qt {
-         }
+@@ -64,202 +64,6 @@
      }
  }
--
+ 
 -# Add the same default rpaths as Xcode does for new projects.
 -# This is especially important for iOS/tvOS/watchOS where no other option is possible.
 -!no_default_rpath {
--    QMAKE_RPATHDIR += @executable_path/Frameworks
+-    QMAKE_RPATHDIR += @executable_path/../Frameworks
 -    equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks
 -}
 -
@@ -463,6 +462,10 @@ index 99f68b78f5..dde69cb7c2 100644
 -    xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier}
 -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}"
 -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
+-
+ !macx-xcode {
+     generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_)
+     generate_xcode_project.target = xcodeproj
 diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
 index e3534561a5..3b01424e67 100644
 --- a/mkspecs/features/mac/default_pre.prf
@@ -532,7 +535,7 @@ diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
 index 8360dd8b38..8b13789179 100644
 --- a/mkspecs/features/mac/sdk.prf
 +++ b/mkspecs/features/mac/sdk.prf
-@@ -1,58 +1 @@
+@@ -1,54 +1 @@
  
 -isEmpty(QMAKE_MAC_SDK): \
 -    error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
@@ -568,10 +571,6 @@ index 8360dd8b38..8b13789179 100644
 -QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)
 -QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
 -
--sysrootified =
--for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
--QMAKE_INCDIR_OPENGL = $$sysrootified
--
 -QMAKESPEC_NAME = $$basename(QMAKESPEC)
 -
 -# Resolve SDK version of various tools
@@ -595,24 +594,24 @@ diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
 index 65212b2abf..accd4c07f0 100644
 --- a/mkspecs/features/qml_module.prf
 +++ b/mkspecs/features/qml_module.prf
-@@ -52,7 +52,7 @@ qmldir.base = $$_PRO_FILE_PWD_
- # Tools need qmldir and plugins.qmltypes always installed on the file system
- qmldir.files = $$qmldir_file $$fq_aux_qml_files
+@@ -54,7 +54,7 @@
+ 
+ qmldir.files = $$qmldir_file
  install_qml_files: qmldir.files += $$fq_qml_files
--qmldir.path = $$instbase/$$TARGETPATH
+-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH
 +qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH
  INSTALLS += qmldir
  
- !debug_and_release|!build_all|CONFIG(release, debug|release) {
+ qmlfiles.base = $$_PRO_FILE_PWD_
 diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
 index cd6377dcc6..e98bf98151 100644
 --- a/mkspecs/features/qml_plugin.prf
 +++ b/mkspecs/features/qml_plugin.prf
-@@ -56,7 +56,7 @@ qml1_target {
-     instbase = $$[QT_INSTALL_QML]
- }
+@@ -50,7 +50,7 @@
  
--target.path = $$instbase/$$TARGETPATH
+ DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
+ 
+-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH
 +target.path = $$NIX_OUTPUT_QML/$$TARGETPATH
  INSTALLS += target
  
@@ -746,7 +745,7 @@ index 8f98987b99..21b3bb8b32 100644
      !static: target.CONFIG = no_dll
      INSTALLS += target
  }
-@@ -29,33 +23,33 @@
+@@ -29,35 +23,35 @@
  #headers
  qt_install_headers {
      gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES
@@ -762,6 +761,8 @@ index 8f98987b99..21b3bb8b32 100644
      private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES
 -    private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
 +    private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
+     generated_privates: \
+         private_headers.CONFIG += no_check_exist
      INSTALLS += private_headers
  
      qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES
@@ -876,7 +877,7 @@ diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcorea
 index 463e30e1c3..0e1ab669e4 100644
 --- a/src/corelib/kernel/qcoreapplication.cpp
 +++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -2665,6 +2665,15 @@ QStringList QCoreApplication::libraryPaths()
+@@ -2668,6 +2668,15 @@
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
  
@@ -889,9 +890,9 @@ index 463e30e1c3..0e1ab669e4 100644
 +            }
 +        }
 +
-         const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
+         QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH");
          if (!libPathEnv.isEmpty()) {
-             QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
+             QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts);
 diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp
 index bed62a02bd..73158993f7 100644
 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp
diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
deleted file mode 100644
index ec9a432ea70..00000000000
--- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-@@ -135,14 +135,16 @@
-   if (!raw_data_ || error_code_)
-     return nullptr;
- 
--  DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
--  if (finished_loading_) {
--    array_buffer_result_ = result;
--    AdjustReportedMemoryUsageToV8(
--        -1 * static_cast<int64_t>(raw_data_->ByteLength()));
--    raw_data_.reset();
-+  if (!finished_loading_) {
-+    return DOMArrayBuffer::Create(
-+        ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength()));
-   }
--  return result;
-+  array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
-+  AdjustReportedMemoryUsageToV8(-1 *
-+                                static_cast<int64_t>(raw_data_->ByteLength()));
-+
-+  raw_data_.reset();
-+  return array_buffer_result_;
- }
- 
- String FileReaderLoader::StringResult() {
diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix
index d83edc97e94..ce567c3a2bc 100644
--- a/pkgs/development/libraries/qt-5/5.12/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   qt3d = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qt3d-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1nii8qz8791ripmqd158qah40j2dj50zn7lmqksqz8gz2jfdqam1";
-      name = "qt3d-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz";
+      sha256 = "8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d";
+      name = "qt3d-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtactiveqt = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtactiveqt-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0gkdx3mc6ysqlf0ci77kf9c961dc9sbi4j3z5q237d1w4js7ca52";
-      name = "qtactiveqt-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtactiveqt-everywhere-src-5.12.3.tar.xz";
+      sha256 = "15a5fde0a069f402bea9f422d8d2c46af440d202122c6307c2a6be642d20dc0f";
+      name = "qtactiveqt-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtandroidextras = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtandroidextras-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0s083ngvya8bknp0bvgb3hyk6zr8shg8rmkzn98956dqz0xs3agm";
-      name = "qtandroidextras-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtandroidextras-everywhere-src-5.12.3.tar.xz";
+      sha256 = "866b3fbcfc2cbebdb83b5adec4e5d0bd29b0e0b0762d66fb3fef0b400e37254f";
+      name = "qtandroidextras-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtbase = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1jzfx8c0hzch0kmz2m4vkn65s7ikiymnm29lsymil4hfg0fj40sy";
-      name = "qtbase-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz";
+      sha256 = "fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701";
+      name = "qtbase-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtcanvas3d = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcanvas3d-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0a61z5amp409aq9v7j0fyk003fbz2i247idl7lgfbl4qqh0ry6xj";
-      name = "qtcanvas3d-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcanvas3d-everywhere-src-5.12.3.tar.xz";
+      sha256 = "c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea";
+      name = "qtcanvas3d-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtcharts = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcharts-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0l6lrrwqbqaf6agsghaw4ysm2vb6b4n9j5lgrs1i0q8h9i51rmww";
-      name = "qtcharts-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcharts-everywhere-src-5.12.3.tar.xz";
+      sha256 = "820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9";
+      name = "qtcharts-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtconnectivity = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtconnectivity-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1912a4my72wcqmmdyj24wkwq9p9ih4gzzzvgiq75pfwyhnxa3g4f";
-      name = "qtconnectivity-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz";
+      sha256 = "01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661";
+      name = "qtconnectivity-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtdatavis3d = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdatavis3d-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0czlj088gf2r6w5ahh0p8n36lbwmds86mxqijshmhzax5cspxnjf";
-      name = "qtdatavis3d-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdatavis3d-everywhere-src-5.12.3.tar.xz";
+      sha256 = "f6d073c4575542f8ff6de3ac3b6e8dde6ae2d87e98119de7a13bc984aa967313";
+      name = "qtdatavis3d-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtdeclarative = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdeclarative-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0yr29hm3bqlwxcmna0bzyxw8k4hw3x8k3k4iiw2sw52p5c85izag";
-      name = "qtdeclarative-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz";
+      sha256 = "839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7";
+      name = "qtdeclarative-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtdoc = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdoc-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1k8caa1nmc9nrhb29vq1qzaz608klnjxy509w6ppxlzz2zbpcr9h";
-      name = "qtdoc-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdoc-everywhere-src-5.12.3.tar.xz";
+      sha256 = "ce5e9d0f48d108c48d742ab2127ead735270d7b525103c6cf409683d7fc8334f";
+      name = "qtdoc-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtgamepad = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgamepad-everywhere-src-5.12.0.tar.xz";
-      sha256 = "14b0np15gm5lzvip33pg6w9dfs065wwdfz18na28bhbxj6wh06ac";
-      name = "qtgamepad-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgamepad-everywhere-src-5.12.3.tar.xz";
+      sha256 = "5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642";
+      name = "qtgamepad-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtgraphicaleffects = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0m9l031zhw8il66ld8bj1lwqlc2xx89nl6dvssz1kl2d5nqqy1c1";
-      name = "qtgraphicaleffects-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz";
+      sha256 = "772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73";
+      name = "qtgraphicaleffects-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtimageformats = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtimageformats-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0bkkk5skpplwfbqv7g41rhgynyxs3khvf8gk2rl2gdixdplpv42z";
-      name = "qtimageformats-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz";
+      sha256 = "db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2";
+      name = "qtimageformats-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtlocation = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtlocation-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0ja4cwj59y1xhwwf4f5gzr0fdrrsxbh14g2x812n03x0yd6i78xh";
-      name = "qtlocation-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz";
+      sha256 = "52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6";
+      name = "qtlocation-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtmacextras = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmacextras-everywhere-src-5.12.0.tar.xz";
-      sha256 = "00xhkj66i3srwmzzin1mcx9m94l5ns08f93c1za3wl23ani7n2nr";
-      name = "qtmacextras-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmacextras-everywhere-src-5.12.3.tar.xz";
+      sha256 = "38dedd29d07ea9e4e92a7ef28f9e03c06cf9a1525aee4f8084310c519f5b47ed";
+      name = "qtmacextras-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtmultimedia = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1a96x6c2w9rs6vfsdcnzmmad4w32dxy2dvismldcwmwcq2whqjsw";
-      name = "qtmultimedia-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz";
+      sha256 = "a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301";
+      name = "qtmultimedia-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtnetworkauth = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtnetworkauth-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0x877ra8375pf8d8p6hgdkyw8yzjqfca6rgki6vi1q8fyi31j4a1";
-      name = "qtnetworkauth-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz";
+      sha256 = "dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332";
+      name = "qtnetworkauth-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtpurchasing = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtpurchasing-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1nk0dp247v1rfbnj84g99zsj6iv86pq32f478r92adz9qcgfs2yr";
-      name = "qtpurchasing-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtpurchasing-everywhere-src-5.12.3.tar.xz";
+      sha256 = "a848f1e1022af38571f5ab0c4ec4b904c12fa6ef19154d44abbcaeb35156753e";
+      name = "qtpurchasing-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtquickcontrols = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0wyd24aphpixi3k9vbxw73z3dy1xnf8hwc99wimr5mpf1cj67yrb";
-      name = "qtquickcontrols-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz";
+      sha256 = "68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46";
+      name = "qtquickcontrols-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtquickcontrols2 = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols2-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1ikxj32rd9pipnrz81l5ln700lnw8w6bx573w01x424sx0p7wxw9";
-      name = "qtquickcontrols2-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz";
+      sha256 = "e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a";
+      name = "qtquickcontrols2-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtremoteobjects = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtremoteobjects-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0pwx2m17yw1qqv8qigfndgj1yd5kq8w5cbiaqlw4zdk1m6jd0h09";
-      name = "qtremoteobjects-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtremoteobjects-everywhere-src-5.12.3.tar.xz";
+      sha256 = "3475a409127739930e0bf833cea5f7f605adc66ab25fac39b72ce4bf3039cc42";
+      name = "qtremoteobjects-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtscript = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscript-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1a7ziipvy8cfmrpw2b868167sw21zrqhfv2la0w9vs6hwli1mzlp";
-      name = "qtscript-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz";
+      sha256 = "0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e";
+      name = "qtscript-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtscxml = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscxml-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0syx3bx9pxxrsxanfv245ifppjhbj7sbrndh8il86xlrcr9cwvnw";
-      name = "qtscxml-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscxml-everywhere-src-5.12.3.tar.xz";
+      sha256 = "70c4b1f8e23560cf54e69aeb3ded4078434e6f78e1b9573fbad1ddace5fc4b19";
+      name = "qtscxml-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtsensors = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsensors-everywhere-src-5.12.0.tar.xz";
-      sha256 = "19n5vlx0j5a0h86mpgs86qzsxbyq8fcrls7yqnjdaw0zga234cf5";
-      name = "qtsensors-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz";
+      sha256 = "7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc";
+      name = "qtsensors-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtserialbus = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialbus-everywhere-src-5.12.0.tar.xz";
-      sha256 = "16imi82v17n18a5m0i2fcfj6hqdpnzn2z9kdcf6a8h93fv4qd4kb";
-      name = "qtserialbus-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialbus-everywhere-src-5.12.3.tar.xz";
+      sha256 = "792cd2d411d2ebd737f5d09580f8db479cd35f2f7e7cedb4412075ef20fcfe4d";
+      name = "qtserialbus-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtserialport = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialport-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1fx9fm0418jq05j2hlb52lblq8nr4m0hj8sizi86p708jmb01m2r";
-      name = "qtserialport-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz";
+      sha256 = "1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51";
+      name = "qtserialport-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtspeech = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtspeech-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1yx4wahl7iaj6lgpvnw8pdi2q4wc2fkpzfidd3j1bc98wpna4f8r";
-      name = "qtspeech-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz";
+      sha256 = "ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5";
+      name = "qtspeech-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtsvg = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsvg-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1kpvqd0p7dblgh26p3a99npqr0wmyg5yv0dcmf78ssrvsy58vrpb";
-      name = "qtsvg-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz";
+      sha256 = "f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2";
+      name = "qtsvg-everywhere-src-5.12.3.tar.xz";
     };
   };
   qttools = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttools-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1hyschrj568h65m3kl35xqz25hpk61vr98r08375vkavdr5y6k2p";
-      name = "qttools-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz";
+      sha256 = "c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8";
+      name = "qttools-everywhere-src-5.12.3.tar.xz";
     };
   };
   qttranslations = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttranslations-everywhere-src-5.12.0.tar.xz";
-      sha256 = "023m68vdjj75xnbpc1jflyg85amnjc9i6nwv650k0w4n1dp1hksv";
-      name = "qttranslations-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz";
+      sha256 = "eefcec0a91c302548f9d948a138b8ec77d78570ce818931bd8475b1bff1205ca";
+      name = "qttranslations-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtvirtualkeyboard = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1nnns0i577zda6qxxd7pxcy06dq0y7lnni8ghn4adh9yl6dvi4yv";
-      name = "qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz";
+      sha256 = "7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22";
+      name = "qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwayland = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwayland-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1mvyv4wkcxj4h3q0mqw53zb1d0pahf8mz3r29kckadvk64djsp2m";
-      name = "qtwayland-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz";
+      sha256 = "f0b45ad84180730e2d5a1249eb20c6357869b4b78f45eb266c2f2b17f77d86ff";
+      name = "qtwayland-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwebchannel = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebchannel-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1w2b31d7xjzdcgwkb4mz3qrl9ci7c9l4c3v4h8y59isip45g66l5";
-      name = "qtwebchannel-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz";
+      sha256 = "72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a";
+      name = "qtwebchannel-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwebengine = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebengine-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0z38ad25n7ckylxnmqrxy95ds4pn7i5k7qxh856zgq1h18wiwn5x";
-      name = "qtwebengine-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz";
+      sha256 = "3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317";
+      name = "qtwebengine-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwebglplugin = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebglplugin-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0bk5dg33kn2l5lmgd6slsrs9xg15x9h9li91lr1q7qs67b8kl8k5";
-      name = "qtwebglplugin-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebglplugin-everywhere-src-5.12.3.tar.xz";
+      sha256 = "23da63013101e97c4e663bb4f6dbb1c7b4386679c634680d3b8d79bcc59d26b3";
+      name = "qtwebglplugin-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwebsockets = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebsockets-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0gzwfjnlgcijym5bn9gi93qlvzizrhf1q9dq06576419sg0s2ka4";
-      name = "qtwebsockets-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz";
+      sha256 = "258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577";
+      name = "qtwebsockets-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwebview = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebview-everywhere-src-5.12.0.tar.xz";
-      sha256 = "11b16b31bxcazqzg1ag9rzh4gj9pif2cf3jz2mj1sdprxp22ra5p";
-      name = "qtwebview-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebview-everywhere-src-5.12.3.tar.xz";
+      sha256 = "f904e7fd7e755527e5bc4633c6f7c144065a3ffea473bf01fffb730385a983c5";
+      name = "qtwebview-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwinextras = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwinextras-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1l6s140vrfxb9ar4p1dq9w2gfk3zvgrpqdxbbzs4ngfpwk6mlky6";
-      name = "qtwinextras-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwinextras-everywhere-src-5.12.3.tar.xz";
+      sha256 = "2b6319f7dd19fc19b028685c163a69f0a10e610d7554411d4660c1b5e42ada3b";
+      name = "qtwinextras-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtx11extras = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtx11extras-everywhere-src-5.12.0.tar.xz";
-      sha256 = "114b4akzpcgx57c6gkl558bl0mbasi34r22fmq3ny84dhvlv9m06";
-      name = "qtx11extras-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz";
+      sha256 = "85e3ae5177970c2d8656226d7535d0dff5764c100e55a79a59161d80754ba613";
+      name = "qtx11extras-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtxmlpatterns = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtxmlpatterns-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0xckcw1j6f5l92c269pb8cx77d21sghp7m7dc05jl1dqmyy7jqpk";
-      name = "qtxmlpatterns-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz";
+      sha256 = "e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61";
+      name = "qtxmlpatterns-everywhere-src-5.12.3.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 458946b803d..8506a80ddf3 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -229,6 +229,8 @@ stdenv.mkDerivation {
       "-widgets"
       "-opengl desktop"
       "-icu"
+      "-L" "${icu.out}/lib"
+      "-I" "${icu.dev}/include"
       "-pch"
     ]
     ++ lib.optionals (compareVersion "5.11.0" < 0)
@@ -265,10 +267,18 @@ stdenv.mkDerivation {
 
     ++ [
       "-system-zlib"
+      "-L" "${zlib.out}/lib"
+      "-I" "${zlib.dev}/include"
       "-system-libjpeg"
+      "-L" "${libjpeg.out}/lib"
+      "-I" "${libjpeg.dev}/include"
       "-system-harfbuzz"
+      "-L" "${harfbuzz.out}/lib"
+      "-I" "${harfbuzz.dev}/include"
       "-system-pcre"
       "-openssl-linked"
+      "-L" "${openssl.out}/lib"
+      "-I" "${openssl.dev}/include"
       "-system-sqlite"
       ''-${if mysql != null then "plugin" else "no"}-sql-mysql''
       ''-${if postgresql != null then "plugin" else "no"}-sql-psql''
@@ -297,10 +307,14 @@ stdenv.mkDerivation {
           "-system-xcb"
           "-xcb"
           "-qpa xcb"
+          "-L" "${libX11.out}/lib"
+          "-I" "${libX11.out}/include"
+          "-L" "${libXext.out}/lib"
+          "-I" "${libXext.out}/include"
+          "-L" "${libXrender.out}/lib"
+          "-I" "${libXrender.out}/include"
 
-          "-system-xkbcommon"
           "-libinput"
-          "-xkbcommon-evdev"
 
           "-no-eglfs"
           "-no-gbm"
@@ -321,6 +335,19 @@ stdenv.mkDerivation {
           "-no-feature-renameat2"
           "-no-feature-getentropy"
         ]
+        ++ lib.optionals (compareVersion "5.12.1" < 0) [
+          # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1
+          "-system-xkbcommon"
+          "-xkbcommon-evdev"
+        ]
+        ++ lib.optionals (cups != null) [
+          "-L" "${cups.lib}/lib"
+          "-I" "${cups.dev}/include"
+        ]
+        ++ lib.optionals (mysql != null) [
+          "-L" "${mysql.out}/lib"
+          "-I" "${mysql.out}/include"
+        ]
     );
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1eb600bd42..a352a56ed31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12960,7 +12960,7 @@ in
       inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper;
       bison = bison2; # error: too few arguments to function 'int yylex(...
       inherit cups;
-      harfbuzz = harfbuzzFull;
+      inherit harfbuzz;
       inherit libGL;
       inherit perl;
       inherit gtk3;

From 3a2a980787c464cdcf6835ccb54c273bd56fe0f1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 6 Aug 2019 14:43:04 -0500
Subject: [PATCH 025/794] Revert "Revert "qt512: Update qtbase.patch""

This reverts commit c220e00d7a4524f59e19d7337aa3d47e9a678e64.
---
 .../libraries/qt-5/5.12/qtbase.patch          | 485 ++++++++----------
 1 file changed, 222 insertions(+), 263 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
index a3b4e438fe8..118ffaa511e 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
@@ -1,8 +1,7 @@
-diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
-index 61bea952b2..9909dae726 100644
---- a/mkspecs/common/mac.conf
-+++ b/mkspecs/common/mac.conf
-@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL     = \
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf	2019-07-10 09:35:08.917628566 -0500
+@@ -24,7 +24,7 @@
  
  QMAKE_FIX_RPATH         = install_name_tool -id
  
@@ -11,11 +10,10 @@ index 61bea952b2..9909dae726 100644
  QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
  
  QMAKE_LFLAGS_REL_RPATH  =
-diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 2ed708e085..05e60ff45f 100644
---- a/mkspecs/features/create_cmake.prf
-+++ b/mkspecs/features/create_cmake.prf
-@@ -21,7 +21,7 @@ load(cmake_functions)
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf	2019-07-10 09:35:08.917628566 -0500
+@@ -21,7 +21,7 @@
  # at cmake time whether package has been found via a symlink, and correct
  # that to an absolute path. This is only done for installations to
  # the /usr or / prefix.
@@ -24,7 +22,7 @@ index 2ed708e085..05e60ff45f 100644
  contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
  
  CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
-@@ -51,45 +51,20 @@ split_incpath {
+@@ -51,45 +51,20 @@
          $$cmake_extra_source_includes.output
  }
  
@@ -81,7 +79,7 @@ index 2ed708e085..05e60ff45f 100644
  
  static|staticlib:CMAKE_STATIC_TYPE = true
  
-@@ -169,7 +144,7 @@ contains(CONFIG, plugin) {
+@@ -169,7 +144,7 @@
        cmake_target_file
  
      cmake_qt5_plugin_file.files = $$cmake_target_file.output
@@ -90,7 +88,7 @@ index 2ed708e085..05e60ff45f 100644
      INSTALLS += cmake_qt5_plugin_file
  
      return()
-@@ -318,7 +293,7 @@ exists($$cmake_macros_file.input) {
+@@ -318,7 +293,7 @@
      cmake_qt5_module_files.files += $$cmake_macros_file.output
  }
  
@@ -99,11 +97,10 @@ index 2ed708e085..05e60ff45f 100644
  
  # We are generating cmake files. Most developers of Qt are not aware of cmake,
  # so we require automatic tests to be available. The only module which should
-diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 3ed6dd5889..4c7c8da21a 100644
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2019-07-10 09:35:08.917628566 -0500
+@@ -3,30 +3,6 @@
      message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
  endif()
  
@@ -134,7 +131,7 @@ index 3ed6dd5889..4c7c8da21a 100644
  !!IF !equals(TEMPLATE, aux)
  # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
  set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
-@@ -52,11 +28,7 @@ endmacro()
+@@ -52,11 +28,7 @@
  macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
@@ -146,7 +143,7 @@ index 3ed6dd5889..4c7c8da21a 100644
      _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
      set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
          \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -69,11 +41,7 @@
      )
  
  !!IF !isEmpty(CMAKE_WINDOWS_BUILD)
@@ -158,7 +155,7 @@ index 3ed6dd5889..4c7c8da21a 100644
      _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
      if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
          set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -89,24 +57,13 @@
  !!IF !no_module_headers
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
@@ -187,7 +184,7 @@ index 3ed6dd5889..4c7c8da21a 100644
      )
  !!ELSE
      set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -122,7 +79,6 @@
      set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
  !!ENDIF
  !!ENDIF
@@ -195,7 +192,7 @@ index 3ed6dd5889..4c7c8da21a 100644
  !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
      include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
  !!ENDIF
-@@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -272,25 +228,13 @@
  !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
  !!IF isEmpty(CMAKE_DEBUG_TYPE)
  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -221,7 +218,7 @@ index 3ed6dd5889..4c7c8da21a 100644
          _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
  !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
      endif()
-@@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -309,25 +253,13 @@
  !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
  !!IF isEmpty(CMAKE_RELEASE_TYPE)
  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -247,7 +244,7 @@ index 3ed6dd5889..4c7c8da21a 100644
          _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
      endif()
-@@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -346,11 +278,7 @@
      macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
          set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
@@ -259,10 +256,9 @@ index 3ed6dd5889..4c7c8da21a 100644
          _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
          set_target_properties(Qt5::${Plugin} PROPERTIES
              \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
-index 99f68b78f5..dde69cb7c2 100644
---- a/mkspecs/features/mac/default_post.prf
-+++ b/mkspecs/features/mac/default_post.prf
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf	2019-07-10 09:35:08.917628566 -0500
 @@ -64,202 +64,6 @@
      }
  }
@@ -466,10 +462,9 @@ index 99f68b78f5..dde69cb7c2 100644
  !macx-xcode {
      generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_)
      generate_xcode_project.target = xcodeproj
-diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
-index e3534561a5..3b01424e67 100644
---- a/mkspecs/features/mac/default_pre.prf
-+++ b/mkspecs/features/mac/default_pre.prf
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf	2019-07-10 09:35:08.917628566 -0500
 @@ -1,60 +1,2 @@
  CONFIG = asset_catalogs rez $$CONFIG
  load(default_pre)
@@ -531,10 +526,9 @@ index e3534561a5..3b01424e67 100644
 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP
 -xcode_copy_phase_strip_setting.value = NO
 -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
-diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
-index 8360dd8b38..8b13789179 100644
---- a/mkspecs/features/mac/sdk.prf
-+++ b/mkspecs/features/mac/sdk.prf
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf	2019-07-10 09:35:08.917628566 -0500
 @@ -1,54 +1 @@
  
 -isEmpty(QMAKE_MAC_SDK): \
@@ -590,10 +584,9 @@ index 8360dd8b38..8b13789179 100644
 -    $$tool = $$sysrooted $$member(value, 1, -1)
 -    cache($$tool_variable, set stash, $$tool)
 -}
-diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
-index 65212b2abf..accd4c07f0 100644
---- a/mkspecs/features/qml_module.prf
-+++ b/mkspecs/features/qml_module.prf
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf	2019-07-10 09:35:08.917628566 -0500
 @@ -54,7 +54,7 @@
  
  qmldir.files = $$qmldir_file
@@ -603,10 +596,9 @@ index 65212b2abf..accd4c07f0 100644
  INSTALLS += qmldir
  
  qmlfiles.base = $$_PRO_FILE_PWD_
-diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
-index cd6377dcc6..e98bf98151 100644
---- a/mkspecs/features/qml_plugin.prf
-+++ b/mkspecs/features/qml_plugin.prf
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf	2019-07-10 09:35:08.918628595 -0500
 @@ -50,7 +50,7 @@
  
  DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
@@ -616,11 +608,10 @@ index cd6377dcc6..e98bf98151 100644
  INSTALLS += target
  
  # Some final setup
-diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
-index 8354f30eea..62028fef8e 100644
---- a/mkspecs/features/qt_app.prf
-+++ b/mkspecs/features/qt_app.prf
-@@ -30,7 +30,7 @@ host_build:force_bootstrap {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -30,7 +30,7 @@
      target.path = $$[QT_HOST_BINS]
  } else {
      !build_pass:qtConfig(debug_and_release): CONFIG += release
@@ -629,11 +620,10 @@ index 8354f30eea..62028fef8e 100644
      CONFIG += relative_qt_rpath  # Qt's tools and apps should be relocatable
  }
  INSTALLS += target
-diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf
-index 3bb3823a8e..655b7b7db8 100644
---- a/mkspecs/features/qt_build_paths.prf
-+++ b/mkspecs/features/qt_build_paths.prf
-@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -24,6 +24,6 @@
  !force_independent {
      # If the module is not built independently, everything ends up in qtbase.
      # This is the case in non-prefix builds, except for selected modules.
@@ -642,11 +632,10 @@ index 3bb3823a8e..655b7b7db8 100644
 +    MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT
 +    MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
  }
-diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
-index 4ad9946ae0..6d66f29c26 100644
---- a/mkspecs/features/qt_common.prf
-+++ b/mkspecs/features/qt_common.prf
-@@ -34,8 +34,8 @@ contains(TEMPLATE, .*lib) {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -34,8 +34,8 @@
          qqt_libdir = \$\$\$\$[QT_HOST_LIBS]
          qt_libdir = $$[QT_HOST_LIBS]
      } else {
@@ -657,11 +646,10 @@ index 4ad9946ae0..6d66f29c26 100644
      }
      contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
          lib_replace.match = "[^ ']*$$rplbase/lib"
-diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
-index 3139c443c6..1b4f2fddd8 100644
---- a/mkspecs/features/qt_docs.prf
-+++ b/mkspecs/features/qt_docs.prf
-@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -45,7 +45,7 @@
  
  QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR)
  !build_online_docs: \
@@ -670,7 +658,7 @@ index 3139c443c6..1b4f2fddd8 100644
  PREP_DOC_INDEXES =
  DOC_INDEXES =
  !isEmpty(QTREPOS) {
-@@ -64,8 +64,8 @@ DOC_INDEXES =
+@@ -64,8 +64,8 @@
          DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc)
  } else {
      prepare_docs: \
@@ -681,7 +669,7 @@ index 3139c443c6..1b4f2fddd8 100644
  }
  
  qtattributionsscanner.target = qtattributionsscanner
-@@ -88,12 +88,12 @@ prepare_docs {
+@@ -88,12 +88,12 @@
      qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch)
  
      inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR
@@ -696,11 +684,10 @@ index 3139c443c6..1b4f2fddd8 100644
      inst_qch_docs.CONFIG += no_check_exist no_default_install no_build
      INSTALLS += inst_qch_docs
  
-diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
-index 43b58817fe..e635b8f67a 100644
---- a/mkspecs/features/qt_example_installs.prf
-+++ b/mkspecs/features/qt_example_installs.prf
-@@ -88,7 +88,7 @@ sourcefiles += \
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -88,7 +88,7 @@
      $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
      $$DBUS_ADAPTORS $$DBUS_INTERFACES
  addInstallFiles(sources.files, $$sourcefiles)
@@ -709,11 +696,10 @@ index 43b58817fe..e635b8f67a 100644
  INSTALLS += sources
  
  check_examples {
-diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 1903e509c8..ae7b585989 100644
---- a/mkspecs/features/qt_functions.prf
-+++ b/mkspecs/features/qt_functions.prf
-@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -69,7 +69,7 @@
  defineTest(qtPrepareTool) {
      cmd = $$eval(QT_TOOL.$${2}.binary)
      isEmpty(cmd) {
@@ -722,10 +708,9 @@ index 1903e509c8..ae7b585989 100644
          exists($${cmd}.pl) {
              $${1}_EXE = $${cmd}.pl
              cmd = perl -w $$system_path($${cmd}.pl)
-diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
-index 8f98987b99..21b3bb8b32 100644
---- a/mkspecs/features/qt_installs.prf
-+++ b/mkspecs/features/qt_installs.prf
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf	2019-07-10 09:35:08.918628595 -0500
 @@ -12,16 +12,10 @@
  #library
  !qt_no_install_library {
@@ -787,11 +772,10 @@ index 8f98987b99..21b3bb8b32 100644
          privpritarget.files = $$MODULE_PRIVATE_PRI
          INSTALLS += privpritarget
      }
-diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
-index 40528a65e2..903f795284 100644
---- a/mkspecs/features/qt_plugin.prf
-+++ b/mkspecs/features/qt_plugin.prf
-@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -88,7 +88,7 @@
      }
  }
  
@@ -800,83 +784,9 @@ index 40528a65e2..903f795284 100644
  INSTALLS += target
  
  TARGET = $$qt5LibraryTarget($$TARGET)
-diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index e0652fdcf9..450b2a2d28 100644
---- a/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
-     add_executable(Qt5::qmake IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
-     add_executable(Qt5::moc IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
-     add_executable(Qt5::rcc IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain)
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
-     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
-+    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ENDIF
-@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain)
-     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
- 
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
-+    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ENDIF
-diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-index c357237d0e..6f0c75de3c 100644
---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-@@ -1,6 +1,6 @@
- 
- !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-index 706304cf34..546420f6ad 100644
---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-@@ -1,6 +1,6 @@
- 
- !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
-index 463e30e1c3..0e1ab669e4 100644
---- a/src/corelib/kernel/qcoreapplication.cpp
-+++ b/src/corelib/kernel/qcoreapplication.cpp
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp	2019-07-10 09:35:08.919628625 -0500
 @@ -2668,6 +2668,15 @@
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
@@ -893,11 +803,114 @@ index 463e30e1c3..0e1ab669e4 100644
          QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH");
          if (!libPathEnv.isEmpty()) {
              QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts);
-diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp
-index bed62a02bd..73158993f7 100644
---- a/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h	2019-07-10 09:35:08.920628655 -0500
+@@ -212,7 +212,7 @@
+ 
+ // --------------------------------------------------------------------------
+ 
+-#if !defined(QT_BOOTSTRAPPED)
++#if 0
+ 
+ QT_END_NAMESPACE
+ #include <os/activity.h>
+@@ -290,7 +290,19 @@
+ 
+ #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
+ 
+-#endif // !defined(QT_BOOTSTRAPPED)
++#else // !defined(QT_BOOTSTRAPPED)
++
++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
++
++#define QT_APPLE_LOG_ACTIVITY2(...)
++#define QT_APPLE_LOG_ACTIVITY1(...)
++#define QT_APPLE_LOG_ACTIVITY(...)
++
++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
++
++#endif
+ 
+ // -------------------------------------------------------------------------
+ 
+Only in qtbase-everywhere-src-5.12.3-b/src/corelib/kernel: qcore_mac_p.h.orig
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in	2019-07-10 09:35:08.918628595 -0500
+@@ -3,7 +3,7 @@
+     add_executable(Qt5::qmake IMPORTED)
+ 
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -18,7 +18,7 @@
+     add_executable(Qt5::moc IMPORTED)
+ 
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -35,7 +35,7 @@
+     add_executable(Qt5::rcc IMPORTED)
+ 
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -116,7 +116,7 @@
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
++    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
+ !!ENDIF
+@@ -130,7 +130,7 @@
+     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+ 
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
++    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
+ !!ENDIF
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in	2019-07-10 09:35:08.918628595 -0500
+@@ -1,6 +1,6 @@
+ 
+ !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
+-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+ !!ELSE
+ set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
+ !!ENDIF
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in	2019-07-10 09:35:08.918628595 -0500
+@@ -1,6 +1,6 @@
+ 
+ !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
+-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+ !!ELSE
+ set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
+ !!ENDIF
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp	2019-07-10 09:35:08.919628625 -0500
+@@ -70,7 +70,11 @@
  // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
  static QTzTimeZoneHash loadTzTimeZones()
  {
@@ -910,7 +923,7 @@ index bed62a02bd..73158993f7 100644
      if (!QFile::exists(path))
          path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
  
-@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
+@@ -644,12 +648,16 @@
          if (!tzif.open(QIODevice::ReadOnly))
              return;
      } else {
@@ -932,10 +945,9 @@ index bed62a02bd..73158993f7 100644
          }
      }
  
-diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
-index 1d947159e2..b36865fc48 100644
---- a/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
+diff -aur qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in	2019-07-10 09:35:08.919628625 -0500
 @@ -2,11 +2,7 @@
  if (NOT TARGET Qt5::qdbuscpp2xml)
      add_executable(Qt5::qdbuscpp2xml IMPORTED)
@@ -949,7 +961,7 @@ index 1d947159e2..b36865fc48 100644
      _qt5_DBus_check_file_exists(${imported_location})
  
      set_target_properties(Qt5::qdbuscpp2xml PROPERTIES
-@@ -17,11 +13,7 @@ endif()
+@@ -17,11 +13,7 @@
  if (NOT TARGET Qt5::qdbusxml2cpp)
      add_executable(Qt5::qdbusxml2cpp IMPORTED)
  
@@ -962,10 +974,9 @@ index 1d947159e2..b36865fc48 100644
      _qt5_DBus_check_file_exists(${imported_location})
  
      set_target_properties(Qt5::qdbusxml2cpp PROPERTIES
-diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 07869efd7d..fb4183bada 100644
---- a/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
+diff -aur qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in	2019-07-10 09:35:08.919628625 -0500
 @@ -2,7 +2,7 @@
  !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
  
@@ -975,7 +986,7 @@ index 07869efd7d..fb4183bada 100644
  !!ELSE
  set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
  !!ENDIF
-@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO
+@@ -17,13 +17,13 @@
      set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
@@ -991,11 +1002,10 @@ index 07869efd7d..fb4183bada 100644
  !!ELSE
      set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  !!ENDIF
-diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-index b5a0a5bbeb..6c20305f4d 100644
---- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations()
+diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp	2019-07-10 09:35:08.919628625 -0500
+@@ -265,12 +265,9 @@
      m_possibleLocations.reserve(7);
      if (qEnvironmentVariableIsSet("QTCOMPOSE"))
          m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
@@ -1009,11 +1019,10 @@ index b5a0a5bbeb..6c20305f4d 100644
  }
  
  QString TableGenerator::findComposeFile()
-diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
-index 57629ac03a..8a7f219a98 100644
---- a/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
+diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp	2019-07-10 09:35:08.919628625 -0500
+@@ -317,10 +317,10 @@
  #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
      static bool function_ptrs_not_initialized = true;
      if (function_ptrs_not_initialized) {
@@ -1026,10 +1035,10 @@ index 57629ac03a..8a7f219a98 100644
              xcursorFound = xcursorLib.load();
          }
          if (xcursorFound) {
-diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp
-index fb1c425d8e..bb8bab9795 100644
---- a/src/plugins/platformthemes/gtk3/main.cpp
-+++ b/src/plugins/platformthemes/gtk3/main.cpp
+Only in qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb: qxcbcursor.cpp.orig
+diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp	2019-07-10 09:35:08.919628625 -0500
 @@ -39,6 +39,7 @@
  
  #include <qpa/qplatformthemeplugin.h>
@@ -1038,7 +1047,7 @@ index fb1c425d8e..bb8bab9795 100644
  
  QT_BEGIN_NAMESPACE
  
-@@ -54,8 +55,22 @@ public:
+@@ -54,8 +55,22 @@
  QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList &params)
  {
      Q_UNUSED(params);
@@ -1062,10 +1071,21 @@ index fb1c425d8e..bb8bab9795 100644
  
      return 0;
  }
-diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h
-index 6498ea84ef..d821ced7fc 100644
---- a/src/testlib/qtestassert.h
-+++ b/src/testlib/qtestassert.h
+diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp	2019-07-10 09:35:08.920628655 -0500
+@@ -43,7 +43,7 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
+-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
+ 
+ using namespace QTestPrivate;
+ 
+diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h
+--- qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h	2019-07-10 09:35:08.919628625 -0500
 @@ -44,10 +44,13 @@
  
  QT_BEGIN_NAMESPACE
@@ -1082,11 +1102,10 @@ index 6498ea84ef..d821ced7fc 100644
  
  QT_END_NAMESPACE
  
-diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-index 99d87e2e46..a4eab2aa72 100644
---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
+diff -aur qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in	2019-07-10 09:35:08.919628625 -0500
+@@ -3,7 +3,7 @@
      add_executable(Qt5::uic IMPORTED)
  
  !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
@@ -1095,63 +1114,3 @@ index 99d87e2e46..a4eab2aa72 100644
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
-index b14a494296..779c4eda95 100644
---- a/src/corelib/kernel/qcore_mac_p.h
-+++ b/src/corelib/kernel/qcore_mac_p.h
-@@ -211,7 +211,7 @@ private:
- 
- // --------------------------------------------------------------------------
- 
--#if !defined(QT_BOOTSTRAPPED)
-+#if 0
- 
- QT_END_NAMESPACE
- #include <os/activity.h>
-@@ -289,7 +289,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current);
- 
- #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
- 
--#endif // !defined(QT_BOOTSTRAPPED)
-+#else // !defined(QT_BOOTSTRAPPED)
-+
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
-+
-+#define QT_APPLE_LOG_ACTIVITY2(...)
-+#define QT_APPLE_LOG_ACTIVITY1(...)
-+#define QT_APPLE_LOG_ACTIVITY(...)
-+
-+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
-+
-+#endif
- 
- // -------------------------------------------------------------------------
- 
-diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp
-index 2c1005ad80..244147ea7d 100644
---- a/src/testlib/qappletestlogger.cpp
-+++ b/src/testlib/qappletestlogger.cpp
-@@ -43,7 +43,7 @@
- 
- QT_BEGIN_NAMESPACE
- 
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
- 
- using namespace QTestPrivate;
- 
-diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
-index 1268730cc6..a50e9b0764 100644
---- a/src/testlib/qtestlog.cpp
-+++ b/src/testlib/qtestlog.cpp
-@@ -524,7 +524,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename)
- #endif
-     }
- 
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
-     // Logger that also feeds messages to AUL. It needs to wrap the existing
-     // logger, as it needs to be able to short circuit the existing logger
-     // in case AUL prints to stderr.

From 7ea1d15fc029cd1f65e93d9d6d1d1cf72876bdc0 Mon Sep 17 00:00:00 2001
From: magenbluten <magenbluten@codemonkey.cc>
Date: Wed, 7 Aug 2019 09:30:35 +0200
Subject: [PATCH 026/794] rocksdb: 6.1.2 -> 6.2.2

---
 .../libraries/rocksdb/0001-findzlib.patch           | 13 -------------
 pkgs/development/libraries/rocksdb/default.nix      |  8 +++++---
 2 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/libraries/rocksdb/0001-findzlib.patch

diff --git a/pkgs/development/libraries/rocksdb/0001-findzlib.patch b/pkgs/development/libraries/rocksdb/0001-findzlib.patch
deleted file mode 100644
index eb532620773..00000000000
--- a/pkgs/development/libraries/rocksdb/0001-findzlib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 132d3b0..37fec63 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,7 +92,7 @@ else()
-   endif()
- 
-   if(WITH_ZLIB)
--    find_package(zlib REQUIRED)
-+	  find_package(ZLIB REQUIRED)
-     add_definitions(-DZLIB)
-     if(ZLIB_INCLUDE_DIRS)
-       # CMake 3
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 05ecf0f8f25..1b6b5b1b57b 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -2,19 +2,21 @@
 
 stdenv.mkDerivation rec {
   pname = "rocksdb";
-  version = "6.1.2";
+  version = "6.2.2";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0gy2zjga3r8k9pbn2b0b5fzv4m0h2ip3zmyja1i7fli9n56civ3y";
+    sha256 = "0wz9rfj8gk6gyabh9anl67fqm5dw2z866y1a0k0j2lmcaag537r2";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ bzip2 lz4 snappy zlib zstd ];
 
-  patches = [ ./0001-findzlib.patch ];
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB "
+  '';
 
   cmakeFlags = [
     "-DPORTABLE=1"

From 3916f79ce57b211542a95f29b8a117cba0a13f21 Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Sat, 3 Aug 2019 19:43:32 +0200
Subject: [PATCH 027/794] mono6: init at 6.0.0.313

---
 pkgs/development/compilers/mono/6.nix       | 9 +++++++++
 pkgs/development/compilers/mono/generic.nix | 8 +++++---
 pkgs/top-level/all-packages.nix             | 5 +++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/mono/6.nix

diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix
new file mode 100644
index 00000000000..ec91d7e979c
--- /dev/null
+++ b/pkgs/development/compilers/mono/6.nix
@@ -0,0 +1,9 @@
+{ callPackage, Foundation, libobjc }:
+
+callPackage ./generic.nix (rec {
+  inherit Foundation libobjc;
+  version = "6.0.0.313";
+  srcArchiveSuffix = "tar.xz";
+  sha256 = "0l0cd6q5xh1vdm6zr78rkfqdsmrgzanjgpxvgig0pyd3glfyjim9";
+  enableParallelBuilding = true;
+})
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index 43ef5d4b62d..6b5c15642a5 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which, enableParallelBuilding ? true }:
+{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which
+, enableParallelBuilding ? true
+, srcArchiveSuffix ? "tar.bz2"
+}:
 
 let
   llvm     = callPackage ./llvm.nix { };
 in
 stdenv.mkDerivation rec {
   name = "mono-${version}";
-
   src = fetchurl {
     inherit sha256;
-    url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2";
+    url = "https://download.mono-project.com/sources/mono/${name}.${srcArchiveSuffix}";
   };
 
   buildInputs =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31b0622d656..60abd188a5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8105,6 +8105,11 @@ in
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
+  mono6 = callPackage ../development/compilers/mono/6.nix {
+    inherit (darwin) libobjc;
+    inherit (darwin.apple_sdk.frameworks) Foundation;
+  };
+
   monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
 
   mosml = callPackage ../development/compilers/mosml { };

From 4e71b7ca93cb6791da4e0c8d4f76a401f4a0ea20 Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Mon, 5 Aug 2019 23:35:04 +0200
Subject: [PATCH 028/794] dotnetPackages.Nuget: 3.4.3 -> 4.9.1

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 1740b327809..1da3968cd9f 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -848,13 +848,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   Nuget = buildDotnetPackage {
     baseName = "Nuget";
-    version = "3.4.3";
+    version = "4.9.1";
 
     src = fetchFromGitHub {
       owner = "mono";
       repo = "nuget-binary";
-      rev = "1f3025c2eb13bfcb56b47ddd77329ac3d9911d1c";
-      sha256 = "01snk05hcrp5i2ys3p1y34r05q1b460q6wb8p3vwpba2q2czdax5";
+      rev = "7871fa26914593fdb2f2500df1196df7b8aecb1c";
+      sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
     };
 
     buildInputs = [ unzip ];

From 510c1c2c872bc795353a38a6e7d46a9e3b3801fd Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Mon, 5 Aug 2019 15:57:59 +0200
Subject: [PATCH 029/794] msbuild: init at 16.3

---
 maintainers/maintainer-list.nix               |    9 +
 .../tools/build-managers/msbuild/default.nix  |  133 ++
 .../tools/build-managers/msbuild/nuget.nix    | 1130 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |    2 +
 4 files changed, 1274 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/msbuild/default.nix
 create mode 100644 pkgs/development/tools/build-managers/msbuild/nuget.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a6107abd756..58dd2cc1eb2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2387,6 +2387,15 @@
     github = "jdagilliland";
     name = "Jason Gilliland";
   };
+  jdanek = {
+    email = "jdanek@redhat.com";
+    github = "jdanekrh";
+    keys = [{
+      longkeyid = "ed25519/0x69275CADF15D872E";
+      fingerprint = "D4A6 F051 AD58 2E7C BCED  5439 6927 5CAD F15D 872E";
+    }];
+    name = "Jiri Daněk";
+  };
   jdehaas = {
     email = "qqlq@nullptr.club";
     github = "jeroendehaas";
diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix
new file mode 100644
index 00000000000..e9bb3c27df9
--- /dev/null
+++ b/pkgs/development/tools/build-managers/msbuild/default.nix
@@ -0,0 +1,133 @@
+{ stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }:
+
+let
+
+  xplat = fetchurl {
+    url = "https://github.com/mono/msbuild/releases/download/0.07/mono_msbuild_xplat-master-8f608e49.zip";
+    sha256 = "1jxq3fk9a6q2a8i9zacxaz3fkvc22i9qvzlpa7wbb95h42g0ffhq";
+  };
+
+  deps = import ./nuget.nix { inherit fetchurl; };
+
+in
+
+stdenv.mkDerivation rec {
+  pname = "msbuild";
+  version = "16.3+xamarinxplat.2019.07.26.14.57";
+
+  src = fetchurl {
+    url = "https://download.mono-project.com/sources/msbuild/msbuild-${version}.tar.xz";
+    sha256 = "1zcdfx4xsh62wj3g1jc2an0lppsfs691lz4dv05xbgi01aq1hk6a";
+  };
+
+  nativeBuildInputs = [
+    dotnet-sdk
+    mono
+  ];
+
+  buildInputs = [
+    dotnetPackages.Nuget
+    glibcLocales
+    makeWrapper
+    unzip
+  ];
+
+  # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild
+  phases = ["unpackPhase" "buildPhase" "installPhase" "installCheckPhase"];
+
+  # https://github.com/NixOS/nixpkgs/issues/38991
+  # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
+  LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
+      "${glibcLocales}/lib/locale/locale-archive";
+
+  buildPhase = ''
+    # nuget would otherwise try to base itself in /homeless-shelter
+    export HOME=$(pwd)/fake-home
+
+    for package in ${toString deps}; do
+      nuget add $package -Source nixos
+    done
+
+    nuget sources Disable -Name "nuget.org"
+    nuget sources Add -Name nixos -Source $(pwd)/nixos
+
+    # license check is case sensitive
+    mv LICENSE license
+
+    mkdir -p artifacts
+    unzip ${xplat} -d artifacts
+    mv artifacts/msbuild artifacts/mono-msbuild
+    chmod +x artifacts/mono-msbuild/MSBuild.dll
+
+    ln -s $(find ${dotnet-sdk} -name libhostfxr.so) artifacts/mono-msbuild/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/
+
+    # overwrite the file
+    echo "#!${stdenv.shell}" > eng/common/dotnet-install.sh
+
+    # msbuild response files to use only the nixos source
+    echo "/p:RestoreSources=nixos" > artifacts/mono-msbuild/MSBuild.rsp
+    echo "/p:RestoreSources=nixos" > src/MSBuild/MSBuild.rsp
+
+    # not patchShebangs, there is /bin/bash in the body of the script as well
+    substituteInPlace ./eng/cibuild_bootstrapped_msbuild.sh --replace /bin/bash ${stdenv.shell}
+
+    # DisableNerdbankVersioning https://gitter.im/Microsoft/msbuild/archives/2018/06/27?at=5b33dbc4ce3b0f268d489bfa
+    # TODO there are some (many?) failing tests
+    ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true
+  '';
+
+  installPhase = ''
+    mono artifacts/mono-msbuild/MSBuild.dll mono/build/install.proj /p:MonoInstallPrefix="$out" /p:Configuration=Release-MONO
+
+    ln -s ${mono}/lib/mono/msbuild/Current/bin/Roslyn $out/lib/mono/msbuild/Current/bin/Roslyn
+
+    makeWrapper ${mono}/bin/mono $out/bin/msbuild \
+      --set MSBuildExtensionsPath $out/lib/mono/xbuild \
+      --set-default MONO_GC_PARAMS "nursery-size=64m" \
+      --add-flags "$out/lib/mono/msbuild/15.0/bin/MSBuild.dll"
+  '';
+
+  doInstallCheck = true;
+
+  # https://docs.microsoft.com/cs-cz/visualstudio/msbuild/walkthrough-creating-an-msbuild-project-file-from-scratch?view=vs-2019
+  installCheckPhase = ''
+    cat > Helloworld.cs <<EOF
+using System;
+
+class HelloWorld
+{
+    static void Main()
+    {
+#if DebugConfig
+        Console.WriteLine("WE ARE IN THE DEBUG CONFIGURATION");
+#endif
+
+        Console.WriteLine("Hello, world!");
+    }
+}
+EOF
+
+    cat > Helloworld.csproj <<EOF
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Compile Include="Helloworld.cs" />
+  </ItemGroup>
+  <Target Name="Build">
+    <Csc Sources="@(Compile)"/>
+  </Target>
+</Project>
+EOF
+
+    $out/bin/msbuild Helloworld.csproj -t:Build
+    ${mono}/bin/mono Helloworld.exe | grep "Hello, world!"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Mono version of Microsoft Build Engine, the build platform for .NET, and Visual Studio";
+    homepage = https://github.com/mono/msbuild;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jdanek ];
+    platforms = platforms.unix;
+  };
+}
+
diff --git a/pkgs/development/tools/build-managers/msbuild/nuget.nix b/pkgs/development/tools/build-managers/msbuild/nuget.nix
new file mode 100644
index 00000000000..0aae3840752
--- /dev/null
+++ b/pkgs/development/tools/build-managers/msbuild/nuget.nix
@@ -0,0 +1,1130 @@
+{ fetchurl }: let
+
+  fetchNuGet = { url, name, version, sha256 }: fetchurl {
+    inherit name url sha256;
+  };
+
+in [
+(fetchNuGet {
+        name = "microsoft.build";
+        version = "14.3.0";
+        url = "https://www.nuget.org/api/v2/package/microsoft.build/14.3.0";
+        sha256 = "1zamn3p8xxi0wsjlpln0y71ncb977f3fp08mvaz4wmbmi76nr0rz";
+        })
+(fetchNuGet {
+        name = "system.io";
+        version = "4.1.0";
+        url = "https://www.nuget.org/api/v2/package/system.io/4.1.0";
+        sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp";
+        })
+(fetchNuGet {
+        name = "system.io";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.io/4.3.0";
+        sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
+        })
+(fetchNuGet {
+        name = "system.xml.xpath";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.xml.xpath/4.3.0";
+        sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci";
+        })
+(fetchNuGet {
+        name = "microsoft.net.compilers.toolset";
+        version = "3.3.0-beta2-19367-02";
+        url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.net.compilers.toolset/3.3.0-beta2-19367-02/microsoft.net.compilers.toolset.3.3.0-beta2-19367-02.nupkg";
+        sha256 = "1v9lz2fmfprhql0klqa8iipiiz3wcflvlgr3a86pcjjk7x0y84sl";
+        })
+(fetchNuGet {
+        name = "system.io.filesystem";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.io.filesystem/4.0.1";
+        sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
+        })
+(fetchNuGet {
+        name = "system.io.filesystem";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.io.filesystem/4.3.0";
+        sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
+        })
+(fetchNuGet {
+        name = "largeaddressaware";
+        version = "1.0.3";
+        url = "https://www.nuget.org/api/v2/package/largeaddressaware/1.0.3";
+        sha256 = "1ppss9bgj0hf5s8307bnm2a4qm10mrymp0v12m28a5q81zjz0fr5";
+        })
+(fetchNuGet {
+        name = "nuget.protocol";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.protocol/5.2.0-rtm.6067";
+        sha256 = "0fm3qgcdsy6dy6fih0n9a4w39mzdha4cz51gr9pp9g4nag34za2a";
+        })
+(fetchNuGet {
+        name = "runtime.native.system.security.cryptography.openssl";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.native.system.security.cryptography.openssl/4.3.0";
+        sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97";
+        })
+(fetchNuGet {
+        name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+        sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3";
+        })
+(fetchNuGet {
+        name = "system.buffers";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.buffers/4.3.0";
+        sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy";
+        })
+(fetchNuGet {
+        name = "system.buffers";
+        version = "4.4.0";
+        url = "https://www.nuget.org/api/v2/package/system.buffers/4.4.0";
+        sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19";
+        })
+(fetchNuGet {
+        name = "xunit.core";
+        version = "2.4.1";
+        url = "https://www.nuget.org/api/v2/package/xunit.core/2.4.1";
+        sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a";
+        })
+(fetchNuGet {
+        name = "system.io.filesystem.primitives";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.io.filesystem.primitives/4.3.0";
+        sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c";
+        })
+(fetchNuGet {
+        name = "system.io.filesystem.primitives";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.io.filesystem.primitives/4.0.1";
+        sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612";
+        })
+(fetchNuGet {
+        name = "system.xml.xmldocument";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.xml.xmldocument/4.0.1";
+        sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1";
+        })
+(fetchNuGet {
+        name = "system.xml.xmldocument";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.xml.xmldocument/4.3.0";
+        sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";
+        })
+(fetchNuGet {
+        name = "microsoft.build.framework";
+        version = "15.5.180";
+        url = "https://www.nuget.org/api/v2/package/microsoft.build.framework/15.5.180";
+        sha256 = "064y3a711ikx9pm9d2wyms4i3k4f9hfvn3vymhwygg7yv7gcj92z";
+        })
+(fetchNuGet {
+        name = "microsoft.build.framework";
+        version = "14.3.0";
+        url = "https://www.nuget.org/api/v2/package/microsoft.build.framework/14.3.0";
+        sha256 = "0r7y1i7dbr3pb53fdrh268hyi627w85nzv2iblwyg8dzkfxraafd";
+        })
+(fetchNuGet {
+        name = "system.globalization";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.globalization/4.3.0";
+        sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
+        })
+(fetchNuGet {
+        name = "system.globalization";
+        version = "4.0.11";
+        url = "https://www.nuget.org/api/v2/package/system.globalization/4.0.11";
+        sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d";
+        })
+(fetchNuGet {
+        name = "microsoft.dotnet.signtool";
+        version = "1.0.0-beta.19372.10";
+        url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.dotnet.signtool/1.0.0-beta.19372.10/microsoft.dotnet.signtool.1.0.0-beta.19372.10.nupkg";
+        sha256 = "1f2im2lilw10zslfclxh49knr542jy7q09p009flxsgn68riy0j6";
+        })
+(fetchNuGet {
+        name = "system.runtime.handles";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.handles/4.3.0";
+        sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8";
+        })
+(fetchNuGet {
+        name = "system.runtime.handles";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.handles/4.0.1";
+        sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g";
+        })
+(fetchNuGet {
+        name = "microsoft.codeanalysis.common";
+        version = "3.0.0-beta1-61516-01";
+        url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.common/3.0.0-beta1-61516-01";
+        sha256 = "1qfm61yrsmihhir7n3hb5ccn1r50i39rv1g74880ma7ihjl1hz54";
+        })
+(fetchNuGet {
+        name = "microsoft.netcore.platforms";
+        version = "1.0.1";
+        url = "https://www.nuget.org/api/v2/package/microsoft.netcore.platforms/1.0.1";
+        sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr";
+        })
+(fetchNuGet {
+        name = "microsoft.netcore.platforms";
+        version = "1.1.0";
+        url = "https://www.nuget.org/api/v2/package/microsoft.netcore.platforms/1.1.0";
+        sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm";
+        })
+(fetchNuGet {
+        name = "system.reflection.primitives";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.reflection.primitives/4.3.0";
+        sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276";
+        })
+(fetchNuGet {
+        name = "system.reflection.primitives";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.reflection.primitives/4.0.1";
+        sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28";
+        })
+(fetchNuGet {
+        name = "microbuild.core";
+        version = "0.2.0";
+        url = "https://www.nuget.org/api/v2/package/microbuild.core/0.2.0";
+        sha256 = "0q4s45jskbyxfx4ay6znnvv94zma2wd85b8rwmwszd2nb0xl3194";
+        })
+(fetchNuGet {
+        name = "system.diagnostics.tracesource";
+        version = "4.0.0";
+        url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracesource/4.0.0";
+        sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h";
+        })
+(fetchNuGet {
+        name = "system.runtime.numerics";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.numerics/4.3.0";
+        sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z";
+        })
+(fetchNuGet {
+        name = "system.threading.tasks.parallel";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.threading.tasks.parallel/4.3.0";
+        sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh";
+        })
+(fetchNuGet {
+        name = "system.threading.tasks.parallel";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.threading.tasks.parallel/4.0.1";
+        sha256 = "114wdg32hr46dfsnns3pgs67kcha5jn47p5gg0mhxfn5vrkr2p75";
+        })
+(fetchNuGet {
+        name = "nuget.credentials";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.credentials/5.2.0-rtm.6067";
+        sha256 = "07g2na590sph9li5igww74i3gqyrj5cb6gsgjh54f1f4bs4x1c4k";
+        })
+(fetchNuGet {
+        name = "system.objectmodel";
+        version = "4.0.12";
+        url = "https://www.nuget.org/api/v2/package/system.objectmodel/4.0.12";
+        sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj";
+        })
+(fetchNuGet {
+        name = "system.objectmodel";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.objectmodel/4.3.0";
+        sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2";
+        })
+(fetchNuGet {
+        name = "system.xml.xmlserializer";
+        version = "4.0.11";
+        url = "https://www.nuget.org/api/v2/package/system.xml.xmlserializer/4.0.11";
+        sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z";
+        })
+(fetchNuGet {
+        name = "microsoft.codeanalysis.build.tasks";
+        version = "3.0.0-beta1-61516-01";
+        url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.build.tasks/3.0.0-beta1-61516-01";
+        sha256 = "1cjpqbd4i0gxhh86nvamlpkisd1krcrya6riwjhghvpjph6115vp";
+        })
+(fetchNuGet {
+        name = "system.private.datacontractserialization";
+        version = "4.1.1";
+        url = "https://www.nuget.org/api/v2/package/system.private.datacontractserialization/4.1.1";
+        sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r";
+        })
+(fetchNuGet {
+        name = "system.numerics.vectors";
+        version = "4.4.0";
+        url = "https://www.nuget.org/api/v2/package/system.numerics.vectors/4.4.0";
+        sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba";
+        })
+(fetchNuGet {
+        name = "microsoft.build.centralpackageversions";
+        version = "2.0.1";
+        url = "https://www.nuget.org/api/v2/package/microsoft.build.centralpackageversions/2.0.1";
+        sha256 = "17cjiaj2b98q8s89168g42jb8rhwm6062jcbv57rbkdiiwdsn55k";
+        })
+(fetchNuGet {
+        name = "system.text.encoding.extensions";
+        version = "4.0.11";
+        url = "https://www.nuget.org/api/v2/package/system.text.encoding.extensions/4.0.11";
+        sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs";
+        })
+(fetchNuGet {
+        name = "system.text.encoding.extensions";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.text.encoding.extensions/4.3.0";
+        sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
+        })
+(fetchNuGet {
+        name = "microsoft.visualstudio.sdk.embedinteroptypes";
+        version = "15.0.15";
+        url = "https://www.nuget.org/api/v2/package/microsoft.visualstudio.sdk.embedinteroptypes/15.0.15";
+        sha256 = "0chr3slzzcanwcyd9isx4gichqzmfh4zd3h83piw0r4xsww1wmpd";
+        })
+(fetchNuGet {
+        name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+        sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy";
+        })
+(fetchNuGet {
+        name = "system.runtime.extensions";
+        version = "4.1.0";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.extensions/4.1.0";
+        sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z";
+        })
+(fetchNuGet {
+        name = "system.runtime.extensions";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.extensions/4.3.0";
+        sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60";
+        })
+(fetchNuGet {
+        name = "system.resources.extensions";
+        version = "4.6.0-preview8.19364.1";
+        url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.resources.extensions/4.6.0-preview8.19364.1/system.resources.extensions.4.6.0-preview8.19364.1.nupkg";
+        sha256 = "0jh9ilbicmsngv77a4ayzs0n7s440ycdf726nbljw029gq4rzvqf";
+        })
+(fetchNuGet {
+        name = "nuget.frameworks";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.frameworks/5.2.0-rtm.6067";
+        sha256 = "1g1kcfqhxr1bhl3ksbdmz3rb9nq1qmkac1sijf9ng4gmr9fmprdm";
+        })
+(fetchNuGet {
+        name = "system.diagnostics.diagnosticsource";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.diagnostics.diagnosticsource/4.3.0";
+        sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq";
+        })
+(fetchNuGet {
+        name = "system.security.claims";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.security.claims/4.3.0";
+        sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn";
+        })
+(fetchNuGet {
+        name = "system.linq.expressions";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.linq.expressions/4.3.0";
+        sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv";
+        })
+(fetchNuGet {
+        name = "system.diagnostics.stacktrace";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.diagnostics.stacktrace/4.3.0";
+        sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd";
+        })
+(fetchNuGet {
+        name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+        sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3";
+        })
+(fetchNuGet {
+        name = "system.diagnostics.tracing";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracing/4.3.0";
+        sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4";
+        })
+(fetchNuGet {
+        name = "system.diagnostics.tracing";
+        version = "4.1.0";
+        url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracing/4.1.0";
+        sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394";
+        })
+(fetchNuGet {
+        name = "xunit.analyzers";
+        version = "0.10.0";
+        url = "https://www.nuget.org/api/v2/package/xunit.analyzers/0.10.0";
+        sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j";
+        })
+(fetchNuGet {
+        name = "xunit.assert";
+        version = "2.4.1";
+        url = "https://www.nuget.org/api/v2/package/xunit.assert/2.4.1";
+        sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6";
+        })
+(fetchNuGet {
+        name = "system.appcontext";
+        version = "4.1.0";
+        url = "https://www.nuget.org/api/v2/package/system.appcontext/4.1.0";
+        sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz";
+        })
+(fetchNuGet {
+        name = "system.appcontext";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.appcontext/4.3.0";
+        sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya";
+        })
+(fetchNuGet {
+        name = "system.text.encoding.codepages";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.text.encoding.codepages/4.3.0";
+        sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv";
+        })
+(fetchNuGet {
+        name = "system.text.encoding.codepages";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.text.encoding.codepages/4.0.1";
+        sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3";
+        })
+(fetchNuGet {
+        name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+        sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa";
+        })
+(fetchNuGet {
+        name = "microsoft.codeanalysis.csharp";
+        version = "3.0.0-beta1-61516-01";
+        url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.csharp/3.0.0-beta1-61516-01";
+        sha256 = "0a7npkdw6s5jczw1lkm63x2bpz1z3ccid20h5nm6k78cv7sihm4h";
+        })
+(fetchNuGet {
+        name = "system.console";
+        version = "4.0.0";
+        url = "https://www.nuget.org/api/v2/package/system.console/4.0.0";
+        sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf";
+        })
+(fetchNuGet {
+        name = "system.console";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.console/4.3.0";
+        sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay";
+        })
+(fetchNuGet {
+        name = "system.reflection.typeextensions";
+        version = "4.1.0";
+        url = "https://www.nuget.org/api/v2/package/system.reflection.typeextensions/4.1.0";
+        sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7";
+        })
+(fetchNuGet {
+        name = "system.runtime.compilerservices.unsafe";
+        version = "4.5.2";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.compilerservices.unsafe/4.5.2";
+        sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi";
+        })
+(fetchNuGet {
+        name = "system.threading.tasks";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.threading.tasks/4.3.0";
+        sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
+        })
+(fetchNuGet {
+        name = "system.threading.tasks";
+        version = "4.0.11";
+        url = "https://www.nuget.org/api/v2/package/system.threading.tasks/4.0.11";
+        sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5";
+        })
+(fetchNuGet {
+        name = "xunit.abstractions";
+        version = "2.0.3";
+        url = "https://www.nuget.org/api/v2/package/xunit.abstractions/2.0.3";
+        sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh";
+        })
+(fetchNuGet {
+        name = "microsoft.build.utilities.core";
+        version = "15.5.180";
+        url = "https://www.nuget.org/api/v2/package/microsoft.build.utilities.core/15.5.180";
+        sha256 = "0c4bjhaqgc98bchln8p5d2p1vyn8qrha2b8gpn2l7bnznbcrd630";
+        })
+(fetchNuGet {
+        name = "microsoft.build.utilities.core";
+        version = "14.3.0";
+        url = "https://www.nuget.org/api/v2/package/microsoft.build.utilities.core/14.3.0";
+        sha256 = "0351nsnx12nzkss6vaqwwh7d7car7hrgyh0vyd4bl83c4x3ls1kb";
+        })
+(fetchNuGet {
+        name = "system.reflection.emit";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.reflection.emit/4.0.1";
+        sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
+        })
+(fetchNuGet {
+        name = "microsoft.visualstudio.setup.configuration.interop";
+        version = "1.16.30";
+        url = "https://www.nuget.org/api/v2/package/microsoft.visualstudio.setup.configuration.interop/1.16.30";
+        sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4";
+        })
+(fetchNuGet {
+        name = "system.net.sockets";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.net.sockets/4.3.0";
+        sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla";
+        })
+(fetchNuGet {
+        name = "microsoft.dotnet.arcade.sdk";
+        version = "1.0.0-beta.19372.10";
+        url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.dotnet.arcade.sdk/1.0.0-beta.19372.10/microsoft.dotnet.arcade.sdk.1.0.0-beta.19372.10.nupkg";
+        sha256 = "1lii0yg4fbsma80mmvw2zwplc26abb46q6gkxwbsbkyszkw128hv";
+        })
+(fetchNuGet {
+        name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+        sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59";
+        })
+(fetchNuGet {
+        name = "runtime.native.system.io.compression";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.native.system.io.compression/4.3.0";
+        sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d";
+        })
+(fetchNuGet {
+        name = "system.diagnostics.debug";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.diagnostics.debug/4.3.0";
+        sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y";
+        })
+(fetchNuGet {
+        name = "system.diagnostics.debug";
+        version = "4.0.11";
+        url = "https://www.nuget.org/api/v2/package/system.diagnostics.debug/4.0.11";
+        sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz";
+        })
+(fetchNuGet {
+        name = "system.xml.readerwriter";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.xml.readerwriter/4.3.0";
+        sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1";
+        })
+(fetchNuGet {
+        name = "system.xml.readerwriter";
+        version = "4.0.11";
+        url = "https://www.nuget.org/api/v2/package/system.xml.readerwriter/4.0.11";
+        sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5";
+        })
+(fetchNuGet {
+        name = "system.threading.timer";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.threading.timer/4.3.0";
+        sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56";
+        })
+(fetchNuGet {
+        name = "system.threading.timer";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.threading.timer/4.0.1";
+        sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6";
+        })
+(fetchNuGet {
+        name = "system.reflection.metadata";
+        version = "1.4.2";
+        url = "https://www.nuget.org/api/v2/package/system.reflection.metadata/1.4.2";
+        sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi";
+        })
+(fetchNuGet {
+        name = "system.reflection.metadata";
+        version = "1.6.0";
+        url = "https://www.nuget.org/api/v2/package/system.reflection.metadata/1.6.0";
+        sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4";
+        })
+(fetchNuGet {
+        name = "system.xml.xdocument";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.xml.xdocument/4.3.0";
+        sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd";
+        })
+(fetchNuGet {
+        name = "system.linq";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.linq/4.3.0";
+        sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
+        })
+(fetchNuGet {
+        name = "system.linq";
+        version = "4.1.0";
+        url = "https://www.nuget.org/api/v2/package/system.linq/4.1.0";
+        sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5";
+        })
+(fetchNuGet {
+        name = "nuget.librarymodel";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.librarymodel/5.2.0-rtm.6067";
+        sha256 = "0dxvnspgkc1lcmilb67kkipg39ih34cmifs6jwk9kbrwf96z51q9";
+        })
+(fetchNuGet {
+        name = "xlifftasks";
+        version = "1.0.0-beta.19252.1";
+        url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/xlifftasks/1.0.0-beta.19252.1/xlifftasks.1.0.0-beta.19252.1.nupkg";
+        sha256 = "0249sfb30y9dgsfryaj8644qw3yc1xp2xzc08lsrwvmm8vjcvkri";
+        })
+(fetchNuGet {
+        name = "system.text.regularexpressions";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.text.regularexpressions/4.3.0";
+        sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l";
+        })
+(fetchNuGet {
+        name = "system.text.regularexpressions";
+        version = "4.1.0";
+        url = "https://www.nuget.org/api/v2/package/system.text.regularexpressions/4.1.0";
+        sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7";
+        })
+(fetchNuGet {
+        name = "system.security.accesscontrol";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.security.accesscontrol/4.3.0";
+        sha256 = "1gakrskmlmwhzmjc1c2mrwk0fml615rsk31dw0kbjnn9yqnnrjbi";
+        })
+(fetchNuGet {
+        name = "xunit.runner.visualstudio";
+        version = "2.4.1";
+        url = "https://www.nuget.org/api/v2/package/xunit.runner.visualstudio/2.4.1";
+        sha256 = "0fln5pk18z98gp0zfshy1p9h6r9wc55nyqhap34k89yran646vhn";
+        })
+(fetchNuGet {
+        name = "system.resources.resourcemanager";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.resources.resourcemanager/4.0.1";
+        sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi";
+        })
+(fetchNuGet {
+        name = "system.resources.resourcemanager";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.resources.resourcemanager/4.3.0";
+        sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49";
+        })
+(fetchNuGet {
+        name = "nuget.projectmodel";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.projectmodel/5.2.0-rtm.6067";
+        sha256 = "1s5950nbcsnfrpbaxdnl6cv1xbsa57fln04lhyrki536476a6wcn";
+        })
+(fetchNuGet {
+        name = "nuget.versioning";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.versioning/5.2.0-rtm.6067";
+        sha256 = "04rr31ms95h7ymqxlalpv3xs48j8ng4ljfz5lmrfw7547rhcrj2h";
+        })
+(fetchNuGet {
+        name = "system.memory";
+        version = "4.5.3";
+        url = "https://www.nuget.org/api/v2/package/system.memory/4.5.3";
+        sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a";
+        })
+(fetchNuGet {
+        name = "system.resources.reader";
+        version = "4.0.0";
+        url = "https://www.nuget.org/api/v2/package/system.resources.reader/4.0.0";
+        sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril";
+        })
+(fetchNuGet {
+        name = "nuget.common";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.common/5.2.0-rtm.6067";
+        sha256 = "1ff5dhkv8v04n2kr5gyjjvki4mqsp1w4dwsgj7cvdcfcm8alba0m";
+        })
+(fetchNuGet {
+        name = "runtime.native.system";
+        version = "4.0.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.native.system/4.0.0";
+        sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf";
+        })
+(fetchNuGet {
+        name = "runtime.native.system";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.native.system/4.3.0";
+        sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
+        })
+(fetchNuGet {
+        name = "system.runtime.interopservices";
+        version = "4.1.0";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices/4.1.0";
+        sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1";
+        })
+(fetchNuGet {
+        name = "system.runtime.interopservices";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices/4.3.0";
+        sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
+        })
+(fetchNuGet {
+        name = "microbuild.core.sentinel";
+        version = "1.0.0";
+        url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microbuild.core.sentinel/1.0.0/microbuild.core.sentinel.1.0.0.nupkg";
+        sha256 = "035kqx5fkapql108n222lz8psvxk04mv3dy1qg3h08i4b8j3dy8i";
+        })
+(fetchNuGet {
+        name = "sn";
+        version = "1.0.0";
+        url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/sn/1.0.0/sn.1.0.0.nupkg";
+        sha256 = "1012fcdc6vq2355v86h434s6p2nnqgpdapb7p25l4h39g5q8p1qs";
+        })
+(fetchNuGet {
+        name = "system.text.encoding";
+        version = "4.0.11";
+        url = "https://www.nuget.org/api/v2/package/system.text.encoding/4.0.11";
+        sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw";
+        })
+(fetchNuGet {
+        name = "system.text.encoding";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.text.encoding/4.3.0";
+        sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr";
+        })
+(fetchNuGet {
+        name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+        sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5";
+        })
+(fetchNuGet {
+        name = "system.reflection.emit.lightweight";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.reflection.emit.lightweight/4.0.1";
+        sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr";
+        })
+(fetchNuGet {
+        name = "microsoft.net.test.sdk";
+        version = "15.9.0";
+        url = "https://www.nuget.org/api/v2/package/microsoft.net.test.sdk/15.9.0";
+        sha256 = "0g7wjgiigs4v8qa32g9ysqgx8bx55dzmbxfkc4ic95mpd1vkjqxw";
+        })
+(fetchNuGet {
+        name = "system.io.compression";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.io.compression/4.3.0";
+        sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz";
+        })
+(fetchNuGet {
+        name = "system.runtime.serialization.primitives";
+        version = "4.1.1";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.serialization.primitives/4.1.1";
+        sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
+        })
+(fetchNuGet {
+        name = "system.diagnostics.fileversioninfo";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.diagnostics.fileversioninfo/4.3.0";
+        sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7";
+        })
+(fetchNuGet {
+        name = "system.xml.xpath.xdocument";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.xml.xpath.xdocument/4.3.0";
+        sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn";
+        })
+(fetchNuGet {
+        name = "system.security.principal.windows";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.security.principal.windows/4.3.0";
+        sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr";
+        })
+(fetchNuGet {
+        name = "vswhere";
+        version = "2.6.7";
+        url = "https://www.nuget.org/api/v2/package/vswhere/2.6.7";
+        sha256 = "0h4k5i96p7633zzf4xsv7615f9x72rr5qr7b9934ri2y6gshfcwk";
+        })
+(fetchNuGet {
+        name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+        sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3";
+        })
+(fetchNuGet {
+        name = "xunit.runner.console";
+        version = "2.4.1";
+        url = "https://www.nuget.org/api/v2/package/xunit.runner.console/2.4.1";
+        sha256 = "13ykz9anhz72xc4q6byvdfwrp54hlcbl6zsfapwfhnzyvfgb9w13";
+        })
+(fetchNuGet {
+        name = "system.threading";
+        version = "4.0.11";
+        url = "https://www.nuget.org/api/v2/package/system.threading/4.0.11";
+        sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
+        })
+(fetchNuGet {
+        name = "system.threading";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.threading/4.3.0";
+        sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
+        })
+(fetchNuGet {
+        name = "system.threading.tasks.dataflow";
+        version = "4.5.24";
+        url = "https://www.nuget.org/api/v2/package/system.threading.tasks.dataflow/4.5.24";
+        sha256 = "0wahbfdb0jxx3hi04xggfms8wgf68wmvv68m2vfp8v2kiqr5mr2r";
+        })
+(fetchNuGet {
+        name = "microsoft.codeanalysis.analyzers";
+        version = "1.1.0";
+        url = "https://www.nuget.org/api/v2/package/microsoft.codeanalysis.analyzers/1.1.0";
+        sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc";
+        })
+(fetchNuGet {
+        name = "system.dynamic.runtime";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.dynamic.runtime/4.3.0";
+        sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
+        })
+(fetchNuGet {
+        name = "system.io.pipes";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.io.pipes/4.3.0";
+        sha256 = "1ygv16gzpi9cnlzcqwijpv7055qc50ynwg3vw29vj1q3iha3h06r";
+        })
+(fetchNuGet {
+        name = "system.net.primitives";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.net.primitives/4.3.0";
+        sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii";
+        })
+(fetchNuGet {
+        name = "system.runtime.serialization.xml";
+        version = "4.1.1";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.serialization.xml/4.1.1";
+        sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk";
+        })
+(fetchNuGet {
+        name = "system.security.cryptography.encoding";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.security.cryptography.encoding/4.3.0";
+        sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32";
+        })
+(fetchNuGet {
+        name = "system.collections.nongeneric";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.collections.nongeneric/4.0.1";
+        sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d";
+        })
+(fetchNuGet {
+        name = "system.diagnostics.tools";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.diagnostics.tools/4.3.0";
+        sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1";
+        })
+(fetchNuGet {
+        name = "microsoft.netframework.referenceassemblies";
+        version = "1.0.0-alpha-004";
+        url = "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/microsoft.netframework.referenceassemblies/1.0.0-alpha-004";
+        sha256 = "1qrpxhcx11v92lqwvrih88mlyfw2rkrsjqh7gl8c1h71vyppr3bp";
+        })
+(fetchNuGet {
+        name = "system.reflection.emit.ilgeneration";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.reflection.emit.ilgeneration/4.0.1";
+        sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0";
+        })
+(fetchNuGet {
+        name = "xunit.extensibility.execution";
+        version = "2.4.1";
+        url = "https://www.nuget.org/api/v2/package/xunit.extensibility.execution/2.4.1";
+        sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia";
+        })
+(fetchNuGet {
+        name = "microsoft.codecoverage";
+        version = "15.9.0";
+        url = "https://www.nuget.org/api/v2/package/microsoft.codecoverage/15.9.0";
+        sha256 = "10v5xrdilnm362g9545qxvlrbwc9vn65jhpb1i0jlhyqsj6bfwzg";
+        })
+(fetchNuGet {
+        name = "xunit.extensibility.core";
+        version = "2.4.1";
+        url = "https://www.nuget.org/api/v2/package/xunit.extensibility.core/2.4.1";
+        sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050";
+        })
+(fetchNuGet {
+        name = "system.collections.concurrent";
+        version = "4.0.12";
+        url = "https://www.nuget.org/api/v2/package/system.collections.concurrent/4.0.12";
+        sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc";
+        })
+(fetchNuGet {
+        name = "system.collections.concurrent";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.collections.concurrent/4.3.0";
+        sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8";
+        })
+(fetchNuGet {
+        name = "system.collections";
+        version = "4.0.11";
+        url = "https://www.nuget.org/api/v2/package/system.collections/4.0.11";
+        sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
+        })
+(fetchNuGet {
+        name = "system.collections";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.collections/4.3.0";
+        sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
+        })
+(fetchNuGet {
+        name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+        sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf";
+        })
+(fetchNuGet {
+        name = "microsoft.build.nugetsdkresolver";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/microsoft.build.nugetsdkresolver/5.2.0-rtm.6067";
+        sha256 = "1rz2i4md7b8rlybb9s7416l0pr357f3ar149s6ipfq0xijn3xgmh";
+        })
+(fetchNuGet {
+        name = "system.reflection";
+        version = "4.1.0";
+        url = "https://www.nuget.org/api/v2/package/system.reflection/4.1.0";
+        sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
+        })
+(fetchNuGet {
+        name = "system.reflection";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.reflection/4.3.0";
+        sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
+        })
+(fetchNuGet {
+        name = "nuget.configuration";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.configuration/5.2.0-rtm.6067";
+        sha256 = "075mypb32i0d0x73rcr0di6pb0bhlp0izv3633ky64kddriajma1";
+        })
+(fetchNuGet {
+        name = "system.net.http";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.net.http/4.3.0";
+        sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j";
+        })
+(fetchNuGet {
+        name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+        sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d";
+        })
+(fetchNuGet {
+        name = "system.security.cryptography.x509certificates";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.security.cryptography.x509certificates/4.3.0";
+        sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h";
+        })
+(fetchNuGet {
+        name = "nuget.packaging";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.packaging/5.2.0-rtm.6067";
+        sha256 = "16p5glvvpp5rw10ycbpyg39k4prir450l12r5frpm8qz0rdp3xig";
+        })
+(fetchNuGet {
+        name = "nuget.commands";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.commands/5.2.0-rtm.6067";
+        sha256 = "06vnphsmwnvcigwj37hy5abipjzwhnq61zw66cclwd6jjibb1kh9";
+        })
+(fetchNuGet {
+        name = "system.runtime";
+        version = "4.1.0";
+        url = "https://www.nuget.org/api/v2/package/system.runtime/4.1.0";
+        sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
+        })
+(fetchNuGet {
+        name = "system.runtime";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.runtime/4.3.0";
+        sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
+        })
+(fetchNuGet {
+        name = "microsoft.win32.primitives";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/microsoft.win32.primitives/4.3.0";
+        sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq";
+        })
+(fetchNuGet {
+        name = "microsoft.win32.primitives";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/microsoft.win32.primitives/4.0.1";
+        sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7";
+        })
+(fetchNuGet {
+        name = "system.collections.immutable";
+        version = "1.2.0";
+        url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.2.0";
+        sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m";
+        })
+(fetchNuGet {
+        name = "system.collections.immutable";
+        version = "1.3.1";
+        url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.3.1";
+        sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva";
+        })
+(fetchNuGet {
+        name = "system.collections.immutable";
+        version = "1.5.0";
+        url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.5.0";
+        sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06";
+        })
+(fetchNuGet {
+        name = "nuget.dependencyresolver.core";
+        version = "5.2.0-rtm.6067";
+        url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.dependencyresolver.core/5.2.0-rtm.6067";
+        sha256 = "0iw1z2lascjjmdkk9nf2wqm5sj5nqjv4611xx29vlmp6cyhnpq4i";
+        })
+(fetchNuGet {
+        name = "netstandard.library";
+        version = "1.6.1";
+        url = "https://www.nuget.org/api/v2/package/netstandard.library/1.6.1";
+        sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8";
+        })
+(fetchNuGet {
+        name = "shouldly";
+        version = "3.0.0";
+        url = "https://www.nuget.org/api/v2/package/shouldly/3.0.0";
+        sha256 = "1hg28w898kl84rx57sclb2z9b76v5hxlwxig1xnb6fr81aahzlw3";
+        })
+(fetchNuGet {
+        name = "microsoft.diasymreader.pdb2pdb";
+        version = "1.1.0-beta1-62506-02";
+        url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.diasymreader.pdb2pdb/1.1.0-beta1-62506-02/microsoft.diasymreader.pdb2pdb.1.1.0-beta1-62506-02.nupkg";
+        sha256 = "1dkhpmq5aw34nndvb4xc370866vf33x70zrjhgvnpwwspb6vb0zh";
+        })
+(fetchNuGet {
+        name = "system.globalization.calendars";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.globalization.calendars/4.3.0";
+        sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq";
+        })
+(fetchNuGet {
+        name = "system.io.compression.zipfile";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.io.compression.zipfile/4.3.0";
+        sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar";
+        })
+(fetchNuGet {
+        name = "system.runtime.interopservices.runtimeinformation";
+        version = "4.0.0";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices.runtimeinformation/4.0.0";
+        sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6";
+        })
+(fetchNuGet {
+        name = "system.runtime.interopservices.runtimeinformation";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices.runtimeinformation/4.3.0";
+        sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii";
+        })
+(fetchNuGet {
+        name = "system.io.filesystem.driveinfo";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.io.filesystem.driveinfo/4.3.0";
+        sha256 = "0j67khc75lwdf7d5i3z41cks7zhac4zdccgvk2xmq6wm1l08xnlh";
+        })
+(fetchNuGet {
+        name = "system.threading.tasks.extensions";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.threading.tasks.extensions/4.3.0";
+        sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";
+        })
+(fetchNuGet {
+        name = "system.threading.tasks.extensions";
+        version = "4.0.0";
+        url = "https://www.nuget.org/api/v2/package/system.threading.tasks.extensions/4.0.0";
+        sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr";
+        })
+(fetchNuGet {
+        name = "microsoft.netcore.targets";
+        version = "1.0.1";
+        url = "https://www.nuget.org/api/v2/package/microsoft.netcore.targets/1.0.1";
+        sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p";
+        })
+(fetchNuGet {
+        name = "microsoft.netcore.targets";
+        version = "1.1.0";
+        url = "https://www.nuget.org/api/v2/package/microsoft.netcore.targets/1.1.0";
+        sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh";
+        })
+(fetchNuGet {
+        name = "system.reflection.extensions";
+        version = "4.0.1";
+        url = "https://www.nuget.org/api/v2/package/system.reflection.extensions/4.0.1";
+        sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn";
+        })
+(fetchNuGet {
+        name = "system.reflection.extensions";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.reflection.extensions/4.3.0";
+        sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq";
+        })
+(fetchNuGet {
+        name = "system.diagnostics.process";
+        version = "4.1.0";
+        url = "https://www.nuget.org/api/v2/package/system.diagnostics.process/4.1.0";
+        sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s";
+        })
+(fetchNuGet {
+        name = "system.diagnostics.process";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.diagnostics.process/4.3.0";
+        sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7";
+        })
+(fetchNuGet {
+        name = "system.security.cryptography.primitives";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.security.cryptography.primitives/4.3.0";
+        sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby";
+        })
+(fetchNuGet {
+        name = "system.threading.thread";
+        version = "4.0.0";
+        url = "https://www.nuget.org/api/v2/package/system.threading.thread/4.0.0";
+        sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc";
+        })
+(fetchNuGet {
+        name = "system.threading.thread";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.threading.thread/4.3.0";
+        sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4";
+        })
+(fetchNuGet {
+        name = "newtonsoft.json";
+        version = "9.0.1";
+        url = "https://www.nuget.org/api/v2/package/newtonsoft.json/9.0.1";
+        sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r";
+        })
+(fetchNuGet {
+        name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+        sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn";
+        })
+(fetchNuGet {
+        name = "xunit";
+        version = "2.4.1";
+        url = "https://www.nuget.org/api/v2/package/xunit/2.4.1";
+        sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20";
+        })
+(fetchNuGet {
+        name = "system.valuetuple";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.valuetuple/4.3.0";
+        sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn";
+        })
+(fetchNuGet {
+        name = "microsoft.netframework.referenceassemblies.net472";
+        version = "1.0.0-alpha-004";
+        url = "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/microsoft.netframework.referenceassemblies.net472/1.0.0-alpha-004";
+        sha256 = "08wa54dm7yskayzxivnwbm8sg1pf6ai8ccr64ixf9lyz3yw6y0nc";
+        })
+(fetchNuGet {
+        name = "system.security.cryptography.algorithms";
+        version = "4.3.0";
+        url = "https://www.nuget.org/api/v2/package/system.security.cryptography.algorithms/4.3.0";
+        sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml";
+        })
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60abd188a5f..37e9f6bd734 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8112,6 +8112,8 @@ in
 
   monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
 
+  msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; };
+
   mosml = callPackage ../development/compilers/mosml { };
 
   mozart-binary = callPackage ../development/compilers/mozart/binary.nix { };

From e57b145a81b334d0b8830c971868f1e0fbcaf35c Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Wed, 7 Aug 2019 07:44:14 +0200
Subject: [PATCH 030/794] fsharp41: 4.1.7 -> 4.1.34; mono = mono6

---
 .../compilers/fsharp41/default.nix            | 66 +++++++++++++++----
 .../fsharp-IsPathRooted-type-inference.patch  | 21 ++++++
 .../fsharp41/fsharp-path-overloads.patch      | 22 +++++++
 .../fsharp41/fsharp-string-switchName.patch   | 13 ++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/dotnet-packages.nix            | 39 ++++++++---
 6 files changed, 139 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch
 create mode 100644 pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch
 create mode 100644 pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch

diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix
index e0094c73098..468fd49ba44 100644
--- a/pkgs/development/compilers/fsharp41/default.nix
+++ b/pkgs/development/compilers/fsharp41/default.nix
@@ -1,14 +1,14 @@
 # Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
 
-{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, dotnetbuildhelpers, dotnetPackages }:
+{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
 
 stdenv.mkDerivation rec {
   name = "fsharp-${version}";
-  version = "4.1.7";
+  version = "4.1.34";
 
   src = fetchurl {
     url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
-    sha256 = "0rfkrk4mzi4w54mfqilvng9ar5swhmnwhsyjc54rx3fd0np3jiyl";
+    sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -17,12 +17,16 @@ stdenv.mkDerivation rec {
     automake
     which
     mono
+    msbuild
     dotnetbuildhelpers
     dotnetPackages.FsCheck262
     dotnetPackages.FSharpCompilerTools
-    dotnetPackages.FSharpCore
+    dotnetPackages.FSharpCore302
+    dotnetPackages.FSharpCore3125
+    dotnetPackages.FSharpCore4001
+    dotnetPackages.FSharpCore4117
     dotnetPackages.FSharpData225
-    dotnetPackages.FsLexYacc704
+    dotnetPackages.FsLexYacc706
     dotnetPackages.MicrosoftDiaSymReader
     dotnetPackages.MicrosoftDiaSymReaderPortablePdb
     dotnetPackages.NUnit350
@@ -31,6 +35,14 @@ stdenv.mkDerivation rec {
     dotnetPackages.SystemValueTuple
   ];
 
+  # https://github.com/mono/mono/tree/fe0f311a848068ab2d17a9b9dd15326e5712d520/packaging/MacSDK/patches
+  # https://github.com/mono/mono/issues/7805
+  patches = [
+    ./fsharp-IsPathRooted-type-inference.patch
+    ./fsharp-string-switchName.patch
+    ./fsharp-path-overloads.patch
+  ];
+
   configurePhase = ''
     substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}"
     ./autogen.sh --prefix $out
@@ -47,24 +59,30 @@ stdenv.mkDerivation rec {
     mkdir packages
 
     ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2
-    ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.4
-    ln -s ${dotnetPackages.FSharpCore}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1
+    ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.27
+    ln -s ${dotnetPackages.FSharpCore302}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.0.2
+    ln -s ${dotnetPackages.FSharpCore3125}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.1.2.5
+    ln -s ${dotnetPackages.FSharpCore4001}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1
+    ln -s ${dotnetPackages.FSharpCore4117}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.1.17
     ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5
-    ln -s ${dotnetPackages.FsLexYacc704}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.4
+    ln -s ${dotnetPackages.FsLexYacc706}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.6
     ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0
     ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0
     ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0
     ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1
     ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2
-    ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.0
+    ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.1
   '';
 
-  # Make sure the executables use the right mono binary,
-  # and set up some symlinks for backwards compatibility.
+  # Signing /home/jdanek/nix/nixpkgs/build/fss/fsharp-4.1.34/again/fsharp-4.1.34/Release/fsharp30/net40/bin/FSharp.Core.dll with Mono key
+  # ERROR: Unknown error during processing: System.UnauthorizedAccessException: Access to the path
+  #   "Release/fsharp30/net40/bin/FSharp.Core.dll" is denied.
+  preInstall = ''
+    find Release/ -name FSharp.Core.dll -exec chmod u+w {} \;
+  '';
+
+  # Set up some symlinks for backwards compatibility.
   postInstall = ''
-    substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono "
-    substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono "
-    substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono "
     ln -s $out/bin/fsharpc $out/bin/fsc
     ln -s $out/bin/fsharpi $out/bin/fsi
     for dll in "$out/lib/mono/fsharp"/FSharp*.dll
@@ -73,6 +91,26 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  doInstallCheck = true;
+  installCheckPhase = ''
+    echo 'printf "int = %i" (6 * 7);;' > script.fsx
+    $out/bin/fsi --exec script.fsx | grep "int = 42"
+    $out/bin/fsharpi --exec script.fsx | grep "int = 42"
+    $out/bin/fsharpiAnyCpu --exec script.fsx | grep "int = 42"
+
+    cat > answer.fs <<EOF
+open System
+
+[<EntryPoint>]
+let main argv =
+    printfn "int = %i" (6 * 7)
+    0
+EOF
+
+    $out/bin/fsc answer.fs
+    ${mono}/bin/mono answer.exe | grep "int = 42"
+  '';
+
   # To fix this error when running:
   # The file "/nix/store/path/whatever.exe" is an not a valid CIL image
   dontStrip = true;
diff --git a/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch b/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch
new file mode 100644
index 00000000000..06dd3e82adc
--- /dev/null
+++ b/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch
@@ -0,0 +1,21 @@
+commit c37fce5b3019c7a150203fc3a484885591b194de
+Author: Alexis Christoforides <alexis@thenull.net>
+Date:   Sun Dec 2 00:10:24 2018 -0500
+
+    Help Path.IsPathRooted method overload selection.
+
+    .NET Core, and Mono after merging https://github.com/mono/mono/pull/11342, introduce ambiguity with a new overload.
+
+diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx
+index cc797e305..699c7bb93 100644
+--- a/src/scripts/scriptlib.fsx
++++ b/src/scripts/scriptlib.fsx
+@@ -92,7 +92,7 @@ module Scripting =
+
+     module Process =
+
+-        let processExePath baseDir exe =
++        let processExePath baseDir (exe:string) =
+             if Path.IsPathRooted(exe) then exe
+             else
+                 match Path.GetDirectoryName(exe) with
diff --git a/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch b/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch
new file mode 100644
index 00000000000..f791317d080
--- /dev/null
+++ b/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch
@@ -0,0 +1,22 @@
+diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx
+index cc797e305..ae8a6d3cc 100644
+--- a/src/scripts/scriptlib.fsx
++++ b/src/scripts/scriptlib.fsx
+@@ -59,12 +59,12 @@ module Scripting =
+
+     let (++) a b = Path.Combine(a,b)
+
+-    let getBasename a = Path.GetFileNameWithoutExtension a
+-    let getFullPath a = Path.GetFullPath a
+-    let getFilename a = Path.GetFileName a
+-    let getDirectoryName a = Path.GetDirectoryName a
++    let getBasename (path: string) = Path.GetFileNameWithoutExtension path
++    let getFullPath (path: string) = Path.GetFullPath path
++    let getFilename (path: string) = Path.GetFileName path
++    let getDirectoryName (path: string) = Path.GetDirectoryName path
+
+-    let copyFile source dir =
++    let copyFile (source: string) dir =
+         let dest = 
+             if not (Directory.Exists dir) then Directory.CreateDirectory dir |>ignore
+             let result = Path.Combine(dir, Path.GetFileName source)
diff --git a/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch b/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch
new file mode 100644
index 00000000000..4b36eaabcaf
--- /dev/null
+++ b/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch
@@ -0,0 +1,13 @@
+diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx
+index cc797e305..5a7be7d2b 100644
+--- a/src/scripts/scriptlib.fsx
++++ b/src/scripts/scriptlib.fsx
+@@ -36,7 +36,7 @@ module Scripting =
+ #if INTERACTIVE
+     let argv = Microsoft.FSharp.Compiler.Interactive.Settings.fsi.CommandLineArgs |> Seq.skip 1 |> Seq.toArray
+
+-    let getCmdLineArgOptional switchName = 
++    let getCmdLineArgOptional (switchName: string) =
+         argv |> Array.filter(fun t -> t.StartsWith(switchName)) |> Array.map(fun t -> t.Remove(0, switchName.Length).Trim()) |> Array.tryHead 
+
+     let getCmdLineArg switchName defaultValue = 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37e9f6bd734..a8e21212c99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7714,7 +7714,7 @@ in
 
   fsharp = callPackage ../development/compilers/fsharp { };
 
-  fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono4; };
+  fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; };
 
   fstar = callPackage ../development/compilers/fstar { };
 
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 1da3968cd9f..e89a7d9df2a 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -45,10 +45,31 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/net40/*" ];
   };
 
-  FSharpCore = fetchNuGet {
+  FSharpCore302 = fetchNuGet {
+    baseName = "FSharp.Core";
+    version = "3.0.2";
+    sha256 = "1s4pqwbmhrsg5sw8i6dixdri3x0yjyilmkhsf4apfkp80si7d73q";
+    outputFiles = [ "*" ];
+  };
+
+  FSharpCore3125 = fetchNuGet {
+    baseName = "FSharp.Core";
+    version = "3.1.2.5";
+    sha256 = "0pfvjimrgrffb5rj612gsid044lfpk8g2cxyh9792dc1n8ck5hih";
+    outputFiles = [ "*" ];
+  };
+
+  FSharpCore4001 = fetchNuGet {
     baseName = "FSharp.Core";
     version = "4.0.0.1";
-    sha256 = "01nhjcxdz8l1r5vvdzhmgy5x7z5fqppab3ki34qg14axgf8jjygn";
+    sha256 = "0v53iq12ji2d1bkdyg9dn8sz5l93sprrh835amh39dghh8v8vm8k";
+    outputFiles = [ "*" ];
+  };
+
+  FSharpCore4117 = fetchNuGet {
+    baseName = "FSharp.Core";
+    version = "4.1.17";
+    sha256 = "1yk23ir66fgqm5r6qyf66zf64l0s223l3yd7p9yvbyimyg0hgzb1";
     outputFiles = [ "*" ];
   };
 
@@ -89,8 +110,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   FSharpCompilerTools = fetchNuGet {
     baseName = "FSharp.Compiler.Tools";
-    version = "4.1.4";
-    sha256 = "0vsp0khlnwh15ibg8s161rw6a6i8rlriclpq53paga447jllf0m8";
+    version = "4.1.27";
+    sha256 = "1m3hl8ja9gp5ajxmjf7bnq24bbkd6kx7yhxf4zb8si27h1n9l6dl";
     outputFiles = [ "*" ];
   };
 
@@ -101,10 +122,10 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "build/*" ];
   };
 
-  FsLexYacc704 = fetchNuGet {
+  FsLexYacc706 = fetchNuGet {
     baseName = "FsLexYacc";
-    version = "7.0.4";
-    sha256 = "01zpdb0pybdf0by02rwd7pb1g0cmnn8jxm2pibzxjxw6f4l43ywi";
+    version = "7.0.6";
+    sha256 = "0xwiq8q5q6ga6zj24w83ch5csbv405xcg6jg2hmnjic0npz0drk2";
     outputFiles = [ "*" ];
   };
 
@@ -203,8 +224,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   SystemValueTuple = fetchNuGet {
     baseName = "System.ValueTuple";
-    version = "4.3.0";
-    sha256 = "00p5s753xh5417arw3k6npf1pc1k3m1s9mrlkw5vmc7pg8lm6n88";
+    version = "4.3.1";
+    sha256 = "0qzq878s66yfkf4n2b9af8lw2bx45s3cg6mi0w8w0bi358fa7q70";
     outputFiles = [ "*" ];
   };
 

From 19d91206e7fb22b93d866f6b7d3c99120299a3df Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 6 Aug 2019 15:42:10 -0700
Subject: [PATCH 031/794] vulkan-*: 1.1.106 -> 1.1.114.0

---
 .../libraries/vulkan-headers/default.nix      |  4 +-
 .../libraries/vulkan-loader/default.nix       |  8 ++--
 .../vulkan-loader/system-search-path.patch    | 45 -------------------
 .../vulkan-validation-layers/default.nix      |  9 ++--
 pkgs/tools/graphics/vulkan-tools/default.nix  |  4 +-
 pkgs/top-level/all-packages.nix               | 12 ++---
 6 files changed, 18 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/development/libraries/vulkan-loader/system-search-path.patch

diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index f7c1bf9a65b..9e3886c264e 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   name = "vulkan-headers-${version}";
-  version = "1.1.106";
+  version = "1.1.114.0";
 
   buildInputs = [ cmake ];
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
     rev = "sdk-${version}";
-    sha256 = "0idw7q715ikj575qmspvgq2gzc6c1sj581b8z3xnv6wz9qbzrmsd";
+    sha256 = "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index a44e91e1bf5..dd09d5d3c7c 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -2,7 +2,7 @@
 , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }:
 
 let
-  version = "1.1.106";
+  version = "1.1.114.0";
 in
 
 assert version == vulkan-headers.version;
@@ -14,17 +14,15 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Loader";
     rev = "sdk-${version}";
-    sha256 = "0zhrwj1gi90x2w8gaaaw5h4b969a8gfy244kn0drrplhhb1nqz3b";
+    sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww";
   };
 
   nativeBuildInputs = [ pkgconfig addOpenGLRunpath ];
   buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ];
   enableParallelBuilding = true;
 
-  patches = [ ./system-search-path.patch ];
-
   cmakeFlags = [
-    "-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share"
+    "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
     "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
   ];
 
diff --git a/pkgs/development/libraries/vulkan-loader/system-search-path.patch b/pkgs/development/libraries/vulkan-loader/system-search-path.patch
deleted file mode 100644
index 26f83e6d534..00000000000
--- a/pkgs/development/libraries/vulkan-loader/system-search-path.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9ac5ce835..cbdb0ff56 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -88,6 +88,12 @@ if(UNIX)
-             STRING
-             "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
-         )
-+    set(
-+        SYSTEM_SEARCH_PATH ""
-+        CACHE
-+            STRING
-+            "Search path to always use, after all other search paths."
-+    )
- endif()
- 
- if(UNIX AND NOT APPLE) # i.e.: Linux
-@@ -184,6 +190,7 @@ if(UNIX)
-     add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}")
-     add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}")
-     add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
-+    add_definitions(-DSYSTEM_SEARCH_PATH="${SYSTEM_SEARCH_PATH}")
- 
-     # Make sure /etc is searched by the loader
-     if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
-diff --git a/loader/loader.c b/loader/loader.c
-index 0d3b5a947..abe357004 100644
---- a/loader/loader.c
-+++ b/loader/loader.c
-@@ -3688,6 +3688,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e
-                 search_path_size += DetermineDataFilePathSize(xdgdatahome, rel_size);
-                 search_path_size += DetermineDataFilePathSize(home_root, rel_size);
-             }
-+            search_path_size += DetermineDataFilePathSize(SYSTEM_SEARCH_PATH, rel_size);
- #endif
-         }
-     }
-@@ -3737,6 +3738,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e
-                 CopyDataFilePath(xdgdatahome, relative_location, rel_size, &cur_path_ptr);
-                 CopyDataFilePath(home_root, relative_location, rel_size, &cur_path_ptr);
-             }
-+            CopyDataFilePath(SYSTEM_SEARCH_PATH, relative_location, rel_size, &cur_path_ptr);
-         }
- 
-         // Remove the last path separator
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index 3c189d09f1c..36d018682df 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchFromGitHub, cmake, writeText, python3
 , vulkan-headers, vulkan-loader, glslang
-, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
+, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland, spirv-headers }:
+
 stdenv.mkDerivation rec {
-  name = "vulkan-validation-layers-${version}";
-  version = "1.1.106.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json!
+  pname = "vulkan-validation-layers";
+  version = "1.1.114.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ValidationLayers";
     rev = "sdk-${version}";
-    sha256 = "1sq42j8ikll2dyi9ygaz80lx89mvq9d21pkaf49gzhg4xjcd97dp";
+    sha256 = "0f8dlrjw1nz2adhzi4sbvljys4h0dyiwafdihsdyrg3xncgffks4";
   };
 
   nativeBuildInputs = [ pkgconfig cmake python3  ];
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index 320b4eed14c..c02054cfbd6 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "vulkan-tools-${version}";
-  version = "1.1.106.0";
+  version = "1.1.114.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Tools";
     rev = "sdk-${version}";
-    sha256 = "0swqyk16mbkivyk79dpqbhpw05a7yrakqynywznr5zgqbc0z4gj8";
+    sha256 = "1d4fcy11gk21x7r7vywdcc1dy9j1d2j78hvd5vfh3vy9fnahx107";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5b089be81b..073e8fcb5c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13828,24 +13828,24 @@ in
         src = fetchFromGitHub {
           owner = "KhronosGroup";
           repo = "SPIRV-Tools";
-          rev = "26c1b8878315a7a5c188df45e0bc236bb222b698";
-          sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b";
+          rev = "aa9e8f538041db3055ea443080e0ccc315fa114f";
+          sha256 = "1nbii0xa5zgs36dmpvzpli1jbzb9ijr7bkgvzmlpcjrjsl02cnbk";
         };
       });
       spirv-headers = spirv-tools.overrideAttrs (_: {
         src = fetchFromGitHub {
           owner = "KhronosGroup";
           repo = "SPIRV-Headers";
-          rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f";
-          sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm";
+          rev = "45c2cc37276d69e5b257507d97fd90d2a5684ccc";
+          sha256 = "1jrzazv5j8nsn8hz5vc43vz4msps05d65wdy9spfg2hg36r1s2pm";
         };
       });
     }).overrideAttrs (_: {
       src = fetchFromGitHub {
         owner = "KhronosGroup";
         repo = "glslang";
-        rev = "e06c7e9a515b716c731bda13f507546f107775d1";
-        sha256 = "04y4dd1cqdkd4qffmhgmg3agf9j07ii2w38vpp4jw53ir818bqdq";
+        rev = "333d1c95792692205472c457d7bec915a94c8000";
+        sha256 = "04srq1zcilhs7p1xz7wcnrncjxqskhfnqggisvxw5f774gk01ks6";
       };
     });
   };

From cf73f645501ef5be263955d940b4effb0b870d5a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 6 Aug 2019 15:45:23 -0700
Subject: [PATCH 032/794] glslang: 7.11.3113 -> 7.11.3214

---
 .../development/compilers/glslang/default.nix | 26 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               | 12 ++++-----
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index 3c46dfc107b..161e57b5479 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -1,16 +1,29 @@
-{ stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }:
+{ stdenv, fetchFromGitHub
+, bison
+, cmake
+, jq
+, python3
+, spirv-headers
+, spirv-tools
+}:
+
 stdenv.mkDerivation rec {
-  name = "glslang-${version}";
-  version = "7.11.3113";
+  pname = "glslang";
+  version = "7.11.3214";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
-    rev = "${version}";
-    sha256 = "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6";
+    rev = version;
+    sha256 = "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins";
   };
 
-  nativeBuildInputs = [ cmake python bison jq ];
+  # These get set at all-packages, keep onto them for child drvs
+  passthru = {
+    inherit spirv-tools spirv-headers;
+  };
+
+  nativeBuildInputs = [ cmake python3 bison jq ];
   enableParallelBuilding = true;
 
   postPatch = ''
@@ -18,6 +31,7 @@ stdenv.mkDerivation rec {
     ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers
   '';
 
+  # Ensure spirv-headers and spirv-tools match exactly to what is expected
   preConfigure = ''
     HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit')
     TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit')
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 073e8fcb5c6..99e09962d8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7727,16 +7727,16 @@ in
       src = fetchFromGitHub {
         owner = "KhronosGroup";
         repo = "SPIRV-Tools";
-        rev = "117a1fd11f11e9bef9faa563c3d5156cc6ab529c";
-        sha256 = "1w5hb6sgy71g279wsghixxc75r7rsm7wki011mpz039q66827sym";
+        rev = "26c1b8878315a7a5c188df45e0bc236bb222b698";
+        sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b";
       };
     });
-    spirv-headers = spirv-tools.overrideAttrs (_: {
+    spirv-headers = spirv-headers.overrideAttrs (_: {
       src = fetchFromGitHub {
         owner = "KhronosGroup";
-        repo = "SPIRV-Tools";
-        rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f";
-        sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
+        repo = "SPIRV-Headers";
+        rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f";
+        sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm";
       };
     });
   };

From ecd78af013c039c85dffef3a5451878dc684e3ac Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 6 Aug 2019 15:48:24 -0700
Subject: [PATCH 033/794] spirv-headers: 2019.1 -> 1.4.1

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

diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix
index 40d272fd07d..9b2c0032d4e 100644
--- a/pkgs/development/libraries/spirv-headers/default.nix
+++ b/pkgs/development/libraries/spirv-headers/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchFromGitHub, cmake }:
+
 stdenv.mkDerivation rec {
-  name = "spirv-headers-${version}";
-  version = "2019.1"; # spirv-tools version whose DEPS file calls for this commit
+  pname = "spirv-headers";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
-    rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; # from spirv-tools' DEPS
-    sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
+    rev = version;
+    sha256 = "1zfmvg3x0q9w652s8g5m5rcckzm6jiiw8rif2qck4vlsryl55akp";
   };
 
   nativeBuildInputs = [ cmake ];

From 96a64ff735c61be49f42aa6ae5e44998658a7d65 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 6 Aug 2019 15:48:54 -0700
Subject: [PATCH 034/794] spirv-tools: 2019.1 -> 2019.3

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

diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index c9df2703daa..85b82318439 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchFromGitHub, cmake, python, spirv-headers }:
+{ stdenv, fetchFromGitHub, cmake, python3, spirv-headers }:
 let
   # Update spirv-headers rev in lockstep according to DEPs file
-  version = "2019.1";
+  version = "2019.3";
 in
 
-assert version == spirv-headers.version;
 stdenv.mkDerivation rec {
   name = "spirv-tools-${version}";
   inherit version;
@@ -13,11 +12,11 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
     rev = "v${version}";
-    sha256 = "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r";
+    sha256 = "1wvipjcjsi815ls08s3dz9hwlbb59dbl4syxkskg1k9d5jjph1a8";
   };
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake python ];
+  buildInputs = [ cmake python3 ];
 
   cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ];
 

From 1ba444e4007c3a14927919051d9bb9692bd23639 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Thu, 8 Aug 2019 08:45:52 -0400
Subject: [PATCH 035/794] flent: run through nixfmt

---
 pkgs/applications/networking/flent/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
index bc0a519a0ee..00522d84569 100644
--- a/pkgs/applications/networking/flent/default.nix
+++ b/pkgs/applications/networking/flent/default.nix
@@ -1,6 +1,5 @@
 { stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5
-, sphinx
-}:
+, sphinx }:
 
 buildPythonApplication rec {
   pname = "flent";
@@ -16,15 +15,11 @@ buildPythonApplication rec {
 
   checkInputs = [ procps ];
 
-  propagatedBuildInputs = [
-    matplotlib
-    procps
-    pyqt5
-  ];
+  propagatedBuildInputs = [ matplotlib procps pyqt5 ];
 
   meta = with stdenv.lib; {
     description = "The FLExible Network Tester";
-    homepage = https://flent.org;
+    homepage = "https://flent.org";
     license = licenses.gpl3;
 
     maintainers = [ maintainers.mmlb ];

From a88232c31ae733a5bc148175ea20549cc81e23b2 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Thu, 8 Aug 2019 08:51:44 -0400
Subject: [PATCH 036/794] flent: use fetchPypi

---
 pkgs/applications/networking/flent/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
index 00522d84569..ed7e8ae9d6a 100644
--- a/pkgs/applications/networking/flent/default.nix
+++ b/pkgs/applications/networking/flent/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5
+{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5
 , sphinx }:
 
 buildPythonApplication rec {
   pname = "flent";
   version = "1.2.2";
-  src = fetchFromGitHub {
-    owner = "tohojo";
-    repo = "flent";
-    rev = "v${version}";
-    sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ziblk36rzr99pbi7xzzkci3sr41m0jf72v38ynp63df6szbbfjb";
   };
 
   buildInputs = [ sphinx ];

From a48c4843cd228f041dc75a120cbfa216e9a2f66a Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Thu, 8 Aug 2019 08:57:04 -0400
Subject: [PATCH 037/794] flent: use wrapQtAppsHook

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

diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
index ed7e8ae9d6a..9b170735dcf 100644
--- a/pkgs/applications/networking/flent/default.nix
+++ b/pkgs/applications/networking/flent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5
+{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, qt5
 , sphinx }:
 
 buildPythonApplication rec {
@@ -10,11 +10,18 @@ buildPythonApplication rec {
   };
 
   buildInputs = [ sphinx ];
+  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
 
   checkInputs = [ procps ];
 
   propagatedBuildInputs = [ matplotlib procps pyqt5 ];
 
+  postInstall = ''
+    for program in $out/bin/*; do
+      wrapQtApp $program --prefix PYTHONPATH : $PYTHONPATH
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "The FLExible Network Tester";
     homepage = "https://flent.org";

From 170caa4506fe40ebbbc47be62934161d2d6c0bb7 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Thu, 8 Aug 2019 09:03:41 -0400
Subject: [PATCH 038/794] flent: 1.2.2 -> 1.3.0

---
 .../applications/networking/flent/default.nix | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
index 9b170735dcf..bbd9a7601ac 100644
--- a/pkgs/applications/networking/flent/default.nix
+++ b/pkgs/applications/networking/flent/default.nix
@@ -1,20 +1,29 @@
-{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, qt5
-, sphinx }:
+{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python
+, pythonPackages, qt5, sphinx, xvfb_run }:
 
 buildPythonApplication rec {
   pname = "flent";
-  version = "1.2.2";
+  version = "1.3.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ziblk36rzr99pbi7xzzkci3sr41m0jf72v38ynp63df6szbbfjb";
+    sha256 = "099779i0ghjd9ikq77z6m6scnlmk946lw9issrgz8zm7babiw4d7";
   };
 
   buildInputs = [ sphinx ];
   nativeBuildInputs = [ qt5.wrapQtAppsHook ];
-
-  checkInputs = [ procps ];
-
   propagatedBuildInputs = [ matplotlib procps pyqt5 ];
+  checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ];
+
+  checkPhase = ''
+    cat >test-runner <<EOF
+    #!/bin/sh
+
+    ${python.pythonForBuild.interpreter} nix_run_setup test
+    EOF
+    chmod +x test-runner
+    wrapQtApp test-runner --prefix PYTHONPATH : $PYTHONPATH
+    xvfb-run -s '-screen 0 800x600x24' ./test-runner
+  '';
 
   postInstall = ''
     for program in $out/bin/*; do

From a1dba15dd54323d4fc4c3f9acf60ed6513cea25d Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 9 Aug 2019 13:22:12 +0000
Subject: [PATCH 039/794] perl: 5.28.2 -> 5.30.0

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e9eb55dbab..1a07676a347 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14251,8 +14251,8 @@ in
   perl530Packages = recurseIntoAttrs perl530.pkgs;
   perldevelPackages = perldevel.pkgs;
 
-  perl = perl528;
-  perlPackages = perl528Packages;
+  perl = perl530;
+  perlPackages = perl530Packages;
 
   ack = perlPackages.ack;
 

From de9cb249389f303ccd1ae3c6a1265e6ca8a3f146 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 10 Aug 2019 00:04:07 +0200
Subject: [PATCH 040/794] lib/modules: Use options `apply` function even if no
 values are defined

This allows `apply` functions to return a valid value if they completely
ignore their argument, which is the case for the option renaming
functions like `mkAliasOptionModule`. Therefore this solves issue #63693
---
 lib/modules.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 0869eae1982..c3c903c1dfa 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -323,16 +323,14 @@ rec {
         else
           mergeDefinitions loc opt.type defs';
 
-      # Check whether the option is defined, and apply the ‘apply’
-      # function to the merged value.  This allows options to yield a
-      # value computed from the definitions.
-      value =
-        if !res.isDefined then
-          throw "The option `${showOption loc}' is used but not defined."
-        else if opt ? apply then
-          opt.apply res.mergedValue
-        else
-          res.mergedValue;
+
+      # The value with a check that it is defined
+      valueDefined = if res.isDefined then res.mergedValue else
+        throw "The option `${showOption loc}' is used but not defined.";
+
+      # Apply the 'apply' function to the merged value. This allows options to
+      # yield a value computed from the definitions
+      value = if opt ? apply then opt.apply valueDefined else valueDefined;
 
     in opt //
       { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;

From 63ad67cbbbd712f10e8e523bb9b004b9c8afd003 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 10 Aug 2019 13:48:02 +0200
Subject: [PATCH 041/794] scons: 3.1.0 -> 3.1.1

Announcement:
https://scons.org/scons-311-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.1/src/CHANGES.txt
---
 pkgs/development/tools/build-managers/scons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 08644def517..1655c154d4e 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -8,7 +8,7 @@ in {
     sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4";
   };
   scons_latest = mkScons {
-    version = "3.1.0";
-    sha256 = "0bqkrpk5j6wvlljpdsimazav44y43qkl9mzc4f8ig8nl73blixgk";
+    version = "3.1.1";
+    sha256 = "19a3j6x7xkmr2srk2yzxx3wv003h9cxx08vr81ps76blvmzl3sjc";
   };
 }

From 791bc4762bf87af5a7cab881b0df01534d34678a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 22:32:51 -0700
Subject: [PATCH 042/794] srt: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix
index bb66174c884..5edb2d92b55 100644
--- a/pkgs/development/libraries/srt/default.nix
+++ b/pkgs/development/libraries/srt/default.nix
@@ -4,13 +4,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "srt";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "Haivision";
     repo = "srt";
     rev = "v${version}";
-    sha256 = "1h1kim9vvqnwx95yd9768ds30h731yg27jz63r90kjxm7b5kmja4";
+    sha256 = "1dwz7qrkdrbmsbh66rbdx36b60r8whkz0wvf47jfckzsj37d2w22";
   };
 
   nativeBuildInputs = [ cmake ];

From 10cc136ed12c120506a446572c26218f38f23f1a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 7 Aug 2019 12:06:17 +0800
Subject: [PATCH 043/794] grc: leave /etc/grc.conf alone so we can override it

plus a few minor cleanups
---
 pkgs/tools/misc/grc/default.nix | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 451828b0f47..828d4e4dab7 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchFromGitHub, python3Packages, makeWrapper }:
+{ stdenv, fetchFromGitHub, python3Packages }:
 
-stdenv.mkDerivation rec {
-  name    = "grc-${version}";
+python3Packages.buildPythonApplication rec {
+  pname = "grc";
   version = "1.11.3";
+  format = "other";
 
   src = fetchFromGitHub {
     owner  = "garabik";
@@ -11,22 +12,18 @@ stdenv.mkDerivation rec {
     sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35";
   };
 
-  buildInputs = with python3Packages; [ wrapPython makeWrapper ];
+  postPatch = ''
+    for f in grc grcat; do
+      substituteInPlace $f \
+        --replace /usr/local/ $out/
+    done
+  '';
 
   installPhase = ''
     runHook preInstall
 
     ./install.sh "$out" "$out"
-
-    for f in $out/bin/* ; do
-      patchPythonScript $f
-      substituteInPlace $f \
-        --replace ' /usr/bin/env python3' '${python3Packages.python.interpreter}' \
-        --replace "'/etc/grc.conf'"   "'$out/etc/grc.conf'" \
-        --replace "'/usr/share/grc/'" "'$out/share/grc/'"
-      wrapProgram $f \
-        --prefix PATH : $out/bin
-    done
+    install -Dm444 -t $out/share/zsh/vendor-completions _grc
 
     runHook postInstall
   '';

From a316d71f59c17b29a52255f1709d9ca283bcfe3a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 12 Aug 2019 18:09:30 -0400
Subject: [PATCH 044/794] mesa: add surfaceless egl platform

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 7b1b5a3cfa9..7610b15296e 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -8,7 +8,7 @@
 , galliumDrivers ? ["auto"]
 , driDrivers ? ["auto"]
 , vulkanDrivers ? ["auto"]
-, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
+, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
 , OpenGL, Xplugin
 , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
 }:

From 3147cb1a8ad60d9b8d13f1188af40c8ba9f7f2fc Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 8 Aug 2019 18:56:53 -0700
Subject: [PATCH 045/794] pythonPackages.sqlalchemy: 1.2.14 -> 1.3.6

---
 .../python-modules/sqlalchemy/default.nix     | 30 ++++---------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index c7ff2e56f02..480ee6a67a0 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -1,43 +1,25 @@
-{ lib
-, fetchPypi
-, fetchpatch
-, buildPythonPackage
-, pytest
+{ lib, fetchPypi, buildPythonPackage, isPy3k
 , mock
-, isPy3k
 , pysqlite
+, pytest
+, pytest_xdist
 }:
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.2.14";
+  version = "1.3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9de7c7dabcf06319becdb7e15099c44e5e34ba7062f9ba10bc00e562f5db3d04";
+    sha256 = "1zxhabcgzspwrh9l7b68p57kqx4h664a1dp9xr8mi84r472pyzi1";
   };
 
-  patches = [
-    # fix for failing doc tests
-    # https://bitbucket.org/zzzeek/sqlalchemy/issues/4370/sqlite-325x-docs-tutorialrst-doctests-fail
-    (fetchpatch {
-      name = "doc-test-fixes.patch";
-      url = https://bitbucket.org/zzzeek/sqlalchemy/commits/63279a69e2b9277df5e97ace161fa3a1bb4f29cd/raw;
-      sha256 = "1x25aj5hqmgjdak4hllya0rf0srr937k1hwaxb24i9ban607hjri";
-    })
-  ];
-
   checkInputs = [
     pytest
     mock
-#     Disable pytest_xdist tests for now, because our version seems to be too new.
-#     pytest_xdist
+    pytest_xdist
   ] ++ lib.optional (!isPy3k) pysqlite;
 
-  checkPhase = ''
-    py.test -k "not test_round_trip_direct_type_affinity"
-  '';
-
   meta = with lib; {
     homepage = http://www.sqlalchemy.org/;
     description = "A Python SQL toolkit and Object Relational Mapper";

From af4e271db9e3469ebce7a6eae142a943e240ffa2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Aug 2019 18:23:40 +0200
Subject: [PATCH 046/794] =?UTF-8?q?libgudev:=20232=20=E2=86=92=20233?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/gnome/sources/folks/0.13/folks-0.13.1.news
---
 .../libraries/libgudev/default.nix            | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index d3dea766cbb..b52a2b1e0fa 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, udev, glib, gobject-introspection, gnome3 }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, udev
+, glib
+, gobject-introspection
+, gnome3
+}:
 
-let
+stdenv.mkDerivation rec {
   pname = "libgudev";
-in stdenv.mkDerivation rec {
-  name = "libgudev-${version}";
-  version = "232";
+  version = "233";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "00xvva04lgqamhnf277lg32phjn971wgpc9cxvgf5x13xdq4jz2q";
   };
 
   nativeBuildInputs = [ pkgconfig gobject-introspection ];

From ce1b77231a8427dba9299ee749a7ea7b2b40b473 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 13 Aug 2019 12:51:45 -0400
Subject: [PATCH 047/794] git: 2.22.0 -> 2.22.1

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 4c78963d7fa..87059634752 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.22.0";
+  version = "2.22.1";
   svn = subversionClient.override { perlBindings = perlSupport; };
 
   gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm";
+    sha256 = "093qjgagha937w96izkpsjkhxf5drsa7rvk5snlyjivqnwxgkqac";
   };
 
   outputs = [ "out" ];

From 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 15 Aug 2019 12:41:18 +0000
Subject: [PATCH 048/794] treewide: name -> pname (easy cases) (#66585)

treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
---
 nixos/modules/hardware/raid/hpsa.nix             |  4 ++--
 nixos/tests/common/letsencrypt/default.nix       |  4 ++--
 pkgs/applications/altcoins/clightning.nix        |  2 +-
 pkgs/applications/altcoins/dashpay.nix           |  2 +-
 pkgs/applications/altcoins/dcrd.nix              |  2 +-
 pkgs/applications/altcoins/dcrwallet.nix         |  2 +-
 pkgs/applications/altcoins/dero.nix              |  2 +-
 pkgs/applications/altcoins/freicoin.nix          |  2 +-
 .../altcoins/go-ethereum-classic/default.nix     |  2 +-
 pkgs/applications/altcoins/masari.nix            |  2 +-
 .../applications/altcoins/monero-gui/default.nix |  2 +-
 pkgs/applications/altcoins/monero/default.nix    |  2 +-
 .../altcoins/nano-wallet/default.nix             |  2 +-
 pkgs/applications/altcoins/parity-ui/default.nix |  4 ++--
 .../altcoins/particl/particl-core.nix            |  2 +-
 pkgs/applications/altcoins/pivx.nix              |  2 +-
 pkgs/applications/altcoins/sumokoin.nix          |  2 +-
 pkgs/applications/altcoins/wownero.nix           |  2 +-
 pkgs/applications/audio/AMB-plugins/default.nix  |  4 ++--
 pkgs/applications/audio/FIL-plugins/default.nix  |  4 ++--
 pkgs/applications/audio/MMA/default.nix          |  2 +-
 pkgs/applications/audio/a2jmidid/default.nix     |  2 +-
 pkgs/applications/audio/aeolus/default.nix       |  4 ++--
 pkgs/applications/audio/ams-lv2/default.nix      |  2 +-
 pkgs/applications/audio/ario/default.nix         |  4 ++--
 pkgs/applications/audio/artyFX/default.nix       |  2 +-
 pkgs/applications/audio/asunder/default.nix      |  4 ++--
 pkgs/applications/audio/audacious/default.nix    |  2 +-
 pkgs/applications/audio/audacity/default.nix     |  2 +-
 .../audio/audio-recorder/default.nix             |  4 ++--
 pkgs/applications/audio/avldrums-lv2/default.nix |  1 -
 pkgs/applications/audio/axoloti/default.nix      |  2 +-
 pkgs/applications/audio/axoloti/dfu-util.nix     |  4 ++--
 pkgs/applications/audio/baudline/default.nix     |  2 +-
 pkgs/applications/audio/bitmeter/default.nix     |  4 ++--
 .../audio/bitwig-studio/bitwig-studio1.nix       |  2 +-
 pkgs/applications/audio/bristol/default.nix      |  4 ++--
 pkgs/applications/audio/bs1770gain/default.nix   |  4 ++--
 pkgs/applications/audio/calf/default.nix         |  4 ++--
 pkgs/applications/audio/caps/default.nix         |  2 +-
 pkgs/applications/audio/cava/default.nix         |  2 +-
 pkgs/applications/audio/cd-discid/default.nix    |  4 ++--
 pkgs/applications/audio/chuck/default.nix        |  2 +-
 pkgs/applications/audio/cmus/default.nix         |  2 +-
 pkgs/applications/audio/cmusfm/default.nix       |  2 +-
 pkgs/applications/audio/csa/default.nix          |  4 ++--
 .../audio/csound/csound-qt/default.nix           |  2 +-
 pkgs/applications/audio/csound/default.nix       |  2 +-
 .../audio/deadbeef/plugins/headerbar-gtk3.nix    |  2 +-
 .../audio/deadbeef/plugins/infobar.nix           |  2 +-
 .../audio/deadbeef/plugins/mpris2.nix            |  4 ++--
 pkgs/applications/audio/denemo/default.nix       |  2 +-
 pkgs/applications/audio/dfasma/default.nix       |  2 +-
 pkgs/applications/audio/distrho/default.nix      |  2 +-
 pkgs/applications/audio/drumgizmo/default.nix    |  4 ++--
 pkgs/applications/audio/drumkv1/default.nix      |  4 ++--
 pkgs/applications/audio/ecasound/default.nix     |  2 +-
 pkgs/applications/audio/eflite/default.nix       |  4 ++--
 pkgs/applications/audio/eq10q/default.nix        |  4 ++--
 pkgs/applications/audio/espeak-ng/default.nix    |  2 +-
 pkgs/applications/audio/eteroj.lv2/default.nix   |  1 -
 pkgs/applications/audio/faust/faustlive.nix      |  2 +-
 pkgs/applications/audio/flac123/default.nix      |  4 ++--
 pkgs/applications/audio/flacon/default.nix       |  2 +-
 pkgs/applications/audio/fmit/default.nix         |  2 +-
 pkgs/applications/audio/fmsynth/default.nix      |  2 +-
 pkgs/applications/audio/fomp/default.nix         |  4 ++--
 pkgs/applications/audio/foo-yc20/default.nix     |  2 +-
 pkgs/applications/audio/freewheeling/default.nix |  2 +-
 .../audio/game-music-emu/default.nix             |  4 ++--
 pkgs/applications/audio/gigedit/default.nix      |  4 ++--
 pkgs/applications/audio/gmpc/default.nix         |  2 +-
 .../audio/gnome-podcasts/default.nix             |  2 +-
 pkgs/applications/audio/greg/default.nix         |  1 -
 pkgs/applications/audio/gtkpod/default.nix       |  4 ++--
 pkgs/applications/audio/guitarix/default.nix     |  2 +-
 .../applications/audio/gxplugins-lv2/default.nix |  1 -
 pkgs/applications/audio/helm/default.nix         |  2 +-
 pkgs/applications/audio/hydrogen/default.nix     |  2 +-
 pkgs/applications/audio/i-score/default.nix      |  2 +-
 pkgs/applications/audio/iannix/default.nix       |  2 +-
 pkgs/applications/audio/id3v2/default.nix        |  4 ++--
 .../audio/infamousPlugins/default.nix            |  2 +-
 pkgs/applications/audio/ir.lv2/default.nix       |  2 +-
 pkgs/applications/audio/jaaa/default.nix         |  4 ++--
 pkgs/applications/audio/jack-capture/default.nix |  4 ++--
 .../audio/jack-oscrolloscope/default.nix         |  4 ++--
 pkgs/applications/audio/jalv/default.nix         |  4 ++--
 pkgs/applications/audio/japa/default.nix         |  4 ++--
 .../applications/audio/keyfinder-cli/default.nix |  2 +-
 pkgs/applications/audio/keyfinder/default.nix    |  2 +-
 pkgs/applications/audio/kid3/default.nix         |  4 ++--
 pkgs/applications/audio/klick/default.nix        |  4 ++--
 .../audio/ladspa-plugins/default.nix             |  2 +-
 pkgs/applications/audio/ladspa-sdk/default.nix   |  2 +-
 pkgs/applications/audio/ladspa-sdk/ladspah.nix   |  2 +-
 pkgs/applications/audio/lash/default.nix         |  4 ++--
 pkgs/applications/audio/linuxband/default.nix    |  4 ++--
 pkgs/applications/audio/linuxsampler/default.nix |  4 ++--
 pkgs/applications/audio/lmms/default.nix         |  2 +-
 pkgs/applications/audio/lsp-plugins/default.nix  |  3 +--
 pkgs/applications/audio/ltc-tools/default.nix    |  2 +-
 pkgs/applications/audio/lv2bm/default.nix        |  2 +-
 .../CharacterCompressor/default.nix              |  2 +-
 .../audio/magnetophonDSP/CompBus/default.nix     |  2 +-
 .../ConstantDetuneChorus/default.nix             |  2 +-
 .../audio/magnetophonDSP/LazyLimiter/default.nix |  2 +-
 .../magnetophonDSP/MBdistortion/default.nix      |  2 +-
 .../audio/magnetophonDSP/RhythmDelay/default.nix |  2 +-
 .../magnetophonDSP/VoiceOfFaust/default.nix      |  2 +-
 .../audio/magnetophonDSP/pluginUtils/default.nix |  2 +-
 .../magnetophonDSP/shelfMultiBand/default.nix    |  2 +-
 pkgs/applications/audio/mda-lv2/default.nix      |  4 ++--
 pkgs/applications/audio/meterbridge/default.nix  |  4 ++--
 pkgs/applications/audio/mhwaveedit/default.nix   |  2 +-
 pkgs/applications/audio/milkytracker/default.nix |  2 +-
 pkgs/applications/audio/mimic/default.nix        |  2 +-
 pkgs/applications/audio/mixxx/default.nix        |  2 +-
 pkgs/applications/audio/moc/default.nix          |  2 +-
 .../audio/mod-distortion/default.nix             |  2 +-
 .../applications/audio/monkeys-audio/default.nix |  1 -
 pkgs/applications/audio/mp3blaster/default.nix   |  2 +-
 pkgs/applications/audio/mp3splt/default.nix      |  3 +--
 pkgs/applications/audio/mp3val/default.nix       |  4 ++--
 pkgs/applications/audio/mpc/default.nix          |  2 +-
 pkgs/applications/audio/mpg321/default.nix       |  2 +-
 pkgs/applications/audio/muse/default.nix         |  2 +-
 pkgs/applications/audio/musescore/darwin.nix     |  2 +-
 pkgs/applications/audio/musescore/default.nix    |  2 +-
 pkgs/applications/audio/ncmpc/default.nix        |  2 +-
 pkgs/applications/audio/ncmpcpp/default.nix      |  4 ++--
 pkgs/applications/audio/ncpamixer/default.nix    |  2 +-
 pkgs/applications/audio/non/default.nix          |  2 +-
 pkgs/applications/audio/normalize/default.nix    |  4 ++--
 pkgs/applications/audio/nova-filters/default.nix |  2 +-
 pkgs/applications/audio/padthv1/default.nix      |  4 ++--
 pkgs/applications/audio/pamix/default.nix        |  2 +-
 pkgs/applications/audio/pamixer/default.nix      |  2 +-
 pkgs/applications/audio/patchage/default.nix     |  2 +-
 .../audio/pd-plugins/cyclone/default.nix         |  2 +-
 .../audio/pd-plugins/maxlib/default.nix          |  2 +-
 .../audio/pd-plugins/mrpeach/default.nix         |  2 +-
 .../audio/pd-plugins/puremapping/default.nix     |  2 +-
 .../audio/pd-plugins/timbreid/default.nix        |  2 +-
 .../audio/pd-plugins/zexy/default.nix            |  4 ++--
 pkgs/applications/audio/petrifoo/default.nix     |  4 ++--
 pkgs/applications/audio/pianobooster/default.nix |  2 +-
 pkgs/applications/audio/playbar2/default.nix     |  2 +-
 .../audio/plugin-torture/default.nix             |  2 +-
 pkgs/applications/audio/ponymix/default.nix      |  2 +-
 pkgs/applications/audio/praat/default.nix        |  2 +-
 .../audio/pulseaudio-modules-bt/default.nix      |  2 +-
 pkgs/applications/audio/puredata/default.nix     |  2 +-
 pkgs/applications/audio/qjackctl/default.nix     |  4 ++--
 pkgs/applications/audio/qmidinet/default.nix     |  4 ++--
 pkgs/applications/audio/qmidiroute/default.nix   |  4 ++--
 pkgs/applications/audio/qsampler/default.nix     |  4 ++--
 pkgs/applications/audio/qsynth/default.nix       |  4 ++--
 pkgs/applications/audio/qtscrobbler/default.nix  |  2 +-
 pkgs/applications/audio/rakarrack/default.nix    |  4 ++--
 pkgs/applications/audio/reaper/default.nix       |  2 +-
 pkgs/applications/audio/redoflacs/default.nix    |  2 +-
 pkgs/applications/audio/renoise/default.nix      |  2 +-
 pkgs/applications/audio/rosegarden/default.nix   |  4 ++--
 pkgs/applications/audio/rubyripper/default.nix   |  2 +-
 pkgs/applications/audio/samplv1/default.nix      |  4 ++--
 .../applications/audio/schismtracker/default.nix |  4 ++--
 pkgs/applications/audio/seq24/default.nix        |  4 ++--
 pkgs/applications/audio/setbfree/default.nix     |  2 +-
 pkgs/applications/audio/sfxr-qt/default.nix      |  2 +-
 pkgs/applications/audio/shntool/default.nix      |  2 +-
 pkgs/applications/audio/sidplayfp/default.nix    |  4 ++--
 pkgs/applications/audio/snapcast/default.nix     |  2 +-
 pkgs/applications/audio/sonic-pi/default.nix     |  2 +-
 .../audio/sonic-visualiser/default.nix           |  4 ++--
 pkgs/applications/audio/sooperlooper/default.nix |  2 +-
 pkgs/applications/audio/sorcer/default.nix       |  2 +-
 .../audio/soundscape-renderer/default.nix        |  2 +-
 pkgs/applications/audio/spectmorph/default.nix   |  4 ++--
 pkgs/applications/audio/spectrojack/default.nix  |  4 ++--
 pkgs/applications/audio/spek/default.nix         |  4 ++--
 pkgs/applications/audio/split2flac/default.nix   |  2 +-
 pkgs/applications/audio/spotifywm/default.nix    |  2 +-
 pkgs/applications/audio/ssrc/default.nix         |  1 -
 pkgs/applications/audio/streamripper/default.nix |  4 ++--
 pkgs/applications/audio/sunvox/default.nix       |  2 +-
 pkgs/applications/audio/svox/default.nix         |  2 +-
 pkgs/applications/audio/swh-lv2/default.nix      |  2 +-
 pkgs/applications/audio/synthv1/default.nix      |  4 ++--
 pkgs/applications/audio/tambura/default.nix      |  1 -
 pkgs/applications/audio/tetraproc/default.nix    |  4 ++--
 pkgs/applications/audio/tomahawk/default.nix     |  4 ++--
 pkgs/applications/audio/transcribe/default.nix   |  2 +-
 pkgs/applications/audio/traverso/default.nix     |  2 +-
 pkgs/applications/audio/vcv-rack/default.nix     |  2 +-
 pkgs/applications/audio/vimpc/default.nix        |  2 +-
 pkgs/applications/audio/vkeybd/default.nix       |  4 ++--
 pkgs/applications/audio/wolf-shaper/default.nix  |  2 +-
 pkgs/applications/audio/x42-plugins/default.nix  |  4 ++--
 pkgs/applications/audio/xsynth-dssi/default.nix  |  4 ++--
 pkgs/applications/audio/yasr/default.nix         |  4 ++--
 pkgs/applications/audio/ympd/default.nix         |  2 +-
 pkgs/applications/audio/yoshimi/default.nix      |  4 ++--
 pkgs/applications/audio/zam-plugins/default.nix  |  2 +-
 .../applications/audio/zita-njbridge/default.nix |  4 ++--
 pkgs/applications/audio/zynaddsubfx/default.nix  |  2 +-
 pkgs/applications/backup/vdmfec/default.nix      |  4 ++--
 .../lightdm-enso-os-greeter/default.nix          |  2 +-
 .../lightdm-mini-greeter/default.nix             |  2 +-
 .../applications/display-managers/ly/default.nix |  2 +-
 pkgs/applications/editors/aewan/default.nix      |  4 ++--
 pkgs/applications/editors/aseprite/default.nix   |  2 +-
 pkgs/applications/editors/bonzomatic/default.nix |  1 -
 pkgs/applications/editors/brackets/default.nix   |  4 ++--
 pkgs/applications/editors/bvi/default.nix        |  4 ++--
 pkgs/applications/editors/bviplus/default.nix    |  2 +-
 .../editors/deadpixi-sam/default.nix             |  2 +-
 pkgs/applications/editors/dhex/default.nix       |  2 +-
 pkgs/applications/editors/dit/default.nix        |  4 ++--
 pkgs/applications/editors/edbrowse/default.nix   |  2 +-
 pkgs/applications/editors/edit/default.nix       |  2 +-
 .../editors/emacs-modes/cask/default.nix         |  2 +-
 .../editors/emacs-modes/cedille/default.nix      |  2 +-
 .../editors/emacs-modes/cryptol/default.nix      |  2 +-
 .../editors/emacs-modes/hol_light/default.nix    |  2 +-
 .../editors/emacs-modes/icicles/default.nix      |  4 ++--
 .../editors/emacs-modes/idris/default.nix        |  1 -
 .../editors/emacs-modes/jabber/default.nix       |  3 +--
 .../editors/emacs-modes/proofgeneral/4.4.nix     |  2 +-
 .../editors/emacs-modes/proofgeneral/HEAD.nix    |  2 +-
 pkgs/applications/editors/featherpad/default.nix |  2 +-
 pkgs/applications/editors/flpsed/default.nix     |  4 ++--
 .../applications/editors/focuswriter/default.nix |  2 +-
 pkgs/applications/editors/hecate/default.nix     |  2 +-
 pkgs/applications/editors/heme/default.nix       |  2 +-
 pkgs/applications/editors/hexcurse/default.nix   |  2 +-
 pkgs/applications/editors/hexedit/default.nix    |  4 ++--
 pkgs/applications/editors/howl/default.nix       |  2 +-
 pkgs/applications/editors/ht/default.nix         |  2 +-
 pkgs/applications/editors/joe/default.nix        |  4 ++--
 pkgs/applications/editors/jucipp/default.nix     |  2 +-
 pkgs/applications/editors/jupp/default.nix       |  2 +-
 pkgs/applications/editors/leafpad/default.nix    |  4 ++--
 pkgs/applications/editors/leo-editor/default.nix |  2 +-
 pkgs/applications/editors/lighttable/default.nix |  6 +++---
 pkgs/applications/editors/mg/default.nix         |  4 ++--
 pkgs/applications/editors/micro/default.nix      |  2 +-
 pkgs/applications/editors/mindforger/default.nix |  2 +-
 pkgs/applications/editors/moe/default.nix        |  4 ++--
 .../applications/editors/monodevelop/default.nix |  4 ++--
 .../editors/music/tuxguitar/default.nix          |  4 ++--
 pkgs/applications/editors/nano/default.nix       |  4 ++--
 .../applications/editors/nano/nanorc/default.nix |  2 +-
 pkgs/applications/editors/ne/default.nix         |  2 +-
 pkgs/applications/editors/nedit/default.nix      |  4 ++--
 pkgs/applications/editors/neovim/default.nix     |  2 +-
 pkgs/applications/editors/okteta/default.nix     |  4 ++--
 pkgs/applications/editors/scite/default.nix      |  2 +-
 pkgs/applications/editors/sigil/default.nix      |  2 +-
 .../editors/supertux-editor/default.nix          |  2 +-
 pkgs/applications/editors/tecoc/default.nix      |  6 +++---
 pkgs/applications/editors/texmaker/default.nix   |  3 +--
 pkgs/applications/editors/texstudio/default.nix  |  1 -
 pkgs/applications/editors/textadept/default.nix  |  2 +-
 pkgs/applications/editors/texworks/default.nix   |  2 +-
 pkgs/applications/editors/tweak/default.nix      |  4 ++--
 pkgs/applications/editors/uemacs/default.nix     |  2 +-
 pkgs/applications/editors/vbindiff/default.nix   |  4 ++--
 pkgs/applications/editors/vim/configurable.nix   |  2 +-
 pkgs/applications/editors/vim/default.nix        |  2 +-
 pkgs/applications/editors/vim/macvim.nix         |  2 +-
 pkgs/applications/editors/vis/default.nix        |  2 +-
 pkgs/applications/editors/wily/default.nix       |  4 ++--
 .../applications/editors/wxhexeditor/default.nix |  2 +-
 .../editors/xmlcopyeditor/default.nix            |  6 +++---
 pkgs/applications/editors/yi/wrapper.nix         |  2 +-
 .../gis/openorienteering-mapper/default.nix      |  2 +-
 pkgs/applications/gis/saga/default.nix           |  1 -
 pkgs/applications/graphics/ImageMagick/7.0.nix   |  2 +-
 .../graphics/ImageMagick/default.nix             |  2 +-
 .../graphics/PythonMagick/default.nix            |  2 +-
 pkgs/applications/graphics/ahoviewer/default.nix |  2 +-
 pkgs/applications/graphics/alchemy/default.nix   |  2 +-
 pkgs/applications/graphics/animbar/default.nix   |  3 +--
 pkgs/applications/graphics/antimony/default.nix  |  2 +-
 pkgs/applications/graphics/apitrace/default.nix  |  2 +-
 pkgs/applications/graphics/autotrace/default.nix |  4 ++--
 pkgs/applications/graphics/avocode/default.nix   |  2 +-
 pkgs/applications/graphics/c3d/default.nix       |  1 -
 pkgs/applications/graphics/darktable/default.nix |  2 +-
 pkgs/applications/graphics/deskew/default.nix    |  2 +-
 pkgs/applications/graphics/dia/default.nix       |  2 +-
 pkgs/applications/graphics/djview/default.nix    |  4 ++--
 pkgs/applications/graphics/drawpile/default.nix  |  2 +-
 pkgs/applications/graphics/exrtools/default.nix  |  4 ++--
 pkgs/applications/graphics/feh/default.nix       |  4 ++--
 .../applications/graphics/fontmatrix/default.nix |  2 +-
 pkgs/applications/graphics/freecad/default.nix   |  2 +-
 pkgs/applications/graphics/fstl/default.nix      |  2 +-
 pkgs/applications/graphics/geeqie/default.nix    |  4 ++--
 pkgs/applications/graphics/giv/default.nix       |  2 +-
 pkgs/applications/graphics/gnuclad/default.nix   |  4 ++--
 pkgs/applications/graphics/goxel/default.nix     |  2 +-
 pkgs/applications/graphics/grafx2/default.nix    |  4 ++--
 .../graphics/graphicsmagick/compat.nix           |  2 +-
 .../graphics/graphicsmagick/default.nix          |  2 +-
 pkgs/applications/graphics/imagej/default.nix    |  2 +-
 .../graphics/imlibsetroot/default.nix            |  2 +-
 pkgs/applications/graphics/imv/default.nix       |  2 +-
 pkgs/applications/graphics/jbrout/default.nix    |  2 +-
 .../graphics/jpeg-archive/default.nix            |  2 +-
 pkgs/applications/graphics/jpeginfo/default.nix  |  4 ++--
 pkgs/applications/graphics/jpegoptim/default.nix |  4 ++--
 pkgs/applications/graphics/k3d/default.nix       |  4 ++--
 .../graphics/kgraphviewer/default.nix            |  4 ++--
 pkgs/applications/graphics/leocad/default.nix    |  2 +-
 pkgs/applications/graphics/meme/default.nix      |  2 +-
 pkgs/applications/graphics/mirage/default.nix    |  4 ++--
 pkgs/applications/graphics/mozjpeg/default.nix   |  2 +-
 pkgs/applications/graphics/mypaint/default.nix   |  2 +-
 pkgs/applications/graphics/nomacs/default.nix    |  2 +-
 pkgs/applications/graphics/paraview/default.nix  |  2 +-
 pkgs/applications/graphics/pbrt/default.nix      |  2 +-
 pkgs/applications/graphics/pencil/default.nix    |  2 +-
 .../applications/graphics/phototonic/default.nix |  2 +-
 pkgs/applications/graphics/potrace/default.nix   |  2 +-
 pkgs/applications/graphics/pqiv/default.nix      |  2 +-
 .../graphics/processing3/default.nix             | 12 ++++++------
 .../applications/graphics/qcomicbook/default.nix |  2 +-
 pkgs/applications/graphics/qiv/default.nix       |  4 ++--
 pkgs/applications/graphics/rapcad/default.nix    |  2 +-
 pkgs/applications/graphics/renderdoc/default.nix |  2 +-
 .../graphics/sane/backends/dsseries/default.nix  |  6 +++---
 pkgs/applications/graphics/sane/frontends.nix    |  4 ++--
 .../graphics/scantailor/advanced.nix             |  2 +-
 .../graphics/screencloud/default.nix             |  2 +-
 pkgs/applications/graphics/swingsane/default.nix |  2 +-
 .../graphics/tesseract/tesseract3.nix            |  2 +-
 .../graphics/tesseract/tesseract4.nix            |  2 +-
 .../graphics/timelapse-deflicker/default.nix     |  2 +-
 pkgs/applications/graphics/viewnior/default.nix  |  4 ++--
 .../graphics/write_stylus/default.nix            |  2 +-
 pkgs/applications/graphics/xaos/default.nix      |  4 ++--
 pkgs/applications/graphics/xfractint/default.nix |  1 -
 pkgs/applications/graphics/xournalpp/default.nix |  2 +-
 pkgs/applications/graphics/xzgv/default.nix      |  2 +-
 pkgs/applications/graphics/yacreader/default.nix |  4 ++--
 pkgs/applications/graphics/yed/default.nix       |  4 ++--
 pkgs/applications/graphics/zgrviewer/default.nix |  3 +--
 pkgs/applications/graphics/zgv/default.nix       |  4 ++--
 pkgs/applications/misc/airtame/default.nix       |  1 -
 pkgs/applications/misc/aminal/default.nix        |  2 +-
 pkgs/applications/misc/ape/clex.nix              |  2 +-
 pkgs/applications/misc/apvlv/default.nix         |  2 +-
 pkgs/applications/misc/artha/default.nix         |  2 +-
 pkgs/applications/misc/autospotting/default.nix  |  2 +-
 pkgs/applications/misc/batti/default.nix         |  4 ++--
 pkgs/applications/misc/bb/default.nix            |  4 ++--
 pkgs/applications/misc/bibletime/default.nix     |  4 ++--
 pkgs/applications/misc/calcurse/default.nix      |  4 ++--
 pkgs/applications/misc/calibre/default.nix       |  4 ++--
 pkgs/applications/misc/candle/default.nix        |  2 +-
 pkgs/applications/misc/cataract/build.nix        |  2 +-
 pkgs/applications/misc/cdrtools/default.nix      |  4 ++--
 pkgs/applications/misc/cgminer/default.nix       |  2 +-
 pkgs/applications/misc/cheat/default.nix         |  1 -
 pkgs/applications/misc/cherrytree/default.nix    |  4 ++--
 .../applications/misc/cli-visualizer/default.nix |  2 +-
 pkgs/applications/misc/clipit/default.nix        |  4 ++--
 pkgs/applications/misc/clipmenu/default.nix      |  2 +-
 .../misc/cool-retro-term/default.nix             |  2 +-
 pkgs/applications/misc/copyq/default.nix         |  2 +-
 pkgs/applications/misc/cpp-ethereum/default.nix  |  2 +-
 pkgs/applications/misc/ctodo/default.nix         |  2 +-
 .../misc/cura/lulzbot/curaengine.nix             |  2 +-
 pkgs/applications/misc/curabydagoma/default.nix  |  2 +-
 pkgs/applications/misc/curaengine/default.nix    |  2 +-
 pkgs/applications/misc/dbeaver/default.nix       |  2 +-
 pkgs/applications/misc/ddgr/default.nix          |  2 +-
 pkgs/applications/misc/deco/default.nix          |  1 -
 pkgs/applications/misc/devilspie2/default.nix    |  2 +-
 pkgs/applications/misc/diff-pdf/default.nix      |  2 +-
 pkgs/applications/misc/diffpdf/default.nix       | 10 +++++-----
 pkgs/applications/misc/digitalbitbox/default.nix |  2 +-
 pkgs/applications/misc/direwolf/default.nix      |  2 +-
 pkgs/applications/misc/doomseeker/default.nix    |  2 +-
 pkgs/applications/misc/dotfiles/default.nix      |  1 -
 pkgs/applications/misc/dozenal/default.nix       |  2 +-
 pkgs/applications/misc/eaglemode/default.nix     |  4 ++--
 pkgs/applications/misc/emem/default.nix          |  1 -
 pkgs/applications/misc/epdfview/default.nix      |  2 +-
 pkgs/applications/misc/et/default.nix            |  2 +-
 pkgs/applications/misc/eterm/default.nix         |  2 +-
 pkgs/applications/misc/eureka-editor/default.nix |  2 +-
 pkgs/applications/misc/evilvte/default.nix       |  2 +-
 pkgs/applications/misc/exercism/default.nix      |  2 +-
 pkgs/applications/misc/extract_url/default.nix   |  2 +-
 pkgs/applications/misc/flamerobin/default.nix    |  2 +-
 pkgs/applications/misc/fme/default.nix           |  2 +-
 pkgs/applications/misc/freemind/default.nix      |  2 +-
 pkgs/applications/misc/gImageReader/default.nix  |  2 +-
 pkgs/applications/misc/galculator/default.nix    |  2 +-
 pkgs/applications/misc/gammu/default.nix         |  2 +-
 .../misc/ganttproject-bin/default.nix            |  2 +-
 pkgs/applications/misc/gcal/default.nix          |  4 ++--
 pkgs/applications/misc/getxbook/default.nix      |  4 ++--
 pkgs/applications/misc/gksu/default.nix          |  3 +--
 pkgs/applications/misc/glava/default.nix         |  2 +-
 pkgs/applications/misc/go-jira/default.nix       |  2 +-
 .../applications/misc/golden-cheetah/default.nix |  4 ++--
 pkgs/applications/misc/gollum/default.nix        |  3 +--
 pkgs/applications/misc/googler/default.nix       |  2 +-
 pkgs/applications/misc/gphoto2/gphotofs.nix      |  2 +-
 pkgs/applications/misc/gpsbabel/default.nix      |  2 +-
 pkgs/applications/misc/gpsprune/default.nix      |  2 +-
 pkgs/applications/misc/gpx-viewer/default.nix    |  4 ++--
 pkgs/applications/misc/gpx/default.nix           |  2 +-
 pkgs/applications/misc/gramps/default.nix        |  4 ++--
 .../misc/green-pdfviewer/default.nix             |  2 +-
 .../misc/gremlin-console/default.nix             |  2 +-
 pkgs/applications/misc/gsimplecal/default.nix    |  2 +-
 pkgs/applications/misc/gtk2fontsel/default.nix   |  4 ++--
 pkgs/applications/misc/gummi/default.nix         |  2 +-
 pkgs/applications/misc/gxmessage/default.nix     |  4 ++--
 pkgs/applications/misc/hdate/default.nix         |  2 +-
 pkgs/applications/misc/hello-unfree/default.nix  |  2 +-
 pkgs/applications/misc/hello/default.nix         |  4 ++--
 pkgs/applications/misc/hivemind/default.nix      |  2 +-
 pkgs/applications/misc/houdini/runtime.nix       |  2 +-
 pkgs/applications/misc/hr/default.nix            |  2 +-
 pkgs/applications/misc/hstr/default.nix          |  2 +-
 pkgs/applications/misc/hugo/default.nix          |  2 +-
 pkgs/applications/misc/hyper/default.nix         |  2 +-
 pkgs/applications/misc/icesl/default.nix         |  2 +-
 pkgs/applications/misc/ipmicfg/default.nix       |  2 +-
 pkgs/applications/misc/ipmiview/default.nix      |  2 +-
 pkgs/applications/misc/iterm2/default.nix        |  2 +-
 pkgs/applications/misc/jbidwatcher/default.nix   |  2 --
 pkgs/applications/misc/josm/default.nix          |  2 +-
 pkgs/applications/misc/jp2a/default.nix          |  2 +-
 pkgs/applications/misc/k2pdfopt/default.nix      |  2 +-
 pkgs/applications/misc/kanboard/default.nix      |  2 +-
 pkgs/applications/misc/kdbplus/default.nix       |  4 ++--
 pkgs/applications/misc/keepassx/2.0.nix          |  2 +-
 pkgs/applications/misc/keepassx/community.nix    |  2 +-
 pkgs/applications/misc/keepassx/default.nix      |  4 ++--
 pkgs/applications/misc/khard/default.nix         |  2 +-
 pkgs/applications/misc/kiwix/default.nix         | 10 +++++-----
 pkgs/applications/misc/latte-dock/default.nix    |  5 ++---
 pkgs/applications/misc/lenmus/default.nix        |  2 +-
 pkgs/applications/misc/libosmocore/default.nix   |  2 +-
 pkgs/applications/misc/librecad/default.nix      |  4 ++--
 pkgs/applications/misc/lilyterm/default.nix      |  2 +-
 pkgs/applications/misc/llpp/default.nix          |  2 +-
 pkgs/applications/misc/ltwheelconf/default.nix   |  1 -
 pkgs/applications/misc/lutris/default.nix        |  2 +-
 pkgs/applications/misc/lyx/default.nix           |  4 ++--
 pkgs/applications/misc/madonctl/default.nix      |  2 +-
 pkgs/applications/misc/makeself/default.nix      | 10 +++++-----
 pkgs/applications/misc/mdp/default.nix           |  2 +-
 pkgs/applications/misc/mediainfo-gui/default.nix |  2 +-
 pkgs/applications/misc/mediainfo/default.nix     |  2 +-
 pkgs/applications/misc/megasync/default.nix      |  2 +-
 pkgs/applications/misc/memo/default.nix          |  2 +-
 pkgs/applications/misc/menumaker/default.nix     |  4 ++--
 pkgs/applications/misc/merkaartor/default.nix    |  2 +-
 pkgs/applications/misc/metamorphose2/default.nix |  2 +-
 pkgs/applications/misc/milu/default.nix          |  2 +-
 pkgs/applications/misc/minergate-cli/default.nix |  2 +-
 pkgs/applications/misc/minergate/default.nix     |  2 +-
 pkgs/applications/misc/mlterm/default.nix        |  4 ++--
 .../misc/moonlight-embedded/default.nix          |  2 +-
 pkgs/applications/misc/mop/default.nix           |  2 +-
 pkgs/applications/misc/mqtt-bench/default.nix    |  2 +-
 pkgs/applications/misc/mupdf/default.nix         |  4 ++--
 pkgs/applications/misc/mwic/default.nix          |  4 ++--
 .../misc/mysql-workbench/default.nix             |  1 -
 pkgs/applications/misc/mystem/default.nix        |  4 ++--
 pkgs/applications/misc/nanoblogger/default.nix   |  4 ++--
 pkgs/applications/misc/navit/default.nix         |  2 +-
 pkgs/applications/misc/neap/default.nix          |  2 +-
 .../misc/netsurf/browser/default.nix             |  2 +-
 .../misc/netsurf/buildsystem/default.nix         |  2 +-
 .../misc/netsurf/nsgenbind/default.nix           |  2 +-
 pkgs/applications/misc/nix-tour/default.nix      |  2 +-
 pkgs/applications/misc/nixnote2/default.nix      |  2 +-
 pkgs/applications/misc/noice/default.nix         |  2 +-
 .../misc/notify-osd-customizable/default.nix     |  2 +-
 pkgs/applications/misc/notify-osd/default.nix    |  2 +-
 pkgs/applications/misc/ola/default.nix           |  2 +-
 pkgs/applications/misc/oneko/default.nix         |  2 +-
 pkgs/applications/misc/openbox-menu/default.nix  |  4 ++--
 pkgs/applications/misc/opencpn/default.nix       |  2 +-
 pkgs/applications/misc/orpie/default.nix         |  4 ++--
 pkgs/applications/misc/osm2xmap/default.nix      |  2 +-
 pkgs/applications/misc/osmctools/default.nix     |  2 +-
 pkgs/applications/misc/osmium-tool/default.nix   |  2 +-
 pkgs/applications/misc/pcmanx-gtk2/default.nix   |  2 +-
 pkgs/applications/misc/pdf-quench/default.nix    |  2 +-
 pkgs/applications/misc/pell/default.nix          |  1 -
 pkgs/applications/misc/pgadmin/default.nix       |  2 +-
 pkgs/applications/misc/pgmanage/default.nix      |  2 +-
 pkgs/applications/misc/phwmon/default.nix        |  2 +-
 .../plasma-applet-volumewin7mixer/default.nix    |  2 +-
 pkgs/applications/misc/plover/default.nix        |  4 ++--
 pkgs/applications/misc/pmenu/default.nix         |  2 +-
 .../misc/polar-bookshelf/default.nix             |  2 +-
 pkgs/applications/misc/projectlibre/default.nix  |  2 +-
 pkgs/applications/misc/prusa-slicer/default.nix  |  2 +-
 pkgs/applications/misc/qlandkartegt/default.nix  |  4 ++--
 .../applications/misc/qlandkartegt/garmindev.nix |  4 ++--
 pkgs/applications/misc/qlcplus/default.nix       |  2 +-
 pkgs/applications/misc/qmapshack/default.nix     |  4 ++--
 pkgs/applications/misc/qolibri/default.nix       |  2 +-
 .../applications/misc/qsyncthingtray/default.nix |  2 +-
 pkgs/applications/misc/quicksynergy/default.nix  |  2 +-
 .../misc/redis-desktop-manager/default.nix       |  2 +-
 pkgs/applications/misc/redshift/default.nix      |  2 +-
 pkgs/applications/misc/regextester/default.nix   |  2 +-
 pkgs/applications/misc/robo3t/default.nix        |  2 +-
 pkgs/applications/misc/robomongo/default.nix     |  2 +-
 pkgs/applications/misc/rxvt/default.nix          |  4 ++--
 .../default.nix                                  |  2 +-
 .../rxvt_unicode-plugins/urxvt-perls/default.nix |  2 +-
 .../urxvt-tabbedex/default.nix                   |  2 +-
 pkgs/applications/misc/safeeyes/default.nix      |  1 -
 pkgs/applications/misc/sakura/default.nix        |  4 ++--
 pkgs/applications/misc/sc-im/default.nix         |  2 +-
 pkgs/applications/misc/sdcv/default.nix          |  2 +-
 pkgs/applications/misc/sequelpro/default.nix     |  2 +-
 pkgs/applications/misc/slade/default.nix         |  2 +-
 pkgs/applications/misc/slic3r/default.nix        |  2 +-
 pkgs/applications/misc/slstatus/default.nix      |  2 +-
 pkgs/applications/misc/spacefm/default.nix       |  2 +-
 pkgs/applications/misc/sqliteman/default.nix     |  2 +-
 pkgs/applications/misc/ssocr/default.nix         |  2 +-
 pkgs/applications/misc/stog/default.nix          |  2 +-
 pkgs/applications/misc/styx/default.nix          |  2 +-
 pkgs/applications/misc/subsurface/default.nix    |  2 +-
 .../applications/misc/syncthing-tray/default.nix |  2 +-
 pkgs/applications/misc/synergy/default.nix       |  2 +-
 pkgs/applications/misc/tabula/default.nix        |  2 +-
 pkgs/applications/misc/tasknc/default.nix        |  2 +-
 pkgs/applications/misc/tasksh/default.nix        |  4 ++--
 pkgs/applications/misc/taskwarrior/default.nix   |  2 +-
 pkgs/applications/misc/termdown/default.nix      |  2 +-
 .../misc/terminal-notifier/default.nix           |  2 +-
 .../misc/terminal-parrot/default.nix             |  2 +-
 pkgs/applications/misc/terminus/default.nix      |  2 +-
 pkgs/applications/misc/termite/default.nix       |  2 +-
 pkgs/applications/misc/tilda/default.nix         |  4 ++--
 pkgs/applications/misc/timewarrior/default.nix   |  2 +-
 pkgs/applications/misc/tint2/default.nix         |  2 +-
 pkgs/applications/misc/tnef/default.nix          |  2 +-
 pkgs/applications/misc/todoist/default.nix       |  2 +-
 pkgs/applications/misc/todolist/default.nix      |  2 +-
 pkgs/applications/misc/toggldesktop/default.nix  |  6 +++---
 pkgs/applications/misc/topydo/default.nix        |  1 -
 pkgs/applications/misc/tpmmanager/default.nix    |  2 +-
 pkgs/applications/misc/tthsum/default.nix        |  2 +-
 pkgs/applications/misc/usync/default.nix         |  1 -
 pkgs/applications/misc/valentina/default.nix     |  2 +-
 pkgs/applications/misc/vcal/default.nix          |  2 +-
 pkgs/applications/misc/veracrypt/default.nix     |  1 -
 pkgs/applications/misc/verbiste/default.nix      |  4 ++--
 pkgs/applications/misc/viking/default.nix        |  2 +-
 pkgs/applications/misc/visidata/default.nix      |  1 -
 pkgs/applications/misc/volnoti/default.nix       |  2 +-
 pkgs/applications/misc/vp/default.nix            |  2 +-
 pkgs/applications/misc/vue/default.nix           |  2 +-
 pkgs/applications/misc/vym/default.nix           |  4 ++--
 pkgs/applications/misc/wcalc/default.nix         |  4 ++--
 pkgs/applications/misc/weather/default.nix       |  4 ++--
 pkgs/applications/misc/wego/default.nix          |  2 +-
 pkgs/applications/misc/wikicurses/default.nix    |  2 +-
 pkgs/applications/misc/wordnet/default.nix       |  2 +-
 pkgs/applications/misc/worker/default.nix        |  4 ++--
 pkgs/applications/misc/workrave/default.nix      |  2 +-
 pkgs/applications/misc/xautoclick/default.nix    |  2 +-
 pkgs/applications/misc/xca/default.nix           |  2 +-
 pkgs/applications/misc/xdgmenumaker/default.nix  |  2 +-
 pkgs/applications/misc/xiphos/default.nix        |  2 +-
 pkgs/applications/misc/xkbd/default.nix          |  4 ++--
 .../misc/xkblayout-state/default.nix             |  1 -
 pkgs/applications/misc/xkbmon/default.nix        |  2 +-
 pkgs/applications/misc/xmind/default.nix         |  4 ++--
 pkgs/applications/misc/xmrig/default.nix         |  2 +-
 pkgs/applications/misc/xmrig/proxy.nix           |  2 +-
 pkgs/applications/misc/xneur/default.nix         |  2 +-
 pkgs/applications/misc/xpad/default.nix          |  2 +-
 .../misc/xrandr-invert-colors/default.nix        |  2 +-
 pkgs/applications/misc/xscope/default.nix        |  3 +--
 pkgs/applications/misc/xsuspender/default.nix    |  2 +-
 pkgs/applications/misc/xsw/default.nix           |  2 +-
 pkgs/applications/misc/xteddy/default.nix        |  2 +-
 pkgs/applications/misc/xtermcontrol/default.nix  |  2 +-
 pkgs/applications/misc/yaft/default.nix          |  2 +-
 pkgs/applications/misc/yakuake/default.nix       |  3 +--
 pkgs/applications/misc/yarssr/default.nix        |  2 +-
 pkgs/applications/misc/yate/default.nix          |  4 ++--
 pkgs/applications/misc/zathura/cb/default.nix    |  4 ++--
 pkgs/applications/misc/zathura/core/default.nix  |  2 +-
 .../misc/zathura/pdf-mupdf/default.nix           |  2 +-
 .../misc/zathura/pdf-poppler/default.nix         |  4 ++--
 .../apache-directory-studio/default.nix          |  2 +-
 pkgs/applications/networking/brig/default.nix    |  2 +-
 .../networking/browsers/arora/default.nix        |  2 +-
 .../networking/browsers/browsh/default.nix       |  2 +-
 .../networking/browsers/chromium/plugins.nix     |  2 +-
 .../networking/browsers/dillo/default.nix        |  4 ++--
 .../networking/browsers/falkon/default.nix       |  2 +-
 .../networking/browsers/links2/default.nix       |  2 +-
 .../networking/browsers/lynx/default.nix         |  2 +-
 .../mozilla-plugins/bluejeans/default.nix        |  2 +-
 .../esteidfirefoxplugin/default.nix              |  2 +-
 .../mozilla-plugins/flashplayer/default.nix      |  2 +-
 .../mozilla-plugins/flashplayer/standalone.nix   |  2 +-
 .../browsers/mozilla-plugins/fribid/default.nix  |  4 ++--
 .../google-talk-plugin/default.nix               |  2 +-
 .../mozilla-plugins/mozplugger/default.nix       |  6 +++---
 .../networking/browsers/qtchan/default.nix       |  2 +-
 .../networking/browsers/surf/default.nix         |  2 +-
 .../browsers/tor-browser-bundle-bin/default.nix  |  2 +-
 .../browsers/tor-browser-bundle/default.nix      |  2 +-
 .../browsers/tor-browser-bundle/extensions.nix   |  8 ++++----
 .../networking/browsers/uzbl/default.nix         |  2 +-
 .../networking/browsers/vimb/default.nix         |  2 +-
 .../networking/browsers/vimprobable2/default.nix |  2 +-
 pkgs/applications/networking/c14/default.nix     |  2 +-
 pkgs/applications/networking/charles/default.nix |  2 +-
 .../networking/cloudflared/default.nix           |  2 +-
 .../networking/cluster/argo/default.nix          |  2 +-
 .../networking/cluster/chronos/default.nix       |  6 +++---
 .../cluster/docker-machine/default.nix           |  2 +-
 .../networking/cluster/docker-machine/kvm.nix    |  2 +-
 .../networking/cluster/docker-machine/kvm2.nix   |  1 -
 .../networking/cluster/docker-machine/xhyve.nix  |  2 +-
 .../networking/cluster/helm/default.nix          |  2 +-
 .../networking/cluster/heptio-ark/default.nix    |  2 +-
 .../networking/cluster/hetzner-kube/default.nix  |  2 +-
 .../networking/cluster/kanif/default.nix         |  4 ++--
 .../networking/cluster/kompose/default.nix       |  2 +-
 .../networking/cluster/kontemplate/default.nix   |  2 +-
 .../networking/cluster/kubernetes/default.nix    |  2 +-
 .../networking/cluster/kubetail/default.nix      |  2 +-
 .../networking/cluster/kubeval/default.nix       |  2 +-
 .../networking/cluster/marathon/default.nix      |  6 +++---
 .../networking/cluster/mesos/default.nix         |  4 ++--
 .../networking/cluster/minishift/default.nix     |  2 +-
 .../networking/cluster/nomad/default.nix         |  2 +-
 .../networking/cluster/openshift/default.nix     |  2 +-
 .../networking/cluster/pachyderm/default.nix     |  2 +-
 .../networking/cluster/ssm-agent/default.nix     |  1 -
 .../networking/cluster/stern/default.nix         |  2 +-
 .../networking/cluster/taktuk/default.nix        |  4 ++--
 .../cluster/terraform-docs/default.nix           |  1 -
 .../cluster/terraform-inventory/default.nix      |  2 +-
 .../terraform-providers/ansible/default.nix      |  2 +-
 .../elasticsearch/default.nix                    |  2 +-
 .../terraform-providers/gandi/default.nix        |  2 +-
 .../cluster/terraform-providers/ibm/default.nix  |  2 +-
 .../terraform-providers/libvirt/default.nix      |  2 +-
 .../networking/cluster/terragrunt/default.nix    |  2 +-
 .../applications/networking/corebird/default.nix |  2 +-
 pkgs/applications/networking/drive/default.nix   |  2 +-
 pkgs/applications/networking/droopy/default.nix  |  2 +-
 pkgs/applications/networking/errbot/default.nix  |  4 ++--
 .../networking/feedreaders/rss2email/default.nix |  3 +--
 .../networking/feedreaders/rssguard/default.nix  |  1 -
 .../networking/feedreaders/rsstail/default.nix   |  2 +-
 pkgs/applications/networking/firehol/default.nix |  2 +-
 pkgs/applications/networking/firehol/iprange.nix |  2 +-
 .../applications/networking/ftp/taxi/default.nix |  2 --
 pkgs/applications/networking/gdrive/default.nix  |  2 +-
 .../google-drive-ocamlfuse/default.nix           |  2 +-
 .../networking/gopher/gopher/default.nix         |  2 +-
 .../networking/gopher/gopherclient/default.nix   |  2 +-
 .../networking/ids/snort/default.nix             |  6 +++---
 .../instant-messengers/SkypeExport/default.nix   |  2 +-
 .../instant-messengers/baresip/default.nix       |  2 +-
 .../bitlbee-discord/default.nix                  |  2 +-
 .../bitlbee-facebook/default.nix                 |  2 +-
 .../instant-messengers/bitlbee-steam/default.nix |  2 +-
 .../instant-messengers/blink/default.nix         |  2 +-
 .../instant-messengers/bluejeans/default.nix     |  2 +-
 .../instant-messengers/centerim/default.nix      |  4 ++--
 .../instant-messengers/coyim/default.nix         |  2 +-
 .../instant-messengers/freetalk/default.nix      |  2 +-
 .../instant-messengers/gitter/default.nix        |  1 -
 .../instant-messengers/jackline/default.nix      |  2 +-
 .../instant-messengers/jitsi/default.nix         |  2 +-
 .../mattermost-desktop/default.nix               |  6 +++---
 .../instant-messengers/mcabber/default.nix       |  2 +-
 .../instant-messengers/mikutter/default.nix      |  2 +-
 .../networking/instant-messengers/mm/default.nix |  2 +-
 .../instant-messengers/nheko/default.nix         |  2 +-
 .../instant-messengers/oysttyer/default.nix      |  2 +-
 .../pidgin-plugins/carbons/default.nix           |  2 +-
 .../pidgin-opensteamworks/default.nix            |  2 +-
 .../pidgin-plugins/pidgin-skypeweb/default.nix   |  2 +-
 .../pidgin-plugins/purple-discord/default.nix    |  2 +-
 .../pidgin-plugins/purple-hangouts/default.nix   |  2 +-
 .../pidgin-plugins/purple-lurch/default.nix      |  2 +-
 .../pidgin-plugins/tox-prpl/default.nix          |  2 +-
 .../pidgin-plugins/window-merge/default.nix      |  2 +-
 .../instant-messengers/pidgin/default.nix        |  4 ++--
 .../instant-messengers/pond/default.nix          |  2 +-
 .../instant-messengers/profanity/default.nix     |  2 +-
 .../instant-messengers/psi-plus/default.nix      |  2 +-
 .../instant-messengers/rambox/bare.nix           |  2 +-
 .../instant-messengers/rambox/sencha/bare.nix    |  2 +-
 .../instant-messengers/ricochet/default.nix      |  2 +-
 .../instant-messengers/ring-daemon/default.nix   |  2 +-
 .../instant-messengers/ring-daemon/restbed.nix   |  2 +-
 .../instant-messengers/riot/riot-web.nix         |  2 +-
 .../instant-messengers/signal-cli/default.nix    |  2 +-
 .../signal-desktop/default.nix                   |  2 +-
 .../instant-messengers/sky/default.nix           |  2 +-
 .../instant-messengers/slack-term/default.nix    |  2 +-
 .../instant-messengers/slack/dark-theme.nix      |  2 +-
 .../instant-messengers/stride/default.nix        |  2 +-
 .../instant-messengers/swift-im/default.nix      |  2 +-
 .../instant-messengers/teamspeak/client.nix      |  2 +-
 .../telegram/tdesktop/default.nix                |  2 +-
 .../telepathy/idle/default.nix                   |  3 +--
 .../instant-messengers/tensor/default.nix        |  2 +-
 .../instant-messengers/torchat/default.nix       |  2 +-
 .../instant-messengers/toxic/default.nix         |  2 +-
 .../instant-messengers/utox/default.nix          |  2 +-
 .../instant-messengers/vacuum/default.nix        |  2 +-
 .../instant-messengers/viber/default.nix         |  2 +-
 .../instant-messengers/xmpp-client/default.nix   |  2 +-
 pkgs/applications/networking/insync/default.nix  |  4 ++--
 .../networking/ipfs-cluster/default.nix          |  4 ++--
 .../networking/ipfs-migrator/default.nix         |  2 +-
 pkgs/applications/networking/ipget/default.nix   |  4 ++--
 .../networking/iptraf-ng/default.nix             |  4 ++--
 pkgs/applications/networking/irc/bip/default.nix |  2 +-
 .../networking/irc/communi/default.nix           |  2 +-
 .../networking/irc/epic5/default.nix             |  4 ++--
 .../networking/irc/glowing-bear/default.nix      |  2 +-
 .../networking/irc/hexchat/default.nix           |  2 +-
 .../networking/irc/irssi/default.nix             |  4 ++--
 .../networking/irc/irssi/otr/default.nix         |  2 +-
 pkgs/applications/networking/irc/sic/default.nix |  2 +-
 .../networking/irc/weechat/default.nix           |  2 +-
 .../irc/weechat/scripts/wee-slack/default.nix    |  2 +-
 .../networking/irc/wraith/default.nix            |  2 +-
 pkgs/applications/networking/jmeter/default.nix  |  4 ++--
 pkgs/applications/networking/jnetmap/default.nix |  2 +-
 pkgs/applications/networking/linssid/default.nix |  2 +-
 .../networking/mailreaders/alpine/default.nix    |  4 ++--
 .../networking/mailreaders/balsa/default.nix     |  4 ++--
 .../mailreaders/claws-mail/default.nix           |  2 +-
 .../networking/mailreaders/imapfilter.nix        |  2 +-
 .../networking/mailreaders/inboxer/default.nix   |  2 +-
 .../networking/mailreaders/mailcheck/default.nix |  2 +-
 .../networking/mailreaders/mailnag/default.nix   |  2 +-
 .../networking/mailreaders/mblaze/default.nix    |  2 +-
 .../networking/mailreaders/mutt/default.nix      |  4 ++--
 .../networking/mailreaders/neomutt/default.nix   |  2 +-
 .../networking/mailreaders/notbit/default.nix    |  2 +-
 .../mailreaders/notmuch-bower/default.nix        |  2 +-
 .../networking/mailreaders/notmuch/default.nix   |  6 +++---
 .../networking/mailreaders/notmuch/muchsync.nix  |  4 ++--
 .../networking/mailreaders/notmuch/mutt.nix      |  2 +-
 .../networking/mailreaders/sylpheed/default.nix  |  4 ++--
 .../mailreaders/thunderbird/default.nix          |  2 +-
 .../networking/mailreaders/trojita/default.nix   |  4 ++--
 .../networking/modem-manager-gui/default.nix     |  2 +-
 pkgs/applications/networking/ndppd/default.nix   |  2 +-
 pkgs/applications/networking/netperf/default.nix |  2 +-
 .../networking/newsreaders/quiterss/default.nix  |  2 +-
 .../networking/nextcloud-client/default.nix      |  2 +-
 pkgs/applications/networking/nload/default.nix   |  4 ++--
 .../networking/nntp-proxy/default.nix            |  2 +-
 pkgs/applications/networking/omping/default.nix  |  2 +-
 .../applications/networking/ostinato/default.nix |  2 +-
 pkgs/applications/networking/owamp/default.nix   |  2 +-
 .../networking/owncloud-client/default.nix       |  2 +-
 .../networking/p2p/deluge/default.nix            |  4 ++--
 .../networking/p2p/eiskaltdcpp/default.nix       |  2 +-
 .../networking/p2p/frostwire/frostwire-bin.nix   |  2 +-
 .../networking/p2p/ktorrent/default.nix          |  4 ++--
 .../applications/networking/p2p/ncdc/default.nix |  2 +-
 .../networking/p2p/qbittorrent/default.nix       |  2 +-
 .../networking/p2p/retroshare/default.nix        |  2 +-
 .../networking/p2p/soulseekqt/default.nix        |  2 +-
 .../networking/p2p/tixati/default.nix            |  2 +-
 .../p2p/transmission-remote-cli/default.nix      |  2 +-
 .../p2p/transmission-remote-gtk/default.nix      |  2 +-
 .../networking/p2p/tribler/default.nix           |  2 +-
 .../networking/p2p/twister/default.nix           |  2 +-
 .../applications/networking/p2p/vuze/default.nix |  2 +-
 pkgs/applications/networking/pjsip/default.nix   |  6 +++---
 .../networking/ps2client/default.nix             |  2 +-
 .../networking/remote/anydesk/default.nix        |  4 ++--
 .../remote/citrix-receiver/default.nix           |  2 +-
 .../remote/citrix-workspace/default.nix          |  2 +-
 .../networking/remote/freerdp/default.nix        |  2 +-
 .../networking/remote/putty/default.nix          |  6 +++---
 .../networking/remote/rdesktop/default.nix       |  1 -
 .../networking/remote/ssvnc/default.nix          |  4 ++--
 .../networking/remote/teamviewer/default.nix     |  2 +-
 .../networking/remote/xrdp/default.nix           |  4 ++--
 .../networking/resilio-sync/default.nix          |  2 +-
 .../networking/seafile-client/default.nix        |  2 +-
 .../networking/sieve-connect/default.nix         |  2 +-
 .../networking/sniffers/ettercap/default.nix     |  2 +-
 .../networking/sniffers/kismet/default.nix       |  4 ++--
 .../applications/networking/sniproxy/default.nix |  2 +-
 pkgs/applications/networking/soapui/default.nix  |  2 +-
 .../networking/ssb/patchwork-classic/default.nix |  2 +-
 .../networking/sync/acd_cli/default.nix          |  1 -
 .../networking/sync/backintime/common.nix        |  2 +-
 .../networking/sync/backintime/qt4.nix           |  2 +-
 .../networking/sync/casync/default.nix           |  2 +-
 .../networking/sync/desync/default.nix           |  2 +-
 .../networking/sync/lsyncd/default.nix           |  2 +-
 .../networking/sync/rclone/browser.nix           |  2 +-
 .../networking/sync/unison/default.nix           |  2 +-
 .../applications/networking/syncplay/default.nix |  2 +-
 .../networking/syncthing-gtk/default.nix         |  2 +-
 pkgs/applications/networking/tsung/default.nix   |  2 +-
 pkgs/applications/networking/umurmur/default.nix |  2 +-
 pkgs/applications/networking/znc/default.nix     |  4 ++--
 pkgs/applications/office/abiword/default.nix     |  4 ++--
 .../office/atlassian-cli/default.nix             |  4 ++--
 pkgs/applications/office/calligra/default.nix    |  3 +--
 pkgs/applications/office/cb2bib/default.nix      |  3 +--
 pkgs/applications/office/gnucash/default.nix     |  6 +++---
 pkgs/applications/office/grisbi/default.nix      |  4 ++--
 .../office/ib/controller/default.nix             |  2 +-
 pkgs/applications/office/ib/tws/default.nix      |  2 +-
 pkgs/applications/office/jabref/default.nix      |  2 +-
 pkgs/applications/office/kexi/default.nix        |  3 +--
 pkgs/applications/office/kmymoney/default.nix    |  4 ++--
 pkgs/applications/office/ledger/default.nix      |  2 +-
 pkgs/applications/office/marp/default.nix        |  2 +-
 pkgs/applications/office/moneyplex/default.nix   |  2 +-
 pkgs/applications/office/osmo/default.nix        |  4 ++--
 pkgs/applications/office/paperless/default.nix   |  2 +-
 pkgs/applications/office/pinpoint/default.nix    |  4 ++--
 pkgs/applications/office/skrooge/default.nix     |  4 ++--
 pkgs/applications/office/todoman/default.nix     |  1 -
 pkgs/applications/office/treesheets/default.nix  |  2 +-
 pkgs/applications/office/trilium/default.nix     |  2 +-
 pkgs/applications/office/tudu/default.nix        |  4 ++--
 pkgs/applications/office/wordgrinder/default.nix |  2 +-
 pkgs/applications/office/zanshin/default.nix     |  1 -
 pkgs/applications/office/zotero/default.nix      |  2 +-
 pkgs/applications/radio/cubicsdr/default.nix     |  2 +-
 pkgs/applications/radio/dmrconfig/default.nix    |  2 +-
 pkgs/applications/radio/fllog/default.nix        |  3 +--
 pkgs/applications/radio/flwrap/default.nix       |  3 +--
 pkgs/applications/radio/gnss-sdr/default.nix     |  2 +-
 pkgs/applications/radio/gnuradio/ais.nix         |  2 +-
 pkgs/applications/radio/gnuradio/default.nix     |  2 +-
 pkgs/applications/radio/gnuradio/gsm.nix         |  2 +-
 pkgs/applications/radio/gnuradio/nacl.nix        |  2 +-
 pkgs/applications/radio/gnuradio/osmosdr.nix     |  2 +-
 pkgs/applications/radio/gnuradio/rds.nix         |  2 +-
 pkgs/applications/radio/gqrx/default.nix         |  2 +-
 pkgs/applications/radio/hackrf/default.nix       |  2 +-
 pkgs/applications/radio/minimodem/default.nix    |  1 -
 pkgs/applications/radio/qsstv/default.nix        |  2 +-
 pkgs/applications/radio/rtl-sdr/default.nix      |  2 +-
 pkgs/applications/radio/rtl_433/default.nix      |  2 +-
 pkgs/applications/radio/unixcw/default.nix       |  2 +-
 pkgs/applications/radio/wsjtx/default.nix        |  2 +-
 .../astronomy/astrolabe-generator/default.nix    |  2 +-
 .../science/astronomy/gildas/default.nix         |  2 +-
 .../science/astronomy/openspace/default.nix      |  2 +-
 .../science/astronomy/stellarium/default.nix     |  2 +-
 .../science/astronomy/xearth/default.nix         |  4 ++--
 .../science/biology/bcftools/default.nix         |  3 +--
 .../science/biology/bedtools/default.nix         |  2 +-
 .../science/biology/bftools/default.nix          |  2 +-
 .../science/biology/bowtie2/default.nix          |  1 -
 .../applications/science/biology/bwa/default.nix |  4 ++--
 .../science/biology/clustal-omega/default.nix    |  4 ++--
 .../science/biology/dcm2niix/default.nix         |  2 +-
 .../science/biology/freebayes/default.nix        |  2 +-
 .../science/biology/hisat2/default.nix           |  2 +-
 .../science/biology/hmmer/default.nix            |  4 ++--
 .../applications/science/biology/igv/default.nix |  2 +-
 .../science/biology/itsx/default.nix             |  2 +-
 .../science/biology/kallisto/default.nix         |  2 +-
 .../science/biology/messer-slim/default.nix      |  2 +-
 .../science/biology/minimap2/default.nix         |  1 -
 .../science/biology/mosdepth/default.nix         |  2 +-
 .../science/biology/neuron/default.nix           |  2 +-
 .../science/biology/niftyreg/default.nix         |  1 -
 .../science/biology/niftyseg/default.nix         |  1 -
 .../science/biology/octopus/default.nix          |  1 -
 .../science/biology/paml/default.nix             |  2 +-
 .../science/biology/picard-tools/default.nix     |  2 +-
 .../science/biology/platypus/default.nix         |  2 +-
 .../science/biology/plink-ng/default.nix         |  2 +-
 .../science/biology/poretools/default.nix        |  1 -
 .../science/biology/raxml/default.nix            |  1 -
 .../science/biology/samtools/default.nix         |  3 +--
 .../science/biology/samtools/samtools_0_1_19.nix |  3 +--
 .../science/biology/seaview/default.nix          |  2 +-
 .../science/biology/snpeff/default.nix           |  2 +-
 .../science/biology/somatic-sniper/default.nix   |  2 +-
 .../science/biology/strelka/default.nix          |  2 +-
 .../science/biology/varscan/default.nix          |  2 +-
 .../science/biology/vcftools/default.nix         |  1 -
 .../science/chemistry/marvin/default.nix         |  1 -
 .../science/chemistry/molden/default.nix         |  2 +-
 .../chemistry/quantum-espresso/default.nix       |  2 +-
 .../science/chemistry/siesta/default.nix         |  2 +-
 .../science/electronics/adms/default.nix         |  2 +-
 .../science/electronics/alliance/default.nix     |  4 ++--
 .../science/electronics/caneda/default.nix       |  2 +-
 .../science/electronics/dsview/default.nix       |  2 +-
 .../science/electronics/dsview/libsigrok4dsl.nix |  2 +-
 .../electronics/dsview/libsigrokdecode4dsl.nix   |  2 +-
 .../science/electronics/eagle/eagle.nix          |  2 +-
 .../science/electronics/eagle/eagle7.nix         |  2 +-
 .../science/electronics/fped/default.nix         |  2 +-
 .../science/electronics/fritzing/default.nix     |  2 +-
 .../science/electronics/geda/default.nix         |  2 +-
 .../science/electronics/gerbv/default.nix        |  2 +-
 .../science/electronics/gtkwave/default.nix      |  4 ++--
 .../science/electronics/kicad/default.nix        |  2 +-
 .../science/electronics/kicad/unstable.nix       |  2 +-
 .../science/electronics/librepcb/default.nix     |  2 +-
 .../science/electronics/ngspice/default.nix      |  2 +-
 .../science/electronics/pcb/default.nix          |  4 ++--
 .../science/electronics/qucs/default.nix         |  2 +-
 .../science/electronics/verilator/default.nix    |  4 ++--
 .../science/geometry/drgeo/default.nix           |  4 ++--
 pkgs/applications/science/logic/abc/default.nix  |  2 +-
 .../science/logic/abella/default.nix             |  4 ++--
 .../applications/science/logic/aiger/default.nix |  4 ++--
 .../science/logic/alt-ergo/default.nix           |  6 +++---
 pkgs/applications/science/logic/avy/default.nix  |  2 +-
 .../science/logic/boolector/default.nix          |  2 +-
 .../science/logic/btor2tools/default.nix         |  2 +-
 .../science/logic/clprover/clprover.nix          |  2 +-
 .../science/logic/cryptominisat/default.nix      |  2 +-
 .../science/logic/cryptoverif/default.nix        |  2 +-
 .../science/logic/cubicle/default.nix            |  2 +-
 pkgs/applications/science/logic/cvc3/default.nix |  4 ++--
 pkgs/applications/science/logic/cvc4/default.nix |  2 +-
 .../science/logic/eprover/default.nix            |  2 +-
 .../science/logic/glucose/default.nix            |  6 +++---
 .../applications/science/logic/glucose/syrup.nix |  6 +++---
 .../science/logic/iprover/default.nix            |  6 +++---
 .../science/logic/jonprl/default.nix             |  2 +-
 pkgs/applications/science/logic/lci/default.nix  |  4 ++--
 pkgs/applications/science/logic/lean/default.nix |  2 +-
 .../applications/science/logic/lean2/default.nix |  2 +-
 pkgs/applications/science/logic/leo2/default.nix |  2 +-
 .../science/logic/lingeling/default.nix          |  2 +-
 .../science/logic/ltl2ba/default.nix             |  4 ++--
 .../applications/science/logic/mcrl2/default.nix |  2 +-
 .../science/logic/metis-prover/default.nix       |  2 +-
 .../science/logic/minisat/default.nix            |  4 ++--
 .../science/logic/opensmt/default.nix            |  2 +-
 pkgs/applications/science/logic/ott/default.nix  |  2 +-
 .../science/logic/picosat/default.nix            |  4 ++--
 pkgs/applications/science/logic/poly/default.nix |  1 -
 .../science/logic/potassco/clingo.nix            |  1 -
 .../science/logic/prooftree/default.nix          |  2 +-
 .../science/logic/proverif/default.nix           |  2 +-
 .../science/logic/satallax/default.nix           |  4 ++--
 .../science/logic/saw-tools/default.nix          |  2 +-
 .../applications/science/logic/spass/default.nix |  2 +-
 .../science/logic/statverif/default.nix          |  2 +-
 pkgs/applications/science/logic/stp/default.nix  |  2 +-
 .../science/logic/symbiyosys/default.nix         |  2 +-
 .../science/logic/tlaplus/default.nix            |  2 +-
 .../applications/science/logic/tlaplus/tlaps.nix |  2 +-
 pkgs/applications/science/logic/tptp/default.nix |  2 +-
 .../applications/science/logic/twelf/default.nix |  2 +-
 .../science/logic/vampire/default.nix            |  2 +-
 .../science/logic/verifast/default.nix           |  4 ++--
 .../applications/science/logic/verit/default.nix |  2 +-
 pkgs/applications/science/logic/why3/default.nix |  2 +-
 .../science/logic/workcraft/default.nix          |  2 +-
 .../applications/science/logic/yices/default.nix |  2 +-
 .../machine-learning/sc2-headless/default.nix    |  2 +-
 .../science/machine-learning/shogun/default.nix  |  1 -
 pkgs/applications/science/math/LiE/default.nix   |  2 +-
 pkgs/applications/science/math/bcal/default.nix  |  2 +-
 pkgs/applications/science/math/bliss/default.nix |  4 ++--
 pkgs/applications/science/math/caffe/default.nix |  2 +-
 pkgs/applications/science/math/calc/default.nix  |  6 +++---
 pkgs/applications/science/math/clp/default.nix   |  2 +-
 pkgs/applications/science/math/cntk/default.nix  |  2 +-
 .../science/math/colpack/default.nix             |  1 -
 pkgs/applications/science/math/cplex/default.nix |  2 +-
 pkgs/applications/science/math/form/default.nix  |  2 +-
 .../science/math/geogebra/default.nix            |  2 +-
 pkgs/applications/science/math/getdp/default.nix |  2 +-
 pkgs/applications/science/math/gfan/default.nix  |  1 -
 .../applications/science/math/gurobi/default.nix |  2 +-
 .../applications/science/math/hmetis/default.nix |  2 +-
 .../science/math/lp_solve/default.nix            |  2 +-
 .../applications/science/math/lrcalc/default.nix |  1 -
 .../applications/science/math/mathematica/10.nix |  2 +-
 pkgs/applications/science/math/mxnet/default.nix |  2 +-
 pkgs/applications/science/math/nauty/default.nix |  2 +-
 pkgs/applications/science/math/pari/gp2c.nix     |  4 ++--
 pkgs/applications/science/math/pcalc/default.nix |  2 +-
 .../science/math/polymake/default.nix            |  1 -
 .../science/math/ratpoints/default.nix           |  2 +-
 .../science/math/sage/sage-tests.nix             |  2 +-
 .../science/math/sage/sage-with-env.nix          |  2 +-
 pkgs/applications/science/math/sage/sage.nix     |  2 +-
 pkgs/applications/science/math/sage/sagedoc.nix  |  2 +-
 pkgs/applications/science/math/sage/sagelib.nix  |  2 +-
 .../applications/science/math/scilab/default.nix |  4 ++--
 .../applications/science/math/scotch/default.nix |  2 +-
 .../science/math/singular/default.nix            |  2 +-
 .../science/math/speedcrunch/default.nix         |  2 +-
 .../science/math/symmetrica/default.nix          |  2 +-
 pkgs/applications/science/math/weka/default.nix  |  4 ++--
 .../science/math/wxmaxima/default.nix            |  2 +-
 pkgs/applications/science/math/yacas/default.nix |  2 +-
 pkgs/applications/science/misc/boinc/default.nix |  4 ++--
 .../science/misc/cytoscape/default.nix           |  4 ++--
 .../science/misc/gplates/default.nix             |  4 ++--
 .../science/misc/netlogo/default.nix             |  2 +-
 .../science/misc/openmvg/default.nix             |  2 +-
 pkgs/applications/science/misc/root/5.nix        |  2 +-
 pkgs/applications/science/misc/root/default.nix  |  2 +-
 .../dl-poly-classic/default.nix                  |  2 +-
 .../molecular-dynamics/lammps/default.nix        |  2 +-
 .../science/physics/quantomatic/default.nix      |  2 +-
 .../science/physics/sacrifice/default.nix        |  2 +-
 .../science/physics/sherpa/default.nix           |  2 +-
 .../science/physics/xfitter/default.nix          |  6 +++---
 .../science/programming/plm/default.nix          |  4 ++--
 .../science/robotics/apmplanner2/default.nix     |  2 +-
 .../science/robotics/gazebo/default.nix          |  4 ++--
 .../science/robotics/qgroundcontrol/default.nix  |  2 +-
 .../science/robotics/yarp/default.nix            |  2 +-
 pkgs/applications/search/grepcidr/default.nix    |  4 ++--
 pkgs/applications/search/grepm/default.nix       |  2 +-
 .../version-management/bitkeeper/default.nix     |  2 +-
 .../version-management/blackbox/default.nix      |  1 -
 .../bugseverywhere/default.nix                   |  2 +-
 .../version-management/cvsps/default.nix         |  2 +-
 .../version-management/diffuse/default.nix       |  4 ++--
 .../version-management/fossil/default.nix        |  4 ++--
 .../version-management/gerrit/default.nix        |  2 +-
 .../git-and-tools/cgit/default.nix               |  4 ++--
 .../git-and-tools/darcs-to-git/default.nix       |  2 +-
 .../git-and-tools/diff-so-fancy/default.nix      |  2 +-
 .../git-and-tools/ghq/default.nix                |  2 +-
 .../git-annex-metadata-gui/default.nix           |  2 +-
 .../git-annex-remote-b2/default.nix              |  2 +-
 .../git-annex-remote-rclone/default.nix          |  2 +-
 .../git-and-tools/git-appraise/default.nix       |  2 +-
 .../git-and-tools/git-bug/default.nix            |  2 +-
 .../git-and-tools/git-bz/default.nix             |  2 +-
 .../git-and-tools/git-cola/default.nix           |  2 +-
 .../git-and-tools/git-extras/default.nix         |  2 +-
 .../git-and-tools/git-hub/default.nix            |  2 +-
 .../git-and-tools/git-imerge/default.nix         |  2 +-
 .../git-and-tools/git-octopus/default.nix        |  2 +-
 .../git-and-tools/git-open/default.nix           |  2 +-
 .../git-and-tools/git-radar/default.nix          |  2 +-
 .../git-and-tools/git-remote-gcrypt/default.nix  |  2 +-
 .../git-and-tools/git-reparent/default.nix       |  2 +-
 .../git-and-tools/git-secrets/default.nix        |  2 +-
 .../git-and-tools/git-stree/default.nix          |  2 +-
 .../git-and-tools/git-sync/default.nix           |  2 +-
 .../git-and-tools/git-test/default.nix           |  2 +-
 .../git-and-tools/gitflow/default.nix            |  1 -
 .../git-and-tools/tig/default.nix                |  3 +--
 .../git-and-tools/transcrypt/default.nix         |  2 +-
 .../version-management/git-crecord/default.nix   |  2 +-
 .../version-management/git-lfs/1.nix             |  2 +-
 .../version-management/git-lfs/default.nix       |  2 +-
 .../version-management/git-repo/default.nix      |  2 +-
 .../version-management/git-sizer/default.nix     |  1 -
 .../version-management/gitkraken/default.nix     |  2 +-
 .../version-management/gitlab/gitaly/default.nix |  2 +-
 .../gitlab/gitlab-shell/default.nix              |  2 +-
 .../gitlab/gitlab-workhorse/default.nix          |  2 +-
 .../version-management/gitolite/default.nix      |  2 +-
 .../version-management/gitstats/default.nix      |  4 ++--
 .../version-management/gogs/default.nix          |  2 +-
 .../version-management/gource/default.nix        |  4 ++--
 .../version-management/monotone-viz/default.nix  |  4 ++--
 .../version-management/mr/default.nix            |  2 +-
 .../version-management/nbstripout/default.nix    |  1 -
 .../version-management/nitpick/default.nix       |  1 -
 .../version-management/p4v/default.nix           |  2 +-
 .../version-management/rapidsvn/default.nix      |  4 ++--
 .../version-management/src/default.nix           |  4 ++--
 .../version-management/srcml/default.nix         |  2 +-
 .../version-management/vcprompt/default.nix      |  2 +-
 .../version-management/vcsh/default.nix          |  2 +-
 pkgs/applications/video/aegisub/default.nix      |  4 ++--
 pkgs/applications/video/avidemux/default.nix     |  2 +-
 pkgs/applications/video/avxsynth/default.nix     |  2 +-
 pkgs/applications/video/bino3d/default.nix       |  4 ++--
 pkgs/applications/video/bombono/default.nix      |  2 +-
 pkgs/applications/video/bomi/default.nix         |  2 +-
 pkgs/applications/video/byzanz/default.nix       |  2 +-
 .../video/clickshare-csc1/default.nix            |  2 +-
 pkgs/applications/video/clipgrab/default.nix     |  4 ++--
 .../applications/video/dvd-slideshow/default.nix |  4 ++--
 pkgs/applications/video/dvdbackup/default.nix    |  4 ++--
 pkgs/applications/video/dvdstyler/default.nix    |  2 +-
 .../applications/video/gnome-mplayer/default.nix |  2 +-
 pkgs/applications/video/gpac/default.nix         |  2 +-
 pkgs/applications/video/k9copy/default.nix       |  4 ++--
 pkgs/applications/video/key-mon/default.nix      |  4 ++--
 pkgs/applications/video/kmplayer/default.nix     |  2 +-
 pkgs/applications/video/lightworks/default.nix   |  4 ++--
 .../video/linuxstopmotion/default.nix            |  2 +-
 pkgs/applications/video/mapmap/default.nix       |  2 +-
 .../applications/video/mediathekview/default.nix |  2 +-
 pkgs/applications/video/minitube/default.nix     |  2 +-
 .../applications/video/mjpg-streamer/default.nix |  2 +-
 pkgs/applications/video/motion/default.nix       |  2 +-
 pkgs/applications/video/mpc-qt/default.nix       |  2 +-
 pkgs/applications/video/mpv/default.nix          |  2 +-
 pkgs/applications/video/mythtv/default.nix       |  2 +-
 pkgs/applications/video/natron/default.nix       |  2 +-
 pkgs/applications/video/obs-studio/default.nix   |  2 +-
 .../video/obs-studio/linuxbrowser.nix            |  2 +-
 pkgs/applications/video/pitivi/default.nix       |  2 +-
 .../video/plex-media-player/default.nix          |  2 +-
 pkgs/applications/video/qstopmotion/default.nix  |  3 +--
 pkgs/applications/video/quvi/library.nix         |  2 +-
 pkgs/applications/video/quvi/scripts.nix         |  2 +-
 pkgs/applications/video/quvi/tool.nix            |  2 +-
 .../video/recordmydesktop/default.nix            |  2 +-
 pkgs/applications/video/recordmydesktop/gtk.nix  |  2 +-
 pkgs/applications/video/recordmydesktop/qt.nix   |  2 +-
 pkgs/applications/video/shotcut/default.nix      |  2 +-
 .../video/simplescreenrecorder/default.nix       |  2 +-
 pkgs/applications/video/smtube/default.nix       |  4 ++--
 pkgs/applications/video/streamlink/default.nix   |  2 +-
 pkgs/applications/video/vlc/default.nix          |  4 ++--
 pkgs/applications/video/w_scan/default.nix       |  4 ++--
 .../video/webtorrent_desktop/default.nix         |  2 +-
 pkgs/applications/video/wxcam/default.nix        |  4 ++--
 pkgs/applications/video/xscast/default.nix       |  2 +-
 .../virtualization/8086tiny/default.nix          |  2 +-
 .../virtualization/aqemu/default.nix             |  2 +-
 .../virtualization/bochs/default.nix             |  4 ++--
 .../virtualization/cbfstool/default.nix          |  2 +-
 .../virtualization/containerd/default.nix        |  2 +-
 .../virtualization/docker/distribution.nix       |  2 +-
 .../virtualization/driver/win-virtio/default.nix |  2 +-
 .../virtualization/dynamips/default.nix          |  1 -
 .../virtualization/ecs-agent/default.nix         |  1 -
 .../looking-glass-client/default.nix             |  2 +-
 .../virtualization/nvidia-docker/default.nix     |  4 ++--
 .../virtualization/nvidia-docker/libnvc.nix      |  2 +-
 .../virtualization/open-vm-tools/default.nix     |  2 +-
 .../virtualization/podman/default.nix            |  2 +-
 .../virtualization/remotebox/default.nix         |  2 +-
 pkgs/applications/virtualization/rkt/default.nix |  4 ++--
 .../applications/virtualization/runc/default.nix |  2 +-
 .../virtualization/seabios/default.nix           |  4 ++--
 .../virtualization/singularity/default.nix       |  2 +-
 .../applications/virtualization/tini/default.nix |  2 +-
 .../virtualization/tinyemu/default.nix           |  4 ++--
 .../virtualization/virt-manager/qt.nix           |  2 +-
 .../virtualization/virt-top/default.nix          |  2 +-
 .../virtualization/virt-what/default.nix         |  4 ++--
 .../applications/virtualization/vpcs/default.nix |  5 ++---
 .../virtualization/x11docker/default.nix         |  2 +-
 .../virtualization/xhyve/default.nix             |  2 +-
 .../window-managers/2bwm/default.nix             |  2 +-
 .../window-managers/afterstep/default.nix        |  2 +-
 .../window-managers/awesome/default.nix          |  2 +-
 .../window-managers/bevelbar/default.nix         |  2 +-
 .../window-managers/bspwm/default.nix            |  2 +-
 .../window-managers/btops/default.nix            |  2 +-
 .../window-managers/fbpanel/default.nix          |  4 ++--
 .../window-managers/fluxbox/default.nix          |  4 ++--
 .../window-managers/fvwm/default.nix             |  3 +--
 .../window-managers/i3/blocks-gaps.nix           |  2 +-
 pkgs/applications/window-managers/i3/blocks.nix  |  2 +-
 pkgs/applications/window-managers/i3/default.nix |  4 ++--
 .../window-managers/i3/i3ipc-glib.nix            |  2 +-
 .../window-managers/i3/lock-color.nix            |  2 +-
 pkgs/applications/window-managers/i3/lock.nix    |  4 ++--
 .../window-managers/icewm/default.nix            |  2 +-
 .../applications/window-managers/jwm/default.nix |  2 +-
 .../window-managers/jwm/jwm-settings-manager.nix |  2 +-
 .../window-managers/matchbox/default.nix         |  2 +-
 .../window-managers/neocomp/default.nix          |  2 +-
 .../window-managers/openbox/default.nix          |  4 ++--
 .../window-managers/oroborus/default.nix         |  2 +-
 .../window-managers/pekwm/default.nix            |  4 ++--
 .../window-managers/ratpoison/default.nix        |  4 ++--
 .../window-managers/sawfish/default.nix          |  2 +-
 .../window-managers/spectrwm/default.nix         |  2 +-
 .../window-managers/stalonetray/default.nix      |  4 ++--
 .../window-managers/stumpish/default.nix         |  1 -
 pkgs/applications/window-managers/sway/bg.nix    |  2 +-
 pkgs/applications/window-managers/sway/idle.nix  |  2 +-
 pkgs/applications/window-managers/sway/lock.nix  |  2 +-
 .../window-managers/sxhkd/default.nix            |  2 +-
 .../window-managers/way-cooler/wlc.nix           |  2 +-
 .../window-managers/weston/default.nix           |  4 ++--
 .../window-managers/windowmaker/default.nix      |  2 +-
 .../window-managers/wmfs/default.nix             |  2 +-
 .../window-managers/wmii-hg/default.nix          |  2 +-
 pkgs/build-support/templaterpm/default.nix       |  2 +-
 pkgs/data/documentation/bgnet/default.nix        |  2 +-
 pkgs/data/documentation/man-pages/default.nix    |  4 ++--
 .../data/documentation/mustache-spec/default.nix |  2 +-
 pkgs/data/documentation/stdman/default.nix       |  2 +-
 pkgs/data/documentation/zeal/default.nix         |  2 +-
 pkgs/data/fonts/dina-pcf/default.nix             |  2 +-
 pkgs/data/fonts/dosemu-fonts/default.nix         |  2 +-
 pkgs/data/fonts/emojione/default.nix             |  2 +-
 pkgs/data/fonts/gohufont/default.nix             |  4 ++--
 pkgs/data/fonts/google-fonts/default.nix         |  2 +-
 pkgs/data/fonts/inconsolata/default.nix          |  2 +-
 pkgs/data/fonts/inconsolata/lgc.nix              |  4 ++--
 pkgs/data/fonts/input-fonts/default.nix          |  2 +-
 pkgs/data/fonts/libre-caslon/default.nix         |  6 +++---
 pkgs/data/fonts/lobster-two/default.nix          |  6 +++---
 pkgs/data/fonts/meslo-lg/default.nix             |  6 +++---
 pkgs/data/fonts/migmix/default.nix               |  2 +-
 pkgs/data/fonts/migu/default.nix                 |  2 +-
 pkgs/data/fonts/monoid/default.nix               |  2 +-
 pkgs/data/fonts/nerdfonts/default.nix            |  2 +-
 pkgs/data/fonts/noto-fonts/tools.nix             |  2 +-
 pkgs/data/fonts/ricty/default.nix                |  2 +-
 .../rictydiminished-with-firacode/default.nix    |  2 +-
 pkgs/data/fonts/roboto-mono/default.nix          |  2 +-
 pkgs/data/fonts/roboto-slab/default.nix          |  2 +-
 pkgs/data/fonts/terminus-font/default.nix        |  5 ++---
 pkgs/data/fonts/tlwg/default.nix                 |  2 +-
 pkgs/data/fonts/ucs-fonts/default.nix            |  2 +-
 pkgs/data/fonts/unifont/default.nix              |  6 +++---
 pkgs/data/fonts/unscii/default.nix               |  3 +--
 pkgs/data/fonts/xits-math/default.nix            |  2 +-
 pkgs/data/icons/bibata-cursors/default.nix       |  2 +-
 .../icons/elementary-xfce-icon-theme/default.nix |  2 +-
 pkgs/data/icons/faba-mono-icons/default.nix      |  1 -
 pkgs/data/icons/iconpack-obsidian/default.nix    |  2 +-
 pkgs/data/icons/maia-icon-theme/default.nix      |  2 +-
 pkgs/data/icons/moka-icon-theme/default.nix      |  1 -
 pkgs/data/icons/numix-icon-theme/default.nix     |  1 -
 pkgs/data/icons/paper-icon-theme/default.nix     |  1 -
 pkgs/data/icons/vanilla-dmz/default.nix          |  2 +-
 pkgs/data/misc/combinatorial_designs/default.nix |  2 +-
 pkgs/data/misc/conway_polynomials/default.nix    |  2 +-
 pkgs/data/misc/elliptic_curves/default.nix       |  1 -
 pkgs/data/misc/geolite-legacy/default.nix        |  2 +-
 pkgs/data/misc/graphs/default.nix                |  1 -
 pkgs/data/misc/libkkc-data/default.nix           |  3 +--
 pkgs/data/misc/pari-galdata/default.nix          |  2 +-
 pkgs/data/misc/pari-seadata-small/default.nix    |  2 +-
 pkgs/data/misc/polytopes_db/default.nix          |  1 -
 pkgs/data/misc/scowl/default.nix                 |  1 -
 .../misc/sound-theme-freedesktop/default.nix     |  4 ++--
 pkgs/data/misc/tzdata/default.nix                |  2 +-
 pkgs/data/misc/xorg-rgb/default.nix              |  1 -
 pkgs/data/themes/matcha/default.nix              |  2 +-
 pkgs/data/themes/nordic-polar/default.nix        |  2 +-
 pkgs/data/themes/nordic/default.nix              |  2 +-
 pkgs/desktops/deepin/dbus-factory/default.nix    |  3 +--
 pkgs/desktops/deepin/dde-api/default.nix         |  3 +--
 pkgs/desktops/deepin/dde-calendar/default.nix    |  3 +--
 .../deepin/dde-control-center/default.nix        |  3 +--
 pkgs/desktops/deepin/dde-daemon/default.nix      |  3 +--
 pkgs/desktops/deepin/dde-dock/default.nix        |  3 +--
 .../desktops/deepin/dde-file-manager/default.nix |  3 +--
 pkgs/desktops/deepin/dde-launcher/default.nix    |  3 +--
 .../deepin/dde-network-utils/default.nix         |  3 +--
 .../desktops/deepin/dde-polkit-agent/default.nix |  3 +--
 .../deepin/dde-qt-dbus-factory/default.nix       |  3 +--
 pkgs/desktops/deepin/dde-session-ui/default.nix  |  3 +--
 pkgs/desktops/deepin/deepin-anything/default.nix |  3 +--
 .../deepin/deepin-calculator/default.nix         |  3 +--
 .../deepin/deepin-desktop-base/default.nix       |  3 +--
 .../deepin/deepin-desktop-schemas/default.nix    |  3 +--
 .../deepin/deepin-gettext-tools/default.nix      |  3 +--
 .../desktops/deepin/deepin-gtk-theme/default.nix |  3 +--
 .../deepin/deepin-icon-theme/default.nix         |  3 +--
 .../deepin/deepin-image-viewer/default.nix       |  3 +--
 pkgs/desktops/deepin/deepin-menu/default.nix     |  3 +--
 pkgs/desktops/deepin/deepin-metacity/default.nix |  3 +--
 .../deepin/deepin-movie-reborn/default.nix       |  3 +--
 pkgs/desktops/deepin/deepin-mutter/default.nix   |  3 +--
 .../deepin/deepin-screenshot/default.nix         |  3 +--
 .../deepin/deepin-shortcut-viewer/default.nix    |  3 +--
 .../deepin/deepin-sound-theme/default.nix        |  3 +--
 pkgs/desktops/deepin/deepin-terminal/default.nix |  3 +--
 pkgs/desktops/deepin/deepin-turbo/default.nix    |  3 +--
 .../deepin/deepin-wallpapers/default.nix         |  3 +--
 pkgs/desktops/deepin/deepin-wm/default.nix       |  3 +--
 .../deepin/dpa-ext-gnomekeyring/default.nix      |  3 +--
 pkgs/desktops/deepin/dtkcore/default.nix         |  3 +--
 pkgs/desktops/deepin/dtkwidget/default.nix       |  3 +--
 pkgs/desktops/deepin/dtkwm/default.nix           |  3 +--
 pkgs/desktops/deepin/go-dbus-factory/default.nix |  3 +--
 .../deepin/go-dbus-generator/default.nix         |  3 +--
 .../desktops/deepin/go-gir-generator/default.nix |  3 +--
 pkgs/desktops/deepin/go-lib/default.nix          |  3 +--
 pkgs/desktops/deepin/qcef/default.nix            |  3 +--
 pkgs/desktops/deepin/qt5dxcb-plugin/default.nix  |  3 +--
 pkgs/desktops/deepin/qt5integration/default.nix  |  3 +--
 pkgs/desktops/deepin/udisks2-qt5/default.nix     |  3 +--
 pkgs/desktops/enlightenment/econnman.nix         |  4 ++--
 pkgs/desktops/enlightenment/efl.nix              |  4 ++--
 pkgs/desktops/enlightenment/enlightenment.nix    |  4 ++--
 pkgs/desktops/enlightenment/ephoto.nix           |  4 ++--
 pkgs/desktops/enlightenment/rage.nix             |  4 ++--
 .../bindings/gnome-python-desktop/default.nix    |  4 ++--
 .../gnome-2/desktop/gtksourceview/default.nix    |  4 ++--
 .../desktop/mail-notification/default.nix        |  2 +-
 pkgs/desktops/gnome-2/platform/GConf/default.nix |  2 +-
 pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix   |  4 ++--
 pkgs/desktops/gnome-3/apps/cheese/default.nix    |  4 ++--
 .../gnome-3/apps/file-roller/default.nix         |  4 ++--
 pkgs/desktops/gnome-3/apps/gedit/default.nix     |  4 ++--
 pkgs/desktops/gnome-3/apps/glade/default.nix     |  4 ++--
 .../gnome-3/apps/gnome-characters/default.nix    |  4 ++--
 .../gnome-3/apps/gnome-clocks/default.nix        |  4 ++--
 .../gnome-3/apps/gnome-documents/default.nix     |  4 ++--
 .../apps/gnome-getting-started-docs/default.nix  |  4 ++--
 .../desktops/gnome-3/apps/gnome-logs/default.nix |  4 ++--
 .../gnome-3/apps/gnome-weather/default.nix       |  4 ++--
 pkgs/desktops/gnome-3/apps/vinagre/default.nix   |  4 ++--
 .../gnome-3/core/adwaita-icon-theme/default.nix  |  4 ++--
 pkgs/desktops/gnome-3/core/empathy/default.nix   |  4 ++--
 pkgs/desktops/gnome-3/core/epiphany/default.nix  |  4 ++--
 .../core/evolution-data-server/default.nix       |  6 +++---
 pkgs/desktops/gnome-3/core/gdm/default.nix       |  4 ++--
 pkgs/desktops/gnome-3/core/gjs/default.nix       |  4 ++--
 .../gnome-3/core/gnome-backgrounds/default.nix   |  4 ++--
 .../gnome-3/core/gnome-calculator/default.nix    |  4 ++--
 .../gnome-3/core/gnome-common/default.nix        |  4 ++--
 .../gnome-3/core/gnome-desktop/default.nix       |  4 ++--
 .../gnome-3/core/gnome-dictionary/default.nix    |  4 ++--
 .../gnome-3/core/gnome-disk-utility/default.nix  |  4 ++--
 .../gnome-3/core/gnome-font-viewer/default.nix   |  4 ++--
 .../gnome-3/core/gnome-keyring/default.nix       |  4 ++--
 .../gnome-3/core/gnome-online-miners/default.nix |  4 ++--
 .../gnome-3/core/gnome-session/default.nix       |  4 ++--
 .../core/gnome-shell-extensions/default.nix      |  6 +++---
 .../gnome-3/core/gnome-shell/default.nix         |  4 ++--
 .../gnome-3/core/gnome-software/default.nix      |  4 ++--
 .../core/gnome-system-monitor/default.nix        |  4 ++--
 .../gnome-3/core/gnome-terminal/default.nix      |  4 ++--
 .../gnome-3/core/gnome-user-docs/default.nix     |  4 ++--
 .../gnome-3/core/gucharmap/unicode-data.nix      |  2 +-
 .../gnome-3/core/simple-scan/default.nix         |  4 ++--
 pkgs/desktops/gnome-3/core/sushi/default.nix     |  4 ++--
 pkgs/desktops/gnome-3/core/totem/default.nix     |  4 ++--
 pkgs/desktops/gnome-3/core/vino/default.nix      |  4 ++--
 .../desktops/gnome-3/core/yelp-tools/default.nix |  4 ++--
 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix  |  4 ++--
 pkgs/desktops/gnome-3/core/yelp/default.nix      |  4 ++--
 pkgs/desktops/gnome-3/core/zenity/default.nix    |  4 ++--
 .../desktops/gnome-3/devtools/anjuta/default.nix |  4 ++--
 .../gnome-3/devtools/devhelp/default.nix         |  4 ++--
 .../devtools/gnome-devel-docs/default.nix        |  4 ++--
 .../gnome-3/devtools/nemiver/default.nix         |  4 ++--
 .../gnome-3/extensions/appindicator/default.nix  |  2 +-
 .../extensions/battery-status/default.nix        |  2 +-
 .../gnome-3/extensions/caffeine/default.nix      |  2 +-
 .../extensions/clipboard-indicator/default.nix   |  2 +-
 .../gnome-3/extensions/dash-to-dock/default.nix  |  2 +-
 .../gnome-3/extensions/dash-to-panel/default.nix |  2 +-
 .../gnome-3/extensions/gsconnect/default.nix     |  4 ++--
 .../gnome-3/extensions/icon-hider/default.nix    |  2 +-
 pkgs/desktops/gnome-3/extensions/impatience.nix  |  2 +-
 .../gnome-3/extensions/mediaplayer/default.nix   |  2 +-
 .../gnome-3/extensions/no-title-bar/default.nix  |  2 +-
 .../gnome-3/extensions/nohotcorner/default.nix   |  2 +-
 .../remove-dropdown-arrows/default.nix           |  2 +-
 .../extensions/system-monitor/default.nix        |  2 +-
 .../gnome-3/extensions/taskwhisperer/default.nix |  2 +-
 .../gnome-3/extensions/timepp/default.nix        |  2 +-
 .../gnome-3/extensions/topicons-plus/default.nix |  2 +-
 .../desktops/gnome-3/extensions/volume-mixer.nix |  2 +-
 .../gnome-3/extensions/workspace-grid.nix        |  2 +-
 .../gnome-3/games/five-or-more/default.nix       |  4 ++--
 .../gnome-3/games/four-in-a-row/default.nix      |  4 ++--
 .../gnome-3/games/gnome-chess/default.nix        |  4 ++--
 .../gnome-3/games/gnome-mahjongg/default.nix     |  4 ++--
 .../gnome-3/games/gnome-mines/default.nix        |  4 ++--
 .../gnome-3/games/gnome-nibbles/default.nix      |  4 ++--
 .../gnome-3/games/gnome-robots/default.nix       |  4 ++--
 .../gnome-3/games/gnome-sudoku/default.nix       |  4 ++--
 .../gnome-3/games/gnome-taquin/default.nix       |  4 ++--
 .../gnome-3/games/gnome-tetravex/default.nix     |  4 ++--
 pkgs/desktops/gnome-3/games/iagno/default.nix    |  4 ++--
 .../desktops/gnome-3/games/lightsoff/default.nix |  4 ++--
 pkgs/desktops/gnome-3/games/tali/default.nix     |  4 ++--
 .../gnome-3/misc/gnome-autoar/default.nix        |  4 ++--
 .../gnome-3/misc/gnome-packagekit/default.nix    |  4 ++--
 pkgs/desktops/gnome-3/misc/gpaste/default.nix    |  4 ++--
 pkgs/desktops/gnome-3/misc/gtkhtml/default.nix   |  4 ++--
 pkgs/desktops/lxde/core/lxmenu-data.nix          |  4 ++--
 pkgs/desktops/lxde/core/lxtask/default.nix       |  4 ++--
 pkgs/desktops/lxqt/lxqt-archiver/default.nix     |  1 -
 pkgs/desktops/lxqt/qlipper/default.nix           |  1 -
 pkgs/desktops/mate/atril/default.nix             |  4 ++--
 pkgs/desktops/mate/caja-extensions/default.nix   |  4 ++--
 pkgs/desktops/mate/engrampa/default.nix          |  4 ++--
 pkgs/desktops/mate/eom/default.nix               |  4 ++--
 pkgs/desktops/mate/libmatekbd/default.nix        |  4 ++--
 pkgs/desktops/mate/libmatemixer/default.nix      |  4 ++--
 pkgs/desktops/mate/libmateweather/default.nix    |  4 ++--
 pkgs/desktops/mate/marco/default.nix             |  4 ++--
 pkgs/desktops/mate/mate-applets/default.nix      |  4 ++--
 pkgs/desktops/mate/mate-backgrounds/default.nix  |  4 ++--
 pkgs/desktops/mate/mate-calc/default.nix         |  4 ++--
 pkgs/desktops/mate/mate-common/default.nix       |  4 ++--
 .../mate/mate-control-center/default.nix         |  4 ++--
 pkgs/desktops/mate/mate-desktop/default.nix      |  4 ++--
 .../mate/mate-icon-theme-faenza/default.nix      |  4 ++--
 pkgs/desktops/mate/mate-icon-theme/default.nix   |  4 ++--
 .../mate/mate-indicator-applet/default.nix       |  4 ++--
 pkgs/desktops/mate/mate-media/default.nix        |  4 ++--
 pkgs/desktops/mate/mate-menus/default.nix        |  4 ++--
 pkgs/desktops/mate/mate-netbook/default.nix      |  4 ++--
 .../mate/mate-notification-daemon/default.nix    |  4 ++--
 pkgs/desktops/mate/mate-panel/default.nix        |  4 ++--
 pkgs/desktops/mate/mate-polkit/default.nix       |  4 ++--
 .../desktops/mate/mate-power-manager/default.nix |  4 ++--
 pkgs/desktops/mate/mate-screensaver/default.nix  |  4 ++--
 .../mate/mate-sensors-applet/default.nix         |  4 ++--
 .../mate/mate-session-manager/default.nix        |  4 ++--
 .../mate/mate-settings-daemon/default.nix        |  4 ++--
 .../mate/mate-system-monitor/default.nix         |  4 ++--
 pkgs/desktops/mate/mate-terminal/default.nix     |  4 ++--
 pkgs/desktops/mate/mate-themes/default.nix       |  4 ++--
 pkgs/desktops/mate/mate-user-guide/default.nix   |  4 ++--
 pkgs/desktops/mate/mate-user-share/default.nix   |  4 ++--
 pkgs/desktops/mate/mate-utils/default.nix        |  4 ++--
 pkgs/desktops/mate/pluma/default.nix             |  4 ++--
 pkgs/desktops/mate/python-caja/default.nix       |  4 ++--
 .../xfce4-hardware-monitor-plugin.nix            |  3 +--
 .../appmenu-gtk-module.nix                       |  2 +-
 .../xfce4-vala-panel-appmenu-plugin/default.nix  |  2 +-
 pkgs/development/arduino/arduino-mk/default.nix  |  2 +-
 pkgs/development/compilers/abcl/default.nix      |  1 -
 .../compilers/apache-flex-sdk/default.nix        |  4 ++--
 .../compilers/arachne-pnr/default.nix            |  2 +-
 pkgs/development/compilers/asn1c/default.nix     |  2 +-
 pkgs/development/compilers/ats/default.nix       |  2 +-
 pkgs/development/compilers/ats2/default.nix      |  2 +-
 pkgs/development/compilers/avian/default.nix     |  2 +-
 pkgs/development/compilers/bigloo/default.nix    |  2 +-
 pkgs/development/compilers/binaryen/default.nix  |  2 +-
 pkgs/development/compilers/ccl/default.nix       |  2 +-
 pkgs/development/compilers/chez/default.nix      |  2 +-
 pkgs/development/compilers/clasp/default.nix     |  1 -
 pkgs/development/compilers/closure/default.nix   |  2 +-
 pkgs/development/compilers/colm/default.nix      |  4 ++--
 pkgs/development/compilers/compcert/default.nix  |  2 +-
 pkgs/development/compilers/coreclr/default.nix   |  2 +-
 .../compilers/cudatoolkit/default.nix            |  2 +-
 pkgs/development/compilers/dev86/default.nix     |  2 +-
 pkgs/development/compilers/dmd/default.nix       |  2 +-
 pkgs/development/compilers/eli/default.nix       |  4 ++--
 pkgs/development/compilers/eql/default.nix       |  2 +-
 .../compilers/factor-lang/default.nix            |  2 +-
 pkgs/development/compilers/fasm/default.nix      |  2 +-
 pkgs/development/compilers/fpc/default.nix       |  2 +-
 pkgs/development/compilers/fpc/lazarus.nix       |  2 +-
 pkgs/development/compilers/fsharp/default.nix    |  2 +-
 pkgs/development/compilers/fsharp41/default.nix  |  2 +-
 pkgs/development/compilers/fstar/default.nix     |  2 +-
 pkgs/development/compilers/gambit/bootstrap.nix  |  2 +-
 .../compilers/gcc-arm-embedded/6/default.nix     |  2 +-
 .../compilers/gcc-arm-embedded/7/default.nix     |  2 +-
 .../compilers/gcc-arm-embedded/8/default.nix     |  2 +-
 pkgs/development/compilers/gcl/2.6.13-pre.nix    |  2 +-
 pkgs/development/compilers/gcl/default.nix       |  4 ++--
 pkgs/development/compilers/glslang/default.nix   |  2 +-
 pkgs/development/compilers/gnu-cobol/default.nix |  2 +-
 .../compilers/gnu-smalltalk/default.nix          |  2 +-
 .../development/compilers/go-jsonnet/default.nix |  2 +-
 pkgs/development/compilers/go/1.10.nix           |  2 +-
 pkgs/development/compilers/go/1.4.nix            |  2 +-
 pkgs/development/compilers/graalvm/default.nix   |  4 ++--
 pkgs/development/compilers/hhvm/default.nix      |  2 +-
 pkgs/development/compilers/iasl/default.nix      |  2 +-
 .../compilers/icedtea-web/default.nix            |  4 ++--
 pkgs/development/compilers/intercal/default.nix  |  4 ++--
 pkgs/development/compilers/ispc/default.nix      |  2 +-
 .../compilers/javacard-devkit/default.nix        |  1 -
 .../compilers/jetbrains-jdk/default.nix          |  1 -
 pkgs/development/compilers/jsonnet/default.nix   |  2 +-
 pkgs/development/compilers/julia/shared.nix      |  3 +--
 pkgs/development/compilers/jwasm/default.nix     |  2 +-
 pkgs/development/compilers/kotlin/default.nix    |  2 +-
 .../development/compilers/llvm/5/compiler-rt.nix |  2 +-
 .../development/compilers/llvm/6/compiler-rt.nix |  2 +-
 .../development/compilers/llvm/7/compiler-rt.nix |  2 +-
 .../development/compilers/llvm/8/compiler-rt.nix |  2 +-
 pkgs/development/compilers/manticore/default.nix |  2 +-
 pkgs/development/compilers/mercury/default.nix   |  2 +-
 .../compilers/microscheme/default.nix            |  4 ++--
 pkgs/development/compilers/mint/default.nix      |  2 +-
 pkgs/development/compilers/mkcl/default.nix      |  2 +-
 .../compilers/mlton/20180207-binary.nix          |  6 +++---
 pkgs/development/compilers/mono/llvm.nix         |  2 +-
 pkgs/development/compilers/mosml/default.nix     |  2 +-
 pkgs/development/compilers/nasm/default.nix      |  4 ++--
 pkgs/development/compilers/neko/default.nix      |  2 +-
 pkgs/development/compilers/nextpnr/default.nix   |  2 +-
 .../compilers/nvidia-cg-toolkit/default.nix      |  2 +-
 pkgs/development/compilers/obliv-c/default.nix   |  2 +-
 pkgs/development/compilers/ocaml/3.08.0.nix      |  4 ++--
 pkgs/development/compilers/ocaml/3.10.0.nix      |  4 ++--
 pkgs/development/compilers/ocaml/3.11.2.nix      |  4 ++--
 pkgs/development/compilers/ocaml/3.12.1.nix      |  4 ++--
 pkgs/development/compilers/ocaml/4.00.1.nix      |  4 ++--
 .../compilers/ocaml/ber-metaocaml.nix            |  8 ++++----
 .../compilers/ocaml/metaocaml-3.09.nix           |  2 +-
 pkgs/development/compilers/opa/default.nix       |  1 -
 pkgs/development/compilers/openspin/default.nix  |  2 +-
 pkgs/development/compilers/owl-lisp/default.nix  |  2 +-
 pkgs/development/compilers/polyml/5.7.nix        |  2 +-
 pkgs/development/compilers/polyml/default.nix    |  2 +-
 pkgs/development/compilers/ponyc/pony-stable.nix |  2 +-
 pkgs/development/compilers/rgbds/default.nix     |  2 +-
 pkgs/development/compilers/sbcl/bootstrap.nix    |  2 +-
 pkgs/development/compilers/sbcl/default.nix      |  4 ++--
 pkgs/development/compilers/scala/dotty-bare.nix  |  2 +-
 pkgs/development/compilers/sdcc/default.nix      |  2 +-
 pkgs/development/compilers/seexpr/default.nix    |  2 +-
 pkgs/development/compilers/serpent/default.nix   |  2 +-
 pkgs/development/compilers/shaderc/default.nix   |  2 +-
 pkgs/development/compilers/smlnj/bootstrap.nix   |  2 +-
 pkgs/development/compilers/solc/default.nix      |  2 +-
 pkgs/development/compilers/souffle/default.nix   |  2 +-
 pkgs/development/compilers/squeak/default.nix    |  2 +-
 pkgs/development/compilers/terra/default.nix     |  2 +-
 pkgs/development/compilers/tinycc/default.nix    |  2 +-
 pkgs/development/compilers/urweb/default.nix     |  4 ++--
 pkgs/development/compilers/wcc/default.nix       |  2 +-
 pkgs/development/compilers/x11basic/default.nix  |  1 -
 pkgs/development/compilers/yap/default.nix       |  4 ++--
 pkgs/development/compilers/yosys/default.nix     |  2 +-
 pkgs/development/compilers/zulu/8.nix            |  2 +-
 pkgs/development/compilers/zulu/default.nix      |  2 +-
 pkgs/development/em-modules/generic/default.nix  |  5 +++--
 .../guile-modules/guile-cairo/default.nix        |  4 ++--
 .../guile-modules/guile-gnome/default.nix        |  3 +--
 .../guile-modules/guile-reader/default.nix       |  4 ++--
 .../guile-modules/guile-sdl/default.nix          |  3 +--
 pkgs/development/interpreters/acl2/default.nix   |  2 +-
 pkgs/development/interpreters/bats/default.nix   |  2 +-
 pkgs/development/interpreters/clips/default.nix  |  2 +-
 .../interpreters/clojurescript/lumo/default.nix  |  2 +-
 .../development/interpreters/duktape/default.nix |  2 +-
 pkgs/development/interpreters/falcon/default.nix |  2 +-
 pkgs/development/interpreters/gauche/default.nix |  2 +-
 .../development/interpreters/gnu-apl/default.nix |  2 +-
 pkgs/development/interpreters/groovy/default.nix |  2 +-
 .../interpreters/icon-lang/default.nix           |  2 +-
 pkgs/development/interpreters/j/default.nix      |  2 +-
 pkgs/development/interpreters/jimtcl/default.nix |  2 +-
 pkgs/development/interpreters/joker/default.nix  |  2 +-
 pkgs/development/interpreters/jruby/default.nix  |  2 +-
 pkgs/development/interpreters/jython/default.nix |  2 +-
 pkgs/development/interpreters/kona/default.nix   |  2 +-
 .../development/interpreters/lolcode/default.nix |  2 +-
 .../interpreters/lua-5/filesystem.nix            |  2 +-
 pkgs/development/interpreters/lua-5/sockets.nix  |  2 +-
 .../interpreters/metamath/default.nix            |  2 +-
 pkgs/development/interpreters/mujs/default.nix   |  2 +-
 pkgs/development/interpreters/octave/default.nix |  6 +++---
 pkgs/development/interpreters/picoc/default.nix  |  2 +-
 .../interpreters/picolisp/default.nix            |  4 ++--
 pkgs/development/interpreters/pixie/default.nix  |  2 +-
 .../interpreters/python/cpython/2.7/boot.nix     |  2 +-
 pkgs/development/interpreters/qnial/default.nix  |  2 +-
 pkgs/development/interpreters/racket/default.nix |  4 ++--
 pkgs/development/interpreters/rakudo/default.nix |  4 ++--
 pkgs/development/interpreters/rebol/default.nix  |  2 +-
 pkgs/development/interpreters/red/default.nix    | 10 +++++-----
 pkgs/development/interpreters/regina/default.nix |  4 ++--
 pkgs/development/interpreters/renpy/default.nix  |  2 +-
 pkgs/development/interpreters/self/default.nix   |  2 +-
 .../interpreters/spidermonkey/1.8.5.nix          |  2 +-
 .../development/interpreters/spidermonkey/38.nix |  2 +-
 .../interpreters/supercollider/default.nix       |  2 +-
 .../interpreters/tinyscheme/default.nix          |  4 ++--
 .../interpreters/unicon-lang/default.nix         |  2 +-
 .../java-modules/postgresql_jdbc/default.nix     |  2 +-
 pkgs/development/libraries/CoinMP/default.nix    |  4 ++--
 pkgs/development/libraries/LASzip/default.nix    |  2 +-
 pkgs/development/libraries/SDL/default.nix       |  4 ++--
 pkgs/development/libraries/SDL2/default.nix      |  4 ++--
 pkgs/development/libraries/SDL2_gfx/default.nix  |  3 +--
 .../development/libraries/SDL2_image/default.nix |  4 ++--
 .../development/libraries/SDL2_mixer/default.nix |  4 ++--
 pkgs/development/libraries/SDL2_net/default.nix  |  4 ++--
 pkgs/development/libraries/SDL2_ttf/default.nix  |  4 ++--
 pkgs/development/libraries/SDL_gfx/default.nix   |  4 ++--
 pkgs/development/libraries/SDL_image/default.nix |  4 ++--
 pkgs/development/libraries/SDL_mixer/default.nix |  3 +--
 pkgs/development/libraries/SDL_net/default.nix   |  4 +---
 pkgs/development/libraries/SDL_sixel/default.nix |  2 +-
 pkgs/development/libraries/SDL_sound/default.nix |  4 ++--
 .../libraries/SDL_stretch/default.nix            |  4 ++--
 pkgs/development/libraries/SDL_ttf/default.nix   |  4 ++--
 .../development/libraries/abseil-cpp/default.nix |  2 +-
 .../libraries/accounts-qt/default.nix            |  2 +-
 pkgs/development/libraries/ace/default.nix       |  2 +-
 pkgs/development/libraries/afflib/default.nix    |  2 +-
 pkgs/development/libraries/aften/default.nix     |  4 ++--
 pkgs/development/libraries/alembic/default.nix   |  2 +-
 pkgs/development/libraries/alkimia/default.nix   |  4 ++--
 pkgs/development/libraries/allegro/5.nix         |  2 +-
 pkgs/development/libraries/allegro/default.nix   |  4 ++--
 pkgs/development/libraries/alure/default.nix     |  2 +-
 pkgs/development/libraries/amrwb/default.nix     |  2 +-
 .../libraries/apache-activemq/default.nix        |  4 ++--
 pkgs/development/libraries/appstream/default.nix |  2 +-
 pkgs/development/libraries/appstream/qt.nix      |  2 +-
 pkgs/development/libraries/aqbanking/default.nix |  4 ++--
 .../libraries/aqbanking/gwenhywfar.nix           |  4 ++--
 .../libraries/aqbanking/libchipcard.nix          |  4 ++--
 pkgs/development/libraries/arb/default.nix       |  1 -
 pkgs/development/libraries/armadillo/default.nix |  2 +-
 pkgs/development/libraries/arrow-cpp/default.nix |  2 +-
 pkgs/development/libraries/assimp/default.nix    |  2 +-
 .../libraries/at-spi2-atk/default.nix            |  3 +--
 .../libraries/at-spi2-core/default.nix           |  3 +--
 .../libraries/audio/jamomacore/default.nix       |  2 +-
 .../libraries/audio/libbs2b/default.nix          |  4 ++--
 .../libraries/audio/libmysofa/default.nix        |  2 +-
 .../libraries/audio/libsmf/default.nix           |  4 ++--
 .../development/libraries/audio/lilv/default.nix |  4 ++--
 pkgs/development/libraries/audio/lv2/default.nix |  4 ++--
 .../development/libraries/audio/lv2/unstable.nix |  2 +-
 .../development/libraries/audio/lvtk/default.nix |  2 +-
 pkgs/development/libraries/audio/ntk/default.nix |  2 +-
 .../libraries/audio/rtaudio/default.nix          |  2 +-
 .../libraries/audio/rtmidi/default.nix           |  2 +-
 .../libraries/audio/sratom/default.nix           |  4 ++--
 .../libraries/audio/zita-alsa-pcmi/default.nix   |  4 ++--
 .../libraries/audio/zita-convolver/default.nix   |  4 ++--
 .../libraries/audio/zita-resampler/default.nix   |  4 ++--
 .../libraries/aws-sdk-cpp/default.nix            |  2 +-
 .../libraries/backward-cpp/default.nix           |  2 +-
 pkgs/development/libraries/bamf/default.nix      |  2 +-
 pkgs/development/libraries/beignet/default.nix   |  4 ++--
 pkgs/development/libraries/biblesync/default.nix |  4 ++--
 pkgs/development/libraries/bobcat/default.nix    |  2 +-
 pkgs/development/libraries/boehm-gc/7.6.6.nix    |  2 +-
 pkgs/development/libraries/boehm-gc/default.nix  |  2 +-
 pkgs/development/libraries/boringssl/default.nix |  2 +-
 pkgs/development/libraries/botan/generic.nix     |  2 +-
 pkgs/development/libraries/box2d/default.nix     |  2 +-
 pkgs/development/libraries/brigand/default.nix   |  2 +-
 pkgs/development/libraries/bullet/default.nix    |  2 +-
 .../libraries/bullet/roboschool-fork.nix         |  2 +-
 pkgs/development/libraries/bwidget/default.nix   |  2 +-
 pkgs/development/libraries/c-blosc/default.nix   |  2 +-
 pkgs/development/libraries/caf/default.nix       |  2 +-
 pkgs/development/libraries/capnproto/default.nix |  2 +-
 pkgs/development/libraries/capstone/default.nix  |  2 +-
 pkgs/development/libraries/catch/default.nix     |  2 +-
 pkgs/development/libraries/catch2/default.nix    |  2 +-
 pkgs/development/libraries/cctz/default.nix      |  2 +-
 pkgs/development/libraries/cddlib/default.nix    |  2 +-
 pkgs/development/libraries/cdk/default.nix       |  2 +-
 pkgs/development/libraries/cegui/default.nix     |  4 ++--
 .../libraries/ceres-solver/default.nix           |  2 +-
 pkgs/development/libraries/cgui/default.nix      |  4 ++--
 pkgs/development/libraries/check/default.nix     |  2 +-
 pkgs/development/libraries/chipmunk/default.nix  |  2 +-
 .../libraries/chromaprint/default.nix            |  4 ++--
 pkgs/development/libraries/cimg/default.nix      |  2 +-
 pkgs/development/libraries/cl/default.nix        |  4 ++--
 pkgs/development/libraries/clipper/default.nix   |  2 +-
 pkgs/development/libraries/cln/default.nix       |  4 ++--
 pkgs/development/libraries/cmark/default.nix     |  2 +-
 pkgs/development/libraries/cmrt/default.nix      |  2 +-
 .../libraries/concurrencykit/default.nix         |  2 +-
 pkgs/development/libraries/coprthr/default.nix   |  2 +-
 pkgs/development/libraries/cpp-hocon/default.nix |  2 +-
 .../libraries/cpp-ipfs-api/default.nix           |  2 +-
 pkgs/development/libraries/cppcms/default.nix    |  4 ++--
 pkgs/development/libraries/cppdb/default.nix     |  4 ++--
 pkgs/development/libraries/cppunit/default.nix   |  4 ++--
 pkgs/development/libraries/cpputest/default.nix  |  4 ++--
 pkgs/development/libraries/cppzmq/default.nix    |  2 +-
 pkgs/development/libraries/cre2/default.nix      |  2 +-
 pkgs/development/libraries/crypto++/default.nix  |  2 +-
 pkgs/development/libraries/ctpl/default.nix      |  2 +-
 pkgs/development/libraries/ctpp2/default.nix     |  4 ++--
 pkgs/development/libraries/curlcpp/default.nix   |  2 +-
 pkgs/development/libraries/curlpp/default.nix    |  2 +-
 pkgs/development/libraries/cutee/default.nix     |  1 -
 pkgs/development/libraries/cutelyst/default.nix  |  2 +-
 .../libraries/cxx-prettyprint/default.nix        |  2 +-
 pkgs/development/libraries/cxxtools/default.nix  |  4 ++--
 .../development/libraries/cyrus-sasl/default.nix |  6 +++---
 pkgs/development/libraries/czmq/3.x.nix          |  4 ++--
 pkgs/development/libraries/czmq/4.x.nix          |  4 ++--
 pkgs/development/libraries/czmqpp/default.nix    |  2 +-
 .../libraries/dbus-cplusplus/default.nix         |  4 ++--
 .../dbus-sharp-glib/dbus-sharp-glib-1.0.nix      |  2 +-
 .../libraries/dbus-sharp-glib/default.nix        |  2 +-
 .../libraries/dbus-sharp/dbus-sharp-1.0.nix      |  2 +-
 .../development/libraries/dbus-sharp/default.nix |  2 +-
 pkgs/development/libraries/dbxml/default.nix     |  4 ++--
 pkgs/development/libraries/dirac/default.nix     |  4 ++--
 .../libraries/dleyna-connector-dbus/default.nix  |  1 -
 pkgs/development/libraries/dlib/default.nix      |  2 +-
 .../development/libraries/docopt_cpp/default.nix |  2 +-
 .../libraries/double-conversion/default.nix      |  2 +-
 pkgs/development/libraries/drumstick/default.nix |  4 ++--
 pkgs/development/libraries/dssi/default.nix      |  4 ++--
 pkgs/development/libraries/dxflib/default.nix    |  4 ++--
 pkgs/development/libraries/dyncall/default.nix   |  2 +-
 .../libraries/easyloggingpp/default.nix          |  2 +-
 pkgs/development/libraries/eccodes/default.nix   |  2 +-
 pkgs/development/libraries/eclib/default.nix     |  1 -
 pkgs/development/libraries/editline/default.nix  |  2 +-
 .../elementary-cmake-modules/default.nix         |  2 +-
 pkgs/development/libraries/embree/2.x.nix        |  2 +-
 pkgs/development/libraries/enchant/1.x.nix       |  3 +--
 pkgs/development/libraries/epoxy/default.nix     |  2 +-
 pkgs/development/libraries/exosip/default.nix    |  2 +-
 pkgs/development/libraries/faac/default.nix      |  4 ++--
 pkgs/development/libraries/faad2/default.nix     |  4 ++--
 pkgs/development/libraries/farbfeld/default.nix  |  2 +-
 pkgs/development/libraries/fastjson/default.nix  |  2 +-
 pkgs/development/libraries/fcgi/default.nix      |  2 +-
 pkgs/development/libraries/fdk-aac/default.nix   |  4 ++--
 pkgs/development/libraries/fflas-ffpack/1.nix    |  1 -
 .../libraries/fflas-ffpack/default.nix           |  1 -
 .../libraries/ffmpeg-full/default.nix            |  2 +-
 .../libraries/ffmpeg-sixel/default.nix           |  2 +-
 pkgs/development/libraries/ffmpeg/generic.nix    |  4 ++--
 .../libraries/ffmpegthumbnailer/default.nix      |  2 +-
 pkgs/development/libraries/ffms/default.nix      |  2 +-
 .../libraries/filter-audio/default.nix           |  2 +-
 .../libraries/flatbuffers/default.nix            |  2 +-
 pkgs/development/libraries/flint/default.nix     |  2 +-
 pkgs/development/libraries/fmt/default.nix       |  2 +-
 pkgs/development/libraries/folly/default.nix     |  2 +-
 .../development/libraries/fontconfig/default.nix |  4 ++--
 pkgs/development/libraries/fox/default.nix       |  4 ++--
 pkgs/development/libraries/fplll/20160331.nix    |  1 -
 pkgs/development/libraries/fplll/default.nix     |  1 -
 pkgs/development/libraries/frame/default.nix     |  4 ++--
 pkgs/development/libraries/freenect/default.nix  |  2 +-
 pkgs/development/libraries/freetds/default.nix   |  4 ++--
 pkgs/development/libraries/frei0r/default.nix    |  4 ++--
 pkgs/development/libraries/fstrcmp/default.nix   |  2 +-
 pkgs/development/libraries/fstrm/default.nix     |  2 +-
 .../development/libraries/gbenchmark/default.nix |  2 +-
 pkgs/development/libraries/gcc/libstdc++/5.nix   |  2 +-
 pkgs/development/libraries/gd/default.nix        |  4 ++--
 pkgs/development/libraries/gdal/2.4.0.nix        |  4 ++--
 pkgs/development/libraries/gdal/default.nix      |  2 +-
 pkgs/development/libraries/gdal/gdal-1_11.nix    |  4 ++--
 .../libraries/gdata-sharp/default.nix            |  2 +-
 pkgs/development/libraries/gdcm/default.nix      |  4 ++--
 pkgs/development/libraries/gecode/3.nix          |  4 ++--
 pkgs/development/libraries/gecode/default.nix    |  2 +-
 pkgs/development/libraries/geis/default.nix      |  4 ++--
 pkgs/development/libraries/getdata/default.nix   |  4 ++--
 pkgs/development/libraries/getdns/default.nix    |  1 -
 pkgs/development/libraries/gettext/default.nix   |  4 ++--
 pkgs/development/libraries/gf2x/default.nix      |  2 +-
 pkgs/development/libraries/gio-sharp/default.nix |  2 +-
 pkgs/development/libraries/givaro/3.7.nix        |  1 -
 pkgs/development/libraries/givaro/3.nix          |  1 -
 pkgs/development/libraries/givaro/default.nix    |  1 -
 pkgs/development/libraries/gl2ps/default.nix     |  4 ++--
 pkgs/development/libraries/glbinding/default.nix |  1 -
 pkgs/development/libraries/glfw/3.x.nix          |  2 +-
 pkgs/development/libraries/glm/default.nix       |  4 ++--
 .../libraries/globalplatform/default.nix         |  4 ++--
 .../globalplatform/gppcscconnectionplugin.nix    |  4 ++--
 pkgs/development/libraries/glog/default.nix      |  2 +-
 pkgs/development/libraries/glpk/default.nix      |  4 ++--
 pkgs/development/libraries/gmime/2.nix           |  4 ++--
 pkgs/development/libraries/gmime/3.nix           |  4 ++--
 pkgs/development/libraries/gmm/default.nix       |  4 ++--
 pkgs/development/libraries/gmtk/default.nix      |  2 +-
 .../libraries/gnome-sharp/default.nix            |  2 +-
 .../development/libraries/gnu-config/default.nix |  2 +-
 pkgs/development/libraries/gnu-efi/default.nix   |  4 ++--
 pkgs/development/libraries/gpgme/default.nix     |  4 ++--
 pkgs/development/libraries/grail/default.nix     |  4 ++--
 .../development/libraries/grantlee/5/default.nix |  4 ++--
 .../graphene-hardened-malloc/default.nix         |  2 +-
 pkgs/development/libraries/grib-api/default.nix  |  2 +-
 pkgs/development/libraries/grpc/default.nix      |  2 +-
 .../gsettings-desktop-schemas/default.nix        |  4 ++--
 .../libraries/gsettings-qt/default.nix           |  2 +-
 .../libraries/gsignond/plugins/lastfm.nix        |  2 +-
 .../libraries/gsignond/plugins/oauth.nix         |  2 +-
 .../libraries/gsignond/plugins/sasl.nix          |  2 +-
 pkgs/development/libraries/gsm/default.nix       |  4 ++--
 pkgs/development/libraries/gsoap/default.nix     |  2 +-
 .../libraries/gstreamer/bad/default.nix          |  4 ++--
 .../libraries/gstreamer/base/default.nix         |  4 ++--
 .../libraries/gstreamer/core/default.nix         |  4 ++--
 .../libraries/gstreamer/ges/default.nix          |  4 ++--
 .../libraries/gstreamer/good/default.nix         |  4 ++--
 .../libraries/gstreamer/libav/default.nix        |  4 ++--
 .../libraries/gstreamer/rtsp-server/default.nix  |  4 ++--
 .../libraries/gstreamer/ugly/default.nix         |  4 ++--
 .../libraries/gstreamer/vaapi/default.nix        |  2 +-
 .../libraries/gstreamer/validate/default.nix     |  4 ++--
 pkgs/development/libraries/gtest/default.nix     |  2 +-
 .../libraries/gtk-sharp-beans/default.nix        |  2 +-
 pkgs/development/libraries/gtk-sharp/2.0.nix     |  2 +-
 pkgs/development/libraries/gtkd/default.nix      |  2 +-
 pkgs/development/libraries/gtksourceview/3.x.nix |  4 ++--
 pkgs/development/libraries/gtksourceview/4.x.nix |  4 ++--
 .../libraries/gtksourceviewmm/default.nix        |  4 ++--
 pkgs/development/libraries/gtkspell/3.nix        |  2 +-
 .../development/libraries/gtkspellmm/default.nix |  4 ++--
 pkgs/development/libraries/gts/default.nix       |  4 ++--
 pkgs/development/libraries/gumbo/default.nix     |  2 +-
 pkgs/development/libraries/gusb/default.nix      |  2 +-
 pkgs/development/libraries/half/default.nix      |  2 +-
 pkgs/development/libraries/hamlib/default.nix    |  3 +--
 pkgs/development/libraries/herqq/default.nix     |  2 +-
 pkgs/development/libraries/hiredis/default.nix   |  2 +-
 pkgs/development/libraries/hivex/default.nix     |  4 ++--
 pkgs/development/libraries/hpx/default.nix       |  2 +-
 pkgs/development/libraries/htmlcxx/default.nix   |  4 ++--
 pkgs/development/libraries/hunspell/default.nix  |  2 +-
 pkgs/development/libraries/idnkit/default.nix    |  4 ++--
 pkgs/development/libraries/iksemel/default.nix   |  2 +-
 pkgs/development/libraries/ilmbase/default.nix   |  4 ++--
 pkgs/development/libraries/iml/default.nix       |  2 +-
 pkgs/development/libraries/incrtcl/default.nix   |  2 +-
 .../libraries/indicator-application/gtk2.nix     |  2 +-
 pkgs/development/libraries/iniparser/default.nix |  8 ++++----
 .../libraries/intel-gmmlib/default.nix           |  4 ++--
 .../libraries/intel-media-driver/default.nix     |  2 +-
 .../libraries/intel-media-sdk/default.nix        |  2 +-
 .../libraries/ip2location-c/default.nix          |  2 +-
 pkgs/development/libraries/irrlicht/default.nix  |  4 ++--
 pkgs/development/libraries/iso-codes/default.nix |  4 ++--
 pkgs/development/libraries/jama/default.nix      |  4 ++--
 pkgs/development/libraries/jasper/default.nix    |  2 +-
 .../libraries/java/commons/bcel/default.nix      |  2 +-
 .../libraries/java/commons/compress/default.nix  |  4 ++--
 .../java/commons/fileupload/default.nix          |  4 ++--
 .../libraries/java/commons/io/default.nix        |  4 ++--
 .../libraries/java/commons/lang/default.nix      |  2 +-
 .../libraries/java/commons/math/default.nix      |  2 +-
 pkgs/development/libraries/java/cup/default.nix  |  2 +-
 .../libraries/java/hydra-ant-logger/default.nix  |  2 +-
 pkgs/development/libraries/java/jzmq/default.nix |  2 +-
 .../libraries/java/lucene/default.nix            |  4 ++--
 pkgs/development/libraries/java/swt/default.nix  |  4 ++--
 pkgs/development/libraries/jemalloc/common.nix   |  4 ++--
 .../libraries/jitterentropy/default.nix          |  2 +-
 pkgs/development/libraries/jxrlib/default.nix    |  1 -
 pkgs/development/libraries/kdb/default.nix       |  3 +--
 pkgs/development/libraries/kerberos/heimdal.nix  |  2 +-
 pkgs/development/libraries/keybinder/default.nix |  4 ++--
 .../development/libraries/keybinder3/default.nix |  2 +-
 pkgs/development/libraries/kmsxx/default.nix     |  1 -
 pkgs/development/libraries/kproperty/default.nix |  3 +--
 pkgs/development/libraries/kreport/default.nix   |  3 +--
 pkgs/development/libraries/lame/default.nix      |  4 ++--
 pkgs/development/libraries/lasso/default.nix     |  2 +-
 pkgs/development/libraries/ldacbt/default.nix    |  2 +-
 pkgs/development/libraries/ldns/default.nix      |  4 +---
 .../development/libraries/leatherman/default.nix |  2 +-
 pkgs/development/libraries/lensfun/default.nix   |  4 ++--
 pkgs/development/libraries/leptonica/default.nix |  4 ++--
 pkgs/development/libraries/leveldb/default.nix   |  2 +-
 pkgs/development/libraries/libaacs/default.nix   |  4 ++--
 pkgs/development/libraries/libaal/default.nix    |  4 ++--
 pkgs/development/libraries/libabw/default.nix    |  4 ++--
 .../libraries/libaccounts-glib/default.nix       |  2 +-
 pkgs/development/libraries/libagar/default.nix   |  2 +-
 .../libraries/libagar/libagar_test.nix           |  2 +-
 .../development/libraries/libamqpcpp/default.nix |  2 +-
 pkgs/development/libraries/libao/default.nix     |  2 +-
 pkgs/development/libraries/libaom/default.nix    |  2 +-
 pkgs/development/libraries/libaosd/default.nix   |  2 +-
 .../development/libraries/libarchive/default.nix |  2 +-
 pkgs/development/libraries/libasr/default.nix    |  4 ++--
 pkgs/development/libraries/libass/default.nix    |  4 ++--
 pkgs/development/libraries/libast/default.nix    |  4 ++--
 .../libraries/libatomic_ops/default.nix          |  2 +-
 pkgs/development/libraries/libb2/default.nix     |  2 +-
 pkgs/development/libraries/libb64/default.nix    |  2 +-
 pkgs/development/libraries/libbap/default.nix    |  2 +-
 pkgs/development/libraries/libbdplus/default.nix |  4 ++--
 pkgs/development/libraries/libbfd/default.nix    |  2 +-
 .../libraries/libbluedevil/default.nix           |  3 +--
 pkgs/development/libraries/libbluray/default.nix |  4 ++--
 pkgs/development/libraries/libbsd/default.nix    |  4 ++--
 pkgs/development/libraries/libbson/default.nix   |  2 +-
 pkgs/development/libraries/libburn/default.nix   |  4 ++--
 pkgs/development/libraries/libcacard/default.nix |  4 ++--
 .../development/libraries/libcangjie/default.nix |  2 +-
 pkgs/development/libraries/libcef/default.nix    |  2 +-
 .../development/libraries/libchardet/default.nix |  2 +-
 .../development/libraries/libchewing/default.nix |  2 +-
 pkgs/development/libraries/libcli/default.nix    |  2 +-
 .../libraries/libclthreads/default.nix           |  2 +-
 .../libraries/libclxclient/default.nix           |  2 +-
 .../development/libraries/libcommuni/default.nix |  2 +-
 .../development/libraries/libconfuse/default.nix |  2 +-
 .../libraries/libcouchbase/default.nix           |  2 +-
 .../development/libraries/libcrafter/default.nix |  2 +-
 pkgs/development/libraries/libcsptr/default.nix  |  2 +-
 .../libraries/libctemplate/default.nix           |  2 +-
 pkgs/development/libraries/libcue/default.nix    |  2 +-
 pkgs/development/libraries/libdap/default.nix    |  4 ++--
 .../libraries/libdbusmenu-qt/qt-5.5.nix          |  2 +-
 pkgs/development/libraries/libdc1394/default.nix |  4 ++--
 pkgs/development/libraries/libde265/default.nix  |  2 +-
 .../development/libraries/libdeflate/default.nix |  2 +-
 pkgs/development/libraries/libdevil/default.nix  |  2 +-
 .../development/libraries/libdigidoc/default.nix |  2 +-
 .../libraries/libdigidocpp/default.nix           |  2 +-
 pkgs/development/libraries/libdiscid/default.nix |  4 ++--
 .../libraries/libdivecomputer/default.nix        |  4 ++--
 pkgs/development/libraries/libdvbpsi/default.nix |  4 ++--
 pkgs/development/libraries/libdvdcss/default.nix |  4 ++--
 pkgs/development/libraries/libdvdnav/default.nix |  4 ++--
 .../development/libraries/libdvdread/default.nix |  4 ++--
 pkgs/development/libraries/libeb/default.nix     |  2 +-
 .../development/libraries/libebur128/default.nix |  2 +-
 .../libraries/libechonest/default.nix            |  4 ++--
 .../libraries/libelf-freebsd/default.nix         |  2 +-
 pkgs/development/libraries/libesmtp/default.nix  |  2 +-
 pkgs/development/libraries/libev/default.nix     |  4 ++--
 pkgs/development/libraries/libevent/default.nix  |  2 +-
 pkgs/development/libraries/libewf/default.nix    |  2 +-
 .../libraries/libexecinfo/default.nix            |  4 ++--
 .../development/libraries/libfakekey/default.nix |  4 ++--
 .../libraries/libfaketime/default.nix            |  2 +-
 pkgs/development/libraries/libfann/default.nix   |  2 +-
 pkgs/development/libraries/libffcall/default.nix |  2 +-
 pkgs/development/libraries/libfive/default.nix   |  2 +-
 .../libraries/libfixposix/default.nix            |  2 +-
 .../libraries/libfreefare/default.nix            |  2 +-
 pkgs/development/libraries/libfsm/default.nix    |  2 +-
 .../libraries/libgaminggear/default.nix          |  4 ++--
 pkgs/development/libraries/libgap/default.nix    |  2 +-
 pkgs/development/libraries/libgcrypt/default.nix |  4 ++--
 .../development/libraries/libgeotiff/default.nix |  2 +-
 pkgs/development/libraries/libgig/default.nix    |  4 ++--
 pkgs/development/libraries/libgksu/default.nix   |  3 +--
 pkgs/development/libraries/libglvnd/default.nix  |  2 +-
 pkgs/development/libraries/libgnurl/default.nix  |  2 +-
 .../libraries/libgringotts/default.nix           |  4 ++--
 pkgs/development/libraries/libgroove/default.nix |  2 +-
 .../development/libraries/libguestfs/default.nix |  2 +-
 pkgs/development/libraries/libgumath/default.nix |  2 +-
 pkgs/development/libraries/libheif/default.nix   |  2 +-
 pkgs/development/libraries/libical/default.nix   |  2 +-
 pkgs/development/libraries/libiconv/default.nix  |  4 ++--
 pkgs/development/libraries/libid3tag/default.nix |  2 +-
 pkgs/development/libraries/libidn2/default.nix   |  4 ++--
 .../libraries/libiec61883/default.nix            |  2 +-
 pkgs/development/libraries/libiio/default.nix    |  2 +-
 .../libraries/libimobiledevice/default.nix       |  2 --
 .../libraries/libinfinity/default.nix            |  4 ++--
 .../libraries/libinotify-kqueue/default.nix      |  2 +-
 pkgs/development/libraries/libinput/default.nix  |  4 ++--
 pkgs/development/libraries/libipfix/default.nix  |  2 +-
 .../libraries/libircclient/default.nix           |  3 +--
 .../development/libraries/libisoburn/default.nix |  4 ++--
 pkgs/development/libraries/libisofs/default.nix  |  4 ++--
 pkgs/development/libraries/libite/default.nix    |  2 +-
 pkgs/development/libraries/libivykis/default.nix |  2 +-
 pkgs/development/libraries/libixp-hg/default.nix |  2 +-
 pkgs/development/libraries/libjreen/default.nix  |  4 ++--
 .../libraries/libjson-rpc-cpp/default.nix        |  2 +-
 .../libraries/libkeyfinder/default.nix           |  2 +-
 .../development/libraries/liblangtag/default.nix |  1 -
 .../development/libraries/liblaxjson/default.nix |  2 +-
 pkgs/development/libraries/liblcf/default.nix    |  2 +-
 pkgs/development/libraries/liblinear/default.nix |  2 +-
 pkgs/development/libraries/liblscp/default.nix   |  4 ++--
 .../libraries/libmatchbox/default.nix            |  2 +-
 .../libraries/libmatheval/default.nix            |  4 ++--
 .../libraries/libmaxminddb/default.nix           |  4 ++--
 pkgs/development/libraries/libmd/default.nix     |  1 -
 .../libraries/libmediainfo/default.nix           |  2 +-
 pkgs/development/libraries/libmesode/default.nix |  2 +-
 pkgs/development/libraries/libmhash/default.nix  |  3 +--
 .../libraries/libmicrohttpd/default.nix          |  4 ++--
 pkgs/development/libraries/libmilter/default.nix |  2 +-
 pkgs/development/libraries/libmkv/default.nix    |  2 +-
 pkgs/development/libraries/libmowgli/default.nix |  2 +-
 pkgs/development/libraries/libmpack/default.nix  |  2 +-
 pkgs/development/libraries/libmpeg2/default.nix  |  4 ++--
 .../development/libraries/libmusicbrainz/5.x.nix |  2 +-
 pkgs/development/libraries/libmx/default.nix     |  2 +-
 .../libraries/libmysqlconnectorcpp/default.nix   |  2 +-
 pkgs/development/libraries/libnabo/default.nix   |  2 +-
 pkgs/development/libraries/libnatpmp/default.nix |  6 +++---
 pkgs/development/libraries/libndctl/default.nix  |  2 +-
 .../development/libraries/libndtypes/default.nix |  2 +-
 pkgs/development/libraries/libnet/default.nix    |  4 ++--
 .../libraries/libnetfilter_acct/default.nix      |  4 ++--
 .../libraries/libnetfilter_conntrack/default.nix |  4 ++--
 .../libraries/libnetfilter_cthelper/default.nix  |  4 ++--
 .../libraries/libnetfilter_cttimeout/default.nix |  4 ++--
 .../libraries/libnetfilter_log/default.nix       |  4 ++--
 .../libraries/libnetfilter_queue/default.nix     |  4 ++--
 pkgs/development/libraries/libnfc/default.nix    |  2 +-
 pkgs/development/libraries/libnfs/default.nix    |  2 +-
 .../development/libraries/libngspice/default.nix |  2 +-
 .../libraries/libomxil-bellagio/default.nix      |  4 ++--
 .../development/libraries/libopcodes/default.nix |  2 +-
 .../libraries/libopenaptx/default.nix            |  2 +-
 pkgs/development/libraries/libosmium/default.nix |  2 +-
 pkgs/development/libraries/libow/default.nix     |  2 +-
 pkgs/development/libraries/libp11/default.nix    |  4 ++--
 pkgs/development/libraries/libpaper/default.nix  |  2 +-
 pkgs/development/libraries/libpfm/default.nix    |  4 ++--
 pkgs/development/libraries/libpinyin/default.nix |  2 +-
 pkgs/development/libraries/libplist/default.nix  |  2 --
 pkgs/development/libraries/libproxy/default.nix  |  2 +-
 .../libraries/libpwquality/default.nix           |  4 ++--
 pkgs/development/libraries/libqtav/default.nix   |  2 +-
 pkgs/development/libraries/libraw/default.nix    |  2 +-
 pkgs/development/libraries/librdf/default.nix    |  2 +-
 pkgs/development/libraries/libre/default.nix     |  2 +-
 .../libraries/librealsense/default.nix           |  2 +-
 pkgs/development/libraries/librem/default.nix    |  2 +-
 pkgs/development/libraries/librep/default.nix    |  2 +-
 pkgs/development/libraries/libressl/default.nix  |  4 ++--
 pkgs/development/libraries/librsync/default.nix  |  2 +-
 pkgs/development/libraries/libscrypt/default.nix |  2 +-
 pkgs/development/libraries/libsearpc/default.nix |  2 +-
 .../development/libraries/libseccomp/default.nix |  2 +-
 .../libraries/libsidplayfp/default.nix           |  3 +--
 pkgs/development/libraries/libsieve/default.nix  |  2 +-
 pkgs/development/libraries/libsixel/default.nix  |  2 +-
 pkgs/development/libraries/libskk/default.nix    |  2 +-
 pkgs/development/libraries/libsmi/default.nix    |  4 ++--
 pkgs/development/libraries/libsolv/default.nix   |  2 +-
 .../development/libraries/libsoundio/default.nix |  2 +-
 pkgs/development/libraries/libsoup/default.nix   |  3 +--
 pkgs/development/libraries/libspiro/default.nix  |  4 ++--
 pkgs/development/libraries/libsrs2/default.nix   |  2 +-
 .../development/libraries/libstrophe/default.nix |  2 +-
 pkgs/development/libraries/libsvm/default.nix    |  2 +-
 pkgs/development/libraries/libtap/default.nix    |  4 ++--
 pkgs/development/libraries/libtar/default.nix    |  2 +-
 pkgs/development/libraries/libtcod/default.nix   |  2 +-
 pkgs/development/libraries/libtelnet/default.nix |  2 +-
 .../development/libraries/libtermkey/default.nix |  2 +-
 pkgs/development/libraries/libtiff/default.nix   |  2 +-
 .../libraries/libtomcrypt/default.nix            |  2 +-
 .../development/libraries/libtommath/default.nix |  2 +-
 pkgs/development/libraries/libuecc/default.nix   |  2 +-
 pkgs/development/libraries/libunarr/default.nix  |  2 +-
 .../libraries/libunibreak/default.nix            |  4 ++--
 pkgs/development/libraries/libunique/3.x.nix     |  2 +-
 .../libraries/libunistring/default.nix           |  4 ++--
 pkgs/development/libraries/libunwind/default.nix |  4 ++--
 pkgs/development/libraries/liburcu/default.nix   |  2 +-
 pkgs/development/libraries/liburing/default.nix  |  2 +-
 .../development/libraries/libusbmuxd/default.nix |  2 --
 .../libraries/libutempter/default.nix            |  2 +-
 .../libraries/libva-utils/default.nix            |  2 +-
 pkgs/development/libraries/libva/1.0.0.nix       |  4 ++--
 .../libraries/libvdpau-va-gl/default.nix         |  2 +-
 pkgs/development/libraries/libvdpau/default.nix  |  4 ++--
 pkgs/development/libraries/libvirt/default.nix   |  4 ++--
 pkgs/development/libraries/libvisio/default.nix  |  4 ++--
 pkgs/development/libraries/libvmi/default.nix    |  2 +-
 pkgs/development/libraries/libvpx/default.nix    |  2 +-
 pkgs/development/libraries/libwacom/default.nix  |  2 +-
 pkgs/development/libraries/libwebp/default.nix   |  4 ++--
 .../libraries/libwebsockets/default.nix          |  2 +-
 .../libraries/libwhereami/default.nix            |  2 +-
 pkgs/development/libraries/libwps/default.nix    |  4 ++--
 pkgs/development/libraries/libx86/default.nix    |  4 ++--
 pkgs/development/libraries/libx86emu/default.nix |  2 +-
 pkgs/development/libraries/libxcomp/default.nix  |  2 +-
 pkgs/development/libraries/libxls/default.nix    |  2 +-
 pkgs/development/libraries/libxml2/default.nix   |  4 ++--
 pkgs/development/libraries/libxmlb/default.nix   |  2 +-
 pkgs/development/libraries/libxnd/default.nix    |  2 +-
 pkgs/development/libraries/libxslt/default.nix   |  3 +--
 .../libraries/libyaml-cpp/default.nix            |  2 +-
 pkgs/development/libraries/libytnef/default.nix  |  2 +-
 pkgs/development/libraries/libzdb/default.nix    |  2 +-
 pkgs/development/libraries/libzen/default.nix    |  2 +-
 pkgs/development/libraries/libzip/default.nix    |  4 ++--
 pkgs/development/libraries/libzmf/default.nix    |  3 +--
 pkgs/development/libraries/lightning/default.nix |  4 ++--
 .../libraries/lightstep-tracer-cpp/default.nix   |  2 +-
 pkgs/development/libraries/linbox/default.nix    |  1 -
 .../libraries/linenoise-ng/default.nix           |  2 +-
 pkgs/development/libraries/linenoise/default.nix |  2 +-
 .../development/libraries/liquid-dsp/default.nix |  2 +-
 pkgs/development/libraries/live555/default.nix   |  2 +-
 pkgs/development/libraries/lmdb/default.nix      |  2 +-
 pkgs/development/libraries/lmdbxx/default.nix    |  2 +-
 pkgs/development/libraries/loadcaffe/default.nix |  2 +-
 pkgs/development/libraries/log4cxx/default.nix   |  4 ++--
 pkgs/development/libraries/log4shib/default.nix  |  2 +-
 pkgs/development/libraries/loki/default.nix      |  2 +-
 pkgs/development/libraries/loudmouth/default.nix |  4 ++--
 pkgs/development/libraries/lucene++/default.nix  |  2 +-
 pkgs/development/libraries/mac/default.nix       |  2 +-
 pkgs/development/libraries/mailcore2/default.nix |  2 +-
 pkgs/development/libraries/mapnik/default.nix    |  2 +-
 pkgs/development/libraries/martyr/default.nix    |  4 ++--
 pkgs/development/libraries/mbedtls/default.nix   |  4 ++--
 pkgs/development/libraries/medfile/default.nix   |  2 +-
 .../libraries/mediastreamer/msopenh264.nix       |  2 +-
 pkgs/development/libraries/mesa-glu/default.nix  |  4 ++--
 .../libraries/microsoft_gsl/default.nix          |  2 +-
 pkgs/development/libraries/mimetic/default.nix   |  1 -
 pkgs/development/libraries/miniball/default.nix  |  2 +-
 pkgs/development/libraries/minixml/default.nix   |  2 +-
 pkgs/development/libraries/mlt/default.nix       |  2 +-
 pkgs/development/libraries/mlt/qt-5.nix          |  2 +-
 pkgs/development/libraries/mongoc/default.nix    |  2 +-
 .../libraries/mono-addins/default.nix            |  2 +-
 .../libraries/mono-zeroconf/default.nix          |  2 +-
 pkgs/development/libraries/motif/default.nix     |  4 ++--
 pkgs/development/libraries/movit/default.nix     |  4 ++--
 pkgs/development/libraries/mpfi/default.nix      |  2 +-
 pkgs/development/libraries/mpfr/default.nix      |  4 ++--
 pkgs/development/libraries/mpich/default.nix     |  2 +-
 pkgs/development/libraries/mpir/default.nix      |  2 +-
 pkgs/development/libraries/mps/default.nix       |  2 +-
 pkgs/development/libraries/msgpuck/default.nix   |  2 +-
 pkgs/development/libraries/mtxclient/default.nix |  2 +-
 pkgs/development/libraries/muparser/default.nix  |  2 +-
 pkgs/development/libraries/mygui/default.nix     |  2 +-
 pkgs/development/libraries/nanoflann/default.nix |  2 +-
 pkgs/development/libraries/nanomsg/default.nix   |  2 +-
 pkgs/development/libraries/nco/default.nix       |  2 +-
 pkgs/development/libraries/neon/0.29.nix         |  4 ++--
 pkgs/development/libraries/neon/default.nix      |  4 ++--
 .../libraries/netcdf-cxx4/default.nix            |  2 +-
 .../libraries/netcdf-fortran/default.nix         |  2 +-
 .../libraries/notify-sharp/default.nix           |  2 +-
 pkgs/development/libraries/npapi-sdk/default.nix |  4 ++--
 pkgs/development/libraries/nss/default.nix       |  4 ++--
 pkgs/development/libraries/ntbtls/default.nix    |  2 +-
 pkgs/development/libraries/ntl/default.nix       |  4 ++--
 pkgs/development/libraries/nuspell/default.nix   |  2 +-
 .../libraries/nvidia-texture-tools/default.nix   |  2 +-
 pkgs/development/libraries/ocl-icd/default.nix   |  4 ++--
 pkgs/development/libraries/ode/default.nix       |  2 +-
 pkgs/development/libraries/odpic/default.nix     |  2 +-
 pkgs/development/libraries/ogre/1.9.x.nix        |  1 -
 pkgs/development/libraries/ogre/default.nix      |  2 +-
 pkgs/development/libraries/ogrepaged/default.nix |  2 +-
 pkgs/development/libraries/ois/default.nix       |  2 +-
 pkgs/development/libraries/olm/default.nix       |  4 ++--
 pkgs/development/libraries/oniguruma/default.nix |  2 +-
 pkgs/development/libraries/opae/default.nix      |  2 +-
 .../libraries/openal-soft/default.nix            |  4 ++--
 pkgs/development/libraries/openbabel/default.nix |  2 +-
 pkgs/development/libraries/openbr/default.nix    |  2 +-
 pkgs/development/libraries/openbsm/default.nix   |  3 +--
 .../libraries/opencl-clhpp/default.nix           |  2 +-
 .../libraries/opencollada/default.nix            |  2 +-
 .../libraries/opencolorio/default.nix            |  2 +-
 pkgs/development/libraries/opencsg/default.nix   |  2 +-
 pkgs/development/libraries/openct/default.nix    |  4 ++--
 pkgs/development/libraries/opencv/3.x.nix        |  2 +-
 pkgs/development/libraries/opencv/4.x.nix        |  2 +-
 pkgs/development/libraries/opencv/default.nix    |  2 +-
 pkgs/development/libraries/opendht/default.nix   |  2 +-
 pkgs/development/libraries/opendkim/default.nix  |  4 ++--
 pkgs/development/libraries/openexr/default.nix   |  4 ++--
 .../libraries/openexrid-unstable/default.nix     |  2 +-
 pkgs/development/libraries/openfst/default.nix   |  3 +--
 pkgs/development/libraries/openfx/default.nix    |  2 +-
 pkgs/development/libraries/openh264/default.nix  |  2 +-
 pkgs/development/libraries/openpa/default.nix    |  3 +--
 pkgs/development/libraries/openpam/default.nix   |  4 ++--
 .../libraries/opensaml-cpp/default.nix           |  2 +-
 pkgs/development/libraries/openssl/chacha.nix    |  2 +-
 .../development/libraries/opensubdiv/default.nix |  2 +-
 .../libraries/opentracing-cpp/default.nix        |  2 +-
 pkgs/development/libraries/openvdb/default.nix   |  2 +-
 pkgs/development/libraries/openwsman/default.nix |  2 +-
 .../libraries/oracle-instantclient/default.nix   |  6 +++---
 pkgs/development/libraries/osip/default.nix      |  2 +-
 .../libraries/osm-gps-map/default.nix            |  2 +-
 pkgs/development/libraries/pagmo2/default.nix    |  2 +-
 pkgs/development/libraries/pangolin/default.nix  |  2 +-
 pkgs/development/libraries/partio/default.nix    |  2 +-
 .../development/libraries/pcaudiolib/default.nix |  2 +-
 pkgs/development/libraries/pcg-c/default.nix     |  4 ++--
 pkgs/development/libraries/pcre2/default.nix     |  4 ++--
 pkgs/development/libraries/phash/default.nix     |  1 -
 .../libraries/physics/apfel/default.nix          |  2 +-
 .../libraries/physics/apfelgrid/default.nix      |  2 +-
 .../libraries/physics/applgrid/default.nix       |  4 ++--
 .../libraries/physics/cernlib/default.nix        |  2 +-
 .../libraries/physics/fastjet/default.nix        |  2 +-
 .../libraries/physics/fastnlo/default.nix        |  4 ++--
 .../libraries/physics/geant4/default.nix         |  2 +-
 .../libraries/physics/geant4/g4py/default.nix    |  2 +-
 .../libraries/physics/hepmc2/default.nix         |  2 +-
 .../libraries/physics/hepmc3/default.nix         |  2 +-
 .../libraries/physics/herwig/default.nix         |  2 +-
 .../libraries/physics/hoppet/default.nix         |  4 ++--
 .../libraries/physics/lhapdf/default.nix         |  2 +-
 .../libraries/physics/mcgrid/default.nix         |  4 ++--
 .../libraries/physics/mela/default.nix           |  2 +-
 .../libraries/physics/nlojet/default.nix         |  2 +-
 .../libraries/physics/pythia/default.nix         |  2 +-
 .../libraries/physics/qcdnum/default.nix         |  2 +-
 .../libraries/physics/rivet/default.nix          |  2 +-
 .../libraries/physics/thepeg/default.nix         |  2 +-
 .../libraries/physics/yoda/default.nix           |  2 +-
 pkgs/development/libraries/pixman/default.nix    |  4 ++--
 .../libraries/pkcs11helper/default.nix           |  4 ++--
 pkgs/development/libraries/pmdk/default.nix      |  2 +-
 pkgs/development/libraries/png++/default.nix     |  2 +-
 pkgs/development/libraries/poco/default.nix      |  4 ++--
 pkgs/development/libraries/podofo/default.nix    |  4 ++--
 pkgs/development/libraries/portmidi/default.nix  |  2 +-
 pkgs/development/libraries/protozero/default.nix |  2 +-
 pkgs/development/libraries/pugixml/default.nix   |  2 +-
 pkgs/development/libraries/pupnp/default.nix     |  2 +-
 pkgs/development/libraries/pybind11/default.nix  |  2 +-
 pkgs/development/libraries/python-qt/default.nix |  2 +-
 pkgs/development/libraries/qca2/default.nix      |  2 +-
 pkgs/development/libraries/qjson/default.nix     |  2 +-
 .../libraries/qmltermwidget/default.nix          |  2 +-
 .../libraries/qt-mobility/default.nix            |  2 +-
 .../libraries/qtinstaller/default.nix            |  2 +-
 pkgs/development/libraries/quesoglc/default.nix  |  3 +--
 pkgs/development/libraries/quickder/default.nix  |  1 -
 pkgs/development/libraries/qxt/default.nix       |  2 +-
 .../development/libraries/rabbitmq-c/default.nix |  2 +-
 pkgs/development/libraries/range-v3/default.nix  |  2 +-
 .../development/libraries/rapidcheck/default.nix |  2 +-
 pkgs/development/libraries/rapidjson/default.nix |  2 +-
 pkgs/development/libraries/rapidxml/default.nix  |  3 +--
 pkgs/development/libraries/rdkafka/default.nix   |  2 +-
 pkgs/development/libraries/re2/default.nix       |  2 +-
 pkgs/development/libraries/readline/7.0.nix      |  2 +-
 pkgs/development/libraries/readline/8.0.nix      |  2 +-
 pkgs/development/libraries/rep-gtk/default.nix   |  2 +-
 pkgs/development/libraries/rote/default.nix      |  4 ++--
 pkgs/development/libraries/safefile/default.nix  |  3 +--
 .../development/libraries/sblim-sfcc/default.nix |  2 +-
 .../libraries/science/benchmark/papi/default.nix |  2 +-
 .../libraries/science/biology/htslib/default.nix |  3 +--
 .../libraries/science/biology/mirtk/default.nix  |  2 +-
 .../science/math/QuadProgpp/default.nix          |  2 +-
 .../libraries/science/math/blas/default.nix      |  4 ++--
 .../libraries/science/math/brial/default.nix     |  2 +-
 .../libraries/science/math/caffe2/default.nix    |  2 +-
 .../science/math/cholmod-extra/default.nix       |  2 --
 .../libraries/science/math/clblas/default.nix    |  2 +-
 .../libraries/science/math/cliquer/default.nix   |  2 +-
 .../libraries/science/math/ecos/default.nix      |  2 +-
 .../libraries/science/math/flintqs/default.nix   |  1 -
 .../libraries/science/math/ipopt/default.nix     |  2 +-
 .../libraries/science/math/lcalc/default.nix     |  1 -
 .../science/math/libbraiding/default.nix         |  2 +-
 .../libraries/science/math/libhomfly/default.nix |  2 +-
 .../libraries/science/math/lrs/default.nix       |  1 -
 .../libraries/science/math/m4ri/default.nix      |  2 +-
 .../libraries/science/math/m4rie/default.nix     |  2 +-
 .../libraries/science/math/openblas/default.nix  |  2 +-
 .../libraries/science/math/openlibm/default.nix  |  2 +-
 .../libraries/science/math/or-tools/default.nix  |  2 +-
 .../libraries/science/math/parmetis/default.nix  |  2 +-
 .../libraries/science/math/petsc/default.nix     |  2 +-
 .../libraries/science/math/planarity/default.nix |  1 -
 .../science/math/primesieve/default.nix          |  2 +-
 .../libraries/science/math/rankwidth/default.nix |  1 -
 .../libraries/science/math/rubiks/default.nix    |  1 -
 .../libraries/science/math/scalapack/default.nix |  2 +-
 .../libraries/science/math/scs/default.nix       |  2 +-
 .../libraries/science/math/suitesparse/4.2.nix   |  2 +-
 .../libraries/science/math/superlu/default.nix   |  2 +-
 .../libraries/science/math/sympow/default.nix    |  2 +-
 .../libraries/science/math/zn_poly/default.nix   |  1 -
 .../science/robotics/ispike/default.nix          |  4 ++--
 .../libraries/scriptaculous/default.nix          |  2 +-
 pkgs/development/libraries/serd/default.nix      |  4 ++--
 pkgs/development/libraries/sfsexp/default.nix    |  2 +-
 .../libraries/shibboleth-sp/default.nix          |  2 +-
 .../libraries/silgraphite/graphite2.nix          |  2 +-
 pkgs/development/libraries/simpleitk/default.nix |  1 -
 .../libraries/smarty3-i18n/default.nix           |  2 +-
 pkgs/development/libraries/smarty3/default.nix   |  2 +-
 pkgs/development/libraries/snappy/default.nix    |  2 +-
 pkgs/development/libraries/sonic/default.nix     |  2 +-
 pkgs/development/libraries/sord/default.nix      |  4 ++--
 pkgs/development/libraries/spandsp/default.nix   |  2 +-
 pkgs/development/libraries/spdk/default.nix      |  2 +-
 pkgs/development/libraries/speechd/default.nix   |  4 ++--
 .../libraries/spirv-headers/default.nix          |  2 +-
 pkgs/development/libraries/sqlcipher/default.nix |  2 +-
 pkgs/development/libraries/sqlite/analyzer.nix   |  2 +-
 pkgs/development/libraries/sqlite/default.nix    |  2 +-
 pkgs/development/libraries/sqlite/sqlar.nix      |  2 +-
 pkgs/development/libraries/srtp/default.nix      |  2 +-
 pkgs/development/libraries/stb/default.nix       |  2 +-
 pkgs/development/libraries/strigi/default.nix    |  4 ++--
 pkgs/development/libraries/stxxl/default.nix     |  2 +-
 pkgs/development/libraries/subunit/default.nix   |  4 ++--
 pkgs/development/libraries/svrcore/default.nix   |  4 ++--
 pkgs/development/libraries/swiften/default.nix   |  2 +-
 pkgs/development/libraries/sword/default.nix     |  4 ++--
 pkgs/development/libraries/symengine/default.nix |  2 +-
 pkgs/development/libraries/szip/default.nix      |  2 +-
 pkgs/development/libraries/tachyon/default.nix   |  4 ++--
 .../libraries/taglib-sharp/default.nix           |  2 +-
 pkgs/development/libraries/tbb/default.nix       |  2 +-
 pkgs/development/libraries/tcllib/default.nix    |  2 +-
 pkgs/development/libraries/tcltls/default.nix    |  2 +-
 pkgs/development/libraries/termbox/default.nix   |  2 +-
 pkgs/development/libraries/theft/default.nix     |  2 +-
 pkgs/development/libraries/thrift/default.nix    |  4 ++--
 pkgs/development/libraries/tinyxml-2/default.nix |  2 +-
 pkgs/development/libraries/tix/default.nix       |  2 +-
 pkgs/development/libraries/tnt/default.nix       |  2 +-
 pkgs/development/libraries/tntdb/default.nix     |  4 ++--
 pkgs/development/libraries/tntnet/default.nix    |  4 ++--
 .../development/libraries/torch-hdf5/default.nix |  2 +-
 pkgs/development/libraries/torch/default.nix     |  2 +-
 .../libraries/trompeloeil/default.nix            |  2 +-
 pkgs/development/libraries/tsocks/default.nix    |  4 ++--
 pkgs/development/libraries/twolame/default.nix   |  2 +-
 pkgs/development/libraries/udns/default.nix      |  4 ++--
 pkgs/development/libraries/udunits/default.nix   |  2 +-
 pkgs/development/libraries/uhttpmock/default.nix |  2 +-
 pkgs/development/libraries/umockdev/default.nix  |  2 +-
 pkgs/development/libraries/unibilium/default.nix |  2 +-
 pkgs/development/libraries/unicap/default.nix    |  4 ++--
 .../libraries/unicorn-emu/default.nix            |  2 +-
 .../libraries/unittest-cpp/default.nix           |  2 +-
 pkgs/development/libraries/unixODBC/default.nix  |  4 ++--
 .../libraries/unixODBCDrivers/default.nix        | 16 ++++++++--------
 pkgs/development/libraries/uriparser/default.nix |  4 ++--
 pkgs/development/libraries/usbredir/default.nix  |  4 ++--
 pkgs/development/libraries/ustr/default.nix      |  4 ++--
 pkgs/development/libraries/v8/3.14.nix           |  2 +-
 pkgs/development/libraries/v8/3.16.14.nix        |  4 ++--
 pkgs/development/libraries/v8/5_x.nix            |  2 +-
 pkgs/development/libraries/v8/default.nix        |  2 +-
 pkgs/development/libraries/v8/plv8_6_x.nix       |  2 +-
 .../libraries/vaapi-intel-hybrid/default.nix     |  2 +-
 .../libraries/vaapi-intel/default.nix            |  2 +-
 .../libraries/vapoursynth-mvtools/default.nix    |  2 +-
 pkgs/development/libraries/vc/0.7.nix            |  2 +-
 pkgs/development/libraries/vc/default.nix        |  2 +-
 pkgs/development/libraries/vcg/default.nix       |  2 +-
 pkgs/development/libraries/vid-stab/default.nix  |  2 +-
 pkgs/development/libraries/vigra/default.nix     |  2 +-
 .../libraries/virglrenderer/default.nix          |  4 ++--
 pkgs/development/libraries/vmime/default.nix     |  2 +-
 pkgs/development/libraries/vmmlib/default.nix    |  2 +-
 pkgs/development/libraries/vrb/default.nix       |  4 ++--
 pkgs/development/libraries/vsqlite/default.nix   |  2 +-
 .../libraries/vulkan-headers/default.nix         |  2 +-
 .../libraries/vulkan-loader/default.nix          |  2 +-
 pkgs/development/libraries/wavpack/default.nix   |  4 ++--
 pkgs/development/libraries/wayland/1.9.nix       |  4 ++--
 pkgs/development/libraries/wayland/protocols.nix |  4 ++--
 pkgs/development/libraries/wcslib/default.nix    |  4 ++--
 pkgs/development/libraries/webkitgtk/2.4.nix     |  4 ++--
 pkgs/development/libraries/webkitgtk/default.nix |  4 ++--
 .../libraries/websocket++/default.nix            |  2 +-
 .../development/libraries/wiredtiger/default.nix |  2 +-
 pkgs/development/libraries/wolfssl/default.nix   |  2 +-
 pkgs/development/libraries/wxSVG/default.nix     |  2 +-
 pkgs/development/libraries/wxsqlite3/default.nix |  2 +-
 .../libraries/wxsqliteplus/default.nix           |  2 +-
 .../libraries/wxwidgets/2.8/default.nix          |  2 +-
 .../libraries/wxwidgets/3.0/default.nix          |  2 +-
 pkgs/development/libraries/wxwidgets/3.0/mac.nix |  2 +-
 .../libraries/wxwidgets/3.1/default.nix          |  2 +-
 pkgs/development/libraries/x265/default.nix      |  2 +-
 pkgs/development/libraries/xalanc/default.nix    |  2 +-
 .../libraries/xapian/tools/omega/default.nix     |  2 +-
 pkgs/development/libraries/xavs/default.nix      |  2 +-
 .../libraries/xcb-util-cursor/HEAD.nix           |  2 +-
 pkgs/development/libraries/xercesc/default.nix   |  4 ++--
 pkgs/development/libraries/xgboost/default.nix   |  2 +-
 pkgs/development/libraries/xlslib/default.nix    |  2 +-
 .../libraries/xml-security-c/default.nix         |  4 ++--
 .../libraries/xml-tooling-c/default.nix          |  2 +-
 pkgs/development/libraries/xsd/default.nix       |  2 +-
 pkgs/development/libraries/xvidcore/default.nix  |  4 ++--
 pkgs/development/libraries/xxHash/default.nix    |  2 +-
 pkgs/development/libraries/xylib/default.nix     |  4 ++--
 pkgs/development/libraries/zeroc-ice/default.nix |  2 +-
 pkgs/development/libraries/zeromq/4.x.nix        |  2 +-
 pkgs/development/libraries/zimlib/default.nix    |  4 ++--
 pkgs/development/libraries/zlog/default.nix      |  4 ++--
 pkgs/development/libraries/zmqpp/default.nix     |  2 +-
 pkgs/development/libraries/zxcvbn-c/default.nix  |  2 +-
 pkgs/development/libraries/zziplib/default.nix   |  2 +-
 pkgs/development/lisp-modules/lisp-packages.nix  |  4 ++--
 pkgs/development/misc/amdadl-sdk/default.nix     |  2 +-
 pkgs/development/mobile/adb-sync/default.nix     |  2 +-
 .../mobile/adbfs-rootless/default.nix            |  2 +-
 .../development/mobile/imgpatchtools/default.nix |  2 +-
 pkgs/development/mobile/webos/cmake-modules.nix  |  2 +-
 pkgs/development/mobile/webos/novacom.nix        |  2 +-
 pkgs/development/mobile/webos/novacomd.nix       |  2 +-
 .../development/ocaml-modules/camomile/0.8.2.nix |  2 +-
 .../development/ocaml-modules/camomile/0.8.5.nix |  2 +-
 pkgs/development/ocaml-modules/cow/default.nix   |  2 +-
 .../ocaml-modules/cryptgps/default.nix           |  2 +-
 .../ocaml-modules/cryptokit/default.nix          |  2 +-
 .../development/ocaml-modules/curses/default.nix |  2 +-
 pkgs/development/ocaml-modules/eliom/default.nix |  1 -
 pkgs/development/ocaml-modules/higlo/default.nix |  2 +-
 .../ocaml-modules/lablgtk/default.nix            |  2 +-
 .../ocaml-modules/lambda-term/1.6.nix            |  2 +-
 .../ocaml-modules/ocaml-libvirt/default.nix      |  2 +-
 .../ocaml-modules/ocaml-text/default.nix         |  2 +-
 .../ocaml-modules/ocamlfuse/default.nix          |  2 +-
 .../ocaml-modules/ocamlgraph/default.nix         |  2 +-
 .../ocaml-modules/ocamlnat/default.nix           |  4 ++--
 pkgs/development/ocaml-modules/ocf/default.nix   |  2 +-
 .../ocaml-modules/ocsigen-server/default.nix     |  2 +-
 .../ocaml-modules/piqi-ocaml/default.nix         |  2 +-
 pkgs/development/ocaml-modules/piqi/default.nix  |  2 +-
 .../ocaml-modules/sqlite3/default.nix            |  2 +-
 pkgs/development/ocaml-modules/uuidm/default.nix |  2 +-
 pkgs/development/pharo/launcher/default.nix      |  2 +-
 pkgs/development/pharo/vm/share.nix              |  2 +-
 .../python-modules/augeas/default.nix            |  1 -
 .../python-modules/binwalk/default.nix           |  2 +-
 .../python-modules/blockdiag/default.nix         |  1 -
 .../python-modules/bottleneck/default.nix        |  1 -
 .../python-modules/btchip/default.nix            |  1 -
 .../python-modules/cgroup-utils/default.nix      |  1 -
 .../python-modules/cx_freeze/default.nix         |  1 -
 .../development/python-modules/cymem/default.nix |  1 -
 pkgs/development/python-modules/django/1_8.nix   |  4 ++--
 pkgs/development/python-modules/dyn/default.nix  |  1 -
 .../python-modules/edward/default.nix            |  1 -
 .../development/python-modules/first/default.nix |  1 -
 .../python-modules/geopandas/default.nix         |  1 -
 .../python-modules/glances/default.nix           |  2 +-
 pkgs/development/python-modules/gpy/default.nix  |  1 -
 .../python-modules/hcs_utils/default.nix         |  1 -
 .../python-modules/hmmlearn/default.nix          |  3 +--
 .../python-modules/hoomd-blue/default.nix        |  2 +-
 .../python-modules/ldappool/default.nix          |  2 +-
 .../python-modules/libgpuarray/default.nix       |  1 -
 .../python-modules/libsoundtouch/default.nix     |  1 -
 .../python-modules/llfuse/default.nix            |  3 +--
 .../python-modules/mps-youtube/default.nix       |  2 +-
 .../python-modules/nilearn/default.nix           |  1 -
 .../python-modules/notify/default.nix            |  2 +-
 .../python-modules/nwdiag/default.nix            |  3 +--
 .../development/python-modules/ovito/default.nix |  2 +-
 .../python-modules/paramz/default.nix            |  1 -
 .../python-modules/passlib/default.nix           |  1 -
 .../python-modules/pathspec/default.nix          |  1 -
 .../python-modules/powerline/default.nix         |  3 +--
 .../python-modules/pyGithub/default.nix          |  1 -
 .../python-modules/pyblock/default.nix           |  4 ++--
 .../python-modules/pycuda/compyte.nix            |  1 -
 pkgs/development/python-modules/pyev/default.nix |  3 +--
 .../python-modules/pyftgl/default.nix            |  3 +--
 .../python-modules/pygobject/default.nix         |  5 ++---
 .../python-modules/pygtksourceview/default.nix   |  1 -
 .../python-modules/pykde4/default.nix            |  4 ++--
 .../python-modules/pykde4/kdelibs.nix            |  4 ++--
 .../python-modules/pylibacl/default.nix          |  1 -
 .../development/python-modules/pyocr/default.nix |  1 -
 .../python-modules/pyparted/default.nix          |  2 +-
 .../python-modules/pypillowfight/default.nix     |  2 +-
 .../development/python-modules/pyro4/default.nix |  2 --
 .../python-modules/python-efl/default.nix        |  4 ++--
 .../python-modules/python_fedora/default.nix     |  1 -
 .../python-modules/pyxattr/default.nix           |  1 -
 .../python-modules/qscintilla/default.nix        |  2 +-
 .../recursive-pth-loader/default.nix             |  1 -
 .../robotframework-ride/default.nix              |  3 +--
 pkgs/development/python-modules/rpkg/default.nix |  3 +--
 .../python-modules/selectors34/default.nix       |  2 --
 .../python-modules/seqdiag/default.nix           |  3 +--
 .../python-modules/serpent/default.nix           |  2 --
 .../python-modules/smugline/default.nix          |  1 -
 .../python-modules/smugpy/default.nix            |  1 -
 .../python-modules/sphfile/default.nix           |  3 +--
 .../python-modules/spotipy/default.nix           |  1 -
 .../python-modules/sybase/default.nix            |  3 +--
 .../python-modules/systemd/default.nix           |  1 -
 .../python-modules/tempita/default.nix           |  2 +-
 .../python-modules/torchvision/default.nix       |  1 -
 .../python-modules/umemcache/default.nix         |  3 +--
 .../python-modules/unicorn/default.nix           |  1 -
 .../python-modules/uritools/default.nix          |  1 -
 .../python-modules/urlgrabber/default.nix        |  1 -
 .../python-modules/usbtmc/default.nix            |  1 -
 pkgs/development/python-modules/wxPython/3.0.nix |  1 -
 pkgs/development/tools/ammonite/default.nix      |  2 +-
 .../tools/analysis/autoflake/default.nix         |  1 -
 .../tools/analysis/checkstyle/default.nix        |  2 +-
 .../tools/analysis/clang-analyzer/default.nix    |  2 +-
 pkgs/development/tools/analysis/coan/default.nix |  4 ++--
 .../tools/analysis/cov-build/default.nix         |  2 +-
 .../tools/analysis/cppcheck/default.nix          |  3 +--
 .../development/tools/analysis/eresi/default.nix |  2 +-
 .../tools/analysis/evmdis/default.nix            |  2 +-
 .../tools/analysis/frama-c/default.nix           |  2 +-
 .../analysis/include-what-you-use/default.nix    |  4 ++--
 .../tools/analysis/jdepend/default.nix           |  4 ++--
 pkgs/development/tools/analysis/kcov/default.nix |  2 +-
 .../tools/analysis/massif-visualizer/default.nix |  4 ++--
 .../tools/analysis/randoop/default.nix           |  4 ++--
 .../tools/analysis/retdec/default.nix            |  2 +-
 .../tools/analysis/retdec/yaracpp.nix            |  2 +-
 pkgs/development/tools/analysis/rr/default.nix   |  2 +-
 .../tools/analysis/snowman/default.nix           |  2 +-
 pkgs/development/tools/analysis/spin/default.nix |  2 +-
 pkgs/development/tools/apktool/default.nix       |  2 +-
 pkgs/development/tools/asmfmt/default.nix        |  2 +-
 pkgs/development/tools/avro-tools/default.nix    | 10 +++++-----
 pkgs/development/tools/azcopy/default.nix        |  2 +-
 pkgs/development/tools/bloaty/default.nix        |  2 +-
 pkgs/development/tools/boomerang/default.nix     |  2 +-
 pkgs/development/tools/boost-build/default.nix   |  2 +-
 .../tools/build-managers/arpa2cm/default.nix     |  1 -
 .../tools/build-managers/bam/default.nix         |  2 +-
 .../tools/build-managers/bazel/0.4.nix           |  2 +-
 .../build-managers/bazel/buildtools/default.nix  |  2 +-
 .../tools/build-managers/bear/default.nix        |  2 +-
 .../tools/build-managers/bmake/default.nix       |  4 ++--
 .../tools/build-managers/boot/default.nix        |  2 +-
 .../tools/build-managers/colormake/default.nix   |  2 +-
 .../tools/build-managers/dub/default.nix         |  2 +-
 .../tools/build-managers/gn/default.nix          |  2 +-
 .../tools/build-managers/gup/default.nix         |  2 +-
 .../tools/build-managers/icmake/default.nix      |  2 +-
 .../tools/build-managers/kati/default.nix        |  2 +-
 .../tools/build-managers/leiningen/default.nix   |  5 ++---
 .../tools/build-managers/mill/default.nix        |  2 +-
 .../tools/build-managers/ninja/default.nix       |  2 +-
 .../tools/build-managers/qbs/default.nix         |  2 +-
 .../build-managers/redo-apenwarr/default.nix     |  2 +-
 .../tools/build-managers/redo-sh/default.nix     |  2 +-
 .../tools/build-managers/remake/default.nix      |  2 +-
 .../tools/build-managers/sbt/default.nix         |  4 ++--
 .../tools/build-managers/shards/default.nix      |  2 +-
 .../tools/build-managers/tup/default.nix         |  2 +-
 .../tools/build-managers/waf/default.nix         |  4 ++--
 pkgs/development/tools/cask/default.nix          |  2 +-
 pkgs/development/tools/check/default.nix         |  2 +-
 .../tools/cloudfoundry-cli/default.nix           |  2 +-
 .../development/tools/compile-daemon/default.nix |  2 +-
 .../default.nix                                  |  2 +-
 .../continuous-integration/cide/default.nix      |  4 ++--
 .../continuous-integration/drone-cli/default.nix |  2 +-
 .../continuous-integration/drone/default.nix     |  2 +-
 .../gitlab-runner/default.nix                    |  2 +-
 .../continuous-integration/jenkins/default.nix   |  2 +-
 pkgs/development/tools/coursier/default.nix      |  2 +-
 pkgs/development/tools/cppclean/default.nix      |  2 +-
 .../tools/database/dbmate/default.nix            |  2 +-
 .../tools/database/ephemeralpg/default.nix       |  4 ++--
 .../tools/database/liquibase/default.nix         |  7 +++----
 .../tools/database/schemaspy/default.nix         |  8 ++++----
 .../development/tools/database/shmig/default.nix |  2 +-
 .../tools/database/sqlcheck/default.nix          |  2 +-
 .../tools/database/sqldeveloper/18.2.nix         |  2 +-
 .../tools/database/sqldeveloper/default.nix      |  2 +-
 pkgs/development/tools/dcadec/default.nix        |  1 -
 pkgs/development/tools/deadcode/default.nix      |  2 +-
 pkgs/development/tools/deis/default.nix          |  2 +-
 pkgs/development/tools/deisctl/default.nix       |  2 +-
 pkgs/development/tools/delve/default.nix         |  2 +-
 pkgs/development/tools/dep/default.nix           |  2 +-
 pkgs/development/tools/devpi-client/default.nix  |  1 -
 pkgs/development/tools/devtodo/default.nix       |  4 ++--
 pkgs/development/tools/doctl/default.nix         |  2 +-
 pkgs/development/tools/drip/default.nix          |  1 -
 pkgs/development/tools/dtools/default.nix        |  2 +-
 pkgs/development/tools/easyjson/default.nix      |  2 +-
 pkgs/development/tools/ejson/default.nix         |  2 +-
 pkgs/development/tools/erlang/cuter/default.nix  |  2 +-
 pkgs/development/tools/errcheck/default.nix      |  2 +-
 pkgs/development/tools/fac/default.nix           |  2 +-
 pkgs/development/tools/flock/default.nix         |  1 -
 pkgs/development/tools/fmbt/default.nix          |  2 +-
 .../development/tools/fusee-launcher/default.nix |  2 +-
 pkgs/development/tools/galen/default.nix         |  1 -
 .../development/tools/gamecube-tools/default.nix |  2 +-
 pkgs/development/tools/gauge/default.nix         |  2 +-
 pkgs/development/tools/gdm/default.nix           |  2 +-
 pkgs/development/tools/git-ftp/default.nix       |  2 +-
 .../tools/git-quick-stats/default.nix            |  2 +-
 pkgs/development/tools/github/cligh/default.nix  |  2 +-
 pkgs/development/tools/glide/default.nix         |  2 +-
 pkgs/development/tools/gllvm/default.nix         |  2 +-
 .../tools/global-platform-pro/default.nix        |  3 +--
 pkgs/development/tools/glock/default.nix         |  2 +-
 pkgs/development/tools/glslviewer/default.nix    |  2 +-
 .../tools/gnome-desktop-testing/default.nix      |  2 +-
 .../tools/go-bindata-assetfs/default.nix         |  2 +-
 pkgs/development/tools/go-bindata/default.nix    |  2 +-
 .../tools/go-junit-report/default.nix            |  2 +-
 pkgs/development/tools/go-motion/default.nix     |  2 +-
 pkgs/development/tools/go-outline/default.nix    |  2 +-
 pkgs/development/tools/go-protobuf/default.nix   |  2 +-
 pkgs/development/tools/go-repo-root/default.nix  |  2 +-
 pkgs/development/tools/go-symbols/default.nix    |  2 +-
 pkgs/development/tools/go2nix/default.nix        |  2 +-
 pkgs/development/tools/goa/default.nix           |  2 +-
 pkgs/development/tools/gocode-gomod/default.nix  |  2 +-
 pkgs/development/tools/gocode/default.nix        |  2 +-
 pkgs/development/tools/goconst/default.nix       |  2 +-
 pkgs/development/tools/goconvey/default.nix      |  2 +-
 pkgs/development/tools/gocyclo/default.nix       |  2 +-
 pkgs/development/tools/godef/default.nix         |  2 +-
 pkgs/development/tools/godot/default.nix         |  2 +-
 pkgs/development/tools/gogetdoc/default.nix      |  2 +-
 pkgs/development/tools/golangci-lint/default.nix |  2 +-
 pkgs/development/tools/golint/default.nix        |  2 +-
 pkgs/development/tools/gometalinter/default.nix  |  2 +-
 pkgs/development/tools/gomodifytags/default.nix  |  2 +-
 .../tools/google-app-engine-go-sdk/default.nix   |  2 +-
 pkgs/development/tools/gopkgs/default.nix        |  2 +-
 pkgs/development/tools/gosec/default.nix         |  2 +-
 pkgs/development/tools/gotags/default.nix        |  2 +-
 pkgs/development/tools/gotests/default.nix       |  2 +-
 pkgs/development/tools/gotools/default.nix       |  2 +-
 pkgs/development/tools/govendor/default.nix      |  2 +-
 pkgs/development/tools/govers/default.nix        |  2 +-
 pkgs/development/tools/gox/default.nix           |  2 +-
 pkgs/development/tools/gpp/default.nix           |  2 +-
 pkgs/development/tools/gron/default.nix          |  2 +-
 .../tools/gtk-mac-bundler/default.nix            |  2 +-
 pkgs/development/tools/guile/g-wrap/default.nix  |  3 +--
 .../tools/guile/guile-lint/default.nix           |  6 +++---
 .../tools/haskell/hyper-haskell/default.nix      |  2 +-
 pkgs/development/tools/hexio/default.nix         |  1 -
 pkgs/development/tools/icestorm/default.nix      |  2 +-
 pkgs/development/tools/iferr/default.nix         |  2 +-
 pkgs/development/tools/imatix_gsl/default.nix    |  2 +-
 pkgs/development/tools/impl/default.nix          |  2 +-
 pkgs/development/tools/ineffassign/default.nix   |  2 +-
 pkgs/development/tools/interfacer/default.nix    |  2 +-
 pkgs/development/tools/irony-server/default.nix  |  2 +-
 pkgs/development/tools/java/cfr/default.nix      |  2 +-
 pkgs/development/tools/java/jhiccup/default.nix  |  2 +-
 pkgs/development/tools/java/visualvm/default.nix |  2 +-
 pkgs/development/tools/jbake/default.nix         |  4 ++--
 pkgs/development/tools/jd/default.nix            |  2 +-
 pkgs/development/tools/jid/default.nix           |  2 +-
 pkgs/development/tools/jmespath/default.nix      |  2 +-
 pkgs/development/tools/jp/default.nix            |  2 +-
 pkgs/development/tools/jq/default.nix            |  2 +-
 pkgs/development/tools/jsduck/default.nix        |  1 -
 pkgs/development/tools/json2hcl/default.nix      |  1 -
 pkgs/development/tools/kafkacat/default.nix      |  2 +-
 pkgs/development/tools/kind/default.nix          |  2 +-
 pkgs/development/tools/ktlint/default.nix        |  6 +++---
 pkgs/development/tools/kube-aws/default.nix      |  2 +-
 pkgs/development/tools/kube-prompt/default.nix   |  2 +-
 pkgs/development/tools/kubicorn/default.nix      |  2 +-
 pkgs/development/tools/leaps/default.nix         |  2 +-
 .../tools/librarian-puppet-go/default.nix        |  2 +-
 .../tools/literate-programming/nuweb/default.nix |  8 ++++----
 pkgs/development/tools/makerpm/default.nix       |  2 +-
 pkgs/development/tools/maligned/default.nix      |  2 +-
 .../misc/abi-compliance-checker/default.nix      |  2 +-
 .../tools/misc/abi-dumper/default.nix            |  2 +-
 pkgs/development/tools/misc/arcanist/default.nix |  2 +-
 .../tools/misc/autoconf-archive/default.nix      |  2 +-
 pkgs/development/tools/misc/autogen/default.nix  |  2 +-
 pkgs/development/tools/misc/awf/default.nix      |  2 +-
 pkgs/development/tools/misc/bashdb/default.nix   |  4 ++--
 .../tools/misc/bin_replace_string/default.nix    |  2 +-
 pkgs/development/tools/misc/bsdbuild/default.nix |  4 ++--
 pkgs/development/tools/misc/ccache/default.nix   |  4 ++--
 pkgs/development/tools/misc/ccls/default.nix     |  2 +-
 pkgs/development/tools/misc/cgdb/default.nix     |  4 ++--
 .../tools/misc/checkbashisms/default.nix         |  2 +-
 pkgs/development/tools/misc/chruby/default.nix   |  2 +-
 .../tools/misc/coccinelle/default.nix            |  4 ++--
 .../tools/misc/complexity/default.nix            |  4 ++--
 pkgs/development/tools/misc/cproto/default.nix   |  2 +-
 pkgs/development/tools/misc/cquery/default.nix   |  2 +-
 pkgs/development/tools/misc/csmith/default.nix   |  8 ++++----
 pkgs/development/tools/misc/cwebbin/default.nix  |  2 +-
 pkgs/development/tools/misc/dfu-util/default.nix |  4 ++--
 pkgs/development/tools/misc/dialog/default.nix   |  6 +++---
 pkgs/development/tools/misc/elfinfo/default.nix  |  2 +-
 .../tools/misc/elfkickers/default.nix            |  2 +-
 pkgs/development/tools/misc/elfutils/default.nix |  4 ++--
 pkgs/development/tools/misc/epm/default.nix      |  2 +-
 pkgs/development/tools/misc/fsatrace/default.nix |  8 ++++----
 pkgs/development/tools/misc/fswatch/default.nix  |  2 +-
 pkgs/development/tools/misc/gede/default.nix     |  4 ++--
 pkgs/development/tools/misc/global/default.nix   |  4 ++--
 pkgs/development/tools/misc/gpshell/default.nix  |  2 +-
 pkgs/development/tools/misc/gputils/default.nix  |  4 ++--
 pkgs/development/tools/misc/hound/default.nix    |  2 +-
 pkgs/development/tools/misc/igprof/default.nix   |  2 +-
 .../tools/misc/inotify-tools/default.nix         |  2 +-
 .../tools/misc/intel-gpu-tools/default.nix       |  2 +-
 pkgs/development/tools/misc/intltool/default.nix |  4 ++--
 pkgs/development/tools/misc/kdbg/default.nix     |  4 ++--
 pkgs/development/tools/misc/kibana/5.x.nix       |  4 ++--
 pkgs/development/tools/misc/loccount/default.nix |  2 +-
 pkgs/development/tools/misc/lsof/default.nix     |  2 +-
 .../tools/misc/lttng-tools/default.nix           |  4 ++--
 .../development/tools/misc/lttng-ust/default.nix |  4 ++--
 .../tools/misc/macdylibbundler/default.nix       |  2 +-
 pkgs/development/tools/misc/md2man/default.nix   |  2 +-
 pkgs/development/tools/misc/moby/default.nix     |  2 +-
 pkgs/development/tools/misc/objconv/default.nix  |  4 ++--
 pkgs/development/tools/misc/opengrok/default.nix |  4 ++--
 pkgs/development/tools/misc/openocd/default.nix  |  2 +-
 .../development/tools/misc/patchelf/unstable.nix |  2 +-
 pkgs/development/tools/misc/pmccabe/default.nix  |  2 +-
 pkgs/development/tools/misc/premake/5.nix        |  2 +-
 pkgs/development/tools/misc/pwndbg/default.nix   |  2 +-
 .../tools/misc/saleae-logic/default.nix          |  1 -
 pkgs/development/tools/misc/sipp/default.nix     |  2 +-
 pkgs/development/tools/misc/strace/default.nix   |  4 ++--
 pkgs/development/tools/misc/tcptrack/default.nix |  2 +-
 pkgs/development/tools/misc/tet/default.nix      |  2 +-
 pkgs/development/tools/misc/texinfo/4.13a.nix    |  4 ++--
 pkgs/development/tools/misc/tie/default.nix      |  4 ++--
 pkgs/development/tools/misc/trv/default.nix      |  2 +-
 .../tools/misc/universal-ctags/default.nix       |  2 +-
 .../tools/misc/usb-modeswitch/data.nix           |  4 ++--
 .../tools/misc/usb-modeswitch/default.nix        |  4 ++--
 .../tools/misc/vtable-dumper/default.nix         |  2 +-
 .../tools/misc/watson-ruby/default.nix           |  2 +-
 pkgs/development/tools/misc/xc3sprog/default.nix |  2 +-
 pkgs/development/tools/misc/ycmd/default.nix     |  2 +-
 pkgs/development/tools/misc/yodl/default.nix     |  2 +-
 pkgs/development/tools/mod/default.nix           |  2 +-
 pkgs/development/tools/msgpack-tools/default.nix |  2 +-
 pkgs/development/tools/mustache-go/default.nix   |  2 +-
 pkgs/development/tools/node-webkit/nw12.nix      |  2 +-
 pkgs/development/tools/nrpl/default.nix          |  2 +-
 pkgs/development/tools/nsis/default.nix          |  2 +-
 pkgs/development/tools/nwjs/default.nix          |  2 +-
 pkgs/development/tools/ocaml/camlp4/default.nix  |  2 +-
 pkgs/development/tools/ocaml/findlib/default.nix |  2 +-
 pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix |  2 +-
 .../tools/ocaml/js_of_ocaml/camlp4.nix           |  2 +-
 .../tools/ocaml/js_of_ocaml/compiler.nix         |  2 +-
 pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix |  2 +-
 .../tools/ocaml/js_of_ocaml/ocamlbuild.nix       |  2 +-
 pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix |  2 +-
 .../ocaml/js_of_ocaml/ppx_deriving_json.nix      |  2 +-
 .../tools/ocaml/js_of_ocaml/tyxml.nix            |  2 +-
 pkgs/development/tools/ocaml/oasis/default.nix   |  2 +-
 pkgs/development/tools/ocaml/obelisk/default.nix |  2 +-
 .../development/tools/ocaml/ocamlmod/default.nix |  2 +-
 .../tools/ocaml/ocsigen-i18n/default.nix         |  1 -
 pkgs/development/tools/ocaml/omake/default.nix   |  4 ++--
 pkgs/development/tools/ocaml/opaline/default.nix |  2 +-
 pkgs/development/tools/ocaml/opam/1.2.2.nix      |  2 +-
 pkgs/development/tools/ocaml/opam/default.nix    |  2 +-
 pkgs/development/tools/ocaml/utop/default.nix    |  2 +-
 pkgs/development/tools/omniorb/default.nix       |  2 +-
 .../tools/omnisharp-roslyn/default.nix           |  2 +-
 pkgs/development/tools/packer/default.nix        |  2 +-
 pkgs/development/tools/packet/default.nix        |  2 +-
 pkgs/development/tools/parse-cli-bin/default.nix |  2 +-
 pkgs/development/tools/parsing/antlr/3.4.nix     |  2 +-
 pkgs/development/tools/parsing/byacc/default.nix |  6 +++---
 pkgs/development/tools/parsing/flex/default.nix  |  2 +-
 .../tools/parsing/flexc++/default.nix            |  2 +-
 .../development/tools/parsing/hammer/default.nix |  2 +-
 pkgs/development/tools/parsing/lemon/default.nix |  2 +-
 pkgs/development/tools/parsing/re2c/default.nix  |  2 +-
 pkgs/development/tools/pet/default.nix           |  2 +-
 pkgs/development/tools/pew/default.nix           |  1 -
 pkgs/development/tools/pgloader/default.nix      |  1 -
 pkgs/development/tools/phantomjs2/default.nix    |  2 +-
 .../tools/profiling/EZTrace/default.nix          |  2 +-
 .../tools/profiling/heaptrack/default.nix        |  2 +-
 .../tools/profiling/pprof/default.nix            |  2 +-
 .../development/tools/protoc-gen-doc/default.nix |  2 +-
 pkgs/development/tools/pup/default.nix           |  2 +-
 pkgs/development/tools/quicktemplate/default.nix |  2 +-
 pkgs/development/tools/rdocker/default.nix       |  2 +-
 .../tools/react-native-debugger/default.nix      |  2 +-
 pkgs/development/tools/reflex/default.nix        |  2 +-
 pkgs/development/tools/reftools/default.nix      |  2 +-
 pkgs/development/tools/reno/default.nix          |  4 ++--
 .../tools/repository-managers/nexus/default.nix  |  4 ++--
 pkgs/development/tools/richgo/default.nix        |  2 +-
 pkgs/development/tools/ronn/default.nix          |  2 +-
 pkgs/development/tools/rtags/default.nix         |  2 +-
 pkgs/development/tools/rucksack/default.nix      |  2 +-
 pkgs/development/tools/sauce-connect/default.nix |  2 +-
 .../tools/selenium/chromedriver/default.nix      |  2 +-
 .../tools/selenium/htmlunit-driver/default.nix   |  4 ++--
 .../tools/selenium/server/default.nix            |  8 ++++----
 pkgs/development/tools/simavr/default.nix        |  2 +-
 pkgs/development/tools/skaffold/default.nix      |  2 +-
 .../tools/solarus-quest-editor/default.nix       |  2 +-
 pkgs/development/tools/sourcetrail/default.nix   |  2 +-
 pkgs/development/tools/spirv-tools/default.nix   |  2 +-
 pkgs/development/tools/sqsh/default.nix          |  4 ++--
 pkgs/development/tools/stagit/default.nix        |  2 +-
 pkgs/development/tools/statik/default.nix        |  2 +-
 pkgs/development/tools/textql/default.nix        |  2 +-
 pkgs/development/tools/thrust/default.nix        |  2 +-
 pkgs/development/tools/toluapp/default.nix       |  2 +-
 pkgs/development/tools/tora/default.nix          |  2 +-
 pkgs/development/tools/toxiproxy/default.nix     |  2 +-
 pkgs/development/tools/trellis/default.nix       |  2 +-
 pkgs/development/tools/tychus/default.nix        |  2 +-
 pkgs/development/tools/uftrace/default.nix       |  2 +-
 pkgs/development/tools/unconvert/default.nix     |  2 +-
 pkgs/development/tools/unity3d/default.nix       |  2 +-
 pkgs/development/tools/valadoc/default.nix       |  4 ++--
 pkgs/development/tools/vcstool/default.nix       |  1 -
 pkgs/development/tools/vgo2nix/default.nix       |  2 +-
 pkgs/development/tools/vim-vint/default.nix      |  2 +-
 pkgs/development/tools/vndr/default.nix          |  2 +-
 pkgs/development/tools/vogl/default.nix          |  2 +-
 .../tools/vulkan-validation-layers/default.nix   |  2 +-
 pkgs/development/tools/vultr/default.nix         |  2 +-
 pkgs/development/tools/wabt/default.nix          |  2 +-
 pkgs/development/tools/watchman/default.nix      |  2 +-
 pkgs/development/tools/wiiload/default.nix       |  2 +-
 pkgs/development/tools/ws/default.nix            |  2 +-
 pkgs/development/tools/xcbuild/default.nix       |  2 +-
 pkgs/development/tools/xqilla/default.nix        |  2 +-
 pkgs/development/tools/yaml2json/default.nix     |  2 +-
 pkgs/development/tools/yj/default.nix            |  2 +-
 pkgs/development/tools/yuicompressor/default.nix |  4 ++--
 pkgs/development/web/csslint/default.nix         |  4 ++--
 pkgs/development/web/grails/default.nix          |  2 +-
 pkgs/development/web/insomnia/default.nix        |  2 +-
 pkgs/development/web/kcgi/default.nix            |  1 -
 pkgs/development/web/now-cli/default.nix         |  2 +-
 pkgs/development/web/postman/default.nix         |  4 ++--
 pkgs/development/web/remarkjs/default.nix        |  2 +-
 pkgs/development/web/valum/default.nix           |  2 +-
 pkgs/development/web/woff2/default.nix           |  2 +-
 pkgs/development/web/xmlindent/default.nix       |  4 ++--
 pkgs/games/0ad/data.nix                          |  2 +-
 pkgs/games/0ad/game.nix                          |  2 +-
 pkgs/games/2048-in-terminal/default.nix          |  2 +-
 pkgs/games/airstrike/default.nix                 |  2 +-
 pkgs/games/amoeba/data.nix                       |  2 +-
 pkgs/games/angband/default.nix                   |  2 +-
 pkgs/games/arx-libertatis/default.nix            |  2 +-
 pkgs/games/astromenace/default.nix               |  2 +-
 pkgs/games/atanks/default.nix                    |  4 ++--
 pkgs/games/bastet/default.nix                    |  2 +-
 pkgs/games/blobby/default.nix                    |  2 +-
 pkgs/games/braincurses/default.nix               |  2 +-
 pkgs/games/brogue/default.nix                    |  2 +-
 pkgs/games/bzflag/default.nix                    |  3 +--
 pkgs/games/chessx/default.nix                    |  2 +-
 pkgs/games/ckan/default.nix                      |  2 +-
 pkgs/games/commandergenius/default.nix           |  2 +-
 pkgs/games/construo/default.nix                  |  4 ++--
 pkgs/games/crafty/default.nix                    |  2 +-
 pkgs/games/cutemaze/default.nix                  |  4 ++--
 pkgs/games/cuyo/default.nix                      |  2 +-
 pkgs/games/dhewm3/default.nix                    |  2 +-
 .../dwarf-fortress/dwarf-therapist/default.nix   |  2 +-
 pkgs/games/dwarf-fortress/soundsense.nix         |  2 +-
 pkgs/games/dxx-rebirth/default.nix               |  2 +-
 pkgs/games/easyrpg-player/default.nix            |  2 +-
 pkgs/games/empty-epsilon/default.nix             |  4 ++--
 pkgs/games/enyo-doom/default.nix                 |  2 +-
 pkgs/games/eternity-engine/default.nix           |  2 +-
 pkgs/games/extremetuxracer/default.nix           |  2 +-
 pkgs/games/ezquake/default.nix                   |  1 -
 pkgs/games/fairymax/default.nix                  |  2 +-
 pkgs/games/fish-fillets-ng/default.nix           |  2 +-
 pkgs/games/fltrator/default.nix                  |  2 +-
 pkgs/games/freecell-solver/default.nix           |  4 ++--
 pkgs/games/freeorion/default.nix                 |  2 +-
 pkgs/games/freesweep/default.nix                 |  2 +-
 pkgs/games/frotz/default.nix                     |  2 +-
 pkgs/games/galaxis/default.nix                   |  4 ++--
 pkgs/games/gambatte/default.nix                  |  2 +-
 pkgs/games/garden-of-coloured-lights/default.nix |  2 +-
 pkgs/games/gcompris/default.nix                  |  2 +-
 pkgs/games/gcs/default.nix                       |  4 ++--
 pkgs/games/gemrb/default.nix                     |  2 +-
 pkgs/games/gl-117/default.nix                    |  4 ++--
 pkgs/games/gnugo/default.nix                     |  2 +-
 pkgs/games/gnujump/default.nix                   |  4 ++--
 pkgs/games/gnushogi/default.nix                  |  4 ++--
 pkgs/games/gtypist/default.nix                   |  2 +-
 pkgs/games/gzdoom/default.nix                    |  2 +-
 pkgs/games/hawkthorne/default.nix                |  2 +-
 pkgs/games/hedgewars/default.nix                 |  2 +-
 pkgs/games/holdingnuts/default.nix               |  3 +--
 pkgs/games/hyperrogue/default.nix                |  2 +-
 pkgs/games/instead-launcher/default.nix          |  2 +-
 pkgs/games/ivan/default.nix                      |  2 +-
 pkgs/games/ja2-stracciatella/default.nix         |  2 +-
 pkgs/games/klavaro/default.nix                   |  4 ++--
 pkgs/games/lbreakout2/default.nix                |  4 ++--
 pkgs/games/leela-zero/default.nix                |  2 +-
 pkgs/games/lgogdownloader/default.nix            |  2 +-
 pkgs/games/liberal-crime-squad/default.nix       |  2 +-
 pkgs/games/lincity/default.nix                   |  4 ++--
 pkgs/games/lincity/ng.nix                        |  2 +-
 pkgs/games/liquidwar/5.nix                       |  2 +-
 pkgs/games/liquidwar/default.nix                 |  4 ++--
 pkgs/games/ltris/default.nix                     |  4 ++--
 pkgs/games/mar1d/default.nix                     |  2 +-
 pkgs/games/meritous/default.nix                  |  2 +-
 pkgs/games/minecraft-server/default.nix          |  2 +-
 pkgs/games/mudlet/default.nix                    |  2 +-
 pkgs/games/newtonwars/default.nix                |  2 +-
 pkgs/games/openarena/default.nix                 |  2 +-
 pkgs/games/openclonk/default.nix                 |  2 +-
 pkgs/games/opendune/default.nix                  |  2 +-
 pkgs/games/opendungeons/default.nix              |  2 +-
 pkgs/games/openmw/default.nix                    |  4 ++--
 pkgs/games/openrw/default.nix                    |  2 +-
 pkgs/games/openspades/default.nix                |  2 +-
 pkgs/games/openttd/default.nix                   |  4 ++--
 pkgs/games/opentyrian/default.nix                |  2 +-
 pkgs/games/pacvim/default.nix                    |  2 +-
 pkgs/games/performous/default.nix                |  2 +-
 pkgs/games/pro-office-calculator/default.nix     |  2 +-
 pkgs/games/qgo/default.nix                       |  2 +-
 pkgs/games/qqwing/default.nix                    |  2 +-
 pkgs/games/quake2/yquake2/default.nix            |  2 +-
 pkgs/games/quake3/ioquake/default.nix            |  2 +-
 pkgs/games/quakespasm/default.nix                |  4 ++--
 pkgs/games/quakespasm/vulkan.nix                 |  2 +-
 pkgs/games/residualvm/default.nix                |  2 +-
 pkgs/games/rftg/default.nix                      |  2 +-
 pkgs/games/rigsofrods/default.nix                |  2 +-
 pkgs/games/riko4/default.nix                     |  4 ++--
 pkgs/games/robotfindskitten/default.nix          |  4 ++--
 pkgs/games/runelite/default.nix                  |  2 +-
 pkgs/games/scid-vs-pc/default.nix                |  2 +-
 pkgs/games/scid/default.nix                      |  2 +-
 pkgs/games/scorched3d/default.nix                |  2 +-
 pkgs/games/scummvm/default.nix                   |  4 ++--
 pkgs/games/sdlmame/default.nix                   |  6 +++---
 pkgs/games/sil/default.nix                       |  2 +-
 pkgs/games/snipes/default.nix                    |  2 +-
 pkgs/games/soi/default.nix                       |  4 ++--
 pkgs/games/solarus/default.nix                   |  2 +-
 pkgs/games/space-orbit/default.nix               |  2 +-
 pkgs/games/spring/default.nix                    |  2 +-
 pkgs/games/spring/springlobby.nix                |  2 +-
 pkgs/games/stardust/default.nix                  |  4 ++--
 pkgs/games/steam/steamcmd.nix                    |  2 +-
 pkgs/games/stepmania/default.nix                 |  2 +-
 pkgs/games/stuntrally/default.nix                |  2 +-
 pkgs/games/supertux/default.nix                  |  2 +-
 pkgs/games/terraria-server/default.nix           |  2 +-
 pkgs/games/the-butterfly-effect/default.nix      |  2 +-
 pkgs/games/the-powder-toy/default.nix            |  2 +-
 pkgs/games/tinyfugue/default.nix                 |  2 +-
 pkgs/games/trackballs/default.nix                |  2 +-
 pkgs/games/tremulous/default.nix                 |  4 ++--
 pkgs/games/tuxpaint/default.nix                  |  4 ++--
 pkgs/games/ue4/default.nix                       |  2 +-
 pkgs/games/ultrastardx/default.nix               |  2 +-
 pkgs/games/unnethack/default.nix                 |  2 +-
 pkgs/games/uqm/default.nix                       |  2 +-
 pkgs/games/urbanterror/default.nix               |  2 +-
 pkgs/games/ut2004/demo.nix                       |  2 +-
 pkgs/games/vitetris/default.nix                  |  2 +-
 pkgs/games/vms-empire/default.nix                |  4 ++--
 pkgs/games/voxelands/default.nix                 |  4 ++--
 pkgs/games/warmux/default.nix                    |  2 +-
 pkgs/games/warsow/default.nix                    |  4 ++--
 pkgs/games/wesnoth/default.nix                   |  4 +---
 pkgs/games/widelands/default.nix                 |  2 +-
 pkgs/games/xjump/default.nix                     |  2 +-
 pkgs/games/xmoto/default.nix                     |  2 +-
 pkgs/games/xpilot/bloodspilot-client.nix         |  2 +-
 pkgs/games/xpilot/bloodspilot-server.nix         |  2 +-
 pkgs/games/xpilot/default.nix                    |  4 ++--
 pkgs/games/xsnow/default.nix                     |  4 ++--
 pkgs/games/xsok/default.nix                      |  1 -
 pkgs/games/xsokoban/default.nix                  |  4 ++--
 pkgs/games/xtris/default.nix                     |  2 +-
 pkgs/games/zandronum/fmod.nix                    |  2 +-
 pkgs/games/zangband/default.nix                  |  3 +--
 pkgs/games/zdoom/default.nix                     |  2 +-
 pkgs/games/zdoom/zdbsp.nix                       |  2 +-
 pkgs/misc/brightnessctl/default.nix              |  2 +-
 pkgs/misc/cups/cups-pk-helper.nix                |  2 +-
 pkgs/misc/cups/default.nix                       |  2 +-
 pkgs/misc/cups/drivers/brlaser/default.nix       |  2 +-
 pkgs/misc/cups/drivers/cnijfilter2/default.nix   |  2 +-
 .../cups/drivers/cnijfilter_2_80/default.nix     |  2 +-
 .../cups/drivers/cnijfilter_4_00/default.nix     |  2 +-
 pkgs/misc/cups/drivers/dymo/default.nix          |  2 +-
 pkgs/misc/cups/drivers/estudio/default.nix       |  2 +-
 pkgs/misc/cups/drivers/fxlinuxprint/default.nix  |  2 +-
 .../cups/drivers/googlecloudprint/default.nix    |  2 +-
 .../misc/cups/drivers/hll2390dw-cups/default.nix |  2 +-
 pkgs/misc/cups/drivers/kyocera/default.nix       |  2 +-
 pkgs/misc/cups/drivers/kyodialog3/default.nix    |  2 +-
 .../drivers/mfcj470dwcupswrapper/default.nix     |  2 +-
 pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix  |  2 +-
 .../drivers/mfcj6510dwcupswrapper/default.nix    |  2 +-
 pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix |  2 +-
 pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix |  4 ++--
 .../drivers/mfcl2720dwcupswrapper/default.nix    |  4 ++--
 pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix |  4 ++--
 .../drivers/mfcl2740dwcupswrapper/default.nix    |  4 ++--
 pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix |  4 ++--
 .../drivers/mfcl8690cdwcupswrapper/default.nix   |  4 ++--
 .../misc/cups/drivers/mfcl8690cdwlpr/default.nix |  4 ++--
 .../cups/drivers/samsung/1.00.36/default.nix     |  2 +-
 pkgs/misc/cups/drivers/samsung/1.00.37.nix       |  2 +-
 .../cups/drivers/samsung/4.00.39/default.nix     |  2 +-
 pkgs/misc/cups/drivers/samsung/4.01.17.nix       |  2 +-
 pkgs/misc/cups/drivers/zj-58/default.nix         |  1 -
 pkgs/misc/cups/filters.nix                       |  4 ++--
 pkgs/misc/drivers/epkowa/default.nix             |  4 ++--
 pkgs/misc/drivers/epson-escpr/default.nix        |  2 +-
 pkgs/misc/drivers/epson-escpr2/default.nix       |  8 ++++----
 pkgs/misc/drivers/moltengamepad/default.nix      |  2 +-
 pkgs/misc/drivers/steamcontroller/default.nix    |  2 +-
 pkgs/misc/dumb/default.nix                       |  2 +-
 pkgs/misc/emulators/atari++/default.nix          |  2 +-
 pkgs/misc/emulators/atari800/default.nix         |  4 ++--
 pkgs/misc/emulators/attract-mode/default.nix     |  2 +-
 pkgs/misc/emulators/blastem/default.nix          |  4 ++--
 pkgs/misc/emulators/cdemu/vhba.nix               |  2 +-
 pkgs/misc/emulators/citra/default.nix            |  2 +-
 pkgs/misc/emulators/darcnes/default.nix          |  2 +-
 pkgs/misc/emulators/desmume/default.nix          |  4 ++--
 pkgs/misc/emulators/dolphin-emu/default.nix      |  2 +-
 pkgs/misc/emulators/dolphin-emu/master.nix       |  2 +-
 pkgs/misc/emulators/emulationstation/default.nix |  2 +-
 pkgs/misc/emulators/epsxe/default.nix            |  2 +-
 pkgs/misc/emulators/firebird-emu/default.nix     |  2 +-
 pkgs/misc/emulators/fs-uae/default.nix           |  4 ++--
 pkgs/misc/emulators/gxemul/default.nix           | 10 +++++-----
 pkgs/misc/emulators/higan/default.nix            |  2 +-
 pkgs/misc/emulators/kega-fusion/default.nix      |  2 +-
 pkgs/misc/emulators/libdsk/default.nix           |  4 ++--
 pkgs/misc/emulators/mednafen/default.nix         |  4 ++--
 pkgs/misc/emulators/mednafen/server.nix          |  2 +-
 pkgs/misc/emulators/mednaffe/default.nix         |  2 +-
 pkgs/misc/emulators/mgba/default.nix             |  2 +-
 pkgs/misc/emulators/mupen64plus/default.nix      |  2 +-
 pkgs/misc/emulators/nestopia/default.nix         |  2 +-
 pkgs/misc/emulators/openmsx/default.nix          |  2 +-
 pkgs/misc/emulators/pcsx2/default.nix            |  2 +-
 pkgs/misc/emulators/pcsxr/default.nix            |  6 +++---
 pkgs/misc/emulators/ppsspp/default.nix           |  2 +-
 pkgs/misc/emulators/qmc2/default.nix             |  4 ++--
 pkgs/misc/emulators/retroarch/default.nix        |  2 +-
 .../retroarch/kodi-advanced-launchers.nix        |  2 +-
 pkgs/misc/emulators/retrofe/default.nix          |  2 +-
 pkgs/misc/emulators/rpcs3/default.nix            |  2 +-
 pkgs/misc/emulators/snes9x-gtk/default.nix       |  2 +-
 pkgs/misc/emulators/stella/default.nix           |  4 ++--
 pkgs/misc/emulators/vbam/default.nix             |  2 +-
 pkgs/misc/emulators/yabause/default.nix          |  4 ++--
 pkgs/misc/gnash/default.nix                      |  2 +-
 pkgs/misc/jackaudio/jack1.nix                    |  2 +-
 pkgs/misc/libcardiacarrest/default.nix           |  2 +-
 pkgs/misc/mnemonicode/default.nix                |  2 +-
 pkgs/misc/mxt-app/default.nix                    |  2 +-
 pkgs/misc/sailsd/default.nix                     |  2 +-
 .../screensavers/betterlockscreen/default.nix    |  2 +-
 pkgs/misc/screensavers/electricsheep/default.nix |  1 -
 .../misc/screensavers/i3lock-pixeled/default.nix |  2 +-
 pkgs/misc/screensavers/physlock/default.nix      |  2 +-
 pkgs/misc/screensavers/pipes/default.nix         |  2 +-
 pkgs/misc/screensavers/rss-glx/default.nix       |  2 +-
 pkgs/misc/screensavers/xautolock/default.nix     |  2 +-
 pkgs/misc/seafile-shared/default.nix             |  2 +-
 pkgs/misc/sndio/default.nix                      |  2 +-
 pkgs/misc/sound-of-sorting/default.nix           |  2 +-
 pkgs/misc/stabber/default.nix                    |  2 +-
 pkgs/misc/themes/adapta-kde/default.nix          |  2 +-
 pkgs/misc/themes/adapta/default.nix              |  2 +-
 pkgs/misc/themes/albatross/default.nix           |  2 +-
 pkgs/misc/themes/arc-kde/default.nix             |  2 +-
 pkgs/misc/themes/blackbird/default.nix           |  1 -
 pkgs/misc/themes/clearlooks-phenix/default.nix   |  2 +-
 pkgs/misc/themes/e17gtk/default.nix              |  2 +-
 pkgs/misc/themes/equilux-theme/default.nix       |  2 +-
 pkgs/misc/themes/jade1/default.nix               |  2 +-
 pkgs/misc/themes/numix-solarized/default.nix     |  2 +-
 pkgs/misc/themes/numix-sx/default.nix            |  2 +-
 pkgs/misc/themes/numix/default.nix               |  2 +-
 pkgs/misc/themes/obsidian2/default.nix           |  2 +-
 pkgs/misc/themes/onestepback/default.nix         |  2 +-
 pkgs/misc/themes/paper/default.nix               |  2 +-
 pkgs/misc/themes/solarc/default.nix              |  2 +-
 pkgs/misc/themes/vertex/default.nix              |  1 -
 pkgs/misc/urbit/default.nix                      |  2 +-
 pkgs/misc/xosd/default.nix                       |  4 ++--
 pkgs/os-specific/darwin/apple-sdk/default.nix    |  2 +-
 .../darwin/apple-source-releases/objc4/pure.nix  |  2 +-
 pkgs/os-specific/darwin/chunkwm/default.nix      |  2 +-
 pkgs/os-specific/darwin/duti/default.nix         |  1 -
 pkgs/os-specific/darwin/goku/default.nix         |  2 +-
 pkgs/os-specific/darwin/iproute2mac/default.nix  |  2 +-
 pkgs/os-specific/darwin/khd/default.nix          |  2 +-
 pkgs/os-specific/darwin/kwm/default.nix          |  2 +-
 pkgs/os-specific/darwin/lsusb/default.nix        |  2 +-
 pkgs/os-specific/darwin/m-cli/default.nix        |  2 +-
 pkgs/os-specific/darwin/opencflite/default.nix   |  4 ++--
 pkgs/os-specific/darwin/osxfuse/default.nix      |  1 -
 pkgs/os-specific/darwin/qes/default.nix          |  2 +-
 .../reattach-to-user-namespace/default.nix       |  2 +-
 pkgs/os-specific/darwin/skhd/default.nix         |  2 +-
 pkgs/os-specific/darwin/smimesign/default.nix    |  2 +-
 pkgs/os-specific/darwin/trash/default.nix        |  2 +-
 pkgs/os-specific/linux/acpi/default.nix          |  4 ++--
 pkgs/os-specific/linux/alsa-tools/default.nix    |  4 ++--
 pkgs/os-specific/linux/alsa-utils/default.nix    |  4 ++--
 .../linux/android-udev-rules/default.nix         |  2 +-
 pkgs/os-specific/linux/atop/default.nix          |  2 +-
 pkgs/os-specific/linux/bpftrace/default.nix      |  2 +-
 pkgs/os-specific/linux/cachefilesd/default.nix   |  4 ++--
 pkgs/os-specific/linux/can-isotp/default.nix     |  2 +-
 pkgs/os-specific/linux/can-utils/default.nix     |  2 +-
 pkgs/os-specific/linux/checkpolicy/default.nix   |  2 +-
 pkgs/os-specific/linux/cifs-utils/default.nix    |  4 ++--
 pkgs/os-specific/linux/conky/default.nix         |  2 +-
 .../linux/conntrack-tools/default.nix            |  4 ++--
 pkgs/os-specific/linux/consoletools/default.nix  |  4 ++--
 pkgs/os-specific/linux/crda/default.nix          |  2 +-
 pkgs/os-specific/linux/criu/default.nix          |  4 ++--
 pkgs/os-specific/linux/dbus-broker/default.nix   |  2 +-
 pkgs/os-specific/linux/directvnc/default.nix     |  2 +-
 pkgs/os-specific/linux/displaylink/default.nix   |  2 +-
 pkgs/os-specific/linux/dmtcp/default.nix         |  2 +-
 pkgs/os-specific/linux/dropwatch/default.nix     |  1 -
 pkgs/os-specific/linux/ebtables/default.nix      |  2 +-
 pkgs/os-specific/linux/eventstat/default.nix     |  2 +-
 pkgs/os-specific/linux/extrace/default.nix       |  2 +-
 pkgs/os-specific/linux/fatrace/default.nix       |  4 ++--
 .../linux/firmware/b43-firmware/6.30.163.46.nix  |  2 +-
 .../firmware/broadcom-bt-firmware/default.nix    |  6 +++---
 .../linux/firmware/bt-fw-converter/default.nix   |  6 +++---
 .../firmware/firmware-linux-nonfree/default.nix  |  2 +-
 .../firmware/openelec-dvb-firmware/default.nix   |  2 +-
 .../firmware/raspberrypi-wireless/default.nix    |  2 +-
 .../linux/firmware/raspberrypi/tools.nix         |  2 +-
 pkgs/os-specific/linux/flashbench/default.nix    |  2 +-
 pkgs/os-specific/linux/fnotifystat/default.nix   |  2 +-
 pkgs/os-specific/linux/forkstat/default.nix      |  2 +-
 pkgs/os-specific/linux/freefall/default.nix      |  2 +-
 pkgs/os-specific/linux/fscrypt/default.nix       |  2 +-
 pkgs/os-specific/linux/fscryptctl/default.nix    |  2 +-
 pkgs/os-specific/linux/ftop/default.nix          |  4 ++--
 pkgs/os-specific/linux/fwts/default.nix          |  2 +-
 pkgs/os-specific/linux/gfxtablet/default.nix     |  2 +-
 .../linux/google-authenticator/default.nix       |  2 +-
 pkgs/os-specific/linux/gpu-switch/default.nix    |  2 +-
 pkgs/os-specific/linux/gradm/default.nix         |  4 ++--
 pkgs/os-specific/linux/guvcview/default.nix      |  2 +-
 pkgs/os-specific/linux/hostapd/default.nix       |  4 ++--
 pkgs/os-specific/linux/hwdata/default.nix        |  2 +-
 .../os-specific/linux/hyperv-daemons/default.nix |  4 ++--
 pkgs/os-specific/linux/i2c-tools/default.nix     |  4 ++--
 pkgs/os-specific/linux/i7z/default.nix           |  2 +-
 pkgs/os-specific/linux/ifenslave/default.nix     |  2 +-
 pkgs/os-specific/linux/ima-evm-utils/default.nix |  2 +-
 pkgs/os-specific/linux/input-utils/default.nix   |  2 +-
 pkgs/os-specific/linux/intel-ocl/default.nix     |  2 +-
 pkgs/os-specific/linux/iptstate/default.nix      |  4 ++--
 pkgs/os-specific/linux/ipvsadm/default.nix       |  4 ++--
 pkgs/os-specific/linux/irqbalance/default.nix    |  2 +-
 pkgs/os-specific/linux/kbd/default.nix           |  4 ++--
 pkgs/os-specific/linux/kbd/keymaps.nix           |  4 ++--
 pkgs/os-specific/linux/kbdlight/default.nix      |  2 +-
 pkgs/os-specific/linux/kexectools/default.nix    |  6 +++---
 pkgs/os-specific/linux/keyutils/default.nix      |  4 ++--
 pkgs/os-specific/linux/klibc/default.nix         |  2 +-
 pkgs/os-specific/linux/libaio/default.nix        |  4 ++--
 pkgs/os-specific/linux/libbpf/default.nix        |  2 +-
 pkgs/os-specific/linux/libcap-ng/default.nix     |  4 ++--
 pkgs/os-specific/linux/libcap/default.nix        |  8 ++++----
 pkgs/os-specific/linux/libcgroup/default.nix     |  4 ++--
 pkgs/os-specific/linux/libnl/default.nix         |  2 +-
 pkgs/os-specific/linux/libratbag/default.nix     |  2 +-
 pkgs/os-specific/linux/libselinux/default.nix    |  2 +-
 pkgs/os-specific/linux/libsemanage/default.nix   |  2 +-
 pkgs/os-specific/linux/libsepol/default.nix      |  2 +-
 pkgs/os-specific/linux/libsmbios/default.nix     |  2 +-
 pkgs/os-specific/linux/libudev0-shim/default.nix |  2 +-
 pkgs/os-specific/linux/libwebcam/default.nix     |  1 -
 pkgs/os-specific/linux/light/default.nix         |  2 +-
 pkgs/os-specific/linux/lm-sensors/default.nix    |  2 +-
 pkgs/os-specific/linux/lockdep/default.nix       |  2 +-
 .../linux/logitech-udev-rules/default.nix        |  2 +-
 pkgs/os-specific/linux/lxc/default.nix           |  2 +-
 pkgs/os-specific/linux/macchanger/default.nix    |  2 +-
 pkgs/os-specific/linux/mbpfan/default.nix        |  2 +-
 pkgs/os-specific/linux/mcelog/default.nix        |  2 +-
 pkgs/os-specific/linux/microcode/iucode-tool.nix |  2 +-
 pkgs/os-specific/linux/miraclecast/default.nix   |  2 +-
 pkgs/os-specific/linux/mmc-utils/default.nix     |  2 +-
 pkgs/os-specific/linux/molly-guard/default.nix   |  2 +-
 pkgs/os-specific/linux/msr-tools/default.nix     |  4 ++--
 .../linux/multipath-tools/default.nix            |  4 ++--
 pkgs/os-specific/linux/net-tools/default.nix     |  4 ++--
 pkgs/os-specific/linux/nfs-utils/default.nix     |  4 ++--
 pkgs/os-specific/linux/nftables/default.nix      |  4 ++--
 pkgs/os-specific/linux/nmon/default.nix          |  2 +-
 pkgs/os-specific/linux/numactl/default.nix       |  2 +-
 pkgs/os-specific/linux/nvme-cli/default.nix      |  2 +-
 pkgs/os-specific/linux/odp-dpdk/default.nix      |  4 ++--
 pkgs/os-specific/linux/ofp/default.nix           |  2 +-
 pkgs/os-specific/linux/open-iscsi/default.nix    |  2 +-
 pkgs/os-specific/linux/open-isns/default.nix     |  2 +-
 pkgs/os-specific/linux/openvswitch/default.nix   |  4 ++--
 pkgs/os-specific/linux/pagemon/default.nix       |  2 +-
 pkgs/os-specific/linux/pam/default.nix           |  2 +-
 pkgs/os-specific/linux/pam_pgsql/default.nix     |  2 +-
 pkgs/os-specific/linux/pam_u2f/default.nix       |  4 ++--
 pkgs/os-specific/linux/paxctl/default.nix        |  4 ++--
 pkgs/os-specific/linux/paxtest/default.nix       |  4 ++--
 pkgs/os-specific/linux/pcm/default.nix           |  2 +-
 pkgs/os-specific/linux/pflask/default.nix        |  2 +-
 pkgs/os-specific/linux/pipework/default.nix      |  2 +-
 pkgs/os-specific/linux/pktgen/default.nix        |  2 +-
 pkgs/os-specific/linux/plymouth/default.nix      |  4 ++--
 pkgs/os-specific/linux/pmount/default.nix        |  2 +-
 .../linux/policycoreutils/default.nix            |  2 +-
 pkgs/os-specific/linux/prl-tools/default.nix     |  2 +-
 pkgs/os-specific/linux/procdump/default.nix      |  2 +-
 pkgs/os-specific/linux/procps-ng/default.nix     |  2 +-
 pkgs/os-specific/linux/pscircle/default.nix      |  2 +-
 pkgs/os-specific/linux/psmisc/default.nix        |  1 -
 pkgs/os-specific/linux/radeontop/default.nix     |  2 +-
 pkgs/os-specific/linux/read-edid/default.nix     |  4 ++--
 pkgs/os-specific/linux/reptyr/default.nix        |  2 +-
 pkgs/os-specific/linux/rewritefs/default.nix     |  2 +-
 pkgs/os-specific/linux/roccat-tools/default.nix  |  4 ++--
 pkgs/os-specific/linux/rtlwifi_new/default.nix   |  2 +-
 pkgs/os-specific/linux/schedtool/default.nix     |  4 ++--
 pkgs/os-specific/linux/sdparm/default.nix        |  4 ++--
 .../os-specific/linux/selinux-python/default.nix |  2 +-
 .../linux/selinux-sandbox/default.nix            |  2 +-
 .../os-specific/linux/semodule-utils/default.nix |  4 ++--
 pkgs/os-specific/linux/sepolgen/default.nix      |  2 +-
 pkgs/os-specific/linux/shadow/default.nix        |  2 +-
 pkgs/os-specific/linux/smem/default.nix          |  2 +-
 pkgs/os-specific/linux/smemstat/default.nix      |  2 +-
 pkgs/os-specific/linux/speedometer/default.nix   |  2 +-
 pkgs/os-specific/linux/sssd/default.nix          |  4 ++--
 .../linux/syscall_limiter/default.nix            |  2 +-
 pkgs/os-specific/linux/sysdig/default.nix        |  2 +-
 pkgs/os-specific/linux/systemd/default.nix       |  2 +-
 pkgs/os-specific/linux/tcp-wrappers/default.nix  |  2 +-
 pkgs/os-specific/linux/thunderbolt/default.nix   |  2 +-
 pkgs/os-specific/linux/tiptop/default.nix        |  4 ++--
 pkgs/os-specific/linux/tiscamera/default.nix     |  3 +--
 pkgs/os-specific/linux/tomb/default.nix          |  2 +-
 pkgs/os-specific/linux/tpacpi-bat/default.nix    |  2 +-
 pkgs/os-specific/linux/trace-cmd/default.nix     |  2 +-
 pkgs/os-specific/linux/untie/default.nix         |  4 ++--
 pkgs/os-specific/linux/usbguard/default.nix      |  4 ++--
 pkgs/os-specific/linux/uvcdynctrl/default.nix    |  2 +-
 pkgs/os-specific/linux/v4l-utils/default.nix     |  4 ++--
 pkgs/os-specific/linux/wireguard/default.nix     |  2 +-
 .../os-specific/linux/wpa_supplicant/default.nix |  4 ++--
 pkgs/os-specific/linux/x86info/default.nix       |  4 ++--
 pkgs/os-specific/linux/xsensors/default.nix      |  2 +-
 .../os-specific/windows/cygwin-setup/default.nix |  2 +-
 pkgs/servers/amqp/rabbitmq-server/default.nix    |  4 ++--
 pkgs/servers/apache-kafka/default.nix            |  2 +-
 pkgs/servers/asterisk/default.nix                |  2 +-
 pkgs/servers/atlassian/confluence.nix            |  4 ++--
 pkgs/servers/atlassian/crowd.nix                 |  4 ++--
 pkgs/servers/atlassian/jira.nix                  |  2 +-
 pkgs/servers/beanstalkd/default.nix              |  2 +-
 pkgs/servers/caddy/default.nix                   |  2 +-
 pkgs/servers/cayley/default.nix                  |  2 +-
 pkgs/servers/clickhouse/default.nix              |  2 +-
 pkgs/servers/cloud-print-connector/default.nix   |  2 +-
 pkgs/servers/computing/slurm/default.nix         |  4 ++--
 pkgs/servers/confluent-platform/default.nix      |  2 +-
 pkgs/servers/consul/default.nix                  |  2 +-
 pkgs/servers/coturn/default.nix                  |  2 +-
 pkgs/servers/couchpotato/default.nix             |  2 +-
 pkgs/servers/dante/default.nix                   |  4 ++--
 pkgs/servers/dgraph/default.nix                  |  2 +-
 pkgs/servers/dict/default.nix                    |  2 +-
 pkgs/servers/dict/dictd-wiktionary.nix           |  2 +-
 pkgs/servers/dict/dictd-wordnet.nix              |  2 +-
 pkgs/servers/dict/libmaa.nix                     |  2 +-
 pkgs/servers/diod/default.nix                    |  4 ++--
 pkgs/servers/dns/coredns/default.nix             |  2 +-
 pkgs/servers/dns/dnsdist/default.nix             |  2 +-
 pkgs/servers/dns/knot-dns/default.nix            |  2 +-
 pkgs/servers/dns/knot-resolver/default.nix       |  4 ++--
 pkgs/servers/dns/pdns-recursor/default.nix       |  2 +-
 pkgs/servers/dns/powerdns/default.nix            |  2 +-
 pkgs/servers/echoip/default.nix                  |  2 +-
 pkgs/servers/elasticmq-server-bin/default.nix    |  3 +--
 pkgs/servers/etcd/default.nix                    |  2 +-
 pkgs/servers/exhibitor/default.nix               |  2 +-
 pkgs/servers/fcgiwrap/default.nix                |  2 +-
 pkgs/servers/felix/default.nix                   |  2 +-
 pkgs/servers/felix/remoteshell.nix               |  2 +-
 pkgs/servers/firebird/default.nix                |  2 +-
 pkgs/servers/foundationdb/cmake.nix              |  2 +-
 pkgs/servers/foundationdb/vsmake.nix             |  2 +-
 pkgs/servers/freeradius/default.nix              |  2 +-
 pkgs/servers/gnatsd/default.nix                  |  2 +-
 pkgs/servers/gopher/gofish/default.nix           |  4 ++--
 pkgs/servers/gotty/default.nix                   |  2 +-
 pkgs/servers/h2/default.nix                      |  2 +-
 pkgs/servers/hbase/default.nix                   |  2 +-
 pkgs/servers/hitch/default.nix                   |  4 ++--
 pkgs/servers/http/4store/default.nix             |  2 +-
 pkgs/servers/http/apache-httpd/2.4.nix           |  2 +-
 .../apache-modules/mod_auth_mellon/default.nix   |  2 +-
 .../http/apache-modules/mod_wsgi/default.nix     |  2 +-
 pkgs/servers/http/apt-cacher-ng/default.nix      |  2 +-
 pkgs/servers/http/couchdb/2.0.0.nix              |  4 ++--
 pkgs/servers/http/couchdb/default.nix            |  4 ++--
 pkgs/servers/http/darkhttpd/default.nix          |  4 ++--
 pkgs/servers/http/h2o/default.nix                |  2 +-
 pkgs/servers/http/hiawatha/default.nix           |  2 +-
 pkgs/servers/http/jetty/default.nix              |  2 +-
 pkgs/servers/http/lwan/default.nix               |  1 -
 pkgs/servers/http/nix-binary-cache/default.nix   |  2 +-
 pkgs/servers/http/openresty/default.nix          |  2 +-
 pkgs/servers/http/pshs/default.nix               |  2 +-
 pkgs/servers/http/spawn-fcgi/default.nix         |  2 +-
 pkgs/servers/http/tengine/default.nix            |  2 +-
 pkgs/servers/http/thttpd/default.nix             |  4 ++--
 pkgs/servers/http/tomcat/axis2/default.nix       |  4 ++--
 pkgs/servers/http/tomcat/default.nix             |  4 ++--
 pkgs/servers/http/unit/default.nix               |  2 +-
 pkgs/servers/http/webfs/default.nix              |  4 ++--
 pkgs/servers/http/webhook/default.nix            |  2 +-
 pkgs/servers/http/yaws/default.nix               |  4 ++--
 pkgs/servers/hydron/default.nix                  |  2 +-
 pkgs/servers/icingaweb2/default.nix              |  2 +-
 pkgs/servers/identd/nullidentdmod/default.nix    |  2 +-
 pkgs/servers/identd/oidentd/default.nix          |  4 ++--
 pkgs/servers/interlock/default.nix               |  2 +-
 pkgs/servers/irker/default.nix                   |  2 +-
 pkgs/servers/jackett/default.nix                 |  8 ++++----
 pkgs/servers/jetbrains/youtrack.nix              |  4 ++--
 pkgs/servers/kippo/default.nix                   |  4 ++--
 pkgs/servers/kwakd/default.nix                   |  2 +-
 pkgs/servers/lidarr/default.nix                  |  2 +-
 pkgs/servers/livepeer/default.nix                |  2 +-
 pkgs/servers/mail/archiveopteryx/default.nix     |  4 ++--
 .../mail/dovecot/plugins/pigeonhole/default.nix  |  2 +-
 pkgs/servers/mail/mailhog/default.nix            |  2 +-
 pkgs/servers/mail/mailman/default.nix            |  4 ++--
 pkgs/servers/mail/mlmmj/default.nix              |  4 ++--
 pkgs/servers/mail/nullmailer/default.nix         |  2 +-
 pkgs/servers/mail/opensmtpd/default.nix          |  4 ++--
 pkgs/servers/mail/opensmtpd/extras.nix           |  4 ++--
 pkgs/servers/mail/postfix/default.nix            |  4 ++--
 pkgs/servers/mail/postsrsd/default.nix           |  2 +-
 pkgs/servers/mail/pypolicyd-spf/default.nix      |  4 ++--
 pkgs/servers/mail/rmilter/default.nix            |  2 +-
 pkgs/servers/mail/rspamd/default.nix             |  2 +-
 pkgs/servers/matterbridge/default.nix            |  2 +-
 pkgs/servers/mattermost/matterircd.nix           |  2 +-
 pkgs/servers/mautrix-whatsapp/default.nix        |  2 +-
 pkgs/servers/mediatomb/default.nix               |  2 +-
 pkgs/servers/meguca/default.nix                  |  2 +-
 pkgs/servers/memcached/default.nix               |  4 ++--
 pkgs/servers/mesos-dns/default.nix               |  2 +-
 pkgs/servers/minio/default.nix                   |  2 +-
 pkgs/servers/mirrorbits/default.nix              |  2 +-
 pkgs/servers/misc/airsonic/default.nix           |  2 +-
 pkgs/servers/misc/subsonic/default.nix           |  8 ++++----
 pkgs/servers/misc/taskserver/default.nix         |  2 +-
 pkgs/servers/monitoring/bosun/default.nix        |  2 +-
 pkgs/servers/monitoring/cadvisor/default.nix     |  2 +-
 .../servers/monitoring/consul-alerts/default.nix |  2 +-
 pkgs/servers/monitoring/facette/default.nix      |  2 +-
 .../monitoring/grafana-reporter/default.nix      |  2 +-
 pkgs/servers/monitoring/grafana/default.nix      |  2 +-
 pkgs/servers/monitoring/kapacitor/default.nix    |  2 +-
 pkgs/servers/monitoring/lcdproc/default.nix      |  2 +-
 pkgs/servers/monitoring/loki/default.nix         |  2 +-
 pkgs/servers/monitoring/longview/default.nix     |  2 +-
 pkgs/servers/monitoring/mtail/default.nix        |  2 +-
 pkgs/servers/monitoring/munin/default.nix        |  2 +-
 pkgs/servers/monitoring/nagios/default.nix       |  4 ++--
 .../monitoring/nagios/plugins/check_ssl_cert.nix |  2 +-
 .../monitoring/newrelic-sysmond/default.nix      |  2 +-
 pkgs/servers/monitoring/plugins/uptime.nix       |  2 +-
 .../monitoring/prometheus/alertmanager.nix       |  2 +-
 .../monitoring/prometheus/bind-exporter.nix      |  2 +-
 .../monitoring/prometheus/blackbox-exporter.nix  |  2 +-
 .../monitoring/prometheus/collectd-exporter.nix  |  2 +-
 .../monitoring/prometheus/consul-exporter.nix    |  2 +-
 .../monitoring/prometheus/dnsmasq-exporter.nix   |  2 +-
 .../monitoring/prometheus/dovecot-exporter.nix   |  2 +-
 .../monitoring/prometheus/fritzbox-exporter.nix  |  2 +-
 .../monitoring/prometheus/haproxy-exporter.nix   |  2 +-
 .../monitoring/prometheus/json-exporter.nix      |  2 +-
 .../monitoring/prometheus/mail-exporter.nix      |  2 +-
 .../monitoring/prometheus/mesos-exporter.nix     |  2 +-
 .../prometheus/minio-exporter/default.nix        |  2 +-
 .../monitoring/prometheus/mysqld-exporter.nix    |  2 +-
 .../monitoring/prometheus/nginx-exporter.nix     |  2 +-
 .../monitoring/prometheus/node-exporter.nix      |  2 +-
 .../monitoring/prometheus/openvpn-exporter.nix   |  2 +-
 .../monitoring/prometheus/postfix-exporter.nix   |  2 +-
 .../monitoring/prometheus/postgres-exporter.nix  |  2 +-
 pkgs/servers/monitoring/prometheus/prom2json.nix |  2 +-
 .../monitoring/prometheus/pushgateway.nix        |  2 +-
 .../monitoring/prometheus/rabbitmq-exporter.nix  |  2 +-
 .../monitoring/prometheus/snmp-exporter.nix      |  2 +-
 .../monitoring/prometheus/statsd-exporter.nix    |  2 +-
 .../monitoring/prometheus/surfboard-exporter.nix |  2 +-
 .../prometheus/unifi-exporter/default.nix        |  2 +-
 pkgs/servers/monitoring/riemann/default.nix      |  4 ++--
 pkgs/servers/monitoring/seyren/default.nix       |  2 +-
 pkgs/servers/monitoring/telegraf/default.nix     |  2 +-
 pkgs/servers/monitoring/zipkin/default.nix       |  2 +-
 pkgs/servers/mpd/clientlib.nix                   |  2 +-
 pkgs/servers/mpd/default.nix                     |  2 +-
 pkgs/servers/mqtt/mosquitto/default.nix          |  2 +-
 pkgs/servers/nats-streaming-server/default.nix   |  2 +-
 pkgs/servers/nextcloud/default.nix               |  4 ++--
 pkgs/servers/nginx-sso/default.nix               |  2 +-
 pkgs/servers/nosql/aerospike/default.nix         |  2 +-
 pkgs/servers/nosql/cassandra/generic.nix         | 10 +++++-----
 pkgs/servers/nosql/eventstore/default.nix        |  2 +-
 pkgs/servers/nosql/neo4j/default.nix             |  2 +-
 pkgs/servers/nosql/redis/default.nix             |  4 ++--
 pkgs/servers/nosql/rethinkdb/default.nix         |  4 ++--
 pkgs/servers/nsq/default.nix                     |  2 +-
 pkgs/servers/openafs/1.6/default.nix             |  2 +-
 pkgs/servers/openafs/1.8/default.nix             |  2 +-
 pkgs/servers/osrm-backend/default.nix            |  2 +-
 pkgs/servers/p910nd/default.nix                  |  4 ++--
 pkgs/servers/plex/raw.nix                        |  1 -
 pkgs/servers/polipo/default.nix                  |  4 ++--
 pkgs/servers/ps3netsrv/default.nix               |  2 +-
 pkgs/servers/quagga/default.nix                  |  4 ++--
 pkgs/servers/radarr/default.nix                  |  8 ++++----
 pkgs/servers/radicale/1.x.nix                    |  2 +-
 pkgs/servers/rippled/default.nix                 |  2 +-
 pkgs/servers/rpcbind/default.nix                 |  2 +-
 pkgs/servers/rt/default.nix                      |  4 ++--
 pkgs/servers/sabnzbd/default.nix                 |  1 -
 pkgs/servers/samba/4.x.nix                       |  4 ++--
 pkgs/servers/search/elasticsearch/5.x.nix        |  4 ++--
 pkgs/servers/search/groonga/default.nix          |  4 ++--
 pkgs/servers/serf/default.nix                    |  2 +-
 pkgs/servers/serviio/default.nix                 |  4 ++--
 pkgs/servers/shairplay/default.nix               |  2 +-
 pkgs/servers/shairport-sync/default.nix          |  2 +-
 pkgs/servers/shellinabox/default.nix             |  2 +-
 pkgs/servers/simplehttp2server/default.nix       |  2 +-
 pkgs/servers/sks/default.nix                     |  2 +-
 pkgs/servers/skydns/default.nix                  |  2 +-
 pkgs/servers/smcroute/default.nix                |  2 +-
 pkgs/servers/softether/4.25.nix                  |  2 +-
 pkgs/servers/softether/4.29.nix                  |  2 +-
 pkgs/servers/sonarr/default.nix                  |  2 +-
 pkgs/servers/sql/cockroachdb/default.nix         |  2 +-
 pkgs/servers/sql/mariadb/default.nix             |  6 +++---
 pkgs/servers/sql/oracle-xe/default.nix           |  6 +++---
 pkgs/servers/sql/percona/5.6.x.nix               |  2 +-
 pkgs/servers/sql/pgbouncer/default.nix           |  4 ++--
 pkgs/servers/sql/pgpool/default.nix              |  5 ++---
 pkgs/servers/sql/postgresql/default.nix          |  4 ++--
 pkgs/servers/sql/postgresql/ext/cstore_fdw.nix   |  2 +-
 pkgs/servers/sql/postgresql/ext/pg_hll.nix       |  2 +-
 pkgs/servers/sql/postgresql/ext/pg_repack.nix    |  2 +-
 pkgs/servers/sql/postgresql/ext/pg_topn.nix      |  2 +-
 pkgs/servers/sql/postgresql/ext/pgjwt.nix        |  2 +-
 pkgs/servers/sql/postgresql/ext/pgtap.nix        |  2 +-
 pkgs/servers/sql/postgresql/ext/postgis.nix      |  2 +-
 pkgs/servers/sql/postgresql/ext/timescaledb.nix  |  2 +-
 .../sql/postgresql/ext/tsearch_extras.nix        |  2 +-
 pkgs/servers/sql/sqlite/jdbc/default.nix         |  3 +--
 pkgs/servers/sslh/default.nix                    |  2 +-
 pkgs/servers/tautulli/default.nix                |  1 -
 pkgs/servers/tegola/default.nix                  |  2 +-
 pkgs/servers/teleport/default.nix                |  2 +-
 pkgs/servers/traefik/default.nix                 |  2 +-
 pkgs/servers/trezord/default.nix                 |  2 +-
 pkgs/servers/tt-rss/default.nix                  |  2 +-
 pkgs/servers/tt-rss/plugin-auth-ldap/default.nix |  2 +-
 .../tt-rss/plugin-ff-instagram/default.nix       |  2 +-
 .../tt-rss/plugin-tumblr-gdpr/default.nix        |  2 +-
 pkgs/servers/tt-rss/theme-feedly/default.nix     |  2 +-
 pkgs/servers/ttyd/default.nix                    |  2 +-
 pkgs/servers/udpt/default.nix                    |  2 +-
 pkgs/servers/uftp/default.nix                    |  2 +-
 pkgs/servers/uhub/default.nix                    |  2 +-
 pkgs/servers/ums/default.nix                     |  6 +++---
 pkgs/servers/uwsgi/default.nix                   |  4 ++--
 pkgs/servers/web-apps/morty/default.nix          |  2 +-
 .../web-apps/pgpkeyserver-lite/default.nix       |  2 +-
 pkgs/servers/web-apps/restya-board/default.nix   |  2 +-
 pkgs/servers/web-apps/selfoss/default.nix        |  4 ++--
 pkgs/servers/web-apps/shaarli/default.nix        |  2 +-
 pkgs/servers/web-apps/shaarli/material-theme.nix |  2 +-
 pkgs/servers/web-apps/virtlyst/default.nix       |  2 +-
 pkgs/servers/web-apps/wallabag/default.nix       |  2 +-
 pkgs/servers/x11/xorg/xcb-util-xrm.nix           |  4 ++--
 pkgs/servers/xmpp/biboumi/default.nix            |  2 +-
 pkgs/servers/xmpp/ejabberd/default.nix           |  4 ++--
 pkgs/servers/xmpp/openfire/default.nix           |  2 +-
 pkgs/servers/xmpp/prosody/default.nix            |  4 ++--
 pkgs/servers/xmpp/pyIRCt/default.nix             | 10 +++++-----
 pkgs/servers/xmpp/pyMAILt/default.nix            |  8 ++++----
 pkgs/servers/zoneminder/default.nix              |  2 +-
 pkgs/servers/zookeeper/default.nix               | 10 +++++-----
 pkgs/shells/any-nix-shell/default.nix            |  2 +-
 pkgs/shells/bash/bash-completion/default.nix     |  4 ++--
 .../shells/bash/nix-bash-completions/default.nix |  2 +-
 pkgs/shells/dgsh/default.nix                     |  2 +-
 pkgs/shells/fish/default.nix                     |  4 ++--
 pkgs/shells/fish/fish-foreign-env/default.nix    |  2 +-
 pkgs/shells/ksh/default.nix                      |  2 +-
 pkgs/shells/mksh/default.nix                     |  2 +-
 pkgs/shells/oh/default.nix                       |  2 +-
 pkgs/shells/powershell/default.nix               |  2 +-
 pkgs/shells/rc/default.nix                       |  2 +-
 pkgs/shells/rssh/default.nix                     |  4 ++--
 pkgs/shells/tcsh/default.nix                     |  8 ++++----
 pkgs/shells/zsh/antigen/default.nix              |  2 +-
 pkgs/shells/zsh/gradle-completion/default.nix    |  2 +-
 pkgs/shells/zsh/grml-zsh-config/default.nix      |  2 +-
 pkgs/shells/zsh/oh-my-zsh/default.nix            |  2 +-
 pkgs/shells/zsh/spaceship-prompt/default.nix     |  2 +-
 pkgs/shells/zsh/zsh-autosuggestions/default.nix  |  2 +-
 pkgs/shells/zsh/zsh-command-time/default.nix     |  2 +-
 pkgs/shells/zsh/zsh-completions/default.nix      |  2 +-
 .../zsh/zsh-history-substring-search/default.nix |  2 +-
 pkgs/shells/zsh/zsh-powerlevel9k/default.nix     |  2 +-
 .../zsh/zsh-syntax-highlighting/default.nix      |  2 +-
 pkgs/tools/X11/autocutsel/default.nix            |  4 ++--
 pkgs/tools/X11/bgs/default.nix                   |  2 +-
 pkgs/tools/X11/ckbcomp/default.nix               |  2 +-
 pkgs/tools/X11/dispad/default.nix                |  2 +-
 pkgs/tools/X11/dragon-drop/default.nix           |  2 +-
 pkgs/tools/X11/ffcast/default.nix                |  2 +-
 pkgs/tools/X11/go-sct/default.nix                |  2 +-
 pkgs/tools/X11/grobi/default.nix                 |  2 +-
 pkgs/tools/X11/hsetroot/default.nix              |  2 +-
 pkgs/tools/X11/jumpapp/default.nix               |  2 +-
 pkgs/tools/X11/numlockx/default.nix              |  1 -
 pkgs/tools/X11/nx-libs/default.nix               |  2 +-
 pkgs/tools/X11/obconf/default.nix                |  2 +-
 pkgs/tools/X11/oblogout/default.nix              |  2 +-
 pkgs/tools/X11/run-scaled/default.nix            |  2 +-
 pkgs/tools/X11/runningx/default.nix              |  2 +-
 pkgs/tools/X11/screen-message/default.nix        |  2 +-
 pkgs/tools/X11/setroot/default.nix               |  2 +-
 pkgs/tools/X11/skippy-xd/default.nix             |  2 +-
 pkgs/tools/X11/sselp/default.nix                 |  4 ++--
 pkgs/tools/X11/virtualgl/lib.nix                 |  2 +-
 pkgs/tools/X11/wayv/default.nix                  |  1 -
 pkgs/tools/X11/winswitch/default.nix             |  4 ++--
 pkgs/tools/X11/wmutils-core/default.nix          |  2 +-
 pkgs/tools/X11/wmutils-opt/default.nix           |  2 +-
 pkgs/tools/X11/x11vnc/default.nix                |  2 +-
 pkgs/tools/X11/xannotate/default.nix             |  1 -
 pkgs/tools/X11/xbanish/default.nix               |  1 -
 pkgs/tools/X11/xbindkeys-config/default.nix      |  2 +-
 pkgs/tools/X11/xcwd/default.nix                  |  2 +-
 pkgs/tools/X11/xdg-utils/default.nix             |  4 ++--
 pkgs/tools/X11/xdotool/default.nix               |  2 +-
 pkgs/tools/X11/xinput_calibrator/default.nix     |  1 -
 pkgs/tools/X11/xkb-switch/default.nix            |  2 +-
 pkgs/tools/X11/xloadimage/default.nix            |  2 +-
 pkgs/tools/X11/xmacro/default.nix                |  4 ++--
 pkgs/tools/X11/xnee/default.nix                  |  4 ++--
 pkgs/tools/X11/xosview2/default.nix              |  4 ++--
 pkgs/tools/X11/xpointerbarrier/default.nix       |  2 +-
 pkgs/tools/X11/xpra/libfakeXinerama.nix          |  4 ++--
 pkgs/tools/X11/xrectsel/default.nix              |  2 +-
 pkgs/tools/X11/xrestop/default.nix               |  2 +-
 pkgs/tools/X11/xsecurelock/default.nix           |  2 +-
 pkgs/tools/X11/xsettingsd/default.nix            |  2 +-
 pkgs/tools/X11/xvkbd/default.nix                 |  2 +-
 pkgs/tools/X11/xwinmosaic/default.nix            |  2 +-
 pkgs/tools/admin/acme.sh/default.nix             |  2 +-
 pkgs/tools/admin/adtool/default.nix              |  4 ++--
 .../amazon-ecr-credential-helper/default.nix     |  2 +-
 pkgs/tools/admin/aws-env/default.nix             |  1 -
 pkgs/tools/admin/aws-rotate-key/default.nix      |  2 +-
 pkgs/tools/admin/aws-vault/default.nix           |  1 -
 pkgs/tools/admin/bluemix-cli/default.nix         |  2 +-
 pkgs/tools/admin/bubblewrap/default.nix          |  4 ++--
 pkgs/tools/admin/cli53/default.nix               |  2 +-
 .../admin/docker-credential-gcr/default.nix      |  2 +-
 pkgs/tools/admin/fastlane/default.nix            |  3 +--
 pkgs/tools/admin/google-cloud-sdk/default.nix    |  4 ++--
 pkgs/tools/admin/gtk-vnc/default.nix             |  4 ++--
 pkgs/tools/admin/iamy/default.nix                |  2 +-
 pkgs/tools/admin/pulumi/default.nix              |  2 +-
 pkgs/tools/admin/scaleway-cli/default.nix        |  2 +-
 pkgs/tools/admin/ssl-cert-check/default.nix      |  1 -
 pkgs/tools/admin/tigervnc/default.nix            |  2 +-
 pkgs/tools/admin/vncdo/default.nix               |  1 -
 pkgs/tools/archivers/afio/default.nix            |  4 ++--
 pkgs/tools/archivers/gnutar/default.nix          |  2 +-
 pkgs/tools/archivers/p7zip/default.nix           |  2 +-
 pkgs/tools/archivers/runzip/default.nix          |  2 +-
 pkgs/tools/archivers/s-tar/default.nix           |  2 +-
 pkgs/tools/archivers/unarj/default.nix           |  4 ++--
 pkgs/tools/archivers/undmg/default.nix           |  2 +-
 pkgs/tools/archivers/unp/default.nix             |  2 +-
 pkgs/tools/archivers/unrar/default.nix           |  2 +-
 pkgs/tools/archivers/unshield/default.nix        |  2 +-
 pkgs/tools/archivers/wimlib/default.nix          |  4 ++--
 pkgs/tools/archivers/xarchive/default.nix        |  4 ++--
 pkgs/tools/archivers/xarchiver/default.nix       |  2 +-
 pkgs/tools/archivers/zpaq/default.nix            |  2 +-
 pkgs/tools/audio/abcm2ps/default.nix             |  2 +-
 pkgs/tools/audio/abcmidi/default.nix             |  4 ++--
 .../tools/audio/accuraterip-checksum/default.nix |  2 +-
 .../audio/acoustid-fingerprinter/default.nix     |  4 ++--
 pkgs/tools/audio/aucdtect/default.nix            |  2 +-
 pkgs/tools/audio/beets/alternatives-plugin.nix   |  2 +-
 pkgs/tools/audio/darkice/default.nix             |  2 +-
 pkgs/tools/audio/ezstream/default.nix            |  4 ++--
 pkgs/tools/audio/glyr/default.nix                |  2 +-
 pkgs/tools/audio/mpdas/default.nix               |  2 +-
 pkgs/tools/audio/mpdcron/default.nix             |  2 +-
 pkgs/tools/audio/mpdris2/default.nix             |  1 -
 pkgs/tools/audio/pasystray/default.nix           |  4 ++--
 pkgs/tools/audio/playerctl/default.nix           |  2 +-
 pkgs/tools/audio/pnmixer/default.nix             |  2 +-
 pkgs/tools/audio/trx/default.nix                 |  2 +-
 pkgs/tools/audio/volumeicon/default.nix          |  2 +-
 pkgs/tools/backup/bareos/default.nix             |  4 ++--
 pkgs/tools/backup/btrbk/default.nix              |  4 ++--
 pkgs/tools/backup/burp/default.nix               |  2 +-
 pkgs/tools/backup/chunksync/default.nix          |  2 +-
 pkgs/tools/backup/dar/default.nix                |  4 ++--
 pkgs/tools/backup/diskrsync/default.nix          |  2 --
 pkgs/tools/backup/duplicati/default.nix          | 10 +++++-----
 pkgs/tools/backup/duply/default.nix              |  2 +-
 pkgs/tools/backup/easysnap/default.nix           |  2 +-
 pkgs/tools/backup/flockit/default.nix            |  2 +-
 pkgs/tools/backup/httrack/default.nix            |  2 +-
 pkgs/tools/backup/httrack/qt.nix                 |  4 ++--
 pkgs/tools/backup/mydumper/default.nix           |  2 +-
 pkgs/tools/backup/ori/default.nix                |  2 +-
 pkgs/tools/backup/partclone/default.nix          |  2 +-
 pkgs/tools/backup/percona-xtrabackup/default.nix |  4 ++--
 pkgs/tools/backup/rdup/default.nix               |  2 +-
 pkgs/tools/backup/restic/default.nix             |  2 +-
 pkgs/tools/backup/restic/rest-server.nix         |  2 +-
 pkgs/tools/backup/rsbep/default.nix              |  2 +-
 pkgs/tools/backup/store-backup/default.nix       |  2 +-
 pkgs/tools/backup/tarsnap/default.nix            |  2 +-
 pkgs/tools/backup/wal-e/default.nix              |  2 +-
 pkgs/tools/backup/wal-g/default.nix              |  2 +-
 pkgs/tools/backup/zbackup/default.nix            |  2 +-
 pkgs/tools/bluetooth/blueman/default.nix         |  4 ++--
 pkgs/tools/bluetooth/bluez-alsa/default.nix      |  2 +-
 pkgs/tools/bootloaders/refind/default.nix        |  2 +-
 pkgs/tools/cd-dvd/bashburn/default.nix           |  4 ++--
 pkgs/tools/cd-dvd/bchunk/default.nix             |  4 ++--
 pkgs/tools/cd-dvd/brasero/default.nix            |  4 ++--
 pkgs/tools/cd-dvd/cdi2iso/default.nix            |  4 ++--
 pkgs/tools/cd-dvd/cdimgtools/default.nix         |  2 +-
 pkgs/tools/cd-dvd/cue2pops/default.nix           |  2 +-
 pkgs/tools/cd-dvd/dvd-vr/default.nix             |  2 +-
 pkgs/tools/cd-dvd/dvdisaster/default.nix         |  4 ++--
 pkgs/tools/cd-dvd/ecm-tools/default.nix          |  2 +-
 pkgs/tools/cd-dvd/mdf2iso/default.nix            |  2 +-
 pkgs/tools/cd-dvd/mkcue/default.nix              |  2 +-
 pkgs/tools/cd-dvd/nrg2iso/default.nix            |  4 ++--
 pkgs/tools/cd-dvd/unetbootin/default.nix         |  2 +-
 pkgs/tools/compression/advancecomp/default.nix   |  2 +-
 pkgs/tools/compression/brotli/default.nix        |  2 +-
 pkgs/tools/compression/bsc/default.nix           |  2 +-
 pkgs/tools/compression/bsdiff/default.nix        |  4 ++--
 pkgs/tools/compression/bzip2/default.nix         |  4 ++--
 pkgs/tools/compression/dtrx/default.nix          |  2 +-
 pkgs/tools/compression/gzip/default.nix          |  4 ++--
 pkgs/tools/compression/lrzip/default.nix         |  4 ++--
 pkgs/tools/compression/lzfse/default.nix         |  2 +-
 pkgs/tools/compression/lzip/default.nix          |  4 ++--
 pkgs/tools/compression/mozlz4a/default.nix       |  1 -
 pkgs/tools/compression/pbzx/default.nix          |  1 -
 pkgs/tools/compression/upx/default.nix           |  4 ++--
 pkgs/tools/compression/xar/default.nix           |  4 ++--
 pkgs/tools/compression/xdelta/default.nix        |  2 +-
 pkgs/tools/compression/xdelta/unstable.nix       |  2 +-
 pkgs/tools/compression/zopfli/default.nix        |  6 +++---
 pkgs/tools/filesystems/afpfs-ng/default.nix      |  2 +-
 pkgs/tools/filesystems/avfs/default.nix          |  4 ++--
 pkgs/tools/filesystems/bashmount/default.nix     |  2 +-
 pkgs/tools/filesystems/bcache-tools/default.nix  |  4 ++--
 pkgs/tools/filesystems/bees/default.nix          |  2 +-
 pkgs/tools/filesystems/bindfs/default.nix        |  4 ++--
 pkgs/tools/filesystems/blobfuse/default.nix      |  2 +-
 pkgs/tools/filesystems/boxfs/default.nix         |  2 +-
 pkgs/tools/filesystems/btrfs-progs/default.nix   |  2 +-
 pkgs/tools/filesystems/chunkfs/default.nix       |  2 +-
 pkgs/tools/filesystems/convoy/default.nix        |  2 +-
 pkgs/tools/filesystems/cryfs/default.nix         |  2 +-
 pkgs/tools/filesystems/darling-dmg/default.nix   |  2 +-
 pkgs/tools/filesystems/disorderfs/default.nix    |  2 +-
 pkgs/tools/filesystems/djmount/default.nix       |  4 ++--
 pkgs/tools/filesystems/dosfstools/default.nix    |  2 +-
 pkgs/tools/filesystems/duff/default.nix          |  2 +-
 pkgs/tools/filesystems/duperemove/default.nix    |  2 +-
 pkgs/tools/filesystems/e2tools/default.nix       |  3 +--
 pkgs/tools/filesystems/encfs/default.nix         |  2 +-
 pkgs/tools/filesystems/exfat/default.nix         |  2 +-
 pkgs/tools/filesystems/ext4magic/default.nix     |  4 ++--
 pkgs/tools/filesystems/extundelete/default.nix   |  2 +-
 pkgs/tools/filesystems/f2fs-tools/default.nix    |  2 +-
 pkgs/tools/filesystems/f3/default.nix            |  1 -
 pkgs/tools/filesystems/fatresize/default.nix     |  2 +-
 pkgs/tools/filesystems/fatsort/default.nix       |  4 ++--
 pkgs/tools/filesystems/fuse-7z-ng/default.nix    |  1 -
 pkgs/tools/filesystems/gcsfuse/default.nix       |  2 +-
 pkgs/tools/filesystems/genimage/default.nix      |  2 +-
 pkgs/tools/filesystems/genromfs/default.nix      |  4 ++--
 pkgs/tools/filesystems/go-mtpfs/default.nix      |  2 +-
 pkgs/tools/filesystems/gpart/default.nix         |  2 +-
 pkgs/tools/filesystems/grive2/default.nix        |  2 +-
 pkgs/tools/filesystems/hubicfuse/default.nix     |  2 +-
 pkgs/tools/filesystems/ifuse/default.nix         |  2 --
 pkgs/tools/filesystems/lizardfs/default.nix      |  2 +-
 pkgs/tools/filesystems/mhddfs/default.nix        |  2 +-
 pkgs/tools/filesystems/mkspiffs/default.nix      |  2 +-
 pkgs/tools/filesystems/mp3fs/default.nix         |  4 ++--
 pkgs/tools/filesystems/mtdutils/default.nix      |  2 +-
 pkgs/tools/filesystems/nixpart/0.4/blivet.nix    |  4 ++--
 pkgs/tools/filesystems/nixpart/0.4/default.nix   |  2 +-
 pkgs/tools/filesystems/nixpart/0.4/pyblock.nix   |  4 ++--
 .../filesystems/nixpart/0.4/pykickstart.nix      |  4 ++--
 pkgs/tools/filesystems/nixpart/0.4/pyparted.nix  |  4 ++--
 pkgs/tools/filesystems/nixpart/default.nix       |  2 +-
 pkgs/tools/filesystems/ntfs-3g/default.nix       |  1 -
 pkgs/tools/filesystems/rdfind/default.nix        |  4 ++--
 pkgs/tools/filesystems/s3backer/default.nix      |  2 +-
 pkgs/tools/filesystems/s3fs/default.nix          |  2 +-
 pkgs/tools/filesystems/securefs/default.nix      |  2 +-
 pkgs/tools/filesystems/simg2img/default.nix      |  2 +-
 pkgs/tools/filesystems/smbnetfs/default.nix      |  4 ++--
 pkgs/tools/filesystems/snapraid/default.nix      |  2 +-
 pkgs/tools/filesystems/squashfs/default.nix      |  2 +-
 pkgs/tools/filesystems/squashfuse/default.nix    |  1 -
 pkgs/tools/filesystems/sshfs-fuse/default.nix    |  2 +-
 pkgs/tools/filesystems/tmsu/default.nix          |  2 +-
 pkgs/tools/filesystems/u3-tool/default.nix       |  3 +--
 pkgs/tools/filesystems/udftools/default.nix      |  2 +-
 pkgs/tools/filesystems/unionfs-fuse/default.nix  |  2 +-
 pkgs/tools/filesystems/xfsprogs/default.nix      |  2 +-
 pkgs/tools/filesystems/xtreemfs/default.nix      |  2 +-
 pkgs/tools/filesystems/yandex-disk/default.nix   |  4 ++--
 pkgs/tools/filesystems/zerofree/default.nix      |  4 ++--
 pkgs/tools/filesystems/zkfuse/default.nix        |  2 +-
 pkgs/tools/graphics/appleseed/default.nix        |  2 +-
 pkgs/tools/graphics/barcode/default.nix          |  3 +--
 pkgs/tools/graphics/blockhash/default.nix        |  2 +-
 pkgs/tools/graphics/cfdg/default.nix             |  6 +++---
 pkgs/tools/graphics/convchain/default.nix        |  2 +-
 pkgs/tools/graphics/cuneiform/default.nix        |  2 +-
 pkgs/tools/graphics/dpic/default.nix             |  4 ++--
 pkgs/tools/graphics/enblend-enfuse/default.nix   |  4 ++--
 pkgs/tools/graphics/epstool/default.nix          |  2 +-
 pkgs/tools/graphics/facedetect/default.nix       |  4 ++--
 .../graphics/fast-neural-doodle/default.nix      |  2 +-
 pkgs/tools/graphics/fim/default.nix              |  4 ++--
 pkgs/tools/graphics/flam3/default.nix            |  1 -
 pkgs/tools/graphics/ggobi/default.nix            |  2 +-
 pkgs/tools/graphics/glee/default.nix             |  1 -
 pkgs/tools/graphics/glmark2/default.nix          |  2 +-
 pkgs/tools/graphics/glxinfo/default.nix          |  2 +-
 pkgs/tools/graphics/gromit-mpx/default.nix       |  2 +-
 pkgs/tools/graphics/ibniz/default.nix            |  4 ++--
 pkgs/tools/graphics/imgur-screenshot/default.nix |  2 +-
 pkgs/tools/graphics/jhead/default.nix            |  8 ++++----
 pkgs/tools/graphics/lepton/default.nix           |  2 +-
 pkgs/tools/graphics/logstalgia/default.nix       |  4 ++--
 pkgs/tools/graphics/luxcorerender/default.nix    |  2 +-
 pkgs/tools/graphics/maim/default.nix             |  2 +-
 pkgs/tools/graphics/neural-style/default.nix     |  2 +-
 pkgs/tools/graphics/nifskope/default.nix         |  2 +-
 pkgs/tools/graphics/optar/default.nix            |  2 +-
 pkgs/tools/graphics/pdf2svg/default.nix          |  2 +-
 pkgs/tools/graphics/pdftag/default.nix           |  1 -
 pkgs/tools/graphics/perceptualdiff/default.nix   |  1 -
 pkgs/tools/graphics/pfstools/default.nix         |  3 +--
 pkgs/tools/graphics/pngquant/default.nix         |  2 +-
 pkgs/tools/graphics/povray/default.nix           |  2 +-
 pkgs/tools/graphics/qrcode/default.nix           |  2 +-
 pkgs/tools/graphics/rocket/default.nix           |  2 +-
 pkgs/tools/graphics/s2png/default.nix            |  2 +-
 pkgs/tools/graphics/scanbd/default.nix           |  4 ++--
 pkgs/tools/graphics/sng/default.nix              |  2 +-
 pkgs/tools/graphics/structure-synth/default.nix  |  2 +-
 pkgs/tools/graphics/swfdec/default.nix           |  1 -
 pkgs/tools/graphics/syntex/default.nix           |  2 +-
 pkgs/tools/graphics/unpaper/default.nix          |  4 ++--
 pkgs/tools/graphics/vips/default.nix             |  2 +-
 pkgs/tools/graphics/vulkan-tools/default.nix     |  2 +-
 pkgs/tools/graphics/wallutils/default.nix        |  2 +-
 .../graphics/wavefunctioncollapse/default.nix    |  2 +-
 pkgs/tools/graphics/welkin/default.nix           |  2 +-
 pkgs/tools/graphics/wkhtmltopdf/default.nix      |  2 +-
 pkgs/tools/graphics/yafaray-core/default.nix     |  2 +-
 pkgs/tools/graphics/yaxg/default.nix             |  2 +-
 pkgs/tools/graphics/zxing/default.nix            |  2 +-
 .../fcitx-engines/fcitx-anthy/default.nix        |  4 ++--
 .../fcitx-engines/fcitx-chewing/default.nix      |  4 ++--
 .../fcitx-engines/fcitx-cloudpinyin/default.nix  |  4 ++--
 .../fcitx-engines/fcitx-hangul/default.nix       |  4 ++--
 .../fcitx-engines/fcitx-libpinyin/default.nix    |  4 ++--
 .../fcitx-engines/fcitx-m17n/default.nix         |  4 ++--
 .../fcitx-engines/fcitx-rime/default.nix         |  4 ++--
 .../fcitx-engines/fcitx-skk/default.nix          |  2 +-
 .../fcitx-engines/fcitx-table-extra/default.nix  |  4 ++--
 .../fcitx-engines/fcitx-table-other/default.nix  |  4 ++--
 .../fcitx-engines/fcitx-unikey/default.nix       |  4 ++--
 pkgs/tools/inputmethods/fcitx/unwrapped.nix      |  2 +-
 .../ibus-engines/ibus-anthy/default.nix          |  4 ++--
 .../ibus-engines/ibus-hangul/default.nix         |  4 ++--
 .../ibus-engines/ibus-kkc/default.nix            |  3 +--
 .../ibus-engines/ibus-libpinyin/default.nix      |  2 +-
 .../ibus-engines/ibus-m17n/default.nix           |  2 +-
 .../ibus-engines/ibus-table-chinese/default.nix  |  2 +-
 .../ibus-engines/ibus-table-others/default.nix   |  4 ++--
 .../ibus-engines/ibus-table/default.nix          |  2 +-
 .../ibus-engines/ibus-uniemoji/default.nix       |  2 +-
 pkgs/tools/inputmethods/ibus/default.nix         |  4 ++--
 pkgs/tools/inputmethods/ibus/ibus-qt.nix         |  4 ++--
 pkgs/tools/inputmethods/keyfuzz/default.nix      |  2 +-
 .../inputmethods/libinput-gestures/default.nix   |  1 -
 pkgs/tools/inputmethods/libkkc/default.nix       |  3 +--
 .../tools/inputmethods/skk/skk-dicts/default.nix |  2 +-
 pkgs/tools/inputmethods/skk/skktools/default.nix |  2 +-
 .../tegaki-zinnia-japanese/default.nix           |  2 +-
 pkgs/tools/inputmethods/touchegg/default.nix     |  4 ++--
 pkgs/tools/inputmethods/triggerhappy/default.nix |  2 +-
 pkgs/tools/inputmethods/uim/default.nix          |  2 +-
 pkgs/tools/inputmethods/zinnia/default.nix       |  2 +-
 pkgs/tools/misc/0x0/default.nix                  |  2 +-
 pkgs/tools/misc/aescrypt/default.nix             |  4 ++--
 pkgs/tools/misc/alarm-clock-applet/default.nix   |  2 +-
 pkgs/tools/misc/antimicro/default.nix            |  2 +-
 pkgs/tools/misc/argtable/default.nix             |  2 +-
 pkgs/tools/misc/arp-scan/default.nix             |  2 +-
 pkgs/tools/misc/aspcud/default.nix               |  2 +-
 pkgs/tools/misc/autojump/default.nix             |  2 +-
 pkgs/tools/misc/automirror/default.nix           |  1 -
 pkgs/tools/misc/autorevision/default.nix         |  2 +-
 pkgs/tools/misc/azure-vhd-utils/default.nix      |  2 +-
 pkgs/tools/misc/bandwidth/default.nix            |  4 ++--
 pkgs/tools/misc/bbe/default.nix                  |  2 +-
 pkgs/tools/misc/bibtex2html/default.nix          |  2 +-
 pkgs/tools/misc/bibtool/default.nix              |  2 +-
 pkgs/tools/misc/bibutils/default.nix             |  2 +-
 pkgs/tools/misc/blink1-tool/default.nix          |  2 +-
 pkgs/tools/misc/blsd/default.nix                 |  2 +-
 pkgs/tools/misc/bmon/default.nix                 |  2 +-
 pkgs/tools/misc/calamares/default.nix            |  3 +--
 pkgs/tools/misc/capture/default.nix              |  2 +-
 pkgs/tools/misc/chelf/default.nix                |  2 +-
 pkgs/tools/misc/chezmoi/default.nix              |  2 +-
 pkgs/tools/misc/cht.sh/default.nix               |  2 +-
 pkgs/tools/misc/ckb-next/default.nix             |  2 +-
 pkgs/tools/misc/clac/default.nix                 |  1 -
 pkgs/tools/misc/clex/default.nix                 |  4 ++--
 pkgs/tools/misc/clipnotify/default.nix           |  2 +-
 pkgs/tools/misc/clipster/default.nix             |  2 +-
 pkgs/tools/misc/cloc/default.nix                 |  2 +-
 pkgs/tools/misc/cloud-sql-proxy/default.nix      |  2 +-
 pkgs/tools/misc/cloud-utils/default.nix          |  2 +-
 pkgs/tools/misc/colord-kde/default.nix           |  4 ++--
 pkgs/tools/misc/contacts/default.nix             |  2 +-
 pkgs/tools/misc/cowsay/default.nix               |  2 +-
 pkgs/tools/misc/cpulimit/default.nix             |  4 ++--
 pkgs/tools/misc/cpuminer/default.nix             |  4 ++--
 pkgs/tools/misc/crex/default.nix                 |  1 -
 pkgs/tools/misc/cunit/default.nix                |  4 ++--
 pkgs/tools/misc/cutecom/default.nix              |  2 +-
 pkgs/tools/misc/dashing/default.nix              |  2 +-
 pkgs/tools/misc/datamash/default.nix             |  4 ++--
 pkgs/tools/misc/dateutils/default.nix            |  4 ++--
 pkgs/tools/misc/dbus-map/default.nix             |  2 +-
 pkgs/tools/misc/ddcutil/default.nix              |  2 +-
 pkgs/tools/misc/debian-devscripts/default.nix    |  2 +-
 pkgs/tools/misc/ding-libs/default.nix            |  2 +-
 pkgs/tools/misc/direnv/default.nix               |  2 +-
 pkgs/tools/misc/diskscan/default.nix             |  2 +-
 pkgs/tools/misc/docbook2mdoc/default.nix         |  4 ++--
 pkgs/tools/misc/docker-ls/default.nix            |  2 +-
 pkgs/tools/misc/docui/default.nix                |  2 +-
 pkgs/tools/misc/dtach/default.nix                |  4 ++--
 pkgs/tools/misc/duc/default.nix                  |  2 +-
 pkgs/tools/misc/dumptorrent/default.nix          |  2 +-
 pkgs/tools/misc/dynamic-colors/default.nix       |  2 +-
 pkgs/tools/misc/emv/default.nix                  |  2 +-
 pkgs/tools/misc/entr/default.nix                 |  4 ++--
 pkgs/tools/misc/envdir-go/default.nix            |  2 +-
 pkgs/tools/misc/envsubst/default.nix             |  2 +-
 pkgs/tools/misc/eot-utilities/default.nix        |  1 -
 pkgs/tools/misc/esptool-ck/default.nix           |  2 +-
 pkgs/tools/misc/ethtool/default.nix              |  4 ++--
 pkgs/tools/misc/expect/default.nix               |  2 +-
 pkgs/tools/misc/fdupes/default.nix               |  2 +-
 pkgs/tools/misc/file/default.nix                 |  6 +++---
 pkgs/tools/misc/filebench/default.nix            |  4 ++--
 pkgs/tools/misc/flashrom/default.nix             |  2 +-
 pkgs/tools/misc/fltrdr/default.nix               |  2 +-
 pkgs/tools/misc/fondu/default.nix                |  2 +-
 pkgs/tools/misc/fpart/default.nix                |  4 ++--
 pkgs/tools/misc/fpp/default.nix                  |  2 +-
 pkgs/tools/misc/fsmark/default.nix               |  2 +-
 pkgs/tools/misc/fsmon/default.nix                |  2 +-
 pkgs/tools/misc/fsql/default.nix                 |  2 +-
 pkgs/tools/misc/fwup/default.nix                 |  2 +-
 pkgs/tools/misc/fzy/default.nix                  |  2 +-
 pkgs/tools/misc/gams/default.nix                 |  2 +-
 pkgs/tools/misc/gawp/default.nix                 |  2 +-
 pkgs/tools/misc/gbdfed/default.nix               |  4 ++--
 pkgs/tools/misc/geekbench/default.nix            |  2 +-
 pkgs/tools/misc/geteltorito/default.nix          |  2 +-
 pkgs/tools/misc/gibo/default.nix                 |  2 +-
 pkgs/tools/misc/git-town/default.nix             |  2 +-
 pkgs/tools/misc/gnokii/default.nix               |  4 ++--
 pkgs/tools/misc/goaccess/default.nix             |  2 +-
 pkgs/tools/misc/gosu/default.nix                 |  2 +-
 pkgs/tools/misc/graylog/default.nix              |  2 +-
 pkgs/tools/misc/grc/default.nix                  |  2 +-
 pkgs/tools/misc/grub4dos/default.nix             |  2 +-
 pkgs/tools/misc/gsmartcontrol/default.nix        |  2 +-
 pkgs/tools/misc/gti/default.nix                  |  2 +-
 pkgs/tools/misc/h5utils/default.nix              |  2 +-
 pkgs/tools/misc/hakuneko/default.nix             |  2 +-
 pkgs/tools/misc/hdf4/default.nix                 |  2 +-
 pkgs/tools/misc/hdf5/1_8.nix                     |  4 ++--
 pkgs/tools/misc/hdf5/default.nix                 |  4 ++--
 pkgs/tools/misc/hdfjava/default.nix              |  2 +-
 pkgs/tools/misc/hdfview/default.nix              |  4 ++--
 pkgs/tools/misc/hebcal/default.nix               |  2 +-
 pkgs/tools/misc/hexd/default.nix                 |  2 +-
 pkgs/tools/misc/hhpc/default.nix                 |  2 +-
 pkgs/tools/misc/hostsblock/default.nix           |  2 +-
 pkgs/tools/misc/hpl/default.nix                  |  4 ++--
 pkgs/tools/misc/i3cat/default.nix                |  2 +-
 pkgs/tools/misc/i3minator/default.nix            |  2 +-
 pkgs/tools/misc/ical2org/default.nix             |  2 +-
 pkgs/tools/misc/ideviceinstaller/default.nix     |  2 --
 pkgs/tools/misc/ifdtool/default.nix              |  2 +-
 pkgs/tools/misc/intelmetool/default.nix          |  2 +-
 pkgs/tools/misc/ipad_charge/default.nix          |  2 +-
 pkgs/tools/misc/ised/default.nix                 |  4 ++--
 pkgs/tools/misc/jdupes/default.nix               |  2 +-
 pkgs/tools/misc/keychain/default.nix             |  2 +-
 pkgs/tools/misc/kt/default.nix                   |  2 +-
 pkgs/tools/misc/latex2html/default.nix           |  2 +-
 pkgs/tools/misc/ldapvi/default.nix               |  2 +-
 pkgs/tools/misc/ldmtool/default.nix              |  2 +-
 pkgs/tools/misc/lf/default.nix                   |  2 +-
 pkgs/tools/misc/libcpuid/default.nix             |  2 +-
 pkgs/tools/misc/linuxquota/default.nix           |  2 +-
 pkgs/tools/misc/logstash/5.x.nix                 |  4 ++--
 pkgs/tools/misc/logstash/contrib.nix             |  2 +-
 pkgs/tools/misc/ltunify/default.nix              |  2 +-
 pkgs/tools/misc/mandoc/default.nix               |  2 +-
 pkgs/tools/misc/massren/default.nix              |  2 +-
 pkgs/tools/misc/mbuffer/default.nix              |  2 +-
 pkgs/tools/misc/mc/default.nix                   |  4 ++--
 pkgs/tools/misc/mcrypt/default.nix               |  4 ++--
 pkgs/tools/misc/megacli/default.nix              |  2 +-
 pkgs/tools/misc/mht2htm/default.nix              |  2 +-
 pkgs/tools/misc/minicom/default.nix              |  2 +-
 pkgs/tools/misc/ministat/default.nix             |  2 +-
 pkgs/tools/misc/mktorrent/default.nix            |  2 +-
 pkgs/tools/misc/mlocate/default.nix              |  4 ++--
 pkgs/tools/misc/mmake/default.nix                |  2 +-
 pkgs/tools/misc/mmv/default.nix                  |  2 +-
 pkgs/tools/misc/mongodb-tools/default.nix        |  2 +-
 pkgs/tools/misc/moreutils/default.nix            |  2 +-
 pkgs/tools/misc/mpdscribble/default.nix          |  2 +-
 pkgs/tools/misc/mprime/default.nix               |  2 +-
 pkgs/tools/misc/mrtg/default.nix                 |  4 ++--
 pkgs/tools/misc/ms-sys/default.nix               |  4 ++--
 pkgs/tools/misc/multitail/default.nix            |  4 ++--
 pkgs/tools/misc/mysqltuner/default.nix           |  2 +-
 pkgs/tools/misc/nagstamon/default.nix            |  2 +-
 pkgs/tools/misc/nbench/default.nix               |  4 ++--
 pkgs/tools/misc/ncdu/default.nix                 |  4 ++--
 pkgs/tools/misc/neofetch/default.nix             |  2 +-
 .../misc/nginx-config-formatter/default.nix      |  2 +-
 pkgs/tools/misc/nms/default.nix                  |  2 +-
 pkgs/tools/misc/noteshrink/default.nix           |  2 +-
 pkgs/tools/misc/noti/default.nix                 |  2 +-
 pkgs/tools/misc/notify-desktop/default.nix       |  2 +-
 pkgs/tools/misc/nvramtool/default.nix            |  2 +-
 pkgs/tools/misc/oci-image-tool/default.nix       |  2 +-
 pkgs/tools/misc/ocz-ssd-guru/default.nix         |  2 +-
 pkgs/tools/misc/opentsdb/default.nix             |  4 ++--
 pkgs/tools/misc/os-prober/default.nix            |  2 +-
 pkgs/tools/misc/osm2pgsql/default.nix            |  2 +-
 pkgs/tools/misc/otfcc/default.nix                |  2 +-
 pkgs/tools/misc/parcellite/default.nix           |  2 +-
 pkgs/tools/misc/pastebinit/default.nix           |  4 ++--
 pkgs/tools/misc/pb_cli/default.nix               |  2 +-
 pkgs/tools/misc/phoronix-test-suite/default.nix  |  4 ++--
 pkgs/tools/misc/phraseapp-client/default.nix     |  2 +-
 pkgs/tools/misc/pick/default.nix                 |  2 +-
 pkgs/tools/misc/picocom/default.nix              |  2 +-
 pkgs/tools/misc/pipelight/default.nix            |  2 +-
 pkgs/tools/misc/pixd/default.nix                 |  2 +-
 pkgs/tools/misc/plantuml/default.nix             |  2 +-
 pkgs/tools/misc/plotinus/default.nix             |  2 +-
 pkgs/tools/misc/plowshare/default.nix            |  2 +-
 pkgs/tools/misc/pod2mdoc/default.nix             |  4 ++--
 pkgs/tools/misc/powerline-go/default.nix         |  1 -
 pkgs/tools/misc/profile-cleaner/default.nix      |  2 +-
 pkgs/tools/misc/profile-sync-daemon/default.nix  |  2 +-
 pkgs/tools/misc/progress/default.nix             |  2 +-
 pkgs/tools/misc/pspg/default.nix                 |  2 +-
 pkgs/tools/misc/radeon-profile/default.nix       |  2 +-
 pkgs/tools/misc/rcm/default.nix                  |  2 +-
 pkgs/tools/misc/recoverjpeg/default.nix          |  4 ++--
 pkgs/tools/misc/rig/default.nix                  |  2 +-
 pkgs/tools/misc/rlwrap/default.nix               |  4 ++--
 pkgs/tools/misc/rmlint/default.nix               |  2 +-
 pkgs/tools/misc/rockbox-utility/default.nix      |  2 +-
 pkgs/tools/misc/roundup/default.nix              |  2 +-
 pkgs/tools/misc/routino/default.nix              |  4 ++--
 pkgs/tools/misc/rw/default.nix                   |  2 +-
 pkgs/tools/misc/sam-ba/default.nix               |  2 +-
 pkgs/tools/misc/scanmem/default.nix              |  2 +-
 pkgs/tools/misc/scfbuild/default.nix             |  2 +-
 pkgs/tools/misc/screen/default.nix               |  4 ++--
 pkgs/tools/misc/screenfetch/default.nix          |  2 +-
 pkgs/tools/misc/sdate/default.nix                |  2 +-
 pkgs/tools/misc/sdl-jstest/default.nix           |  2 +-
 pkgs/tools/misc/sl/default.nix                   |  2 +-
 pkgs/tools/misc/slop/default.nix                 |  2 +-
 pkgs/tools/misc/smenu/default.nix                |  2 +-
 pkgs/tools/misc/snapper/default.nix              |  2 +-
 pkgs/tools/misc/sonota/default.nix               |  2 +-
 pkgs/tools/misc/staruml/default.nix              |  2 +-
 pkgs/tools/misc/subberthehut/default.nix         |  2 +-
 pkgs/tools/misc/sutils/default.nix               |  2 +-
 pkgs/tools/misc/svtplay-dl/default.nix           |  2 +-
 pkgs/tools/misc/sweep-visualizer/default.nix     |  2 +-
 .../tools/misc/system-config-printer/default.nix |  4 ++--
 pkgs/tools/misc/systrayhelper/default.nix        |  2 +-
 pkgs/tools/misc/teleconsole/default.nix          |  2 +-
 pkgs/tools/misc/tewisay/default.nix              |  2 +-
 pkgs/tools/misc/texi2mdoc/default.nix            |  4 ++--
 .../misc/thin-provisioning-tools/default.nix     |  2 +-
 pkgs/tools/misc/time/default.nix                 |  4 ++--
 pkgs/tools/misc/tio/default.nix                  |  2 +-
 pkgs/tools/misc/tldr/default.nix                 |  2 +-
 pkgs/tools/misc/tlp/default.nix                  |  2 +-
 pkgs/tools/misc/tmate/default.nix                |  2 +-
 pkgs/tools/misc/togglesg-download/default.nix    |  2 +-
 pkgs/tools/misc/toilet/default.nix               |  4 ++--
 pkgs/tools/misc/toybox/default.nix               |  1 -
 pkgs/tools/misc/ttfautohint/default.nix          |  4 ++--
 pkgs/tools/misc/ttwatch/default.nix              |  2 +-
 pkgs/tools/misc/tty-clock/default.nix            |  2 +-
 pkgs/tools/misc/ttylog/default.nix               |  2 +-
 pkgs/tools/misc/ttyplot/default.nix              |  2 +-
 pkgs/tools/misc/ttyrec/default.nix               |  4 ++--
 pkgs/tools/misc/txt2man/default.nix              |  4 ++--
 pkgs/tools/misc/txtw/default.nix                 |  2 +-
 pkgs/tools/misc/ultrastar-creator/default.nix    |  2 +-
 pkgs/tools/misc/umlet/default.nix                |  2 +-
 pkgs/tools/misc/units/default.nix                |  4 ++--
 pkgs/tools/misc/up/default.nix                   |  2 +-
 pkgs/tools/misc/upower-notify/default.nix        |  2 +-
 pkgs/tools/misc/urjtag/default.nix               |  2 +-
 pkgs/tools/misc/vfdecrypt/default.nix            |  2 +-
 pkgs/tools/misc/vimer/default.nix                |  2 +-
 pkgs/tools/misc/vimpager/build.nix               |  2 +-
 pkgs/tools/misc/wakatime/default.nix             |  2 +-
 pkgs/tools/misc/wl-clipboard/default.nix         |  2 +-
 pkgs/tools/misc/woeusb/default.nix               |  2 +-
 pkgs/tools/misc/woof/default.nix                 |  2 +-
 pkgs/tools/misc/wv/default.nix                   |  3 +--
 pkgs/tools/misc/wyrd/default.nix                 |  2 +-
 pkgs/tools/misc/xclip/default.nix                |  2 +-
 pkgs/tools/misc/xdaliclock/default.nix           |  4 ++--
 pkgs/tools/misc/xdo/default.nix                  |  2 +-
 pkgs/tools/misc/xflux/gui.nix                    |  2 +-
 pkgs/tools/misc/xiccd/default.nix                |  2 +-
 pkgs/tools/misc/xmonad-log/default.nix           |  2 +-
 pkgs/tools/misc/xsel/default.nix                 |  2 +-
 pkgs/tools/misc/yle-dl/default.nix               |  2 +-
 .../misc/yubikey-personalization/default.nix     |  2 +-
 pkgs/tools/misc/zabbix-cli/default.nix           |  2 +-
 pkgs/tools/misc/zsh-autoenv/default.nix          |  2 +-
 pkgs/tools/misc/zsh-navigation-tools/default.nix |  2 +-
 pkgs/tools/networking/acme-client/default.nix    |  2 +-
 pkgs/tools/networking/argus-clients/default.nix  |  3 +--
 pkgs/tools/networking/argus/default.nix          |  3 +--
 pkgs/tools/networking/aria2/default.nix          |  2 +-
 pkgs/tools/networking/arping/default.nix         |  2 +-
 pkgs/tools/networking/assh/default.nix           |  2 +-
 pkgs/tools/networking/asynk/default.nix          |  4 ++--
 pkgs/tools/networking/atftp/default.nix          |  4 ++--
 pkgs/tools/networking/biosdevname/default.nix    |  2 +-
 pkgs/tools/networking/bud/default.nix            |  2 +-
 pkgs/tools/networking/bully/default.nix          |  2 +-
 pkgs/tools/networking/ccnet/default.nix          |  2 +-
 pkgs/tools/networking/chrony/default.nix         |  4 ++--
 pkgs/tools/networking/cmst/default.nix           |  4 ++--
 pkgs/tools/networking/cntlm/default.nix          |  4 ++--
 pkgs/tools/networking/connect/default.nix        |  2 +-
 .../networking/connman/connman-gtk/default.nix   |  2 +-
 .../connman/connman-ncurses/default.nix          |  2 +-
 .../connman/connman-notify/default.nix           |  2 +-
 .../networking/connman/connman_dmenu/default.nix |  2 +-
 .../networking/connman/connmanui/default.nix     |  2 +-
 pkgs/tools/networking/connman/default.nix        |  4 ++--
 pkgs/tools/networking/darkstat/default.nix       |  4 ++--
 pkgs/tools/networking/davix/default.nix          |  2 +-
 pkgs/tools/networking/dd-agent/5.nix             |  2 +-
 pkgs/tools/networking/dd-agent/datadog-agent.nix |  2 +-
 .../dd-agent/datadog-process-agent.nix           |  2 +-
 pkgs/tools/networking/dhcp/default.nix           |  4 ++--
 pkgs/tools/networking/dhcping/default.nix        |  2 +-
 pkgs/tools/networking/dibbler/default.nix        |  4 ++--
 pkgs/tools/networking/dirb/default.nix           |  2 +-
 .../networking/dnscrypt-proxy/1.x/default.nix    |  4 ++--
 .../networking/dnscrypt-wrapper/default.nix      |  2 +-
 pkgs/tools/networking/dnsperf/default.nix        |  2 +-
 pkgs/tools/networking/driftnet/default.nix       |  2 +-
 pkgs/tools/networking/eggdrop/default.nix        |  2 +-
 pkgs/tools/networking/envoy/default.nix          |  2 +-
 .../networking/eternal-terminal/default.nix      |  2 +-
 pkgs/tools/networking/fakeroute/default.nix      |  4 ++--
 pkgs/tools/networking/fastd/default.nix          |  2 +-
 pkgs/tools/networking/ferm/default.nix           |  2 +-
 pkgs/tools/networking/flannel/default.nix        |  2 +-
 pkgs/tools/networking/freebind/default.nix       |  2 +-
 pkgs/tools/networking/gmvault/default.nix        |  4 ++--
 pkgs/tools/networking/goklp/default.nix          |  2 +-
 pkgs/tools/networking/grpcurl/default.nix        |  2 +-
 pkgs/tools/networking/gvpe/default.nix           |  2 +-
 pkgs/tools/networking/hans/default.nix           |  2 +-
 pkgs/tools/networking/haproxy/default.nix        |  3 +--
 pkgs/tools/networking/horst/default.nix          |  2 +-
 pkgs/tools/networking/hping/default.nix          |  2 +-
 pkgs/tools/networking/htpdate/default.nix        |  4 ++--
 pkgs/tools/networking/http-prompt/default.nix    |  1 -
 pkgs/tools/networking/httperf/default.nix        |  1 -
 pkgs/tools/networking/httping/default.nix        |  4 ++--
 pkgs/tools/networking/httplab/default.nix        |  2 +-
 pkgs/tools/networking/httpstat/default.nix       |  1 -
 pkgs/tools/networking/httptunnel/default.nix     |  4 ++--
 pkgs/tools/networking/i2p/default.nix            |  2 +-
 pkgs/tools/networking/i2pd/default.nix           |  2 --
 pkgs/tools/networking/ifstat-legacy/default.nix  |  2 +-
 pkgs/tools/networking/inadyn/default.nix         |  2 +-
 pkgs/tools/networking/iouyap/default.nix         |  1 -
 pkgs/tools/networking/ip2location/default.nix    |  2 +-
 pkgs/tools/networking/ip2unix/default.nix        |  2 +-
 pkgs/tools/networking/ipcalc/default.nix         |  4 ++--
 pkgs/tools/networking/ipv6calc/default.nix       |  4 ++--
 pkgs/tools/networking/kail/default.nix           |  2 +-
 pkgs/tools/networking/kea/default.nix            |  3 +--
 pkgs/tools/networking/keepalived/default.nix     |  2 +-
 pkgs/tools/networking/lftp/default.nix           |  8 ++++----
 pkgs/tools/networking/lldpd/default.nix          |  4 ++--
 .../tools/networking/logmein-hamachi/default.nix |  4 ++--
 pkgs/tools/networking/maxscale/default.nix       |  4 ++--
 pkgs/tools/networking/mcrcon/default.nix         |  2 +-
 pkgs/tools/networking/megatools/default.nix      |  2 +-
 .../networking/memtier-benchmark/default.nix     |  2 +-
 pkgs/tools/networking/minio-client/default.nix   |  2 +-
 pkgs/tools/networking/minissdpd/default.nix      |  6 +++---
 pkgs/tools/networking/miredo/default.nix         |  2 +-
 pkgs/tools/networking/mu/default.nix             |  2 +-
 pkgs/tools/networking/nat-traverse/default.nix   |  2 +-
 pkgs/tools/networking/ncftp/default.nix          |  2 +-
 pkgs/tools/networking/ndjbdns/default.nix        |  2 +-
 pkgs/tools/networking/netalyzr/default.nix       |  2 +-
 pkgs/tools/networking/nethogs/default.nix        |  2 +-
 pkgs/tools/networking/netmask/default.nix        |  2 +-
 pkgs/tools/networking/netrw/default.nix          |  2 +-
 pkgs/tools/networking/netselect/default.nix      |  4 ++--
 .../networking/network-manager/0.9.8/default.nix |  2 +-
 .../tools/networking/network-manager/default.nix |  2 +-
 pkgs/tools/networking/network-manager/dmenu.nix  |  2 +-
 .../networking/network-manager/strongswan.nix    |  3 +--
 pkgs/tools/networking/ngrep/default.nix          |  2 +-
 pkgs/tools/networking/ngrok-1/default.nix        |  2 +-
 pkgs/tools/networking/nss-pam-ldapd/default.nix  |  4 ++--
 pkgs/tools/networking/nuttcp/default.nix         | 10 +++++-----
 pkgs/tools/networking/nzbget/default.nix         |  2 +-
 pkgs/tools/networking/ocproxy/default.nix        |  2 +-
 pkgs/tools/networking/ocserv/default.nix         |  2 +-
 pkgs/tools/networking/olsrd/default.nix          |  4 ++--
 pkgs/tools/networking/openconnect_pa/default.nix |  2 +-
 pkgs/tools/networking/openntpd/default.nix       |  4 ++--
 pkgs/tools/networking/openresolv/default.nix     |  4 ++--
 pkgs/tools/networking/opensm/default.nix         |  2 +-
 pkgs/tools/networking/openssh/default.nix        |  4 ++--
 pkgs/tools/networking/openvpn/default.nix        |  4 ++--
 pkgs/tools/networking/p2p/tahoe-lafs/default.nix |  6 +++---
 pkgs/tools/networking/packetdrill/default.nix    |  2 +-
 pkgs/tools/networking/pacparser/default.nix      |  4 ++--
 pkgs/tools/networking/par2cmdline/default.nix    |  2 +-
 pkgs/tools/networking/pcapc/default.nix          |  2 +-
 pkgs/tools/networking/philter/default.nix        |  4 ++--
 pkgs/tools/networking/pingtcp/default.nix        |  2 +-
 pkgs/tools/networking/pixiewps/default.nix       |  2 +-
 pkgs/tools/networking/polysh/default.nix         |  4 ++--
 pkgs/tools/networking/ppp/default.nix            |  4 ++--
 pkgs/tools/networking/pptpd/default.nix          |  3 +--
 pkgs/tools/networking/privoxy/default.nix        |  4 ++--
 pkgs/tools/networking/proxychains/default.nix    |  4 ++--
 pkgs/tools/networking/pssh/default.nix           |  2 +-
 pkgs/tools/networking/pykms/default.nix          |  2 +-
 .../tools/networking/qr-filetransfer/default.nix |  2 +-
 pkgs/tools/networking/quicktun/default.nix       |  2 +-
 pkgs/tools/networking/radsecproxy/default.nix    |  2 +-
 pkgs/tools/networking/radvd/default.nix          |  4 ++--
 pkgs/tools/networking/ratools/default.nix        |  2 +-
 pkgs/tools/networking/reaver-wps/default.nix     |  4 ++--
 pkgs/tools/networking/redir/default.nix          |  2 +-
 pkgs/tools/networking/ripmime/default.nix        |  3 +--
 pkgs/tools/networking/s3gof3r/default.nix        |  2 +-
 pkgs/tools/networking/samplicator/default.nix    |  2 +-
 pkgs/tools/networking/shncpd/default.nix         |  2 +-
 pkgs/tools/networking/simpleproxy/default.nix    |  2 +-
 pkgs/tools/networking/sipcalc/default.nix        |  4 ++--
 pkgs/tools/networking/sipsak/default.nix         |  2 +-
 pkgs/tools/networking/skydive/default.nix        |  2 +-
 pkgs/tools/networking/slack-cli/default.nix      |  2 +-
 pkgs/tools/networking/slirp4netns/default.nix    |  2 +-
 pkgs/tools/networking/smokeping/default.nix      |  2 +-
 pkgs/tools/networking/snabb/default.nix          |  2 +-
 pkgs/tools/networking/spiped/default.nix         |  4 ++--
 pkgs/tools/networking/spoofer/default.nix        |  3 +--
 pkgs/tools/networking/ssh-ident/default.nix      |  2 +-
 pkgs/tools/networking/sshpass/default.nix        |  2 +-
 pkgs/tools/networking/ssldump/default.nix        |  2 +-
 pkgs/tools/networking/sstp/default.nix           |  2 +-
 pkgs/tools/networking/strongswan/default.nix     |  4 ++--
 pkgs/tools/networking/stubby/default.nix         |  1 -
 pkgs/tools/networking/stun/default.nix           |  1 -
 pkgs/tools/networking/stunnel/default.nix        |  4 ++--
 pkgs/tools/networking/subfinder/default.nix      |  2 +-
 .../tools/networking/swagger-codegen/default.nix |  1 -
 pkgs/tools/networking/swaks/default.nix          |  4 ++--
 pkgs/tools/networking/tcpdump/default.nix        |  2 +-
 pkgs/tools/networking/tcpreplay/default.nix      |  2 +-
 pkgs/tools/networking/tftp-hpa/default.nix       |  4 ++--
 pkgs/tools/networking/tinc/default.nix           |  2 +-
 pkgs/tools/networking/tinc/pre.nix               |  2 +-
 pkgs/tools/networking/tinyproxy/default.nix      |  2 +-
 pkgs/tools/networking/tracebox/default.nix       |  2 +-
 pkgs/tools/networking/traceroute/default.nix     |  4 ++--
 pkgs/tools/networking/twa/default.nix            |  2 +-
 pkgs/tools/networking/ua/default.nix             |  2 +-
 pkgs/tools/networking/ubridge/default.nix        |  2 +-
 .../tools/networking/uget-integrator/default.nix |  2 +-
 pkgs/tools/networking/uget/default.nix           |  4 ++--
 pkgs/tools/networking/unbound/default.nix        |  4 ++--
 pkgs/tools/networking/unbound/python.nix         |  1 -
 pkgs/tools/networking/wbox/default.nix           |  4 ++--
 pkgs/tools/networking/weighttp/default.nix       |  2 +-
 pkgs/tools/networking/wget/default.nix           |  4 ++--
 pkgs/tools/networking/whois/default.nix          |  2 +-
 pkgs/tools/networking/wicd/default.nix           |  4 ++--
 pkgs/tools/networking/wireguard-go/default.nix   |  2 +-
 pkgs/tools/networking/wolfebin/default.nix       |  2 +-
 pkgs/tools/networking/wrk/default.nix            |  2 +-
 pkgs/tools/networking/wrk2/default.nix           |  2 +-
 pkgs/tools/networking/wuzz/default.nix           |  2 +-
 pkgs/tools/networking/zap/default.nix            |  2 +-
 pkgs/tools/nix/nix-script/default.nix            |  2 +-
 .../package-management/apt-dater/default.nix     |  2 +-
 pkgs/tools/package-management/apt/default.nix    |  2 +-
 pkgs/tools/package-management/bunny/default.nix  |  2 +-
 pkgs/tools/package-management/cde/default.nix    |  2 +-
 pkgs/tools/package-management/clib/default.nix   |  2 +-
 .../package-management/createrepo_c/default.nix  |  2 +-
 pkgs/tools/package-management/dpkg/default.nix   |  2 +-
 pkgs/tools/package-management/gx/default.nix     |  2 +-
 pkgs/tools/package-management/gx/go/default.nix  |  2 +-
 .../package-management/home-manager/default.nix  |  2 +-
 .../tools/package-management/librepo/default.nix |  2 +-
 pkgs/tools/package-management/morph/default.nix  |  2 +-
 .../package-management/mynewt-newt/default.nix   |  2 +-
 .../package-management/nix-bundle/default.nix    |  1 -
 .../tools/package-management/nix-pin/default.nix |  2 +-
 .../package-management/nix-prefetch/default.nix  |  1 -
 .../tools/package-management/nix-top/default.nix |  2 +-
 .../package-management/nixops/nixops-dns.nix     |  2 +-
 pkgs/tools/package-management/nixui/default.nix  |  2 +-
 pkgs/tools/package-management/opkg/default.nix   |  2 +-
 .../package-management/packagekit/default.nix    |  2 +-
 pkgs/tools/package-management/packagekit/qt.nix  |  2 +-
 pkgs/tools/package-management/pacman/default.nix |  2 +-
 pkgs/tools/package-management/rpm/default.nix    |  2 +-
 pkgs/tools/security/2fa/default.nix              |  2 +-
 pkgs/tools/security/acsccid/default.nix          |  2 +-
 pkgs/tools/security/aespipe/default.nix          |  2 +-
 pkgs/tools/security/afl/default.nix              |  4 ++--
 pkgs/tools/security/afl/libdislocator.nix        |  2 +-
 pkgs/tools/security/aide/default.nix             |  4 ++--
 .../security/asc-key-to-qr-code-gif/default.nix  |  2 +-
 pkgs/tools/security/aws-okta/default.nix         |  2 +-
 pkgs/tools/security/b2sum/default.nix            |  2 +-
 .../tools/security/bash-supergenpass/default.nix |  2 +-
 pkgs/tools/security/bmrsa/11.nix                 |  2 +-
 pkgs/tools/security/bruteforce-luks/default.nix  |  2 +-
 pkgs/tools/security/ccid/default.nix             |  4 ++--
 pkgs/tools/security/certmgr/default.nix          |  2 +-
 pkgs/tools/security/certstrap/default.nix        |  2 +-
 pkgs/tools/security/cfssl/default.nix            |  2 +-
 pkgs/tools/security/chntpw/default.nix           |  2 +-
 .../security/chrome-token-signing/default.nix    |  2 +-
 pkgs/tools/security/cipherscan/default.nix       |  2 +-
 pkgs/tools/security/clamav/default.nix           |  4 ++--
 pkgs/tools/security/cowpatty/default.nix         |  4 ++--
 pkgs/tools/security/crackxls/default.nix         |  2 +-
 pkgs/tools/security/crunch/default.nix           |  4 ++--
 pkgs/tools/security/ctmg/default.nix             |  2 +-
 pkgs/tools/security/default.nix                  |  2 +-
 pkgs/tools/security/doas/default.nix             |  2 +-
 pkgs/tools/security/duo-unix/default.nix         |  2 +-
 pkgs/tools/security/ecdsautils/default.nix       |  2 +-
 pkgs/tools/security/ecryptfs/default.nix         |  2 +-
 pkgs/tools/security/ecryptfs/helper.nix          |  1 -
 pkgs/tools/security/efitools/default.nix         |  2 +-
 pkgs/tools/security/eid-mw/default.nix           |  2 +-
 pkgs/tools/security/enchive/default.nix          |  2 +-
 pkgs/tools/security/encryptr/default.nix         |  2 +-
 pkgs/tools/security/enpass/default.nix           |  2 +-
 pkgs/tools/security/eschalot/default.nix         |  1 -
 pkgs/tools/security/fcrackzip/default.nix        |  4 ++--
 pkgs/tools/security/fpm2/default.nix             |  2 +-
 pkgs/tools/security/fprot/default.nix            |  2 +-
 pkgs/tools/security/fwknop/default.nix           |  1 -
 pkgs/tools/security/gen-oath-safe/default.nix    |  2 +-
 pkgs/tools/security/gencfsm/default.nix          |  2 +-
 pkgs/tools/security/gnu-pw-mgr/default.nix       |  4 ++--
 pkgs/tools/security/gnupg/20.nix                 |  4 ++--
 pkgs/tools/security/gnupg/22.nix                 |  4 ++--
 pkgs/tools/security/gorilla-bin/default.nix      |  2 +-
 pkgs/tools/security/gpgstats/default.nix         |  4 ++--
 pkgs/tools/security/hash-slinger/default.nix     |  1 -
 pkgs/tools/security/hash_extender/default.nix    |  2 +-
 pkgs/tools/security/haveged/default.nix          |  2 +-
 pkgs/tools/security/ifdnfc/default.nix           |  2 +-
 pkgs/tools/security/john/default.nix             |  4 ++--
 pkgs/tools/security/keybase/default.nix          |  2 +-
 pkgs/tools/security/keybase/gui.nix              |  2 +-
 pkgs/tools/security/kpcli/default.nix            |  4 ++--
 pkgs/tools/security/libacr38u/default.nix        |  2 +-
 pkgs/tools/security/libmodsecurity/default.nix   |  2 +-
 pkgs/tools/security/logkeys/default.nix          |  2 +-
 pkgs/tools/security/lynis/default.nix            |  1 -
 pkgs/tools/security/masscan/default.nix          |  2 +-
 pkgs/tools/security/metasploit/default.nix       |  2 +-
 pkgs/tools/security/mfcuk/default.nix            |  2 +-
 pkgs/tools/security/minisign/default.nix         |  2 +-
 pkgs/tools/security/mkp224o/default.nix          |  2 +-
 pkgs/tools/security/modsecurity/default.nix      |  4 ++--
 pkgs/tools/security/monkeysphere/default.nix     |  2 +-
 pkgs/tools/security/nasty/default.nix            |  4 ++--
 pkgs/tools/security/neopg/default.nix            |  2 +-
 pkgs/tools/security/nitrokey-app/default.nix     |  2 +-
 pkgs/tools/security/nmap/qt.nix                  |  2 +-
 pkgs/tools/security/notary/default.nix           |  2 +-
 pkgs/tools/security/nsjail/default.nix           |  2 +-
 pkgs/tools/security/nwipe/default.nix            |  2 +-
 pkgs/tools/security/omapd/default.nix            |  4 ++--
 pkgs/tools/security/onioncircuits/default.nix    |  2 +-
 pkgs/tools/security/opencryptoki/default.nix     |  2 +-
 pkgs/tools/security/opensc/default.nix           |  2 +-
 pkgs/tools/security/p0f/default.nix              |  4 ++--
 pkgs/tools/security/paperkey/default.nix         |  4 ++--
 pkgs/tools/security/pass/default.nix             |  4 ++--
 pkgs/tools/security/pass/extensions/audit.nix    |  2 +-
 .../tools/security/pass/extensions/genphrase.nix |  2 +-
 pkgs/tools/security/pass/extensions/import.nix   |  2 +-
 pkgs/tools/security/pass/extensions/otp.nix      |  2 +-
 pkgs/tools/security/pass/extensions/tomb.nix     |  2 +-
 pkgs/tools/security/pass/extensions/update.nix   |  2 +-
 pkgs/tools/security/pass/rofi-pass.nix           |  2 +-
 pkgs/tools/security/pcsc-cyberjack/default.nix   |  2 +-
 pkgs/tools/security/pcsc-scm-scl011/default.nix  |  2 +-
 pkgs/tools/security/pcsclite/default.nix         |  2 +-
 pkgs/tools/security/pdfcrack/default.nix         |  2 +-
 pkgs/tools/security/pgpdump/default.nix          |  2 +-
 pkgs/tools/security/prey/default.nix             |  2 +-
 pkgs/tools/security/qdigidoc/default.nix         |  2 +-
 pkgs/tools/security/qesteidutil/default.nix      |  2 +-
 pkgs/tools/security/rarcrack/default.nix         |  2 +-
 pkgs/tools/security/rhash/default.nix            |  2 +-
 pkgs/tools/security/sbsigntool/default.nix       |  2 +-
 pkgs/tools/security/scallion/default.nix         |  2 +-
 pkgs/tools/security/scrypt/default.nix           |  4 ++--
 pkgs/tools/security/seccure/default.nix          |  4 ++--
 pkgs/tools/security/secp256k1/default.nix        |  2 +-
 pkgs/tools/security/sedutil/default.nix          |  2 +-
 .../security/sha1collisiondetection/default.nix  |  2 +-
 pkgs/tools/security/shc/default.nix              |  2 +-
 pkgs/tools/security/signify/default.nix          |  2 +-
 pkgs/tools/security/signing-party/default.nix    |  1 -
 pkgs/tools/security/simple-tpm-pk11/default.nix  |  2 +-
 pkgs/tools/security/softhsm/default.nix          |  4 ++--
 .../spectre-meltdown-checker/default.nix         |  2 +-
 pkgs/tools/security/ssdeep/default.nix           |  2 +-
 pkgs/tools/security/sshguard/default.nix         |  4 ++--
 pkgs/tools/security/sslscan/default.nix          |  2 +-
 pkgs/tools/security/steghide/default.nix         |  2 +-
 pkgs/tools/security/stoken/default.nix           |  1 -
 pkgs/tools/security/stricat/default.nix          |  4 ++--
 pkgs/tools/security/su-exec/default.nix          |  2 +-
 pkgs/tools/security/sudolikeaboss/default.nix    |  2 +-
 pkgs/tools/security/tboot/default.nix            |  4 ++--
 pkgs/tools/security/tcpcrypt/default.nix         |  2 +-
 pkgs/tools/security/thc-hydra/default.nix        |  2 +-
 pkgs/tools/security/tor/tor-arm.nix              |  2 +-
 pkgs/tools/security/tor/torsocks.nix             |  2 +-
 pkgs/tools/security/tpm-luks/default.nix         |  2 +-
 pkgs/tools/security/tpm-quote-tools/default.nix  |  4 ++--
 pkgs/tools/security/trousers/default.nix         |  4 ++--
 pkgs/tools/security/vault/default.nix            |  2 +-
 pkgs/tools/security/volatility/default.nix       |  4 ++--
 pkgs/tools/security/wipe/default.nix             |  4 ++--
 pkgs/tools/security/yara/default.nix             |  2 +-
 pkgs/tools/system/amtterm/default.nix            |  4 ++--
 pkgs/tools/system/at/default.nix                 |  2 +-
 pkgs/tools/system/augeas/default.nix             |  4 ++--
 pkgs/tools/system/bfs/default.nix                |  2 +-
 pkgs/tools/system/bootchart/default.nix          |  2 +-
 pkgs/tools/system/chase/default.nix              |  2 +-
 pkgs/tools/system/collectd/data.nix              |  2 +-
 pkgs/tools/system/collectd/default.nix           |  4 ++--
 pkgs/tools/system/confd/default.nix              |  2 +-
 pkgs/tools/system/consul-template/default.nix    |  2 +-
 pkgs/tools/system/daemonize/default.nix          |  2 +-
 pkgs/tools/system/das_watchdog/default.nix       |  2 +-
 pkgs/tools/system/datefudge/default.nix          |  1 -
 pkgs/tools/system/dd_rescue/default.nix          |  4 ++--
 pkgs/tools/system/ddrutility/default.nix         |  4 ++--
 pkgs/tools/system/dfc/default.nix                |  4 ++--
 pkgs/tools/system/di/default.nix                 |  4 ++--
 pkgs/tools/system/efibootmgr/default.nix         |  2 +-
 pkgs/tools/system/efivar/default.nix             |  2 +-
 pkgs/tools/system/envconsul/default.nix          |  2 +-
 pkgs/tools/system/evemu/default.nix              |  2 +-
 pkgs/tools/system/facter/default.nix             |  2 +-
 pkgs/tools/system/fakeroot/default.nix           |  4 ++--
 pkgs/tools/system/fcron/default.nix              |  4 ++--
 pkgs/tools/system/fio/default.nix                |  2 +-
 pkgs/tools/system/foremost/default.nix           |  4 ++--
 pkgs/tools/system/freeipmi/default.nix           |  4 ++--
 pkgs/tools/system/gohai/default.nix              |  2 +-
 pkgs/tools/system/goreman/default.nix            |  2 +-
 pkgs/tools/system/gptfdisk/default.nix           |  4 ++--
 pkgs/tools/system/hardinfo/default.nix           |  2 +-
 pkgs/tools/system/hardlink/default.nix           |  2 +-
 pkgs/tools/system/htop/default.nix               |  4 ++--
 pkgs/tools/system/hwinfo/default.nix             |  2 +-
 pkgs/tools/system/illum/default.nix              |  2 +-
 pkgs/tools/system/inxi/default.nix               |  2 +-
 pkgs/tools/system/ioping/default.nix             |  2 +-
 pkgs/tools/system/iops/default.nix               |  4 ++--
 pkgs/tools/system/journalbeat/default.nix        |  2 +-
 pkgs/tools/system/logcheck/default.nix           |  2 +-
 pkgs/tools/system/logrotate/default.nix          |  2 +-
 pkgs/tools/system/lr/default.nix                 |  2 +-
 pkgs/tools/system/memtester/default.nix          |  2 +-
 pkgs/tools/system/netdata/default.nix            |  2 +-
 pkgs/tools/system/nq/default.nix                 |  2 +-
 pkgs/tools/system/nvtop/default.nix              |  2 +-
 pkgs/tools/system/pcstat/default.nix             |  2 +-
 pkgs/tools/system/plan9port/default.nix          |  1 -
 pkgs/tools/system/psensor/default.nix            |  2 +-
 pkgs/tools/system/psstop/default.nix             |  2 +-
 pkgs/tools/system/rofi-systemd/default.nix       |  2 +-
 pkgs/tools/system/runit/default.nix              |  6 +++---
 pkgs/tools/system/s-tui/default.nix              |  1 -
 pkgs/tools/system/safe-rm/default.nix            |  4 ++--
 pkgs/tools/system/setserial/default.nix          |  4 ++--
 pkgs/tools/system/sleuthkit/default.nix          |  4 ++--
 pkgs/tools/system/socklog/default.nix            |  2 +-
 pkgs/tools/system/suid-chroot/default.nix        |  4 ++--
 pkgs/tools/system/supervise/default.nix          |  2 +-
 pkgs/tools/system/symlinks/default.nix           |  2 +-
 .../tools/system/syslog-ng-incubator/default.nix |  4 ++--
 pkgs/tools/system/testdisk-photorec/default.nix  |  2 +-
 pkgs/tools/system/thermald/default.nix           |  2 +-
 pkgs/tools/system/thinkfan/default.nix           |  2 +-
 pkgs/tools/system/uptimed/default.nix            |  2 +-
 pkgs/tools/system/vbetool/default.nix            |  4 ++--
 pkgs/tools/system/vboot_reference/default.nix    |  2 +-
 pkgs/tools/system/wsmancli/default.nix           |  2 +-
 pkgs/tools/system/xe/default.nix                 |  2 +-
 pkgs/tools/text/agrep/default.nix                |  2 +-
 pkgs/tools/text/aha/default.nix                  |  2 +-
 pkgs/tools/text/ansifilter/default.nix           |  2 +-
 pkgs/tools/text/ascii/default.nix                |  4 ++--
 pkgs/tools/text/catdoc/default.nix               |  4 ++--
 pkgs/tools/text/codesearch/default.nix           |  2 +-
 pkgs/tools/text/copyright-update/default.nix     |  4 ++--
 pkgs/tools/text/dadadodo/default.nix             |  4 ++--
 pkgs/tools/text/diction/default.nix              |  4 ++--
 pkgs/tools/text/dos2unix/default.nix             |  4 ++--
 pkgs/tools/text/enca/default.nix                 |  4 ++--
 pkgs/tools/text/esh/default.nix                  |  2 +-
 pkgs/tools/text/glogg/default.nix                |  4 ++--
 pkgs/tools/text/gnused/default.nix               |  2 +-
 pkgs/tools/text/groff/default.nix                |  4 ++--
 pkgs/tools/text/gucci/default.nix                |  2 +-
 pkgs/tools/text/highlight/default.nix            |  2 +-
 pkgs/tools/text/html-tidy/default.nix            |  2 +-
 pkgs/tools/text/icdiff/default.nix               |  2 +-
 pkgs/tools/text/jsawk/default.nix                |  2 +-
 pkgs/tools/text/jumanpp/default.nix              |  3 +--
 pkgs/tools/text/kytea/default.nix                |  4 ++--
 pkgs/tools/text/languagetool/default.nix         |  4 ++--
 pkgs/tools/text/link-grammar/default.nix         |  3 +--
 pkgs/tools/text/mb2md/default.nix                |  2 +-
 pkgs/tools/text/mecab/ipadic.nix                 |  2 +-
 pkgs/tools/text/miller/default.nix               |  2 +-
 pkgs/tools/text/mir-qualia/default.nix           |  2 +-
 pkgs/tools/text/numdiff/default.nix              |  2 +-
 pkgs/tools/text/odt2txt/default.nix              |  2 +-
 pkgs/tools/text/peco/default.nix                 |  2 +-
 pkgs/tools/text/platinum-searcher/default.nix    |  2 +-
 pkgs/tools/text/podiff/default.nix               |  2 +-
 pkgs/tools/text/poedit/default.nix               |  2 +-
 pkgs/tools/text/proselint/default.nix            |  4 ++--
 pkgs/tools/text/qshowdiff/default.nix            |  2 +-
 pkgs/tools/text/reckon/default.nix               |  4 ++--
 pkgs/tools/text/rpl/default.nix                  |  1 -
 pkgs/tools/text/rst2html5/default.nix            |  4 +---
 pkgs/tools/text/schema2ldif/default.nix          |  2 +-
 pkgs/tools/text/shfmt/default.nix                |  2 +-
 pkgs/tools/text/shocco/default.nix               |  2 +-
 pkgs/tools/text/sift/default.nix                 |  2 +-
 pkgs/tools/text/silver-searcher/default.nix      |  2 +-
 pkgs/tools/text/txt2tags/default.nix             |  4 ++--
 pkgs/tools/text/unrtf/default.nix                |  4 ++--
 pkgs/tools/text/untex/default.nix                |  4 ++--
 pkgs/tools/text/vale/default.nix                 |  2 +-
 pkgs/tools/text/wgetpaste/default.nix            |  4 ++--
 pkgs/tools/text/xidel/default.nix                |  2 +-
 pkgs/tools/text/xml/basex/default.nix            |  2 +-
 pkgs/tools/text/xml/html-xml-utils/default.nix   |  4 ++--
 pkgs/tools/text/xml/jing-trang/default.nix       |  2 +-
 pkgs/tools/text/xml/rnv/default.nix              |  2 +-
 pkgs/tools/text/xml/rxp/default.nix              |  2 +-
 pkgs/tools/text/xml/xmlformat/default.nix        |  2 +-
 pkgs/tools/text/xurls/default.nix                |  2 +-
 pkgs/tools/text/zimwriterfs/default.nix          |  4 ++--
 pkgs/tools/typesetting/djvu2pdf/default.nix      |  2 +-
 pkgs/tools/typesetting/fop/default.nix           |  4 ++--
 pkgs/tools/typesetting/git-latexdiff/default.nix |  2 +-
 pkgs/tools/typesetting/htmldoc/default.nix       |  2 +-
 pkgs/tools/typesetting/mmark/default.nix         |  2 +-
 pkgs/tools/typesetting/multimarkdown/default.nix |  2 +-
 pkgs/tools/typesetting/odpdown/default.nix       |  2 +-
 pkgs/tools/typesetting/pdf2djvu/default.nix      |  4 ++--
 pkgs/tools/typesetting/pdf2odt/default.nix       |  2 +-
 pkgs/tools/typesetting/pdfgrep/default.nix       |  4 ++--
 pkgs/tools/typesetting/satysfi/default.nix       |  2 +-
 pkgs/tools/typesetting/scdoc/default.nix         |  2 +-
 pkgs/tools/typesetting/sile/default.nix          |  4 ++--
 pkgs/tools/typesetting/skribilo/default.nix      |  4 ++--
 pkgs/tools/typesetting/sshlatex/default.nix      |  2 +-
 pkgs/tools/typesetting/ted/default.nix           |  3 +--
 pkgs/tools/typesetting/tex/auctex/default.nix    |  3 +--
 pkgs/tools/typesetting/tikzit/default.nix        |  2 +-
 pkgs/tools/typesetting/xmlroff/default.nix       |  4 ++--
 pkgs/tools/video/atomicparsley/default.nix       |  2 +-
 pkgs/tools/video/bento4/default.nix              |  2 +-
 pkgs/tools/video/rtmpdump/default.nix            |  2 +-
 pkgs/tools/video/swftools/default.nix            |  4 ++--
 pkgs/tools/video/untrunc/default.nix             |  2 +-
 pkgs/tools/video/yamdi/default.nix               |  2 +-
 .../virtualization/amazon-ecs-cli/default.nix    |  2 +-
 pkgs/tools/virtualization/awless/default.nix     |  2 +-
 .../tools/virtualization/cloudmonkey/default.nix |  2 --
 .../virtualization/distrobuilder/default.nix     |  2 +-
 .../virtualization/ec2-ami-tools/default.nix     |  4 ++--
 .../google-compute-engine-oslogin/default.nix    |  2 +-
 .../google-compute-engine/default.nix            |  2 +-
 pkgs/tools/virtualization/govc/default.nix       |  2 +-
 .../tools/virtualization/marathonctl/default.nix |  2 +-
 .../tools/virtualization/rootlesskit/default.nix |  2 +-
 .../xe-guest-utilities/default.nix               |  1 -
 pkgs/top-level/lua-packages.nix                  |  2 +-
 4616 files changed, 5674 insertions(+), 6081 deletions(-)

diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix
index 3a65cb800a9..4d7af138292 100644
--- a/nixos/modules/hardware/raid/hpsa.nix
+++ b/nixos/modules/hardware/raid/hpsa.nix
@@ -4,11 +4,11 @@ with lib;
 
 let
   hpssacli = pkgs.stdenv.mkDerivation rec {
-    name = "hpssacli-${version}";
+    pname = "hpssacli";
     version = "2.40-13.0";
 
     src = pkgs.fetchurl {
-      url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${name}_amd64.deb";
+      url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb";
       sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw";
     };
 
diff --git a/nixos/tests/common/letsencrypt/default.nix b/nixos/tests/common/letsencrypt/default.nix
index 8fe59bf4e70..58d87c64e34 100644
--- a/nixos/tests/common/letsencrypt/default.nix
+++ b/nixos/tests/common/letsencrypt/default.nix
@@ -56,11 +56,11 @@
 
 let
   softhsm = pkgs.stdenv.mkDerivation rec {
-    name = "softhsm-${version}";
+    pname = "softhsm";
     version = "1.3.8";
 
     src = pkgs.fetchurl {
-      url = "https://dist.opendnssec.org/source/${name}.tar.gz";
+      url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz";
       sha256 = "0flmnpkgp65ym7w3qyg78d3fbmvq3aznmi66rgd420n33shf7aif";
     };
 
diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix
index 481e19c66cd..a8846431f1e 100644
--- a/pkgs/applications/altcoins/clightning.nix
+++ b/pkgs/applications/altcoins/clightning.nix
@@ -3,7 +3,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "clightning-${version}";
+  pname = "clightning";
   version = "0.7.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix
index b2f2a457a99..03dcd6cb54e 100644
--- a/pkgs/applications/altcoins/dashpay.nix
+++ b/pkgs/applications/altcoins/dashpay.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "dashpay-${version}";
+  pname = "dashpay";
   version = "0.12.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/altcoins/dcrd.nix
index cc3e83befa6..16d39e85da1 100644
--- a/pkgs/applications/altcoins/dcrd.nix
+++ b/pkgs/applications/altcoins/dcrd.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }:
 
 buildGoPackage rec {
-  name = "dcrd-${version}";
+  pname = "dcrd";
   version = "1.1.2";
   rev = "refs/tags/v${version}";
   goPackagePath = "github.com/decred/dcrd";
diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/altcoins/dcrwallet.nix
index 8d966684b23..163ed2615d3 100644
--- a/pkgs/applications/altcoins/dcrwallet.nix
+++ b/pkgs/applications/altcoins/dcrwallet.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }:
 
 buildGoPackage rec {
-  name = "dcrwallet-${version}";
+  pname = "dcrwallet";
   version = "1.1.2";
   rev = "refs/tags/v${version}";
   goPackagePath = "github.com/decred/dcrwallet";
diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix
index 8405ea8f842..0ab63bb5395 100644
--- a/pkgs/applications/altcoins/dero.nix
+++ b/pkgs/applications/altcoins/dero.nix
@@ -2,7 +2,7 @@
 , lmdb, miniupnpc, readline }:
 
 stdenv.mkDerivation rec {
-  name = "dero-${version}";
+  pname = "dero";
   version = "0.11.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix
index 78ce074eafd..1f9fc3f9f96 100644
--- a/pkgs/applications/altcoins/freicoin.nix
+++ b/pkgs/applications/altcoins/freicoin.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.6-2";
-  name = "freicoin-${version}";
+  pname = "freicoin";
 
   src = fetchFromGitHub {
     owner = "freicoin";
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
index 7461e4c376a..ed8086f742f 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix
+++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "go-ethereum-classic-${version}";
+  pname = "go-ethereum-classic";
   version = "4.0.0";
 
   goPackagePath = "github.com/ethereumproject/go-ethereum";
diff --git a/pkgs/applications/altcoins/masari.nix b/pkgs/applications/altcoins/masari.nix
index 02a6d25df51..dfa005abb6e 100644
--- a/pkgs/applications/altcoins/masari.nix
+++ b/pkgs/applications/altcoins/masari.nix
@@ -2,7 +2,7 @@
 , lmdb, miniupnpc, readline }:
 
 stdenv.mkDerivation rec {
-  name = "masari-${version}";
+  pname = "masari";
   version = "0.1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index aaff39f1c6b..8adab50a09c 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -24,7 +24,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "monero-gui-${version}";
+  pname = "monero-gui";
   version = "0.14.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index f351c9fa504..b6f07452861 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -11,7 +11,7 @@ assert stdenv.isDarwin -> IOKit != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name    = "monero-${version}";
+  pname = "monero";
   version = "0.14.1.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index 58ab367c020..a8d29ae149d 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "nano-wallet-${version}";
+  pname = "nano-wallet";
   version = "18.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix
index c59b2ccb8ac..0615aed2ca0 100644
--- a/pkgs/applications/altcoins/parity-ui/default.nix
+++ b/pkgs/applications/altcoins/parity-ui/default.nix
@@ -5,13 +5,13 @@ let
 uiEnv = pkgs.callPackage ./env.nix { };
 
 in stdenv.mkDerivation rec {
-  name = "parity-ui-${version}";
+  pname = "parity-ui";
   version = "0.3.4";
 
   src = fetchurl {
     url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
     sha256 = "1xbd00r9ph8w2d6d2c5xg4b5l74ljzs50rpc6kahfznypmh4kr73";
-    name = "${name}.deb";
+    name = "${pname}-${version}.deb";
   };
 
   nativeBuildInputs = [ makeWrapper nodePackages.asar ];
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
index f5efa0bb52c..613d57cd9c8 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -16,7 +16,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "particl-core-${version}";
+  pname = "particl-core";
   version = "0.17.1.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/altcoins/pivx.nix b/pkgs/applications/altcoins/pivx.nix
index 995b8deccd9..7b51538d063 100644
--- a/pkgs/applications/altcoins/pivx.nix
+++ b/pkgs/applications/altcoins/pivx.nix
@@ -9,7 +9,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "pivx-${version}";
+  pname = "pivx";
   version = "3.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/altcoins/sumokoin.nix b/pkgs/applications/altcoins/sumokoin.nix
index 026008b2761..ad65da057ae 100644
--- a/pkgs/applications/altcoins/sumokoin.nix
+++ b/pkgs/applications/altcoins/sumokoin.nix
@@ -2,7 +2,7 @@
 , libunwind, lmdb, miniupnpc }:
 
 stdenv.mkDerivation rec {
-  name = "sumokoin-${version}";
+  pname = "sumokoin";
   version = "0.2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/altcoins/wownero.nix b/pkgs/applications/altcoins/wownero.nix
index 7aed3297832..365afb5a241 100644
--- a/pkgs/applications/altcoins/wownero.nix
+++ b/pkgs/applications/altcoins/wownero.nix
@@ -6,7 +6,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "wownero-${version}";
+  pname = "wownero";
 
   version = "0.6.1.2";
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix
index 3ea7b90f84a..720fd0b88be 100644
--- a/pkgs/applications/audio/AMB-plugins/default.nix
+++ b/pkgs/applications/audio/AMB-plugins/default.nix
@@ -2,10 +2,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "AMB-plugins-${version}";
+  pname = "AMB-plugins";
   version = "0.8.1";
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "0x4blm4visjqj0ndqr0cg776v3b7lvplpc8cgi9n51llhavn0jpl";
   };
 
diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix
index b9322c37df0..ed1f05eaf5c 100644
--- a/pkgs/applications/audio/FIL-plugins/default.nix
+++ b/pkgs/applications/audio/FIL-plugins/default.nix
@@ -2,10 +2,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "FIL-plugins-${version}";
+  pname = "FIL-plugins";
   version = "0.3.0";
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1scfv9j7jrp50r565haa4rvxn1vk2ss86xssl5qgcr8r45qz42qw";
   };
 
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
index ed7a8481f69..92f46abddd5 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -2,7 +2,7 @@
 
   stdenv.mkDerivation rec {
   version = "16.06";
-  name = "mma-${version}";
+  pname = "mma";
 
   src = fetchurl {
     url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index 70709ae4ac4..b94fed41341 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -5,7 +5,7 @@
 let
   inherit (python2Packages) python dbus-python;
 in stdenv.mkDerivation rec {
-  name = "a2jmidid-${version}";
+  pname = "a2jmidid";
   version = "8";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix
index 7b80b32331b..389052d30e1 100644
--- a/pkgs/applications/audio/aeolus/default.nix
+++ b/pkgs/applications/audio/aeolus/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aeolus-${version}";
+  pname = "aeolus";
   version = "0.9.7";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k";
   };
 
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix
index d6064e80e3f..0750c38550b 100644
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -2,7 +2,7 @@
 , wafHook }:
 
 stdenv.mkDerivation  rec {
-  name = "ams-lv2-${version}";
+  pname = "ams-lv2";
   version = "1.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix
index 02d818410df..4b48f5f1eea 100644
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@@ -5,10 +5,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.6";
-  name = "ario-${version}";
+  pname = "ario";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ario-player/${name}.tar.gz";
+    url = "mirror://sourceforge/ario-player/${pname}-${version}.tar.gz";
     sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl";
   };
 
diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix
index 91a0a1f140c..4b76ebdf605 100644
--- a/pkgs/applications/audio/artyFX/default.nix
+++ b/pkgs/applications/audio/artyFX/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "artyFX-${version}";
+  pname = "artyFX";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix
index 9c42c98ba5e..e4c145b35c7 100644
--- a/pkgs/applications/audio/asunder/default.nix
+++ b/pkgs/applications/audio/asunder/default.nix
@@ -13,9 +13,9 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "2.9.3";
-  name = "asunder-${version}";
+  pname = "asunder";
   src = fetchurl {
-    url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2";
+    url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";
     sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5";
   };
 
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 68660b5d054..12e8237d485 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "audacious-${version}";
+  pname = "audacious";
   version = "3.9";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index b685fda7683..6be40a7b93a 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -8,7 +8,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "2.3.2";
-  name = "audacity-${version}";
+  pname = "audacity";
 
   src = fetchurl {
     url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix
index 7b84cd02a62..534b87e9fa7 100644
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@@ -5,11 +5,11 @@
 , pulseaudioSupport ? true, libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "audio-recorder-${version}";
+  pname = "audio-recorder";
   version = "2.1.3";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ebionic.tar.gz";
     sha256 = "160pnmnmc9zwzyclsci3w1qwlgxkfx1y3x5ck6i587w78570an1r";
   };
diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix
index c49470b76e2..7ca5d83b48b 100644
--- a/pkgs/applications/audio/avldrums-lv2/default.nix
+++ b/pkgs/applications/audio/avldrums-lv2/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "avldrums.lv2";
   version = "0.3.5";
 
diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix
index e3f1b6acf87..7f551304df1 100644
--- a/pkgs/applications/audio/axoloti/default.nix
+++ b/pkgs/applications/audio/axoloti/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.12-2";
-  name = "axoloti-${version}";
+  pname = "axoloti";
 
   src = fetchFromGitHub {
     owner = "axoloti";
diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix
index 07a78260991..e9fa6daecfe 100644
--- a/pkgs/applications/audio/axoloti/dfu-util.nix
+++ b/pkgs/applications/audio/axoloti/dfu-util.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libusb1-axoloti }:
 
 stdenv.mkDerivation rec {
-  name="dfu-util-${version}";
+  pname = "dfu-util";
   version = "0.8";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libusb1-axoloti ];
 
   src = fetchurl {
-    url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz";
+    url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
     sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm";
   };
 
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix
index 6827d12b321..c35df95b24c 100644
--- a/pkgs/applications/audio/baudline/default.nix
+++ b/pkgs/applications/audio/baudline/default.nix
@@ -7,7 +7,7 @@ let
     [ libXmu libXt libX11 libXext libXxf86vm libjack2 ];
 in
 stdenv.mkDerivation rec {
-  name = "baudline-${version}";
+  pname = "baudline";
   version = "1.08";
 
   src =
diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix
index fbe2c97042f..6f471f3a028 100644
--- a/pkgs/applications/audio/bitmeter/default.nix
+++ b/pkgs/applications/audio/bitmeter/default.nix
@@ -1,11 +1,11 @@
 { stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "bitmeter-${version}";
+  pname = "bitmeter";
   version = "1.2";
 
   src = fetchurl {
-    url = "https://devel.tlrmx.org/audio/source/${name}.tar.gz";
+    url = "https://devel.tlrmx.org/audio/source/${pname}-${version}.tar.gz";
     sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
   };
 
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
index 31716fce1c2..83586847190 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
@@ -6,7 +6,7 @@
 , xdg_utils, zenity, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "bitwig-studio-${version}";
+  pname = "bitwig-studio";
   version = "1.3.16";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index e1ed12b9bd2..504900d6595 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }:
 
 stdenv.mkDerivation  rec {
-  name = "bristol-${version}";
+  pname = "bristol";
   version = "0.60.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bristol/${name}.tar.gz";
+    url = "mirror://sourceforge/bristol/${pname}-${version}.tar.gz";
     sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
   };
 
diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index adda9235364..2dee463aeee 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ffmpeg, sox }:
 
 stdenv.mkDerivation rec {
-  name = "bs1770gain-${version}";
+  pname = "bs1770gain";
   version = "0.5.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bs1770gain/${name}.tar.gz";
+    url = "mirror://sourceforge/bs1770gain/${pname}-${version}.tar.gz";
     sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk";
   };
 
diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index 7d7d25ea88a..0106e8b4584 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -2,11 +2,11 @@
 , gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "calf-${version}";
+  pname = "calf";
   version = "0.90.3";
 
   src = fetchurl {
-    url = "https://calf-studio-gear.org/files/${name}.tar.gz";
+    url = "https://calf-studio-gear.org/files/${pname}-${version}.tar.gz";
     sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3";
   };
 
diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix
index 1f53809e905..eabbf866837 100644
--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "caps-${version}";
+  pname = "caps";
   version = "0.9.26";
   src = fetchurl {
     url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index 439175b090a..5c5c262056e 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -2,7 +2,7 @@
   libpulseaudio, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "cava-${version}";
+  pname = "cava";
   version = "0.6.1";
 
   buildInputs = [
diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix
index 382d4a1b667..76f76c1e750 100644
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/pkgs/applications/audio/cd-discid/default.nix
@@ -2,11 +2,11 @@
 , IOKit ? null }:
 
 stdenv.mkDerivation rec {
-  name = "cd-discid-${version}";
+  pname = "cd-discid";
   version = "1.4";
 
   src = fetchurl {
-    url = "http://linukz.org/download/${name}.tar.gz";
+    url = "http://linukz.org/download/${pname}-${version}.tar.gz";
     sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz";
   };
 
diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix
index da26a718835..692485d0dcf 100644
--- a/pkgs/applications/audio/chuck/default.nix
+++ b/pkgs/applications/audio/chuck/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.0.0";
-  name = "chuck-${version}";
+  pname = "chuck";
 
   src = fetchurl {
     url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index b574993338d..b88951c0fc5 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -101,7 +101,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "cmus-${version}";
+  pname = "cmus";
   version = "2.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix
index 2147a84f24b..51b88607208 100644
--- a/pkgs/applications/audio/cmusfm/default.nix
+++ b/pkgs/applications/audio/cmusfm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2018-10-11";
-  name = "cmusfm-unstable-${version}";
+  pname = "cmusfm-unstable";
   src = fetchFromGitHub {
     owner = "Arkq";
     repo = "cmusfm";
diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/applications/audio/csa/default.nix
index c3b3b944135..0b8afada020 100644
--- a/pkgs/applications/audio/csa/default.nix
+++ b/pkgs/applications/audio/csa/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "csa-${version}";
+  pname = "csa";
   version = "0.5.100810";
 
   src = fetchurl {
-    url = "mirror://sourceforge/csa/${name}.tar.gz";
+    url = "mirror://sourceforge/csa/${pname}-${version}.tar.gz";
     sha256 = "1syg81dzdil0dyx1mlx1n7if3qsf2iz243p2zv34a1acfqm509r3";
   };
 
diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix
index e97341acbb4..86e200ab252 100644
--- a/pkgs/applications/audio/csound/csound-qt/default.nix
+++ b/pkgs/applications/audio/csound/csound-qt/default.nix
@@ -3,7 +3,7 @@
   qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "csound-qt-${version}";
+  pname = "csound-qt";
   version = "0.9.6-beta3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index cb968ee9e00..758448c2fb3 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "csound-${version}";
+  pname = "csound";
   # When updating, please check if https://github.com/csound/csound/issues/1078
   # has been fixed in the new version so we can use the normal fluidsynth
   # version and remove fluidsynth 1.x from nixpkgs again.
diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
index dab3a97f6e7..b26360f0c46 100644
--- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "deadbeef-headerbar-gtk3-plugin-${version}";
+  pname = "deadbeef-headerbar-gtk3-plugin";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix
index d2355681b72..8a81101983f 100644
--- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "deadbeef-infobar-plugin-${version}";
+  pname = "deadbeef-infobar-plugin";
   version = "1.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index 4d5367087c1..5b27f3c3f32 100644
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, deadbeef, glib }:
 
 stdenv.mkDerivation rec {
-  name = "deadbeef-mpris2-plugin-${version}";
+  pname = "deadbeef-mpris2-plugin";
   version = "1.12";
 
   src = fetchurl {
-    url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz";
+    url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${pname}-${version}.tar.xz";
     sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh";
   };
 
diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix
index d01e7879335..331e3fb9698 100644
--- a/pkgs/applications/audio/denemo/default.nix
+++ b/pkgs/applications/audio/denemo/default.nix
@@ -5,7 +5,7 @@
 , portaudio, portmidi, fftw, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "denemo-${version}";
+  pname = "denemo";
   version = "2.3.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index d16534b03d3..1785ca60060 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -27,7 +27,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "dfasma-${version}";
+  pname = "dfasma";
   version = "1.4.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 1c41451b08f..054fc758d64 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -8,7 +8,7 @@ let
               else if stdenv.hostPlatform.isWindows then "mingw"
               else "linux";
 in stdenv.mkDerivation rec {
-  name = "distrho-ports-${version}";
+  pname = "distrho-ports";
   version = "2018-04-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index e5354b06094..11b214f6bb3 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.17";
-  name = "drumgizmo-${version}";
+  pname = "drumgizmo";
 
   src = fetchurl {
-    url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
+    url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "177c27kz9srds7a659zz9yhp58z0zsk0ydwww7l3jkjlylm1p8x1";
   };
 
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index f8e1db4814c..8f1f79169d7 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
 
 stdenv.mkDerivation rec {
-  name = "drumkv1-${version}";
+  pname = "drumkv1";
   version = "0.9.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
+    url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
     sha256 = "02sa29fdjgwcf7izly685gxvga3bxyyqvskvfiisgm2xg3h9r983";
   };
 
diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix
index 1013b8a560c..6c9cd628a51 100644
--- a/pkgs/applications/audio/ecasound/default.nix
+++ b/pkgs/applications/audio/ecasound/default.nix
@@ -14,7 +14,7 @@
 # TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log.
 
 stdenv.mkDerivation rec {
-  name = "ecasound-${version}";
+  pname = "ecasound";
   version = "2.9.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix
index 4138a07ec06..2338c0ed376 100644
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/pkgs/applications/audio/eflite/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }:
 
 stdenv.mkDerivation rec {
-  name = "eflite-${version}";
+  pname = "eflite";
   version = "0.4.1";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz";
+    url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${pname}-${version}.tar.gz";
     sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
   };
 
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
index 651604c71a1..0308fad831d 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig
 , xorg }:
 stdenv.mkDerivation rec {
-  name = "eq10q-${version}";
+  pname = "eq10q";
   version = "2.2";
   src = fetchurl {
-    url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";
+    url = "mirror://sourceforge/project/eq10q/${pname}-${version}.tar.gz";
     sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk";
   };
 
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 5d0af8cf17a..043d5b9d2d3 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -4,7 +4,7 @@
 , sonicSupport ? true, sonic }:
 
 stdenv.mkDerivation rec {
-  name = "espeak-ng-${version}";
+  pname = "espeak-ng";
   version = "1.49.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix
index 28e4879efdc..bbfe1ad5623 100644
--- a/pkgs/applications/audio/eteroj.lv2/default.nix
+++ b/pkgs/applications/audio/eteroj.lv2/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "eteroj.lv2";
   version = "0.4.0";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner  = "OpenMusicKontrollers";
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
index 754c4807060..4268a783c8d 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "faustlive-${version}";
+  pname = "faustlive";
   version = "2017-12-05";
   src = fetchFromGitHub {
     owner = "grame-cncm";
diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix
index f0863bfc50b..19ed2352355 100644
--- a/pkgs/applications/audio/flac123/default.nix
+++ b/pkgs/applications/audio/flac123/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }:
 
 stdenv.mkDerivation rec {
-  name = "flac123-${version}";
+  pname = "flac123";
   version = "0.0.12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/flac-tools/${name}-release.tar.gz";
+    url = "mirror://sourceforge/flac-tools/${pname}-${version}-release.tar.gz";
     sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr";
   };
 
diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index 2d2d88308cc..02317fee15f 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "flacon-${version}";
+  pname = "flacon";
   version = "5.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index a61f7dc0a90..d1b1cddd011 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -10,7 +10,7 @@ assert portaudioSupport -> portaudio != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "fmit-${version}";
+  pname = "fmit";
   version = "1.1.14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix
index 58d095080fe..dc163de8ade 100644
--- a/pkgs/applications/audio/fmsynth/default.nix
+++ b/pkgs/applications/audio/fmsynth/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }:
 stdenv.mkDerivation rec {
-  name = "fmsynth-unstable-${version}";
+  pname = "fmsynth-unstable";
   version = "2015-02-07";
   src = fetchFromGitHub {
     owner = "Themaister";
diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix
index 680fab4ca64..a92d331baad 100644
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/pkgs/applications/audio/fomp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "fomp-${version}";
+  pname = "fomp";
   version = "1.0.0";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
   };
 
diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix
index 28b2cd98e02..330ae56f13f 100644
--- a/pkgs/applications/audio/foo-yc20/default.nix
+++ b/pkgs/applications/audio/foo-yc20/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "git-2015-05-21";
-  name = "foo-yc20-${version}";
+  pname = "foo-yc20";
   src = fetchFromGitHub {
     owner = "sampov2";
     repo = "foo-yc20";
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index efb832ae625..a2588093309 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "freewheeling-${version}";
+  pname = "freewheeling";
   version = "0.6.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix
index a0a79785283..d95b3eea596 100644
--- a/pkgs/applications/audio/game-music-emu/default.nix
+++ b/pkgs/applications/audio/game-music-emu/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.1";
-  name = "game-music-emu-${version}";
+  pname = "game-music-emu";
 
   src = fetchurl {
-    url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${name}.tar.bz2";
+    url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.bz2";
     sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw";
   };
 
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index e9ce20f6c80..d8fada45eb1 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gigedit-${version}";
+  pname = "gigedit";
   version = "1.1.0";
 
   src = fetchurl {
-    url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
+    url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
     sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
   };
 
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 099e4428016..66e9b6545a4 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gmpc-${version}";
+  pname = "gmpc";
   version = "11.8.16";
 
   libmpd = stdenv.mkDerivation {
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index 3981bc79276..3406f317884 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -5,7 +5,7 @@
 # rustPlatform.buildRustPackage rec {
 stdenv.mkDerivation rec {
   version = "0.4.6";
-  name = "gnome-podcasts-${version}";
+  pname = "gnome-podcasts";
 
   src = fetchurl {
     url = https://gitlab.gnome.org/World/podcasts/uploads/e59ac5d618d7daf4c7f33ba72957c466/gnome-podcasts-0.4.6.tar.xz;
diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix
index e7a23b6f204..e027680f5fe 100644
--- a/pkgs/applications/audio/greg/default.nix
+++ b/pkgs/applications/audio/greg/default.nix
@@ -3,7 +3,6 @@
 with pythonPackages; buildPythonApplication rec {
   pname = "greg";
   version = "0.4.7";
-  name = pname + "-" + version;
 
   disabled = !isPy3k;
 
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index e01dbc1d30f..fd3632ee155 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.1.5";
-  name = "gtkpod-${version}";
+  pname = "gtkpod";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gtkpod/${name}.tar.gz";
+    url = "mirror://sourceforge/gtkpod/${pname}-${version}.tar.gz";
     sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
   };
 
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 9df4308131e..91f4b1dcdfe 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -11,7 +11,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "guitarix-${version}";
+  pname = "guitarix";
   version = "0.38.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix
index 04cb57800f9..1f4323eb9d5 100644
--- a/pkgs/applications/audio/gxplugins-lv2/default.nix
+++ b/pkgs/applications/audio/gxplugins-lv2/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "GxPlugins.lv2";
   version = "0.7";
 
diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix
index fa76a1a26e8..d32c55122c5 100644
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@@ -3,7 +3,7 @@
 
   stdenv.mkDerivation rec {
   version = "0.9.0";
-  name = "helm-${version}";
+  pname = "helm";
 
   src = fetchFromGitHub {
     owner = "mtytel";
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index d68bfbf2ae4..50093f8a61d 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.7";
-  name = "hydrogen-${version}";
+  pname = "hydrogen";
 
   src = fetchurl {
     url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz";
diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index 69fc4b419c0..2cc39e64943 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -27,7 +27,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.0-b31";
-  name = "i-score-${version}";
+  pname = "i-score";
 
   src = fetchFromGitHub {
     owner = "OSSIA";
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index c26980e1bb2..1fd8531fb7f 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "iannix-${version}";
+  pname = "iannix";
   version = "2016-01-31";
   src = fetchFromGitHub {
     owner = "iannix";
diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix
index d2720fcace6..0fdb3b2a4a1 100644
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/pkgs/applications/audio/id3v2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, id3lib, groff, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "id3v2-${version}";
+  pname = "id3v2";
   version = "0.1.12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/id3v2/${name}.tar.gz";
+    url = "mirror://sourceforge/id3v2/${pname}-${version}.tar.gz";
     sha256 = "1gr22w8gar7zh5pyyvdy7cy26i47l57jp1l1nd60xfwx339zl1c1";
   };
 
diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix
index 2b8c041a074..341c4181842 100644
--- a/pkgs/applications/audio/infamousPlugins/default.nix
+++ b/pkgs/applications/audio/infamousPlugins/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }:
 
 stdenv.mkDerivation rec {
-  name = "infamousPlugins-${version}";
+  pname = "infamousPlugins";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix
index 84be6b866fa..0ca5988383a 100644
--- a/pkgs/applications/audio/ir.lv2/default.nix
+++ b/pkgs/applications/audio/ir.lv2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }:
 
 stdenv.mkDerivation rec {
-  name = "ir.lv2-${version}";
+  pname = "ir.lv2";
   version = "1.2.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
index 33c74f2b044..92b2f8ac515 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }:
 
 stdenv.mkDerivation rec {
-  name = "jaaa-${version}";
+  pname = "jaaa";
   version = "0.9.2";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1czksxx2g8na07k7g57qlz0vvkkgi5bzajcx7vc7jhb94hwmmxbc";
   };
 
diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix
index f11bba34c74..c62ccc4fc88 100644
--- a/pkgs/applications/audio/jack-capture/default.nix
+++ b/pkgs/applications/audio/jack-capture/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libjack2, libsndfile, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "jack_capture-${version}";
+  pname = "jack_capture";
   version = "0.9.73";
 
   src = fetchurl {
-    url = "https://archive.notam02.no/arkiv/src/${name}.tar.gz";
+    url = "https://archive.notam02.no/arkiv/src/${pname}-${version}.tar.gz";
     sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1";
   };
 
diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix
index 75a8a6a4b1a..d31bc981e0c 100644
--- a/pkgs/applications/audio/jack-oscrolloscope/default.nix
+++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "jack_oscrolloscope-${version}";
+  pname = "jack_oscrolloscope";
   version = "0.7";
 
   src = fetchurl {
-    url = "http://das.nasophon.de/download/${name}.tar.gz";
+    url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
     sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
   };
 
diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index 0f1ed143ddd..a40d5101b34 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -2,11 +2,11 @@
 , serd, sord , sratom, suil, wafHook }:
 
 stdenv.mkDerivation  rec {
-  name = "jalv-${version}";
+  pname = "jalv";
   version = "1.6.2";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "13al2hb9s3m7jgbg051x704bmzmcg4wb56cfh8z588kiyh0mxpaa";
   };
 
diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix
index 18b7bcd1d56..a9eb15aabf3 100644
--- a/pkgs/applications/audio/japa/default.nix
+++ b/pkgs/applications/audio/japa/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.2";
-  name = "japa-${version}";
+  pname = "japa";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1zmi4wg23hwsypg3h6y3qb72cbrihqcs19qrbzgs5a67d13q4897";
   };
 
diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix
index 344e6894baf..4bb1d63a1e7 100644
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libav, libkeyfinder }:
 
 stdenv.mkDerivation rec {
-  name = "keyfinder-cli-${version}";
+  pname = "keyfinder-cli";
   version = "2015-09-13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 55039e8508b..d47fc3b6190 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }:
 
 stdenv.mkDerivation rec {
-  name = "keyfinder-${version}";
+  pname = "keyfinder";
   version = "2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 04d0349c88f..dfb07c4f456 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "kid3-${version}";
+  pname = "kid3";
   version = "3.7.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz";
     sha256 = "0xkrsjrbr3z8cn8hjf623l28r3b755gr11i0clv8d8i3s10vhbd8";
   };
 
diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix
index 5e54609f8bf..f33245d8f1c 100644
--- a/pkgs/applications/audio/klick/default.nix
+++ b/pkgs/applications/audio/klick/default.nix
@@ -2,11 +2,11 @@
 , libsamplerate, libsndfile, liblo, libjack2, boost }:
 
 stdenv.mkDerivation rec {
-  name = "klick-${version}";
+  pname = "klick";
   version = "0.12.2";
 
   src = fetchurl {
-    url = "http://das.nasophon.de/download/${name}.tar.gz";
+    url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
     sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42";
   };
 
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index a60b3db2fb8..44186abc3c4 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -2,7 +2,7 @@
 , perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "swh-plugins-${version}";
+  pname = "swh-plugins";
   version = "0.4.17";
 
 
diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix
index 72bb7010b62..a7779ee8aee 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/pkgs/applications/audio/ladspa-sdk/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "ladspa-sdk-${version}";
+  pname = "ladspa-sdk";
   version = "1.15";
   src = fetchurl {
     url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
index b57b7283b85..3fad5de1de5 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "ladspa.h-${version}";
+  pname = "ladspa.h";
   version = "1.15";
   src = fetchurl {
     url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix
index 7fb5a01e2c8..e96972b0d1b 100644
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -4,11 +4,11 @@
 assert libuuid != null;
 
 stdenv.mkDerivation  rec {
-  name = "lash-${version}";
+  pname = "lash";
   version = "0.5.4";
 
   src = fetchurl {
-    url = "mirror://savannah/lash/${name}.tar.gz";
+    url = "mirror://savannah/lash/${pname}-${version}.tar.gz";
     sha256 = "05kc4brcx8mncai0rj2gz4s4bsrsy9q8xlnaddf75i0m8jl7snhh";
   };
 
diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix
index a8e33c23dc0..b5a99150cb2 100644
--- a/pkgs/applications/audio/linuxband/default.nix
+++ b/pkgs/applications/audio/linuxband/default.nix
@@ -4,10 +4,10 @@ let
   inherit (python2Packages) pyGtkGlade pygtksourceview python;
 in stdenv.mkDerivation rec {
   version = "12.02.1";
-  name = "linuxband-${version}";
+  pname = "linuxband";
 
   src = fetchurl {
-    url = "http://linuxband.org/assets/sources/${name}.tar.gz";
+    url = "http://linuxband.org/assets/sources/${pname}-${version}.tar.gz";
     sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
   };
 
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
index f173e41321f..26fc2408d8a 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -2,11 +2,11 @@
 , alsaLib, asio, libjack2, libgig, libsndfile, lv2 }:
 
 stdenv.mkDerivation rec {
-  name = "linuxsampler-${version}";
+  pname = "linuxsampler";
   version = "2.1.0";
 
   src = fetchurl {
-    url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
+    url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
     sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf";
   };
 
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 59e94e0bdad..d22065eb9fe 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -4,7 +4,7 @@
 , qtbase, qtx11extras, qttools, SDL ? null }:
 
 stdenv.mkDerivation rec {
-  name = "lmms-${version}";
+  pname = "lmms";
   version = "1.2.0-rc7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix
index c80485734ca..3d5c6f699dd 100644
--- a/pkgs/applications/audio/lsp-plugins/default.nix
+++ b/pkgs/applications/audio/lsp-plugins/default.nix
@@ -6,12 +6,11 @@
 stdenv.mkDerivation rec {
   pname = "lsp-plugins";
   version = "1.1.9";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "sadko4u";
     repo = "${pname}";
-    rev = "${name}";
+    rev = "${pname}-${version}";
     sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2";
   };
 
diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix
index 81db133ff9a..c986e3af288 100644
--- a/pkgs/applications/audio/ltc-tools/default.nix
+++ b/pkgs/applications/audio/ltc-tools/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, pkgconfig, libltc, libsndfile, jack2}:
 
 stdenv.mkDerivation rec {
-  name = "ltc-tools-${version}";
+  pname = "ltc-tools";
   version = "0.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix
index d3821c51fbc..7288d39ce77 100644
--- a/pkgs/applications/audio/lv2bm/default.nix
+++ b/pkgs/applications/audio/lv2bm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }:
 
 stdenv.mkDerivation rec {
-  name = "lv2bm-${version}";
+  pname = "lv2bm";
   version = "git-2015-11-29";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
index f355c540f30..6488d1bd65e 100644
--- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "CharacterCompressor-${version}";
+  pname = "CharacterCompressor";
   version = "0.3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
index 90e4eabeef0..c5728b6e8b7 100644
--- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "CompBus-${version}";
+  pname = "CompBus";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
index 73dd7b48e9c..331e58c4bd2 100644
--- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "constant-detune-chorus-${version}";
+  pname = "constant-detune-chorus";
   version = "0.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
index 39065db6ede..046ee70e990 100644
--- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "LazyLimiter-${version}";
+  pname = "LazyLimiter";
   version = "0.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
index 362451988d3..aa7da17dafd 100644
--- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "MBdistortion-${version}";
+  pname = "MBdistortion";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
index 3f809aa7847..ae05866e57d 100644
--- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "RhythmDelay-${version}";
+  pname = "RhythmDelay";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 740763889ff..718bbdaf49e 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
 stdenv.mkDerivation rec {
-  name = "VoiceOfFaust-${version}";
+  pname = "VoiceOfFaust";
   version = "1.1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
index 6237628e600..356e95bf97c 100644
--- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "pluginUtils-${version}";
+  pname = "pluginUtils";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
index cb9247fd3d0..292cd3dfd86 100644
--- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "shelfMultiBand-${version}";
+  pname = "shelfMultiBand";
   version = "0.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix
index 26290e5bf88..901be5a23d0 100644
--- a/pkgs/applications/audio/mda-lv2/default.nix
+++ b/pkgs/applications/audio/mda-lv2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "mda-lv2-${version}";
+  pname = "mda-lv2";
   version = "1.2.2";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4";
   };
 
diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix
index d16107e4c29..4d2fa0e15b4 100644
--- a/pkgs/applications/audio/meterbridge/default.nix
+++ b/pkgs/applications/audio/meterbridge/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.3";
-  name = "meterbridge-${version}";
+  pname = "meterbridge";
 
   src = fetchurl {
-    url = "http://plugin.org.uk/meterbridge/${name}.tar.gz";
+    url = "http://plugin.org.uk/meterbridge/${pname}-${version}.tar.gz";
     sha256 = "0s7n3czfpil94vsd7iblv4xrck9c7zvsz4r3yfbkqcv85pjz1viz";
   };
 
diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix
index db70e59218b..e4d6c0293df 100644
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -3,7 +3,7 @@
 , vorbis-tools }:
 
 stdenv.mkDerivation rec {
-  name = "mhwaveedit-${version}";
+  pname = "mhwaveedit";
   version = "1.4.24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index 6b3abeb1e23..7f86e2c2071 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.02.00";
-  name = "milkytracker-${version}";
+  pname = "milkytracker";
 
   src = fetchFromGitHub {
     owner  = "milkytracker";
diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix
index dcaffe3eb9b..e91b2c9360d 100644
--- a/pkgs/applications/audio/mimic/default.nix
+++ b/pkgs/applications/audio/mimic/default.nix
@@ -3,7 +3,7 @@
 , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-  name = "mimic-${version}";
+  pname = "mimic";
   version = "1.2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 6d186cccde3..58a75ac44ce 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -7,7 +7,7 @@
 }:
 
 mkDerivation rec {
-  name = "mixxx-${version}";
+  pname = "mixxx";
   version = "2.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 3ed330cc743..89d062d584e 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -30,7 +30,7 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "moc-${version}";
+  pname = "moc";
   version = "2.5.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix
index c66f7837322..3fbe927be4b 100644
--- a/pkgs/applications/audio/mod-distortion/default.nix
+++ b/pkgs/applications/audio/mod-distortion/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lv2 }:
 
 stdenv.mkDerivation rec {
-  name = "mod-distortion-git-${version}";
+  pname = "mod-distortion-git";
   version = "2016-08-19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix
index 1b3e89d4885..58bb4d3e327 100644
--- a/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/pkgs/applications/audio/monkeys-audio/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   version = "3.99-u4-b5";
   pname = "monkeys-audio";
-  name = pname + "-" + version;
 
   patches = [ ./buildfix.diff ];
 
diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix
index eb5aa7c036c..727133be78d 100644
--- a/pkgs/applications/audio/mp3blaster/default.nix
+++ b/pkgs/applications/audio/mp3blaster/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
 
   version = "3.2.6";
 
-  name = "mp3blaster-${version}";
+  pname = "mp3blaster";
 
   src = fetchFromGitHub {
     owner = "stragulus";
diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix
index f2922e7eecf..f067c5af6df 100644
--- a/pkgs/applications/audio/mp3splt/default.nix
+++ b/pkgs/applications/audio/mp3splt/default.nix
@@ -3,11 +3,10 @@
 stdenv.mkDerivation rec {
   pname = "mp3splt";
   version = "2.6.2";
-  name = "${pname}-${version}";
 
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1aiv20gypb6r84qabz8gblk8vi42cg3x333vk2pi3fyqvl82phry";
   };
 
diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix
index 7477bea7602..6c35779f6c4 100644
--- a/pkgs/applications/audio/mp3val/default.nix
+++ b/pkgs/applications/audio/mp3val/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mp3val-${version}";
+  pname = "mp3val";
   version = "0.1.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mp3val/${name}-src.tar.gz";
+    url = "mirror://sourceforge/mp3val/${pname}-${version}-src.tar.gz";
     sha256 = "17y3646ghr38r620vkrxin3dksxqig5yb3nn4cfv6arm7kz6x8cm";
   };
 
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 220e72b568a..b13e1cc037a 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mpd_clientlib }:
 
 stdenv.mkDerivation rec {
-  name = "mpc-${version}";
+  pname = "mpc";
   version = "0.28";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index 3ffc5265f7a..65dfe3484b6 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mpg321-${version}";
+  pname = "mpg321";
   version = "0.3.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index b3efa82ead4..8582fd78192 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -17,7 +17,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "muse-sequencer-${version}";
+  pname = "muse-sequencer";
   version = "3.1pre1";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix
index e14594ae3b2..6f81ebbb8f1 100644
--- a/pkgs/applications/audio/musescore/darwin.nix
+++ b/pkgs/applications/audio/musescore/darwin.nix
@@ -8,7 +8,7 @@ in
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "musescore-darwin-${version}";
+  pname = "musescore-darwin";
   version = "${concatStringsSep "." versionComponents}";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index a595bb06900..2e69c3cda7a 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation rec {
-  name = "musescore-${version}";
+  pname = "musescore";
   version = "3.0.5";
 
   src = fetchzip {
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index a35d9c670fe..d89b61aa21f 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -2,7 +2,7 @@
 , mpd_clientlib, gettext, boost }:
 
 stdenv.mkDerivation rec {
-  name = "ncmpc-${version}";
+  pname = "ncmpc";
   version = "0.34";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index d35cefb8841..2ba36b4a50d 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -11,11 +11,11 @@ assert taglibSupport -> (taglib != null);
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "ncmpcpp-${version}";
+  pname = "ncmpcpp";
   version = "0.8.2";
 
   src = fetchurl {
-    url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
+    url = "https://ncmpcpp.rybczak.net/stable/${pname}-${version}.tar.bz2";
     sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5";
   };
 
diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix
index 8b715a24e3c..53ed9b3297c 100644
--- a/pkgs/applications/audio/ncpamixer/default.nix
+++ b/pkgs/applications/audio/ncpamixer/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "ncpamixer-${version}";
+  pname = "ncpamixer";
   version = "1.3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 44dd0d2d4ec..94cf32f8f82 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "non-${version}";
+  pname = "non";
   version = "2018-02-15";
   src = fetchFromGitHub {
     owner = "original-male";
diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix
index 85c902d3839..490ecc967bb 100644
--- a/pkgs/applications/audio/normalize/default.nix
+++ b/pkgs/applications/audio/normalize/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libmad }:
 
 stdenv.mkDerivation rec {
-  name = "normalize-${version}";
+  pname = "normalize";
   version = "0.7.7";
 
   src = fetchurl {
-    url = "mirror://savannah/normalize/${name}.tar.gz";
+    url = "mirror://savannah/normalize/${pname}-${version}.tar.gz";
     sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0";
   };
 
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix
index bb186687c66..91443bb1ef7 100644
--- a/pkgs/applications/audio/nova-filters/default.nix
+++ b/pkgs/applications/audio/nova-filters/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2-2";
-  name = "nova-filters-${version}";
+  pname = "nova-filters";
 
   src = fetchurl {
     url = https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz;
diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index e503793ab39..b34db81981f 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftw }:
 
 stdenv.mkDerivation rec {
-  name = "padthv1-${version}";
+  pname = "padthv1";
   version = "0.9.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/padthv1/${name}.tar.gz";
+    url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
     sha256 = "1k4p2ir12qjcs62knvw2s6qyvb46203yx22fnwp341cjk171cxji";
   };
 
diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix
index cc4a781ef66..2507f08e9e5 100644
--- a/pkgs/applications/audio/pamix/default.nix
+++ b/pkgs/applications/audio/pamix/default.nix
@@ -3,7 +3,7 @@
 , libpulseaudio, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "pamix-${version}";
+  pname = "pamix";
   version = "1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index 322a4e23846..2d518aad285 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-  name = "pamixer-${version}";
+  pname = "pamixer";
   version = "1.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix
index 7f3940e0ae9..4f76aefb5ed 100644
--- a/pkgs/applications/audio/patchage/default.nix
+++ b/pkgs/applications/audio/patchage/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "patchage-${version}";
+  pname = "patchage";
   version = "1.0.1";
   src = fetchsvn {
     url = http://svn.drobilla.net/lad/trunk/patchage/;
diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
index ae43bad5b2c..6440f6e787f 100644
--- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix
+++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, puredata }:
 
 stdenv.mkDerivation rec {
-  name = "cyclone-${version}";
+  pname = "cyclone";
   version = "0.3beta-2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
index 0eb75d77c68..21ba375200b 100644
--- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix
+++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, puredata }:
 
 stdenv.mkDerivation rec {
-  name = "maxlib-${version}";
+  pname = "maxlib";
   version = "1.5.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
index 972a162b73f..9e7de39218d 100644
--- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
+++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, puredata }:
 
 stdenv.mkDerivation rec {
-  name = "mrpeach-${version}";
+  pname = "mrpeach";
   version = "1.1";
 
   # this was to only usable url I could find:
diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
index 37d692a3ab5..c214d3fcf40 100644
--- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix
+++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, puredata }:
 
 stdenv.mkDerivation rec {
-  name = "puremapping-${version}";
+  pname = "puremapping";
   version = "20160130";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
index f2e54b327fc..fa9660fbbf6 100644
--- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix
+++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.0";
-  name = "timbreid-${version}";
+  pname = "timbreid";
 
   src = fetchurl {
     url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip";
diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix
index d56462ccc84..cc307417c06 100644
--- a/pkgs/applications/audio/pd-plugins/zexy/default.nix
+++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, automake, puredata }:
 
 stdenv.mkDerivation rec {
-  name = "zexy-${version}";
+  pname = "zexy";
   version = "2.2.4";
 
   src = fetchurl {
-    url = "https://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz";
+    url = "https://puredata.info/downloads/zexy/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp";
   };
 
diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix
index d86e5aae2cd..8bbeffb1f7a 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/applications/audio/petrifoo/default.nix
@@ -3,11 +3,11 @@
 , pkgconfig, openssl }:
 
 stdenv.mkDerivation  rec {
-  name = "petri-foo-${version}";
+  pname = "petri-foo";
   version = "0.1.87";
 
   src = fetchurl {
-    url =  "mirror://sourceforge/petri-foo/${name}.tar.bz2";
+    url =  "mirror://sourceforge/petri-foo/${pname}-${version}.tar.bz2";
     sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
   };
 
diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index 53afcdd2306..c2c4672be12 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }:
 
 stdenv.mkDerivation  rec {
-  name = "pianobooster-${version}";
+  pname = "pianobooster";
   version = "0.6.4b";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix
index 16d5eb69cb9..8c21dc8f2ad 100644
--- a/pkgs/applications/audio/playbar2/default.nix
+++ b/pkgs/applications/audio/playbar2/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "playbar2-${version}";
+  pname = "playbar2";
   version = "2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix
index 5529998803c..346387be7e3 100644
--- a/pkgs/applications/audio/plugin-torture/default.nix
+++ b/pkgs/applications/audio/plugin-torture/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }:
 
 stdenv.mkDerivation rec {
-  name = "plugin-torture-${version}";
+  pname = "plugin-torture";
   version = "2016-07-25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix
index 5cfbb7bf5a4..6d168ec5661 100644
--- a/pkgs/applications/audio/ponymix/default.nix
+++ b/pkgs/applications/audio/ponymix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ponymix-${version}";
+  pname = "ponymix";
   version = "5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index 5db5035c835..9414f4211d7 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, alsaLib, gtk2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "praat-${version}";
+  pname = "praat";
   version = "6.0.43";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index 9989f75c0bd..b8082c12c64 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -23,7 +23,7 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  name = "pulseaudio-modules-bt-${version}";
+  pname = "pulseaudio-modules-bt";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index 6ade9042b53..5886a465409 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation  rec {
-  name = "puredata-${version}";
+  pname = "puredata";
   version = "0.49-0";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 9b8c8035239..0b50d3098aa 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -2,12 +2,12 @@
 
 mkDerivation rec {
   version = "0.5.9";
-  name = "qjackctl-${version}";
+  pname = "qjackctl";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
-    url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
+    url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz";
     sha256 = "1saywsda9m124rmjp7i3n0llryaliabjxhqhvqr6dm983qy7pypk";
   };
 
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 16e76bb631c..d627f352e73 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.5";
-  name = "qmidinet-${version}";
+  pname = "qmidinet";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
+    url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz";
     sha256 = "0az20hh14g7k6h779dk1b6fshxnfj2664sj6ypgllzriwv430x9y";
   };
 
diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix
index 7f5191a02c2..2a83d98b6ea 100644
--- a/pkgs/applications/audio/qmidiroute/default.nix
+++ b/pkgs/applications/audio/qmidiroute/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.0";
-  name = "qmidiroute-${version}";
+  pname = "qmidiroute";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${pname}-${version}.tar.gz";
     sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n";
   };
 
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index 4e6df82a32a..a878f4edad8 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -2,11 +2,11 @@
 , liblscp, libgig, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "qsampler-${version}";
+  pname = "qsampler";
   version = "0.5.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qsampler/${name}.tar.gz";
+    url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz";
     sha256 = "0lx2mzyajmjckwfvgf8p8bahzpj0n0lflyip41jk32nwd2hzjhbs";
   };
 
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 82e003b2bea..81b7e35b630 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt5, autoconf, pkgconfig }:
 
 stdenv.mkDerivation  rec {
-  name = "qsynth-${version}";
+  pname = "qsynth";
   version = "0.5.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qsynth/${name}.tar.gz";
+    url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz";
     sha256 = "18im4w8agj60nkppwbkxqnhpp13z5li3w30kklv4lgs20rvgbvl6";
   };
 
diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix
index 453da89953e..68e8e6402ac 100644
--- a/pkgs/applications/audio/qtscrobbler/default.nix
+++ b/pkgs/applications/audio/qtscrobbler/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
-  name = "qtscrobbler-${version}";
+  pname = "qtscrobbler";
   version = "0.11";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix
index ec71cfb427c..36302458a75 100644
--- a/pkgs/applications/audio/rakarrack/default.nix
+++ b/pkgs/applications/audio/rakarrack/default.nix
@@ -2,11 +2,11 @@
 libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
 
 stdenv.mkDerivation  rec {
-  name = "rakarrack-${version}";
+  pname = "rakarrack";
   version = "0.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/rakarrack/${name}.tar.bz2";
+    url = "mirror://sourceforge/rakarrack/${pname}-${version}.tar.bz2";
     sha256 = "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn";
   };
 
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 2e4658a68c9..334656ecc9a 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "reaper-${version}";
+  pname = "reaper";
   version = "5.980";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix
index 1918fa9e3a9..e32fd42af32 100644
--- a/pkgs/applications/audio/redoflacs/default.nix
+++ b/pkgs/applications/audio/redoflacs/default.nix
@@ -2,7 +2,7 @@
 , flac, sox }:
 
 stdenv.mkDerivation rec {
-  name = "redoflacs-${version}";
+  pname = "redoflacs";
   version = "0.30.20150202";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index ddbefd129ff..62625aa421d 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -14,7 +14,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "renoise-${version}";
+  pname = "renoise";
   version = "3.1.0";
 
   src =
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index 313227f7798..9445bf3723c 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation (rec {
   version = "19.06";
-  name = "rosegarden-${version}";
+  pname = "rosegarden";
 
   src = fetchurl {
-    url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
+    url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2";
     sha256 = "169qb58v2s8va59hzkih8nqb2aipsqlrbfs8q39ywqa8w5d60gcc";
   };
 
diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix
index 9e0a3712c97..82aa86f795b 100644
--- a/pkgs/applications/audio/rubyripper/default.nix
+++ b/pkgs/applications/audio/rubyripper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ruby, cdparanoia, makeWrapper }:
 stdenv.mkDerivation rec {
   version = "0.6.2";
-  name = "rubyripper-${version}";
+  pname = "rubyripper";
   src = fetchurl {
     url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2";
     sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1";
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index f9b1fe6afe0..5a62a8a4292 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }:
 
 stdenv.mkDerivation rec {
-  name = "samplv1-${version}";
+  pname = "samplv1";
   version = "0.9.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/samplv1/${name}.tar.gz";
+    url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
     sha256 = "1y61wb0bzm1cz7y8xxv6hp8mrkfb9zm9irg6zs4g6aanw539r6l8";
   };
 
diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix
index ab1a6e38738..f902b2dd41b 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "20120105";
-  name = "schismtracker-${version}";
+  pname = "schismtracker";
 
   src = fetchurl {
-    url = "http://schismtracker.org/dl/${name}.tar.bz2";
+    url = "http://schismtracker.org/dl/${pname}-${version}.tar.bz2";
     sha256 = "1ny7wv2wxm1av299wvpskall6438wjjpadphmqc7c0h6d0zg5kii";
   };
 
diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix
index d47ede27ece..9bab024f021 100644
--- a/pkgs/applications/audio/seq24/default.nix
+++ b/pkgs/applications/audio/seq24/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }:
 
 stdenv.mkDerivation  rec {
-  name = "seq24-${version}";
+  pname = "seq24";
   version = "0.9.3";
 
   src = fetchurl {
-    url = "https://launchpad.net/seq24/trunk/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/seq24/trunk/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1qpyb7355s21sgy6gibkybxpzx4ikha57a8w644lca6qy9mhcwi3";
   };
 
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index 1047734a2c1..9502cb7b7e7 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation  rec {
-  name = "setbfree-${version}";
+  pname = "setbfree";
   version = "0.8.8";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix
index a98d1431d65..5708ef0ce0a 100644
--- a/pkgs/applications/audio/sfxr-qt/default.nix
+++ b/pkgs/applications/audio/sfxr-qt/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sfxr-qt-${version}";
+  pname = "sfxr-qt";
   version = "1.2.0";
   src = fetchFromGitHub {
     owner = "agateau";
diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix
index 8645251b384..dc8d95d2c49 100644
--- a/pkgs/applications/audio/shntool/default.nix
+++ b/pkgs/applications/audio/shntool/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.10";
-  name = "shntool-${version}";
+  pname = "shntool";
 
   src = fetchurl {
     url = http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz;
diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix
index b857c5b6835..aff8c173d9f 100644
--- a/pkgs/applications/audio/sidplayfp/default.nix
+++ b/pkgs/applications/audio/sidplayfp/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.4";
-  name = "sidplayfp-${version}";
+  pname = "sidplayfp";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${name}.tar.gz";
+    url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${pname}-${version}.tar.gz";
     sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m";
   };
 
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 5730dec6b99..21a36cecbe5 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -32,7 +32,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "snapcast-${version}";
+  pname = "snapcast";
   version = "0.15.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index ee72b6cdb1a..7934af8aad8 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -21,7 +21,7 @@ let
 
 in stdenv.mkDerivation rec {
   version = "3.1.0";
-  name = "sonic-pi-${version}";
+  pname = "sonic-pi";
 
   src = fetchFromGitHub {
     owner = "samaaron";
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index d5f613b4594..501d097f29f 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -7,11 +7,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sonic-visualiser-${version}";
+  pname = "sonic-visualiser";
   version = "2.4.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz";
     sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb";
   };
 
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix
index bf4d96c6fc4..8dcca85a25c 100644
--- a/pkgs/applications/audio/sooperlooper/default.nix
+++ b/pkgs/applications/audio/sooperlooper/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sooperlooper-git-${version}";
+  pname = "sooperlooper-git";
   version = "2016-07-19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix
index cf0b5db81f6..5d8ae0928c9 100644
--- a/pkgs/applications/audio/sorcer/default.nix
+++ b/pkgs/applications/audio/sorcer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "sorcer-${version}";
+  pname = "sorcer";
   version = "1.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix
index babe4edff9d..01f0708d115 100644
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -15,7 +15,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "soundscape-renderer-unstable-${version}";
+  pname = "soundscape-renderer-unstable";
 
   version = "2016-11-03";
 
diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix
index 64deede535b..7544a3520c7 100644
--- a/pkgs/applications/audio/spectmorph/default.nix
+++ b/pkgs/applications/audio/spectmorph/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }:
 
 stdenv.mkDerivation rec {
-  name = "spectmorph-${version}";
+  pname = "spectmorph";
   version = "0.5.0";
   src = fetchurl {
-    url = "http://spectmorph.org/files/releases/${name}.tar.bz2";
+    url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2";
     sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn";
   };
 
diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix
index 6614e370224..4c1682b1e0b 100644
--- a/pkgs/applications/audio/spectrojack/default.nix
+++ b/pkgs/applications/audio/spectrojack/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "spectrojack-${version}";
+  pname = "spectrojack";
   version = "0.4.1";
 
   src = fetchurl {
-    url = "http://sed.free.fr/spectrojack/${name}.tar.gz";
+    url = "http://sed.free.fr/spectrojack/${pname}-${version}.tar.gz";
     sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp";
   };
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix
index 8af7888f74b..f4922e388c4 100644
--- a/pkgs/applications/audio/spek/default.nix
+++ b/pkgs/applications/audio/spek/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }:
 
 stdenv.mkDerivation rec {
-  name = "spek-${version}";
+  pname = "spek";
   version = "0.8.3";
 
   src = fetchzip {
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz";
     sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv";
   };
diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix
index 372e507ed0e..3c9565df919 100644
--- a/pkgs/applications/audio/split2flac/default.nix
+++ b/pkgs/applications/audio/split2flac/default.nix
@@ -18,7 +18,7 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  name = "split2flac-${version}";
+  pname = "split2flac";
   version = "122";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix
index 64ae9491535..3447049099b 100644
--- a/pkgs/applications/audio/spotifywm/default.nix
+++ b/pkgs/applications/audio/spotifywm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }:
 stdenv.mkDerivation rec {
-  name = "spotifywm-unstable-${version}";
+  pname = "spotifywm-unstable";
   version = "2016-11-28";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix
index 19386b47794..9eb71835caa 100644
--- a/pkgs/applications/audio/ssrc/default.nix
+++ b/pkgs/applications/audio/ssrc/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "ssrc";
-  name = "${pname}-${version}";
   version = "1.33";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix
index 39d1c266a37..efa87a2f72c 100644
--- a/pkgs/applications/audio/streamripper/default.nix
+++ b/pkgs/applications/audio/streamripper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }:
 
 stdenv.mkDerivation rec {
-  name = "streamripper-${version}";
+  pname = "streamripper";
   version = "1.64.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/streamripper/${name}.tar.gz";
+    url = "mirror://sourceforge/streamripper/${pname}-${version}.tar.gz";
     sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1";
   };
 
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
index 957ee50ca7a..1a3d1a96c85 100644
--- a/pkgs/applications/audio/sunvox/default.nix
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -12,7 +12,7 @@ let
     else "x86";
 in
 stdenv.mkDerivation rec {
-  name = "SunVox-${version}";
+  pname = "SunVox";
   version = "1.9.4c";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
index 5e26b6c1cdb..d25e61c37f5 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/pkgs/applications/audio/svox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "svox-${version}";
+  pname = "svox";
   version = "2017-07-18";
 
   src = fetchgit {
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix
index 6fa0eb7f8f2..b59752d7cc3 100644
--- a/pkgs/applications/audio/swh-lv2/default.nix
+++ b/pkgs/applications/audio/swh-lv2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "swh-lv2-${version}";
+  pname = "swh-lv2";
   version = "1.0.16";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index d28329b0117..1c373aefb4f 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, qt5, libjack2, alsaLib, liblo, lv2 }:
 
 stdenv.mkDerivation rec {
-  name = "synthv1-${version}";
+  pname = "synthv1";
   version = "0.9.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/synthv1/${name}.tar.gz";
+    url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
     sha256 = "0cvamqzg74qfr7kzk3skimskmv0j3d1rmmpbpsmfcrg8srvyx9r2";
   };
 
diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix
index a739d72898e..2438cf68536 100644
--- a/pkgs/applications/audio/tambura/default.nix
+++ b/pkgs/applications/audio/tambura/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
   pname = "Tambura";
-  name = "${pname}-${version}";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix
index 257963de256..40362fdd496 100644
--- a/pkgs/applications/audio/tetraproc/default.nix
+++ b/pkgs/applications/audio/tetraproc/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tetraproc-${version}";
+  pname = "tetraproc";
   version = "0.8.6";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "02155ljfwgvfgq9z258fb4z7jrz7qx022d054fj5gr0v007cv0r7";
   };
 
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index 78bd4338353..c983123ca38 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -12,11 +12,11 @@ assert enableKDE       -> kdelibs4     != null;
 assert enableTelepathy -> telepathy-qt != null;
 
 stdenv.mkDerivation rec {
-  name = "tomahawk-${version}";
+  pname = "tomahawk";
   version = "0.8.4";
 
   src = fetchurl {
-    url = "http://download.tomahawk-player.org/${name}.tar.bz2";
+    url = "http://download.tomahawk-player.org/${pname}-${version}.tar.bz2";
     sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g";
   };
 
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix
index 74079041948..8eb846ac9c5 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/pkgs/applications/audio/transcribe/default.nix
@@ -2,7 +2,7 @@
 , glib, gst_all_1,  gtk3, libSM, libX11, libpng12, pango, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "transcribe-${version}";
+  pname = "transcribe";
   version = "8.72";
 
   src = if stdenv.hostPlatform.system == "i686-linux" then
diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix
index 0c432acf4af..0f70f956713 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/pkgs/applications/audio/traverso/default.nix
@@ -3,7 +3,7 @@
 , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
 }:
 stdenv.mkDerivation rec {
-  name = "traverso-${version}";
+  pname = "traverso";
   version = "0.49.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 2e55306029f..066767c293c 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -27,7 +27,7 @@ let
   };
 in
 with stdenv.lib; stdenv.mkDerivation rec {
-  name = "VCV-Rack-${version}";
+  pname = "VCV-Rack";
   version = "1.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix
index ce561b5db31..7f02ea9cefe 100644
--- a/pkgs/applications/audio/vimpc/default.nix
+++ b/pkgs/applications/audio/vimpc/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.09.2";
-  name = "vimpc-${version}";
+  pname = "vimpc";
 
   src = fetchFromGitHub {
     owner = "boysetsfrog";
diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix
index b7b0fba2d54..485edaa1ff2 100644
--- a/pkgs/applications/audio/vkeybd/default.nix
+++ b/pkgs/applications/audio/vkeybd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, libX11, makeWrapper, tcl, tk }:
 
 stdenv.mkDerivation  rec {
-  name = "vkeybd-${version}";
+  pname = "vkeybd";
   version = "0.1.18d";
 
   src = fetchurl {
-    url = "ftp://ftp.suse.com/pub/people/tiwai/vkeybd/${name}.tar.bz2";
+    url = "ftp://ftp.suse.com/pub/people/tiwai/vkeybd/${pname}-${version}.tar.bz2";
     sha256 = "0107b5j1gf7dwp7qb4w2snj4bqiyps53d66qzl2rwj4jfpakws5a";
   };
 
diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix
index 735e4eb632c..13bf1d674c7 100644
--- a/pkgs/applications/audio/wolf-shaper/default.nix
+++ b/pkgs/applications/audio/wolf-shaper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "wolf-shaper-${version}";
+  pname = "wolf-shaper";
   version = "0.1.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index ece2f567791..22594d3ec85 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "20190714";
-  name = "x42-plugins-${version}";
+  pname = "x42-plugins";
 
   src = fetchurl {
-    url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz";
+    url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
     sha256 = "1mifmdy9pi1lg0h4nsvyjjnnni41vhgg34lks94mrx46wq90bgx4";
   };
 
diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix
index a55b47a6c16..c0803ffa418 100644
--- a/pkgs/applications/audio/xsynth-dssi/default.nix
+++ b/pkgs/applications/audio/xsynth-dssi/default.nix
@@ -2,11 +2,11 @@
 ladspaH, ladspaPlugins, liblo, pkgconfig }:
 
 stdenv.mkDerivation  rec {
-  name = "xsynth-dssi-${version}";
+  pname = "xsynth-dssi";
   version = "0.9.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dssi/${name}.tar.gz";
+    url = "mirror://sourceforge/dssi/${pname}-${version}.tar.gz";
     sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
   };
 
diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix
index ca6d6240688..c8902f1dda4 100644
--- a/pkgs/applications/audio/yasr/default.nix
+++ b/pkgs/applications/audio/yasr/default.nix
@@ -1,12 +1,12 @@
 {stdenv,fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "yasr-${version}";
+  pname = "yasr";
 
   version = "0.6.9";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${name}.tar.gz";
+    url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${pname}-${version}.tar.gz";
     sha256 = "1prv9r9y6jb5ga5578ldiw507fa414m60xhlvjl29278p3x7rwa1";
   };
 
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix
index b800df016c9..7976f747717 100644
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/pkgs/applications/audio/ympd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "ympd-${version}";
+  pname = "ympd";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 00a22ac711e..0936fe5a8ed 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -5,11 +5,11 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
-  name = "yoshimi-${version}";
+  pname = "yoshimi";
   version = "1.5.11.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
+    url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2";
     sha256 = "00w0ll94dpss9f1rnaxjmw6mgjx5q2dz8w4mc3wyrk4s4gbd7154";
   };
 
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index 69906b81438..cc04632cfb5 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
 
 stdenv.mkDerivation rec {
-  name = "zam-plugins-${version}";
+  pname = "zam-plugins";
   version = "3.11";
 
   src = fetchgit {
diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/applications/audio/zita-njbridge/default.nix
index faa90e684ae..1ec6946cf38 100644
--- a/pkgs/applications/audio/zita-njbridge/default.nix
+++ b/pkgs/applications/audio/zita-njbridge/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.4";
-  name = "zita-njbridge-${version}";
+  pname = "zita-njbridge";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1l8rszdjhp0gq7mr54sdgfs6y6cmw11ssmqb1v9yrkrz5rmwzg8j";
   };
 
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index 7bc1c07befa..e22bf9ed653 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation  rec {
-  name = "zynaddsubfx-${version}";
+  pname = "zynaddsubfx";
   version = "3.0.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/backup/vdmfec/default.nix b/pkgs/applications/backup/vdmfec/default.nix
index 3a480f70d4b..1366bb484a9 100644
--- a/pkgs/applications/backup/vdmfec/default.nix
+++ b/pkgs/applications/backup/vdmfec/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "vdmfec-${version}";
+  pname = "vdmfec";
   version = "1.0";
 
   src = fetchurl {
-    url = "http://members.tripod.com/professor_tom/archives/${name}.tgz";
+    url = "http://members.tripod.com/professor_tom/archives/${pname}-${version}.tgz";
     sha256 = "0i7q4ylx2xmzzq778anpkj4nqir5gf573n1lbpxnbc10ymsjq2rm";
   };
 
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
index 45fd3cb8cbb..8302303a08e 100644
--- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.1";
-  name = "lightdm-enso-os-greeter-${version}";
+  pname = "lightdm-enso-os-greeter";
 
   src = fetchgit {
     url = https://github.com/nick92/Enso-OS;
diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index 91446f73507..69635718e3b 100644
--- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "lightdm-mini-greeter-${version}";
+  pname = "lightdm-mini-greeter";
   version = "0.3.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix
index e8edcc3f634..2f0a770bc71 100644
--- a/pkgs/applications/display-managers/ly/default.nix
+++ b/pkgs/applications/display-managers/ly/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, linux-pam }:
 
 stdenv.mkDerivation rec { 
-  name = "ly-${version}";
+  pname = "ly";
   version = "0.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix
index 214b435429a..1bd73bebe03 100644
--- a/pkgs/applications/editors/aewan/default.nix
+++ b/pkgs/applications/editors/aewan/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "aewan-${version}";
+  pname = "aewan";
   version = "1.0.01";
 
   src = fetchurl {
-    url = "mirror://sourceforge/aewan/${name}.tar.gz";
+    url = "mirror://sourceforge/aewan/${pname}-${version}.tar.gz";
     sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817";
   };
 
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 7db4d3e947b..170fde7b9ca 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -10,7 +10,7 @@ let
   skia = callPackage ./skia.nix {};
 in
 stdenv.mkDerivation rec {
-  name = "aseprite-${version}";
+  pname = "aseprite";
   version = if unfree then "1.2.11" else "1.1.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix
index 9f1db146448..a12ccd257f8 100644
--- a/pkgs/applications/editors/bonzomatic/default.nix
+++ b/pkgs/applications/editors/bonzomatic/default.nix
@@ -1,7 +1,6 @@
 { stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "bonzomatic";
   version = "2018-03-29";
 
diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index 17ae4052198..439b721632d 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -8,13 +8,13 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  name = "brackets-${version}";
+  pname = "brackets";
   version = "1.9";
 
   src = fetchurl {
     url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb";
     sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp";
-    name = "${name}.deb";
+    name = "${pname}-${version}.deb";
   };
 
   phases = [ "installPhase" "fixupPhase" ];
diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix
index f5e14ff1e09..3237c543ee6 100644
--- a/pkgs/applications/editors/bvi/default.nix
+++ b/pkgs/applications/editors/bvi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "bvi-${version}";
+  pname = "bvi";
   version = "1.4.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bvi/${name}.src.tar.gz";
+    url = "mirror://sourceforge/bvi/${pname}-${version}.src.tar.gz";
     sha256 = "00pq9rv7s8inqxq2m3xshxi58691i3pxw9smibcrgh6768l3qnh1";
   };
 
diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix
index d08e006ec5b..2c6b153370e 100644
--- a/pkgs/applications/editors/bviplus/default.nix
+++ b/pkgs/applications/editors/bviplus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "bviplus-${version}";
+  pname = "bviplus";
   version = "0.9.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix
index 4ab11064eae..65ec4393912 100644
--- a/pkgs/applications/editors/deadpixi-sam/default.nix
+++ b/pkgs/applications/editors/deadpixi-sam/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2017-10-27";
-  name = "deadpixi-sam-unstable-${version}";
+  pname = "deadpixi-sam-unstable";
 
   src = fetchFromGitHub {
     owner = "deadpixi";
diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix
index f4581c4bece..efb3a2f9ffa 100644
--- a/pkgs/applications/editors/dhex/default.nix
+++ b/pkgs/applications/editors/dhex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "dhex-${version}";
+  pname = "dhex";
   version = "0.69";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix
index 12ca7a07140..2f83b0b8d99 100644
--- a/pkgs/applications/editors/dit/default.nix
+++ b/pkgs/applications/editors/dit/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchurl, stdenv, libiconv, ncurses, lua }:
 
 stdenv.mkDerivation rec {
-  name = "dit-${version}";
+  pname = "dit";
   version = "0.5";
 
   src = fetchurl {
-    url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz";
+    url = "https://hisham.hm/dit/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "05vhr1gl3bb5fg49v84xhmjaqdjw6djampvylw10ydvbpnpvjvjc";
   };
 
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index 0b6e28434f5..0de514233f8 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
 
 stdenv.mkDerivation rec {
-  name = "edbrowse-${version}";
+  pname = "edbrowse";
   version = "3.7.4";
 
   buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix
index 17fa75fe634..acda484ba3a 100644
--- a/pkgs/applications/editors/edit/default.nix
+++ b/pkgs/applications/editors/edit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }:
 
 stdenv.mkDerivation rec {
-  name = "edit-nightly-${version}";
+  pname = "edit-nightly";
   version = "20160425";
 
   src = fetchgit {
diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix
index 34120db6aa7..8c9b7771b0f 100644
--- a/pkgs/applications/editors/emacs-modes/cask/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cask/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.4";
-  name = "cask-${version}";
+  pname = "cask";
 
   src = fetchFromGitHub {
     owner = "cask";
diff --git a/pkgs/applications/editors/emacs-modes/cedille/default.nix b/pkgs/applications/editors/emacs-modes/cedille/default.nix
index 2d1cbb75981..ce9f57ef40b 100644
--- a/pkgs/applications/editors/emacs-modes/cedille/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cedille/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cedille, emacs }:
 
 stdenv.mkDerivation rec {
-  name    = "cedille-mode-${version}";
+  pname = "cedille-mode";
   version = cedille.version;
 
   src = cedille.src;
diff --git a/pkgs/applications/editors/emacs-modes/cryptol/default.nix b/pkgs/applications/editors/emacs-modes/cryptol/default.nix
index 5b408ad7999..108d23ce233 100644
--- a/pkgs/applications/editors/emacs-modes/cryptol/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cryptol/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, emacs }:
 
 stdenv.mkDerivation rec {
-  name    = "cryptol-mode-${version}";
+  pname = "cryptol-mode";
   version = "0.1.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
index c32669239f8..ce13c3042b9 100644
--- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn }:
 
 stdenv.mkDerivation rec {
-  name    = "hol_light-mode-${version}";
+  pname = "hol_light-mode";
   version = "73";
 
   src = fetchsvn {
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 17cf213a799..27dcd1063bf 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -21,7 +21,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "2019-02-22";
-  name = "icicles-${version}";
+  pname = "icicles";
 
   srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = "emacs --batch -L . -f batch-byte-compile *.el";
 
-  installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/";
+  installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/";
 
   meta = {
     homepage = https://www.emacswiki.org/emacs/Icicles;
diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix
index 2e168b3abf7..18e2e8ec168 100644
--- a/pkgs/applications/editors/emacs-modes/idris/default.nix
+++ b/pkgs/applications/editors/emacs-modes/idris/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, emacs }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "idris-mode";
   version = "0.9.18";
 
diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix
index c0ddbc88cf2..c8b64130872 100644
--- a/pkgs/applications/editors/emacs-modes/jabber/default.nix
+++ b/pkgs/applications/editors/emacs-modes/jabber/default.nix
@@ -2,9 +2,8 @@
 stdenv.mkDerivation rec {
   pname  = "emacs-jabber";
   version = "0.8.0";
-  name = "${pname}-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26";
   };
   buildInputs = [ emacs ];
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix
index 0f7ac1d1dc8..1f59a355da3 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emacs, texinfo, texLive, which, automake, enableDoc ? false }:
 
 stdenv.mkDerivation rec {
-  name = "ProofGeneral-${version}";
+  pname = "ProofGeneral";
   version = "4.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
index de72b24f87a..99d7f641eac 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
 
 stdenv.mkDerivation (rec {
-  name = "ProofGeneral-unstable-${version}";
+  pname = "ProofGeneral-unstable";
   version = "2018-01-30";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix
index 6d420599152..e48fba1551e 100644
--- a/pkgs/applications/editors/featherpad/default.nix
+++ b/pkgs/applications/editors/featherpad/default.nix
@@ -4,7 +4,7 @@ with qt5;
 
 stdenv.mkDerivation rec {
   version = "0.10.0";
-  name = "featherpad-${version}";
+  pname = "featherpad";
   src = fetchFromGitHub {
     owner = "tsujan";
     repo = "FeatherPad";
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 104206a1491..b8b11e5e831 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fltk13, ghostscript }:
 
 stdenv.mkDerivation rec {
-  name = "flpsed-${version}";
+  pname = "flpsed";
   version = "0.7.3";
 
   src = fetchurl {
-    url = "http://www.flpsed.org/${name}.tar.gz";
+    url = "http://www.flpsed.org/${pname}-${version}.tar.gz";
     sha256 = "0vngqxanykicabhfdznisv82k5ypkxwg0s93ms9ribvhpm8vf2xp";
   };
 
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index ce553fa8b28..e1155cb098c 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia }:
 
 stdenv.mkDerivation rec {
-  name = "focuswriter-${version}";
+  pname = "focuswriter";
   version = "1.7.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix
index 8aea8508aef..de57fb09215 100644
--- a/pkgs/applications/editors/hecate/default.nix
+++ b/pkgs/applications/editors/hecate/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "0.0.1";
-  name = "hecate-${version}";
+  pname = "hecate";
 
   src = fetchFromGitHub {
     owner  = "evanmiller";
diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
index dce02b56890..4e67fc304b1 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/pkgs/applications/editors/heme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "heme-${version}";
+  pname = "heme";
   version = "0.4.2";
   src = fetchurl {
     url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz";
diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix
index 22cc4d47e68..a6437f070b9 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "hexcurse-${version}";
+  pname = "hexcurse";
   version = "1.60.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix
index 4671df77554..09191b38e1b 100644
--- a/pkgs/applications/editors/hexedit/default.nix
+++ b/pkgs/applications/editors/hexedit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "hexedit-${version}";
+  pname = "hexedit";
   version = "1.2.13";
 
   src = fetchurl {
-    url = "http://rigaux.org/${name}.src.tgz";
+    url = "http://rigaux.org/${pname}-${version}.src.tgz";
     sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka";
   };
 
diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix
index e7f200a4c07..5e5f2f8563c 100644
--- a/pkgs/applications/editors/howl/default.nix
+++ b/pkgs/applications/editors/howl/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "howl-${version}";
+  pname = "howl";
   version = "0.6";
 
   # Use the release tarball containing pre-downloaded dependencies sources
diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix
index 63864bc581d..fc1fe969bdc 100644
--- a/pkgs/applications/editors/ht/default.nix
+++ b/pkgs/applications/editors/ht/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ht-${version}";
+  pname = "ht";
   version = "2.1.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix
index b2ace8accd8..6f5839b3d06 100644
--- a/pkgs/applications/editors/joe/default.nix
+++ b/pkgs/applications/editors/joe/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "4.6";
-  name = "joe-${version}";
+  pname = "joe";
 
   src = fetchurl {
-    url = "mirror://sourceforge/joe-editor/${name}.tar.gz";
+    url = "mirror://sourceforge/joe-editor/${pname}-${version}.tar.gz";
     sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9";
   };
 
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index 9547b82efa1..cb9f10281c7 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -6,7 +6,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "juicipp-${version}";
+  pname = "juicipp";
   version = "1.2.3";
 
   meta = {
diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix
index 5e6406e33f2..4a44b35a0fa 100644
--- a/pkgs/applications/editors/jupp/default.nix
+++ b/pkgs/applications/editors/jupp/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "jupp-${version}";
+  pname = "jupp";
   version = "3.1";
   srcName = "joe-3.1jupp31";
 
diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix
index c3b46cf61df..795342fba5d 100644
--- a/pkgs/applications/editors/leafpad/default.nix
+++ b/pkgs/applications/editors/leafpad/default.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.18.1";
-  name = "leafpad-${version}";
+  pname = "leafpad";
   src = fetchurl {
-    url = "https://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz";
     sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
   };
 
diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index a2274be463e..ff824d8b45b 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "leo-editor-${version}";
+  pname = "leo-editor";
   version = "5.7.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index c3a280aed92..90e8c73e075 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -21,13 +21,13 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "lighttable-${version}";
+  pname = "lighttable";
   version = "0.8.1";
 
   src =
       fetchurl {
         name = "LightTableLinux64.tar.gz";
-        url = "https://github.com/LightTable/LightTable/releases/download/${version}/${name}-linux.tar.gz";
+        url = "https://github.com/LightTable/LightTable/releases/download/${version}/${pname}-${version}-linux.tar.gz";
         sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv";
       };
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     tar xf ${src}
     mkdir -p $out/{bin,share/LightTable}
-    mv ./${name}-linux/* $out/share/LightTable
+    mv ./${pname}-${version}-linux/* $out/share/LightTable
 
     patchelf \
       --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index 4fb8d51b969..de1a5ce7879 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libbsd, ncurses, buildPackages }:
 
 stdenv.mkDerivation rec {
-  name = "mg-${version}";
+  pname = "mg";
   version = "20171014";
 
   src = fetchurl {
-    url = "http://homepage.boetes.org/software/mg/${name}.tar.gz";
+    url = "http://homepage.boetes.org/software/mg/${pname}-${version}.tar.gz";
     sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai";
   };
 
diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix
index fab3646efdf..e6b93f20c48 100644
--- a/pkgs/applications/editors/micro/default.nix
+++ b/pkgs/applications/editors/micro/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage  rec {
-  name = "micro-${version}";
+  pname = "micro";
   version = "1.4.1";
 
   goPackagePath = "github.com/zyedidia/micro";
diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix
index a027242c5ee..9cfcf95e78b 100644
--- a/pkgs/applications/editors/mindforger/default.nix
+++ b/pkgs/applications/editors/mindforger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qmake, qtbase, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  name = "mindforger-${version}";
+  pname = "mindforger";
   version = "1.48.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix
index 3f7eba73ca4..4e960524b94 100644
--- a/pkgs/applications/editors/moe/default.nix
+++ b/pkgs/applications/editors/moe/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "moe-${version}";
+  pname = "moe";
   version = "1.10";
 
   src = fetchurl {
-    url = "mirror://gnu/moe/${name}.tar.lz";
+    url = "mirror://gnu/moe/${pname}-${version}.tar.lz";
     sha256 = "0fymywdiy9xqppcmvgs7mf7d3gfrky3jp5jkxs2l3v93asml9zcc";
   };
 
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index c2917aa394f..3a21eec07f4 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -7,10 +7,10 @@
 stdenv.mkDerivation rec {
   version = "5.9.4.5";
   revision = "8010a90f6e246b32364e3fb46ef2c9d1be9c9a2b";
-  name = "monodevelop-${version}";
+  pname = "monodevelop";
 
   src = fetchurl {
-    url = "https://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
+    url = "https://download.mono-project.com/sources/monodevelop/${pname}-${version}.tar.bz2";
     sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji";
   };
 
diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix
index 1b1c6eaf9e5..70f99fa749b 100644
--- a/pkgs/applications/editors/music/tuxguitar/default.nix
+++ b/pkgs/applications/editors/music/tuxguitar/default.nix
@@ -7,10 +7,10 @@ let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostP
     { arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; };
 in stdenv.mkDerivation rec {
   version = "1.2";
-  name = "tuxguitar-${version}";
+  pname = "tuxguitar";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tuxguitar/${name}-linux-${metadata.arch}.tar.gz";
+    url = "mirror://sourceforge/tuxguitar/${pname}-${version}-linux-${metadata.arch}.tar.gz";
     sha256 = metadata.sha256;
   };
 
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 6bbdaf77a69..6072cb62b59 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -19,11 +19,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "nano-${version}";
+  pname = "nano";
   version = "3.2";
 
   src = fetchurl {
-    url = "mirror://gnu/nano/${name}.tar.xz";
+    url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
     sha256 = "0jb3zq0v84xb0chyynkcp2jhs9660wmpkic294p4p6c96npp69yi";
   };
 
diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix
index fb30036e146..7902ddc410c 100644
--- a/pkgs/applications/editors/nano/nanorc/default.nix
+++ b/pkgs/applications/editors/nano/nanorc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "nanorc-${version}";
+  pname = "nanorc";
   version = "2018-09-05";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
index 9bc6425bc41..96687ab81d6 100644
--- a/pkgs/applications/editors/ne/default.nix
+++ b/pkgs/applications/editors/ne/default.nix
@@ -2,7 +2,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "ne-${version}";
+  pname = "ne";
   version = "3.1.2";
   src = fetchFromGitHub {
     owner = "vigna";
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index 6fff6df8cdd..b1b3a416178 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xlibsWrapper, motif, libXpm }:
 
 stdenv.mkDerivation rec {
-  name = "nedit-${version}";
+  pname = "nedit";
   version = "5.7";
   
   src = fetchurl {
-    url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz";
+    url = "mirror://sourceforge/nedit/nedit-source/${pname}-${version}-src.tar.gz";
     sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd";
   };
 
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 0d0877015ee..7d558dfb893 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -20,7 +20,7 @@ let
     ));
 in
   stdenv.mkDerivation rec {
-    name = "neovim-unwrapped-${version}";
+    pname = "neovim-unwrapped";
     version = "0.3.8";
 
     src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index 03bdd5e0882..287758e0fd8 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -3,11 +3,11 @@
 , qca-qt5, shared-mime-info }:
 
 stdenv.mkDerivation rec {
-  name = "okteta-${version}";
+  pname = "okteta";
   version = "0.26.2";
 
   src = fetchurl {
-    url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
     sha256 = "0k38hd9wq6jvzy0225y61rzr7lgwbac1haalhsrfpmyjy6d833dv";
   };
 
diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
index 2f4693982a9..2dceee0a37d 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "scite-${version}";
+  pname = "scite";
   version = "4.0.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index 90d89ce7799..ac171f60ead 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation rec {
-  name = "sigil-${version}";
+  pname = "sigil";
   version = "0.9.14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix
index a6d624d4b1e..efbca2949dd 100644
--- a/pkgs/applications/editors/supertux-editor/default.nix
+++ b/pkgs/applications/editors/supertux-editor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }:
 stdenv.mkDerivation rec {
   version = "git-2014-08-20";
-  name = "supertux-editor-${version}";
+  pname = "supertux-editor";
 
   src = fetchFromGitHub {
     owner = "SuperTux";
diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index dd986b346a3..48af4a99dad 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "tecoc-git-${version}";
+  pname = "tecoc-git";
   version = "20150606";
 
   src = fetchFromGitHub {
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
   makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ];
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/doc/${name} $out/lib/teco/macros
+    mkdir -p $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros
     cp src/tecoc $out/bin
-    cp src/aaout.txt doc/* $out/share/doc/${name}
+    cp src/aaout.txt doc/* $out/share/doc/${pname}-${version}
     cp lib/* lib2/* $out/lib/teco/macros
     (cd $out/bin
      ln -s tecoc Make
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 79ece9d62a9..2a4459ddc3e 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "texmaker";
   version = "5.0.3";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
+    url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
     sha256 = "0vrj9w5lk3vf6138n5bz8phmy3xp5kv4dq1rgirghcf4hbxdyx30";
   };
 
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 50113dd1566..04e2cb45e28 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "texstudio";
   version = "2.12.16";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "${pname}-org";
diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index 79cad6a9782..85006e51b66 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }:
 stdenv.mkDerivation rec {
   version = "10.2";
-  name = "textadept-${version}";
+  pname = "textadept";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix
index 86904c11f74..8042363f73c 100644
--- a/pkgs/applications/editors/texworks/default.nix
+++ b/pkgs/applications/editors/texworks/default.nix
@@ -4,7 +4,7 @@
 , withPython ? true, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "texworks-${version}";
+  pname = "texworks";
   version = "0.6.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix
index aa3b4b99d7a..6bfce921d0f 100644
--- a/pkgs/applications/editors/tweak/default.nix
+++ b/pkgs/applications/editors/tweak/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "tweak-${version}";
+  pname = "tweak";
   version = "3.02";
 
   src = fetchurl {
-    url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz";
+    url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${pname}-${version}.tar.gz";
     sha256 = "06js54pr5hwpwyxj77zs5s40n5aqvaw48dkj7rid2d47pyqijk2v";
   };
 
diff --git a/pkgs/applications/editors/uemacs/default.nix b/pkgs/applications/editors/uemacs/default.nix
index 551fa67d986..fad4e82d37f 100644
--- a/pkgs/applications/editors/uemacs/default.nix
+++ b/pkgs/applications/editors/uemacs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "uemacs-${version}";
+  pname = "uemacs";
   version = "2014-12-08";
 
   src = fetchgit {
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix
index 8d3a5353c98..d1aa59569e6 100644
--- a/pkgs/applications/editors/vbindiff/default.nix
+++ b/pkgs/applications/editors/vbindiff/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "vbindiff-${version}";
+  pname = "vbindiff";
   version = "3.0_beta5";
 
   buildInputs = [ ncurses ];
 
   src = fetchurl {
-    url = "https://www.cjmweb.net/vbindiff/${name}.tar.gz";
+    url = "https://www.cjmweb.net/vbindiff/${pname}-${version}.tar.gz";
     sha256 = "1f1kj4jki08bnrwpzi663mjfkrx4wnfpzdfwd2qgijlkx5ysjkgh";
   };
 
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 4d37b77f61b..1d65be3e73d 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -68,7 +68,7 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "vim_configurable-${version}";
+  pname = "vim_configurable";
 
   inherit (common) version postPatch hardeningDisable enableParallelBuilding meta;
 
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 26cd61d182b..732bfbf0bfd 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -13,7 +13,7 @@ let
   common = callPackage ./common.nix {};
 in
 stdenv.mkDerivation rec {
-  name = "vim-${version}";
+  pname = "vim";
 
   inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
 
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index ec2d75ffaf6..4c24c5f48d8 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -25,7 +25,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "macvim-${version}";
+  pname = "macvim";
 
   version = "8.1.1517";
 
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index 7825188fea9..5b9548df7f1 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vis-${version}";
+  pname = "vis";
   version  = "0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix
index ce67cc2d648..aab3aecd7d6 100644
--- a/pkgs/applications/editors/wily/default.nix
+++ b/pkgs/applications/editors/wily/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.13.42";
-  name = "wily-${version}";
+  pname = "wily";
 
   src = fetchurl {
-    url = "mirror://sourceforge/wily/${name}.tar.gz";
+    url = "mirror://sourceforge/wily/${pname}-${version}.tar.gz";
     sha256 = "1jy4czk39sh365b0mjpj4d5wmymj98x163vmwzyx3j183jqrhm2z";
   };
 
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index c345e8a95d5..09ccbad6cd7 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "wxHexEditor-${version}";
+  pname = "wxHexEditor";
   version = "0.24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/applications/editors/xmlcopyeditor/default.nix
index d91403bc54f..eeda097db25 100644
--- a/pkgs/applications/editors/xmlcopyeditor/default.nix
+++ b/pkgs/applications/editors/xmlcopyeditor/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }:
 
 stdenv.mkDerivation rec {
-  name = "xmlcopyeditor-${version}";
+  pname = "xmlcopyeditor";
   version = "1.2.1.3";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "mirror://sourceforge/xml-copy-editor/${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz";
     sha256 = "0bwxn89600jbrkvlwyawgc0c0qqxpl453mbgcb9qbbxl8984ns4v";
   };
 
diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix
index a90275638dc..100e64fc197 100644
--- a/pkgs/applications/editors/yi/wrapper.nix
+++ b/pkgs/applications/editors/yi/wrapper.nix
@@ -9,7 +9,7 @@ let
     (self: [ self.yi ] ++ extraPackages self);
 in
 stdenv.mkDerivation rec {
-  name = "yi-custom-${version}";
+  pname = "yi-custom";
   version = "0.0.0.1";
   dontUnpack = true;
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
index 38aeee6d13e..244f37b10df 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "OpenOrienteering-Mapper-${version}";
+  pname = "OpenOrienteering-Mapper";
   version = "0.8.4";
 
   buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 7440e2633a3..1ae1221a330 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   pname = "saga";
   version = "7.3.0";
-  name = "${pname}-${version}";
 
   # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
   # for why the have additional buildInputs on darwin
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 2bd2207a97a..c5a6210878b 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -20,7 +20,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "imagemagick-${version}";
+  pname = "imagemagick";
   inherit (cfg) version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index ecc6a5b00de..59f471ab4e3 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -32,7 +32,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "imagemagick-${version}";
+  pname = "imagemagick";
   inherit (cfg) version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index 938df76e257..e35a0190d8b 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "pythonmagick-${version}";
+  pname = "pythonmagick";
   version = "0.9.16";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 5210af4df7a..fb06266cdc5 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -7,7 +7,7 @@
 assert useUnrar -> unrar != null;
 
 stdenv.mkDerivation rec {
-  name = "ahoviewer-${version}";
+  pname = "ahoviewer";
   version = "1.6.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix
index 09664889f35..5132d5950aa 100644
--- a/pkgs/applications/graphics/alchemy/default.nix
+++ b/pkgs/applications/graphics/alchemy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "alchemy-${version}";
+  pname = "alchemy";
   version = "008";
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix
index c918e4b302b..c4f1b4218d0 100644
--- a/pkgs/applications/graphics/animbar/default.nix
+++ b/pkgs/applications/graphics/animbar/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "animbar";
   version = "1.2";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "0836nwcpyfdrapyj3hbg3wh149ihc26pc78h01adpc7c0r7d9pr9";
   };
 
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 0257a109568..7d800d57b63 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -9,7 +9,7 @@ let
   gitTag    = "0.9.3";
 in
   stdenv.mkDerivation rec {
-    name    = "antimony-${version}";
+    pname = "antimony";
     version = "2018-10-20";
 
     src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index c98c323fc79..5ce36f4f10e 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  name = "apitrace-${version}";
+  pname = "apitrace";
   version = "7.1-572-g${builtins.substring 0 8 src.rev}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix
index cc08dce906c..57e95dfef10 100644
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/pkgs/applications/graphics/autotrace/default.nix
@@ -6,11 +6,11 @@
 # libpng16.so.16 rather than libpng12.
 
 stdenv.mkDerivation rec {
-  name = "autotrace-${version}";
+  pname = "autotrace";
   version = "0.31.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${name}.tar.gz";
+    url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${pname}-${version}.tar.gz";
     sha256 = "1xmgja5fv48mdbsa51inf7ksz36nqd6bsaybrk5xgprm6cy946js";
   };
 
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 52fd3cebec2..a8a7ec5dd57 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "avocode-${version}";
+  pname = "avocode";
   version = "3.9.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix
index 7e1c6d7c8c4..4e864d953df 100644
--- a/pkgs/applications/graphics/c3d/default.nix
+++ b/pkgs/applications/graphics/c3d/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchgit, cmake, itk, Cocoa }:
 
 stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
   pname   = "c3d";
   version = "2018-10-04";
 
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index e16ef45fe1e..6565db2c42a 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.6.2";
-  name = "darktable-${version}";
+  pname = "darktable";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix
index 71e2d82ea7c..c35aaa044ae 100644
--- a/pkgs/applications/graphics/deskew/default.nix
+++ b/pkgs/applications/graphics/deskew/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "deskew-${version}";
+  pname = "deskew";
   version = "1.25";
 
   src = fetchFromBitbucket {
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 0ce160242e5..b0e32678a14 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -4,7 +4,7 @@ libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-them
 gtk-mac-integration-gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "dia-${version}";
+  pname = "dia";
   version = "0.97.3.20170622";
 
   src = fetchgit {
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index d90fb41c03b..1917640fd2e 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -3,11 +3,11 @@
 , darwin }:
 
 stdenv.mkDerivation rec {
-  name = "djview-${version}";
+  pname = "djview";
   version = "4.10.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/djvu/${name}.tar.gz";
+    url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz";
     sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4";
   };
 
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index eca3740f975..5db104f031c 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -58,7 +58,7 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "drawpile-${version}";
+  pname = "drawpile";
   version = "2.1.11";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix
index 7980d09fed1..c8928540bb6 100644
--- a/pkgs/applications/graphics/exrtools/default.nix
+++ b/pkgs/applications/graphics/exrtools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "exrtools-${version}";
+  pname = "exrtools";
   version = "0.4";
 
   src = fetchurl {
-    url =  "http://scanline.ca/exrtools/${name}.tar.gz";
+    url =  "http://scanline.ca/exrtools/${pname}-${version}.tar.gz";
     sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
   };
 
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 3eff3360a6c..503feee3d65 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "feh-${version}";
+  pname = "feh";
   version = "3.2.1";
 
   src = fetchurl {
-    url = "https://feh.finalrewind.org/${name}.tar.bz2";
+    url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
     sha256 = "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg";
   };
 
diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index 8ca093b90c3..3b866297603 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "fontmatrix-${version}";
+  pname = "fontmatrix";
   version = "0.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index b8f4d544503..5f866d00b3e 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -8,7 +8,7 @@ assert mpi != null;
 let
   pythonPackages = python3Packages;
 in mkDerivation rec {
-  name = "freecad-${version}";
+  pname = "freecad";
   version = "0.18.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix
index bdb1e87d70e..1d712a63fbd 100644
--- a/pkgs/applications/graphics/fstl/default.nix
+++ b/pkgs/applications/graphics/fstl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }:
 
 mkDerivation rec {
-  name = "fstl-${version}";
+  pname = "fstl";
   version = "0.9.3";
 
   buildInputs = [qtbase mesa_glu];
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 08b2757dd6e..62e2ebfa4b1 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "geeqie-${version}";
+  pname = "geeqie";
   version = "1.4";
 
   src = fetchurl {
-    url = "http://geeqie.org/${name}.tar.xz";
+    url = "http://geeqie.org/${pname}-${version}.tar.xz";
     sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w";
   };
 
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index ec708ad971a..9ba7dbed37b 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -2,7 +2,7 @@
 , pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
 
 stdenv.mkDerivation rec {
-  name = "giv-${version}";
+  pname = "giv";
   version = "0.9.26";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix
index b3671ead377..eb48333997c 100644
--- a/pkgs/applications/graphics/gnuclad/default.nix
+++ b/pkgs/applications/graphics/gnuclad/default.nix
@@ -2,11 +2,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnuclad-${version}";
+  pname = "gnuclad";
   version = "0.2.4";
 
   src = fetchurl {
-    url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${pname}-${version}.tar.gz";
     sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
   };
 
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index b25ba8f567d..e4ab5639ba6 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -2,7 +2,7 @@
 , glfw3, gtk3, libpng12 }:
 
 stdenv.mkDerivation rec {
-  name = "goxel-${version}";
+  pname = "goxel";
   version = "0.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
index b1580d73b64..039bb1917d3 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
 
   version = "2.4.2035";
-  name = "grafx2-${version}";
+  pname = "grafx2";
 
   src = fetchurl {
-    url = "https://grafx2.googlecode.com/files/${name}-src.tgz";
+    url = "https://grafx2.googlecode.com/files/${pname}-${version}-src.tgz";
     sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q";
   };
 
diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix
index fedcafc5978..be8885caff1 100644
--- a/pkgs/applications/graphics/graphicsmagick/compat.nix
+++ b/pkgs/applications/graphics/graphicsmagick/compat.nix
@@ -1,7 +1,7 @@
 { stdenv, graphicsmagick }:
 
 stdenv.mkDerivation rec {
-  name = "graphicsmagick-imagemagick-compat-${version}";
+  pname = "graphicsmagick-imagemagick-compat";
   inherit (graphicsmagick) version;
 
   dontUnpack = true;
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 84d1450da82..403a5285e15 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -3,7 +3,7 @@
 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  name = "graphicsmagick-${version}";
+  pname = "graphicsmagick";
   version = "1.3.32";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix
index 0bbd543a307..7d5a9013035 100644
--- a/pkgs/applications/graphics/imagej/default.nix
+++ b/pkgs/applications/graphics/imagej/default.nix
@@ -8,7 +8,7 @@
 
 let
   imagej150 = stdenv.mkDerivation rec {
-    name = "imagej-${version}";
+    pname = "imagej";
     version = "150";
 
     src = fetchurl {
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix
index a881c0fc1f9..5fdd20825cd 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/pkgs/applications/graphics/imlibsetroot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libX11, libXinerama, imlib2 }:
 
 stdenv.mkDerivation rec {
-  name = "imlibsetroot-${version}";
+  pname = "imlibsetroot";
   version = "1.2";
   src = fetchurl {
     url = "https://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz";
diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
index 89712d4d1f7..38e536c70cb 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "imv-${version}";
+  pname = "imv";
   version = "3.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
index 42ed667dee9..4eb7518cc10 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@@ -3,7 +3,7 @@
 let
   inherit (pythonPackages) python;
 in pythonPackages.buildPythonApplication rec {
-  name = "jbrout-${version}";
+  pname = "jbrout";
   version = "338";
 
   src = fetchsvn {
diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix
index ed583490c90..b5664d51a14 100644
--- a/pkgs/applications/graphics/jpeg-archive/default.nix
+++ b/pkgs/applications/graphics/jpeg-archive/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }:
 
 stdenv.mkDerivation rec {
-  name = "jpeg-archive-${version}";
+  pname = "jpeg-archive";
   version = "2.2.0"; # can be found here https://github.com/danielgtaylor/jpeg-archive/blob/master/src/util.c#L15
 
   # update with
diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/applications/graphics/jpeginfo/default.nix
index f438bf6f7ed..e15aedd77e1 100644
--- a/pkgs/applications/graphics/jpeginfo/default.nix
+++ b/pkgs/applications/graphics/jpeginfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "jpeginfo-${version}";
+  pname = "jpeginfo";
   version = "1.6.1";
 
   src = fetchurl {
-    url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz";
+    url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz";
     sha256 = "0lvn3pnylyj56158d3ix9w1gas1s29klribw9bz1xym03p7k37k2";
   };
 
diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix
index b24b14698e6..cc1ca3a0ff2 100644
--- a/pkgs/applications/graphics/jpegoptim/default.nix
+++ b/pkgs/applications/graphics/jpegoptim/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.6";
-  name = "jpegoptim-${version}";
+  pname = "jpegoptim";
 
   src = fetchurl {
-    url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz";
+    url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz";
     sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8";
   };
 
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 301dc902dce..1487fb8adba 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.0.6";
-  name = "k3d-${version}";
+  pname = "k3d";
   src = fetchFromGitHub {
     owner = "K-3D";
     repo = "k3d";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0vdjjg6h8mxm2n8mvkkg2mvd27jn2xx90hnmx23cbd35mpz9p4aa";
   };
 
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index e70fafa24b6..9b96b30c62b 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -5,11 +5,11 @@
 }:
 
 mkDerivation rec {
-  name = "kgraphviewer-${version}";
+  pname = "kgraphviewer";
   version = "2.4.3";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz";
+    url = "mirror://kde/stable/kgraphviewer/${version}/${pname}-${version}.tar.xz";
     sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l";
   };
 
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 4f86e573689..201a4fe113e 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -6,7 +6,7 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/
 { stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "leocad-${version}";
+  pname = "leocad";
   version = "19.07.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix
index 2fddc39e0d0..5f8a0bb6eed 100644
--- a/pkgs/applications/graphics/meme/default.nix
+++ b/pkgs/applications/graphics/meme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "meme-unstable-${version}";
+  pname = "meme-unstable";
   version = "2017-09-10";
 
   owner = "nomad-software";
diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix
index 515b834b41e..3d1fc52637f 100644
--- a/pkgs/applications/graphics/mirage/default.nix
+++ b/pkgs/applications/graphics/mirage/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pythonPackages, libX11, gettext }:
 
 pythonPackages.buildPythonApplication rec {
-    name = "mirage-${version}";
+    pname = "mirage";
     version = "0.9.5.2";
 
     src = fetchurl {
-      url = "mirror://sourceforge/mirageiv/${name}.tar.bz2";
+      url = "mirror://sourceforge/mirageiv/${pname}-${version}.tar.bz2";
       sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c";
     };
 
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix
index b48fd891a6a..63cc4a3a8d3 100644
--- a/pkgs/applications/graphics/mozjpeg/default.nix
+++ b/pkgs/applications/graphics/mozjpeg/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.3.1";
-  name = "mozjpeg-${version}";
+  pname = "mozjpeg";
 
   src = fetchFromGitHub {
     owner = "mozilla";
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index 466ab3e26fb..5ad5ab6acc6 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -4,7 +4,7 @@
 let
   inherit (python2Packages) python pycairo pygobject3 numpy;
 in stdenv.mkDerivation rec {
-  name = "mypaint-${version}";
+  pname = "mypaint";
   version = "1.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index d0838070262..e4393726483 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -17,7 +17,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nomacs-${version}";
+  pname = "nomacs";
   version = "3.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index cf13c6fb05e..13a00991265 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -5,7 +5,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
-  name = "paraview-${version}";
+  pname = "paraview";
   version = "5.6.0";
 
   # fetching from GitHub instead of taking an "official" source
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix
index 3cc7166b4e4..a0aaed49c9c 100644
--- a/pkgs/applications/graphics/pbrt/default.nix
+++ b/pkgs/applications/graphics/pbrt/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
 
   version = "2018-08-15";
-  name = "pbrt-v3-${version}";
+  pname = "pbrt-v3";
 
   src = fetchFromGitHub {
     rev = "86b5821308088deea70b207bc8c22219d0103d65";
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index f622d3f388e..37857fc459e 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.4";
-  name = "pencil-${version}";
+  pname = "pencil";
 
   src = fetchurl {
     url    = "http://pencil.evolus.vn/dl/V${version}/Pencil_${version}_amd64.deb";
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index 7da1d4b612f..5e7fb5cf7a0 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
 
 stdenv.mkDerivation rec {
-  name = "phototonic-${version}";
+  pname = "phototonic";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
index 132136da658..f50af2925a3 100644
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/pkgs/applications/graphics/potrace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "potrace-${version}";
+  pname = "potrace";
   version = "1.15";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index ec4ce69d5e8..1ad51e92d47 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation (rec {
-  name = "pqiv-${version}";
+  pname = "pqiv";
   version = "2.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix
index 6f90131db12..9399d760f0d 100644
--- a/pkgs/applications/graphics/processing3/default.nix
+++ b/pkgs/applications/graphics/processing3/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.4";
-  name = "processing3-${version}";
+  pname = "processing3";
 
   src = fetchFromGitHub {
     owner = "processing";
@@ -39,16 +39,16 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir $out
-    cp -dpR build/linux/work $out/${name}
+    cp -dpR build/linux/work $out/${pname}-${version}
 
-    rmdir $out/${name}/java
-    ln -s ${jdk} $out/${name}/java
+    rmdir $out/${pname}-${version}/java
+    ln -s ${jdk} $out/${pname}-${version}/java
 
-    makeWrapper $out/${name}/processing      $out/bin/processing \
+    makeWrapper $out/${pname}-${version}/processing      $out/bin/processing \
         --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
         --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \
         --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
-    makeWrapper $out/${name}/processing-java $out/bin/processing-java \
+    makeWrapper $out/${pname}-${version}/processing-java $out/bin/processing-java \
         --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
         --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \
         --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix
index c37e21ec898..4d416a7c106 100644
--- a/pkgs/applications/graphics/qcomicbook/default.nix
+++ b/pkgs/applications/graphics/qcomicbook/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
 
 stdenv.mkDerivation rec {
-  name = "qcomicbook-${version}";
+  pname = "qcomicbook";
   version = "0.9.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
index ce08e2b1be9..750217d9918 100644
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation (rec {
   version = "2.3.2";
-  name = "qiv-${version}";
+  pname = "qiv";
 
   src = fetchurl {
-    url = "https://spiegl.de/qiv/download/${name}.tgz";
+    url = "https://spiegl.de/qiv/download/${pname}-${version}.tgz";
     sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28";
   };
 
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index b300c0071fa..7e9547c1067 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.8";
-  name = "rapcad-${version}";
+  pname = "rapcad";
 
   src = fetchFromGitHub {
     owner = "gilesbathgate";
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index 3fd4521d7cd..594429503a3 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -13,7 +13,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "1.4";
-  name = "renderdoc-${version}";
+  pname = "renderdoc";
 
   src = fetchFromGitHub {
     owner = "baldurk";
diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix
index 01c203b407c..d4165be3784 100644
--- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix
+++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, rpmextract }:
 
 stdenv.mkDerivation rec {
-  name = "libsane-dsseries-${version}";
+  pname = "libsane-dsseries";
   version = "1.0.5-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf100974/${name}.x86_64.rpm";
+    url = "https://download.brother.com/welcome/dlf100974/${pname}-${version}.x86_64.rpm";
     sha256 = "1wfdbfbf51cc7njzikdg48kwpnpc0pg5s6p0s0y3z0q7y59x2wbq";
   };
 
   nativeBuildInputs = [ rpmextract ];
 
   unpackCmd = ''
-    mkdir ${name} && pushd ${name}
+    mkdir ${pname}-${version} && pushd ${pname}-${version}
     rpmextract $curSrc
     popd
   '';
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index f6994db81e4..66473c4a155 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }:
 
 stdenv.mkDerivation rec {
-  name = "sane-frontends-${version}";
+  pname = "sane-frontends";
   version = "1.0.14";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/latestfile/175/${name}.tar.gz";
+    url = "https://alioth.debian.org/frs/download.php/latestfile/175/${pname}-${version}.tar.gz";
     sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7";
   };
 
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index d55441e39fa..63f16f688ac 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -3,7 +3,7 @@
 , qtbase, qttools }:
 
 stdenv.mkDerivation rec {
-  name = "scantailor-advanced-${version}";
+  pname = "scantailor-advanced";
   version = "1.0.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
index 292ae9c8faa..88bbbd9d864 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/pkgs/applications/graphics/screencloud/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "screencloud-${version}";
+  pname = "screencloud";
   version = "1.2.0";
 
   # API Keys. According to the author of the AUR package, these are only used
diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix
index d0f2a48c589..f56646e5aed 100644
--- a/pkgs/applications/graphics/swingsane/default.nix
+++ b/pkgs/applications/graphics/swingsane/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeDesktopItem, unzip, jre, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "swingsane-${version}";
+  pname = "swingsane";
   version = "0.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix
index 23713271c40..157c0b9742b 100644
--- a/pkgs/applications/graphics/tesseract/tesseract3.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract3.nix
@@ -2,7 +2,7 @@
 , leptonica, libpng, libtiff, icu, pango, opencl-headers }:
 
 stdenv.mkDerivation rec {
-  name = "tesseract-${version}";
+  pname = "tesseract";
   version = "3.05.00";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix
index af0063301f1..548f58a50fb 100644
--- a/pkgs/applications/graphics/tesseract/tesseract4.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract4.nix
@@ -2,7 +2,7 @@
 , leptonica, libpng, libtiff, icu, pango, opencl-headers }:
 
 stdenv.mkDerivation rec {
-  name = "tesseract-${version}";
+  pname = "tesseract";
   version = "4.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/applications/graphics/timelapse-deflicker/default.nix
index b4ddb143685..8355545e8dd 100644
--- a/pkgs/applications/graphics/timelapse-deflicker/default.nix
+++ b/pkgs/applications/graphics/timelapse-deflicker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "timelapse-deflicker-${version}";
+  pname = "timelapse-deflicker";
   version = "0.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index 48930ccbbb9..4f5fb12faa6 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -2,13 +2,13 @@
 , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}:
 
 stdenv.mkDerivation rec {
-  name = "viewnior-${version}";
+  pname = "viewnior";
   version = "1.6";
 
   src = fetchFromGitHub {
     owner = "xsisqox";
     repo = "Viewnior";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "06ppv3r85l3id4ij6h4y5fgm3nib2587fdrdv9fccyi75zk7fs0p";
   };
 
diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix
index e11bc3dd5bb..232eeeb0115 100644
--- a/pkgs/applications/graphics/write_stylus/default.nix
+++ b/pkgs/applications/graphics/write_stylus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }:
 stdenv.mkDerivation rec {
-  name = "write_stylus-${version}";
+  pname = "write_stylus";
   version = "209";
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix
index 182f68f3112..e80362c386b 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/pkgs/applications/graphics/xaos/default.nix
@@ -2,11 +2,11 @@
 , libXt, zlib, gettext, intltool, perl }:
 
 stdenv.mkDerivation rec {
-  name = "xaos-${version}";
+  pname = "xaos";
   version = "3.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xaos/${name}.tar.gz";
+    url = "mirror://sourceforge/xaos/${pname}-${version}.tar.gz";
     sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq";
   };
 
diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix
index 2269f1c18f1..ae4765fc9e7 100644
--- a/pkgs/applications/graphics/xfractint/default.nix
+++ b/pkgs/applications/graphics/xfractint/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, libX11, libXft}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "xfractint";
   version = "20.04p14";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index 2487b093148..41539f32b07 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -23,7 +23,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xournalpp-${version}";
+  pname = "xournalpp";
   version = "1.0.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix
index 69ab67dffb7..de3f3a78988 100644
--- a/pkgs/applications/graphics/xzgv/default.nix
+++ b/pkgs/applications/graphics/xzgv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "xzgv-${version}";
+  pname = "xzgv";
   version = "0.9.2";
   src = fetchurl {
     url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index 3cf42343658..e545dd5a723 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "yacreader-${version}";
+  pname = "yacreader";
   version = "9.5.0";
 
   src = fetchurl {
-    url = "https://github.com/YACReader/yacreader/releases/download/${version}/${name}-src.tar.xz";
+    url = "https://github.com/YACReader/yacreader/releases/download/${version}/${pname}-${version}-src.tar.xz";
     sha256 = "0cv5y76kjvsqsv4fp99j8np5pm4m76868i1nn40q6hy573dmxwm6";
   };
 
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index 799ceef1bed..0038d41475f 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, makeWrapper, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "yEd-${version}";
+  pname = "yEd";
   version = "3.19";
 
   src = fetchzip {
-    url = "https://www.yworks.com/resources/yed/demo/${name}.zip";
+    url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip";
     sha256 = "0l70pc7wl2ghfkjab9w2mbx7crwha7xwkrpmspsi5c6q56dw7s33";
   };
 
diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix
index ac3d303a7a6..db07b9e1db4 100644
--- a/pkgs/applications/graphics/zgrviewer/default.nix
+++ b/pkgs/applications/graphics/zgrviewer/default.nix
@@ -2,9 +2,8 @@
 stdenv.mkDerivation rec {
   version = "0.9.0";
   pname = "zgrviewer";
-  name="${pname}-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/zvtm/${pname}/${version}/${name}.zip";
+    url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip";
     sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23";
   };
   buildInputs = [jre unzip];
diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix
index 7a49e5b2cb7..8ef705f7ef4 100644
--- a/pkgs/applications/graphics/zgv/default.nix
+++ b/pkgs/applications/graphics/zgv/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }:
 
 stdenv.mkDerivation rec {
-  name = "zgv-${version}";
+  pname = "zgv";
   version = "5.9";
   src = fetchurl {
-    url = "https://www.svgalib.org/rus/zgv/${name}.tar.gz";
+    url = "https://www.svgalib.org/rus/zgv/${pname}-${version}.tar.gz";
     sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj";
   };
 
diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix
index 50582d94ff4..465c72d73f5 100644
--- a/pkgs/applications/misc/airtame/default.nix
+++ b/pkgs/applications/misc/airtame/default.nix
@@ -14,7 +14,6 @@ let libPath = lib.makeLibraryPath [
 in stdenv.mkDerivation rec {
   pname = "airtame";
   version = "3.3.0";
-  name = "${pname}-${version}";
   longName = "${pname}-application";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix
index 8cb014bb021..8c5aded5ed9 100644
--- a/pkgs/applications/misc/aminal/default.nix
+++ b/pkgs/applications/misc/aminal/default.nix
@@ -10,7 +10,7 @@
 }:
 
 buildGoPackage rec {
-  name = "aminal-${version}";
+  pname = "aminal";
   version = "0.8.6";
 
   goPackagePath = "github.com/liamg/aminal";
diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix
index 37d140e19ba..c680ffe9678 100644
--- a/pkgs/applications/misc/ape/clex.nix
+++ b/pkgs/applications/misc/ape/clex.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "attempto-clex-${version}";
+  pname = "attempto-clex";
   version = "5133afe";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index 2da0de9ead8..b5af1af91f3 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.1.5";
-  name = "apvlv-${version}";
+  pname = "apvlv";
 
   src = fetchFromGitHub {
     owner = "naihe2010";
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
index 202c1669f85..791e2d0f52e 100644
--- a/pkgs/applications/misc/artha/default.nix
+++ b/pkgs/applications/misc/artha/default.nix
@@ -1,7 +1,7 @@
 { stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }:
 
 stdenv.mkDerivation rec {
-  name = "artha-${version}";
+  pname = "artha";
   version = "1.0.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix
index 2dd151c1a6c..444a8da7036 100644
--- a/pkgs/applications/misc/autospotting/default.nix
+++ b/pkgs/applications/misc/autospotting/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "autospotting-${version}";
+  pname = "autospotting";
   version = "unstable-2018-11-17";
   goPackagePath = "github.com/AutoSpotting/AutoSpotting";
 
diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix
index abb3eb33536..8b994c55de3 100644
--- a/pkgs/applications/misc/batti/default.nix
+++ b/pkgs/applications/misc/batti/default.nix
@@ -7,11 +7,11 @@ let
   inherit (pythonPackages) dbus-python pygtk python;
 in stdenv.mkDerivation rec {
 
-  name = "batti-${version}";
+  pname = "batti";
   version = "0.3.8";
 
   src = fetchurl {
-    url = "https://batti-gtk.googlecode.com/files/${name}.tar.gz";
+    url = "https://batti-gtk.googlecode.com/files/${pname}-${version}.tar.gz";
     sha256 = "072d92gpsiiin631589nj77i2w1425p6db0qxyml7myscfy9jgx6";
   };
 
diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix
index f085e4bd7dd..06df1df9f76 100644
--- a/pkgs/applications/misc/bb/default.nix
+++ b/pkgs/applications/misc/bb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }:
 
 stdenv.mkDerivation rec {
-  name    = "bb-${version}";
+  pname = "bb";
   version = "1.3rc1";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/aa-project/bb/${version}/${name}.tar.gz";
+    url    = "mirror://sourceforge/aa-project/bb/${version}/${pname}-${version}.tar.gz";
     sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr";
   };
 
diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index 41184d6e949..a3f0a3b84f2 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -4,10 +4,10 @@ stdenv.mkDerivation rec {
 
   version = "2.10.1";
 
-  name = "bibletime-${version}";
+  pname = "bibletime";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bibletime/${name}.tar.xz";
+    url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz";
     sha256 = "14fayy5h1ffjxin669q56fflxn4ij1irgn60cygwx2y02cwxbll6";
   };
 
diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index a1581408201..402198a9732 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "calcurse-${version}";
+  pname = "calcurse";
   version = "4.5.0";
 
   src = fetchurl {
-    url = "https://calcurse.org/files/${name}.tar.gz";
+    url = "https://calcurse.org/files/${pname}-${version}.tar.gz";
     sha256 = "1vjwcmp51h7dsvwn0qx93w9chp3wp970v7d9mjhk7jyamcbfywn3";
   };
 
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 0b66be1f84c..a949f0400cb 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 mkDerivation rec {
-  name = "calibre-${version}";
+  pname = "calibre";
   version = "3.45.2";
 
   src = fetchurl {
-    url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
+    url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
     sha256 = "1379g375s3h0fgv9qg43hrg16knd76ym7qkffpn1qyc7kkhv8a05";
   };
 
diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix
index 35aa681df4b..77cabc409c7 100644
--- a/pkgs/applications/misc/candle/default.nix
+++ b/pkgs/applications/misc/candle/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "candle-${version}";
+  pname = "candle";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index e48b32a783d..dae6e404a9d 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   inherit version;
-  name = "cataract-${version}";
+  pname = "cataract";
 
   src = fetchgit {
     url = "git://git.bzatek.net/cataract";
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index 1bbb7d61b01..20bfe727f6d 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, acl, libcap, Carbon, IOKit }:
 
 stdenv.mkDerivation rec {
-  name = "cdrtools-${version}";
+  pname = "cdrtools";
   version = "3.02a06";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cdrtools/${name}.tar.bz2";
+    url = "mirror://sourceforge/cdrtools/${pname}-${version}.tar.bz2";
     sha256 = "1cayhfbhj5g2vgmkmq5scr23k0ka5fsn0dhn0n9yllj386csnygd";
   };
 
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index 9d63b5aedcb..04f32a67b84 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.7.2";
-  name = "cgminer-${version}";
+  pname = "cgminer";
 
   src = fetchgit {
     url = "https://github.com/ckolivas/cgminer.git";
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 41660bc7f2b..357dd9bcb8a 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -2,7 +2,6 @@
 
 with python3.pkgs;
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "cheat";
   version = "2.5.1";
 
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 0578393dfca..856853e3b1c 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "cherrytree-${version}";
+  pname = "cherrytree";
   version = "0.38.8";
 
   src = fetchurl {
-    url = "https://www.giuspen.com/software/${name}.tar.xz";
+    url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz";
     sha256 = "1ns87xl2sgrf3nha4xkhp0xcxlycqszlp6xdrn95lg6vzm0fa8dg";
   };
 
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index 6602adb2f2a..4986661e2f6 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.8";
-  name = "cli-visualizer-${version}";
+  pname = "cli-visualizer";
 
   src = fetchFromGitHub {
     owner = "dpayne";
diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix
index 4477cbbcc06..693ce84c97a 100644
--- a/pkgs/applications/misc/clipit/default.nix
+++ b/pkgs/applications/misc/clipit/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "clipit-${version}";
+  pname = "clipit";
   version = "1.4.2";
 
   src = fetchurl {
-    url = "https://github.com/downloads/shantzu/ClipIt/${name}.tar.gz";
+    url = "https://github.com/downloads/shantzu/ClipIt/${pname}-${version}.tar.gz";
     sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva";
   };
 
diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix
index e6e4ede6ac1..7577c0a3db9 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/pkgs/applications/misc/clipmenu/default.nix
@@ -3,7 +3,7 @@ let
   runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ];
 in
 stdenv.mkDerivation rec {
-  name = "clipmenu-${version}";
+  pname = "clipmenu";
   version = "5.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index bd49323b03f..c9dcc97d5cd 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -3,7 +3,7 @@
 
 mkDerivation rec {
   version = "1.1.1";
-  name = "cool-retro-term-${version}";
+  pname = "cool-retro-term";
 
   src = fetchFromGitHub {
     owner = "Swordfish90";
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 3ee357ce151..2aad4d352c9 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "CopyQ-${version}";
+  pname = "CopyQ";
   version = "3.9.0";
 
   src  = fetchFromGitHub {
diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix
index 4d997519246..0e9ff40cffa 100644
--- a/pkgs/applications/misc/cpp-ethereum/default.nix
+++ b/pkgs/applications/misc/cpp-ethereum/default.nix
@@ -17,7 +17,7 @@
 , extraCmakeFlags ? []
 }:
 stdenv.mkDerivation rec {
-  name = "cpp-ethereum-${version}";
+  pname = "cpp-ethereum";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix
index 0123e0c38d7..72918a40733 100644
--- a/pkgs/applications/misc/ctodo/default.nix
+++ b/pkgs/applications/misc/ctodo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, fetchurl, ncurses, readline }:
 
 stdenv.mkDerivation rec {
-  name = "ctodo-${version}";
+  pname = "ctodo";
   version = "1.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
index e44f43d22bf..90f5f307d85 100644
--- a/pkgs/applications/misc/cura/lulzbot/curaengine.nix
+++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
@@ -1,7 +1,7 @@
 { stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
 
 stdenv.mkDerivation rec {
-  name = "curaengine-lulzBot-${version}";
+  pname = "curaengine-lulzBot";
   version = "3.6.18";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix
index 4e620425d5c..a367efaaef3 100644
--- a/pkgs/applications/misc/curabydagoma/default.nix
+++ b/pkgs/applications/misc/curabydagoma/default.nix
@@ -14,7 +14,7 @@
 # If, however, someone needs it, we certainly can find a solution.
 
 stdenv.mkDerivation rec {
-  name = "curabydagoma-${version}";
+  pname = "curabydagoma";
   # Version is the date, UNIX format
   version = "1520506579";
   # Hash of the user's choice: os, arch, package type...
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 823e6d6e2e9..3e4c77aafc6 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }:
 
 stdenv.mkDerivation rec {
-  name = "curaengine-${version}";
+  pname = "curaengine";
   version = "4.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 82d77b65f66..d8cf86461ac 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -6,7 +6,7 @@
 # See `pkgs/applications/editors/eclipse/*.nix`
 
 stdenv.mkDerivation rec {
-  name = "dbeaver-ce-${version}";
+  pname = "dbeaver-ce";
   version = "6.1.4";
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix
index b010e5401b8..3cbb091a4e2 100644
--- a/pkgs/applications/misc/ddgr/default.nix
+++ b/pkgs/applications/misc/ddgr/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.6";
-  name = "ddgr-${version}";
+  pname = "ddgr";
 
   src = fetchFromGitHub {
     owner = "jarun";
diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix
index 7f4629100d5..a1fdabd8ccb 100644
--- a/pkgs/applications/misc/deco/default.nix
+++ b/pkgs/applications/misc/deco/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "deco";
   version = "0.0.2";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "ebzzry";
diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
index 4fb9ca5fa71..5699396a084 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }:
 
 stdenv.mkDerivation rec {
-  name = "devilspie2-${version}";
+  pname = "devilspie2";
   version = "0.43";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index 467c2b3c2d5..283b66318ea 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -8,7 +8,7 @@ let
       [ wxGTK ];
 in
 stdenv.mkDerivation rec {
-  name = "diff-pdf-${version}";
+  pname = "diff-pdf";
   version = "2017-12-30";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index daea20835c8..37ed8eb23fb 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.1.3";
-  name = "diffpdf-${version}";
+  pname = "diffpdf";
 
   src = fetchurl {
-    url = "http://www.qtrac.eu/${name}.tar.gz";
+    url = "http://www.qtrac.eu/${pname}-${version}.tar.gz";
     sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566";
   };
 
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
     install -Dpm755 -D diffpdf $out/bin/diffpdf
     install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1
 
-    install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/icons $out/share/pixmaps $out/share/applications
-    install -Dpm644 CHANGES README help.html $out/share/doc/${name}/
-    install -Dpm644 gpl-2.0.txt $out/share/licenses/${name}/
+    install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications
+    install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/
+    install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/
     install -Dpm644 images/icon.png $out/share/icons/diffpdf.png
     install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png
 
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index 58bc483d43f..13539169dec 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -47,7 +47,7 @@ let
   copyUdevRuleToOutput = name: rule:
     "cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
 in stdenv.mkDerivation rec {
-  name = "digitalbitbox-${version}";
+  pname = "digitalbitbox";
   version = "2.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
index f1e33ea5357..8f7dbd2d2ed 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "direwolf-${version}";
+  pname = "direwolf";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index fd08ed9c391..8cfadd77ece 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
 
 stdenv.mkDerivation rec {
-  name = "doomseeker-${version}";
+  pname = "doomseeker";
   version = "2018-03-05";
 
   src = fetchFromBitbucket {
diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix
index 1d3c405b703..5150f13fb80 100644
--- a/pkgs/applications/misc/dotfiles/default.nix
+++ b/pkgs/applications/misc/dotfiles/default.nix
@@ -2,7 +2,6 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "dotfiles";
-  name = "${pname}-${version}";
   version = "0.6.4";
 
   src = pythonPackages.fetchPypi {
diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix
index b5ae9fb567c..226bdea0301 100644
--- a/pkgs/applications/misc/dozenal/default.nix
+++ b/pkgs/applications/misc/dozenal/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "12010904";
-  name = "dozenal-${version}";
+  pname = "dozenal";
   src = fetchFromGitHub {
     owner = "dgoodmaniii";
     repo = "dozenal";
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 6c802e683ce..ae83802a7b4 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -2,11 +2,11 @@
 librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "eaglemode-${version}";
+  pname = "eaglemode";
   version = "0.94.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/eaglemode/${name}.tar.bz2";
+    url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2";
     sha256 = "0mpnk0fzy02jxbafipkdkj48m6k38h42j599gw4sdnag7ymlms89";
   };
 
diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index d447e7f50d5..62358d41cc5 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "emem";
   version = "0.2.50";
-  name = "${pname}-${version}";
 
   inherit jdk;
 
diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix
index b6c10dbebca..1a87b7f5c8b 100644
--- a/pkgs/applications/misc/epdfview/default.nix
+++ b/pkgs/applications/misc/epdfview/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }:
 
 stdenv.mkDerivation rec {
-  name = "epdfview-${version}";
+  pname = "epdfview";
   version = "0.1.8";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
index bf1ae3037fc..d0d3c2b424d 100644
--- a/pkgs/applications/misc/et/default.nix
+++ b/pkgs/applications/misc/et/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "et-${version}";
+  pname = "et";
   version = "0.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix
index 98b47990314..56cac7ca918 100644
--- a/pkgs/applications/misc/eterm/default.nix
+++ b/pkgs/applications/misc/eterm/default.nix
@@ -3,7 +3,7 @@
 , pkgconfig, imlib2, libast }:
 
 stdenv.mkDerivation rec {
-  name = "eterm-${version}";
+  pname = "eterm";
   version = "0.9.6";
   srcName = "Eterm-${version}";
 
diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix
index b8bd0a59bea..e9d1317390e 100644
--- a/pkgs/applications/misc/eureka-editor/default.nix
+++ b/pkgs/applications/misc/eureka-editor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }:
 
 stdenv.mkDerivation rec {
-  name = "eureka-editor-${version}";
+  pname = "eureka-editor";
   version = "1.21";
   shortver = "121";
 
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix
index 4746f4ead1b..d1161aa6822 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "evilvte-${version}";
+  pname = "evilvte";
   version = "0.5.2-20140827";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 21fed2e28de..6d04cef76ce 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name    = "exercism-${version}";
+  pname = "exercism";
   version = "3.0.11";
 
   goPackagePath = "github.com/exercism/cli";
diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/applications/misc/extract_url/default.nix
index 2b7888c9cd0..f96d3f0f57c 100644
--- a/pkgs/applications/misc/extract_url/default.nix
+++ b/pkgs/applications/misc/extract_url/default.nix
@@ -10,7 +10,7 @@ let
     ++ lib.optional uriFindSupport perlPackages.URIFind;
 
 in stdenv.mkDerivation rec {
-  name = "extract_url-${version}";
+  pname = "extract_url";
   version = "1.6.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix
index f70042884a8..06cf3c06ffa 100644
--- a/pkgs/applications/misc/flamerobin/default.nix
+++ b/pkgs/applications/misc/flamerobin/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.3.1";
-  name = "flamerobin-${version}";
+  pname = "flamerobin";
 
   src = fetchFromGitHub {
     owner = "mariuz";
diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix
index 4e786bfb36f..2ca059820ef 100644
--- a/pkgs/applications/misc/fme/default.nix
+++ b/pkgs/applications/misc/fme/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec{
 
-  name = "fme-${version}";
+  pname = "fme";
   version = "1.1.3";
   
   src = fetchurl {
diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix
index 5152c8aa3f7..aee3937689b 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jdk, jre, ant }:
 
 stdenv.mkDerivation rec {
-  name = "freemind-${version}";
+  pname = "freemind";
   version = "1.0.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix
index 9a34694e2f2..67d4bd65a9f 100644
--- a/pkgs/applications/misc/gImageReader/default.nix
+++ b/pkgs/applications/misc/gImageReader/default.nix
@@ -15,7 +15,7 @@ let
   pythonEnv = python3.withPackages( ps: with ps;[ pygobject3 ] );
 in
 stdenv.mkDerivation rec {
-  name = "gImageReader-${version}";
+  pname = "gImageReader";
   version = "3.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix
index 44071b32875..ecf8ae9da8d 100644
--- a/pkgs/applications/misc/galculator/default.nix
+++ b/pkgs/applications/misc/galculator/default.nix
@@ -3,7 +3,7 @@
 , gtk, pkgconfig, flex }:
 
 stdenv.mkDerivation rec {
-  name = "galculator-${version}";
+  pname = "galculator";
   version = "2.1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 739df59b31c..fb6902634da 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -7,7 +7,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "gammu-${version}";
+  pname = "gammu";
   version = "1.40.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix
index dd0a5c9a4f6..96d3d34046e 100644
--- a/pkgs/applications/misc/ganttproject-bin/default.nix
+++ b/pkgs/applications/misc/ganttproject-bin/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ganttproject-bin-${version}";
+  pname = "ganttproject-bin";
   version = "2.8.10";
 
   src = let build = "r2364"; in fetchzip {
diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix
index a3aebf22733..f5eb6e188b7 100644
--- a/pkgs/applications/misc/gcal/default.nix
+++ b/pkgs/applications/misc/gcal/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses  }:
 
 stdenv.mkDerivation rec {
-  name = "gcal-${version}";
+  pname = "gcal";
   version = "4.1";
 
   src = fetchurl {
-    url = "mirror://gnu/gcal/${name}.tar.xz";
+    url = "mirror://gnu/gcal/${pname}-${version}.tar.xz";
     sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci";
   };
 
diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix
index a77f87f6f1f..983a210c163 100644
--- a/pkgs/applications/misc/getxbook/default.nix
+++ b/pkgs/applications/misc/getxbook/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name    = "getxbook-${version}";
+  pname = "getxbook";
   version = "1.2";
 
   src = fetchurl {
-    url    = "https://njw.me.uk/getxbook/${name}.tar.xz";
+    url    = "https://njw.me.uk/getxbook/${pname}-${version}.tar.xz";
     sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
   };
 
diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
index 4af776674e6..b5d008579ac 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/pkgs/applications/misc/gksu/default.nix
@@ -5,10 +5,9 @@
 stdenv.mkDerivation rec {
   version = "2.0.2";
   pname = "gksu";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://people.debian.org/~kov/gksu/${name}.tar.gz";
+    url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz";
     sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1";
   };
 
diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix
index 3831780c791..6f5146161a6 100644
--- a/pkgs/applications/misc/glava/default.nix
+++ b/pkgs/applications/misc/glava/default.nix
@@ -21,7 +21,7 @@ let
   '';
 in
   stdenv.mkDerivation rec {
-    name = "glava-${version}";
+    pname = "glava";
     version = "1.6.3";
 
     src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix
index b80ddb8f303..f8da250dbc7 100644
--- a/pkgs/applications/misc/go-jira/default.nix
+++ b/pkgs/applications/misc/go-jira/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "go-jira-${version}";
+  pname = "go-jira";
   version = "1.0.17";
 
   goPackagePath = "gopkg.in/Netflix-Skunkworks/go-jira.v1";
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index d4ff7269987..dd0c24e2e29 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -14,10 +14,10 @@ let
     categories = "Application;Utility;";
   };
 in mkDerivation rec {
-  name = "golden-cheetah-${version}";
+  pname = "golden-cheetah";
   version = "3.4";
   src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz";
     sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf";
   };
diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index 62f2d7a069d..e9a177ee193 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -2,7 +2,6 @@
 , git }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "gollum";
   # nix-shell -p bundix icu zlib
   version = (import ./gemset.nix).gollum.version;
@@ -10,7 +9,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
 
   env = bundlerEnv {
-    name = "${name}-gems";
+    name = "${pname}-${version}-gems";
     inherit pname ruby;
     gemdir = ./.;
   };
diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 3dcbcaf38b8..12eb8839b8a 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.9";
-  name = "googler-${version}";
+  pname = "googler";
 
   src = fetchFromGitHub {
     owner = "jarun";
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix
index 7b23fca2121..c1c2a44bd7f 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/applications/misc/gphoto2/gphotofs.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }:
 
 stdenv.mkDerivation rec {
-  name = "gphoto2fs-${version}";
+  pname = "gphoto2fs";
   version = "0.5.0";
   src = fetchurl {
     url="mirror://sourceforge/gphoto/gphotofs/${version}/gphotofs-0.5.tar.bz2";
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index aa0ed5f6463..9d244ca18f3 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "gpsbabel-${version}";
+  pname = "gpsbabel";
   version = "1.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 4f0c1864677..9c0dc48d42e 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }:
 
 stdenv.mkDerivation rec {
-  name = "gpsprune-${version}";
+  pname = "gpsprune";
   version = "19.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix
index 735818171e8..04ab062c1a1 100644
--- a/pkgs/applications/misc/gpx-viewer/default.nix
+++ b/pkgs/applications/misc/gpx-viewer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "gpx-viewer-${version}";
+  pname = "gpx-viewer";
   version = "0.4.0";
 
   src = fetchurl {
-    url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80";
   };
 
diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix
index 9fef9381949..a341a212a37 100644
--- a/pkgs/applications/misc/gpx/default.nix
+++ b/pkgs/applications/misc/gpx/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "gpx-${version}";
+  pname = "gpx";
   version = "2.5.2";
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index e9026ded470..84be50ccb5e 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -10,7 +10,7 @@ let
   inherit (pythonPackages) python buildPythonApplication;
 in buildPythonApplication rec {
   version = "5.0.1";
-  name = "gramps-${version}";
+  pname = "gramps";
 
   nativeBuildInputs = [ wrapGAppsHook gettext ];
   buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] 
@@ -48,7 +48,7 @@ in buildPythonApplication rec {
     eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
     if [ -e "$eapth" ]; then
         # move colliding easy_install.pth to specifically named one
-        mv "$eapth" $(dirname "$eapth")/${name}.pth
+        mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth
     fi
 
     rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
index cb4f4748eec..308f084bd58 100644
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ b/pkgs/applications/misc/green-pdfviewer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "green-pdfviewer-${version}";
+  pname = "green-pdfviewer";
   version = "nightly-2014-04-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix
index 9274c2d0521..87e636b9c03 100644
--- a/pkgs/applications/misc/gremlin-console/default.nix
+++ b/pkgs/applications/misc/gremlin-console/default.nix
@@ -1,7 +1,7 @@
 { fetchzip, stdenv, makeWrapper, openjdk }:
 
 stdenv.mkDerivation rec {
-  name = "gremlin-console-${version}";
+  pname = "gremlin-console";
   version = "3.3.4";
   src = fetchzip {
     url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix
index 7f3b3a8d6dc..ea78331e476 100644
--- a/pkgs/applications/misc/gsimplecal/default.nix
+++ b/pkgs/applications/misc/gsimplecal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "gsimplecal-${version}";
+  pname = "gsimplecal";
   version = "2.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix
index 8f683272e12..204624f2439 100644
--- a/pkgs/applications/misc/gtk2fontsel/default.nix
+++ b/pkgs/applications/misc/gtk2fontsel/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.1";
-  name = "gtk2fontsel-${version}";
+  pname = "gtk2fontsel";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gtk2fontsel/${name}.tar.gz";
+    url = "mirror://sourceforge/gtk2fontsel/${pname}-${version}.tar.gz";
     sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw";
   };
 
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
index 1e237923d05..f0026cac52e 100644
--- a/pkgs/applications/misc/gummi/default.nix
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.6";
-  name = "gummi-${version}";
+  pname = "gummi";
 
   src = pkgs.fetchFromGitHub {
     owner = "alexandervdm";
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
index a9e6d905c28..a7313e7c969 100644
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "gxmessage-${version}";
+  pname = "gxmessage";
   version = "3.4.3";
 
   src = fetchurl {
-    url = "http://homepages.ihug.co.nz/~trmusson/stuff/${name}.tar.gz";
+    url = "http://homepages.ihug.co.nz/~trmusson/stuff/${pname}-${version}.tar.gz";
     sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
   };
 
diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix
index e2f5f653d47..989dfb886ec 100644
--- a/pkgs/applications/misc/hdate/default.nix
+++ b/pkgs/applications/misc/hdate/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.02";
-  name = "hdate-${version}";
+  pname = "hdate";
   src = fetchurl {
     url = "https://sourceforge.net/projects/libhdate/files/libhdate/libhdate-${version}/libhdate-${version}.tar.bz2";
     sha256 = "3c930a8deb57c01896dc37f0d7804e5a330ee8e88c4ff610b71f9d2b02c17762";
diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix
index 1647a09edfd..a2d2e8ad735 100644
--- a/pkgs/applications/misc/hello-unfree/default.nix
+++ b/pkgs/applications/misc/hello-unfree/default.nix
@@ -1,7 +1,7 @@
 { stdenv, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "example-unfree-package-${version}";
+  pname = "example-unfree-package";
   version = "1.0";
 
   phases = [ "installPhase" "fixupPhase" ];
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index 63a8af99f7c..8bae8ce373c 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hello-${version}";
+  pname = "hello";
   version = "2.10";
 
   src = fetchurl {
-    url = "mirror://gnu/hello/${name}.tar.gz";
+    url = "mirror://gnu/hello/${pname}-${version}.tar.gz";
     sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
   };
 
diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix
index 0431f35057b..84f5bad24d2 100644
--- a/pkgs/applications/misc/hivemind/default.nix
+++ b/pkgs/applications/misc/hivemind/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "hivemind-${version}";
+  pname = "hivemind";
   version = "1.0.4";
   goPackagePath = "github.com/DarthSim/hivemind";
 
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 500f1df36a0..88c87eaca87 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -30,7 +30,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "17.0.352";
-  name = "houdini-runtime-${version}";
+  pname = "houdini-runtime";
   src = requireFile rec {
     name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz";
     sha256 = "0cl5fkgaplb0cvv7mli06ffc9j4ngpy8hl5zqabj3d645gcgafjg";
diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix
index 2fd56e3c555..437c42b0331 100644
--- a/pkgs/applications/misc/hr/default.nix
+++ b/pkgs/applications/misc/hr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "hr-${version}";
+  pname = "hr";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index 7cdf1a319f6..0d25d3d686c 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -2,7 +2,7 @@
 , autoreconfHook, pkgconfig, gettext }:
 
 stdenv.mkDerivation rec {
-  name    = "hstr-${version}";
+  pname = "hstr";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 0bb3f15fdc1..9e26e44a4f7 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "hugo-${version}";
+  pname = "hugo";
   version = "0.55.4";
 
   goPackagePath = "github.com/gohugoio/hugo";
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index f8d808a49c2..f21675e60b2 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -12,7 +12,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "2.1.2";
-  name = "hyper-${version}";
+  pname = "hyper";
   src = fetchurl {
     url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb";
     sha256 = "1n4qlbk7q9zkhhg72mdks95g15xgyrc6ixf882ghvrqghd4zxplm";
diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix
index c0c1faef09d..c197e1a8fd3 100644
--- a/pkgs/applications/misc/icesl/default.nix
+++ b/pkgs/applications/misc/icesl/default.nix
@@ -3,7 +3,7 @@ let
   lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ];
 in
 stdenv.mkDerivation rec {
-  name = "iceSL-${version}";
+  pname = "iceSL";
   version = "2.1.10";
 
   src =  if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip {
diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
index d9bccee889a..7daa2704e22 100644
--- a/pkgs/applications/misc/ipmicfg/default.nix
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "ipmicfg-${version}";
+  pname = "ipmicfg";
   version = "1.29.0";
   buildVersion = "181029";
 
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index b5fa9143ddb..64e0f0d325b 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }:
 
 stdenv.mkDerivation rec {
-   name = "IPMIView-${version}";
+   pname = "IPMIView";
    version = "2.14.0";
    buildVersion = "180213";
 
diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix
index e493226be60..d63576d5cbd 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/misc/iterm2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "iterm2-${version}";
+  pname = "iterm2";
   version = "3.0.14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index 5939d7789b4..c8951059d4c 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
   pname = "jbidwatcher";
   version = "2.5.6";
 
-  name = "${pname}-${version}";
-
   src = fetchurl {
     url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar";
     sha256 = "1cw59wh72w1zzibs8x64dma3jc4hry64wjksqs52nc3vpnf0fzfr";
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 8838de9ac96..56b28dbc8db 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }:
 
 stdenv.mkDerivation rec {
-  name = "josm-${version}";
+  pname = "josm";
   version = "15238";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix
index 138ee397d3f..2a9e162e7ea 100644
--- a/pkgs/applications/misc/jp2a/default.nix
+++ b/pkgs/applications/misc/jp2a/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.7";
-  name = "jp2a-${version}";
+  pname = "jp2a";
 
   src = fetchFromGitHub {
     owner = "cslarsen";
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 7c5845b3541..9391fe88c5e 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -12,7 +12,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "k2pdfopt-${version}";
+  pname = "k2pdfopt";
   version = "2.51a";
 
   src = (fetchzip {
diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index ecfcc771728..0a42d5e4f28 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "kanboard-${version}";
+  pname = "kanboard";
   version = "1.2.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix
index b518481e29a..2af091b0df3 100644
--- a/pkgs/applications/misc/kdbplus/default.nix
+++ b/pkgs/applications/misc/kdbplus/default.nix
@@ -7,7 +7,7 @@ let
     [ stdenv.cc.libc stdenv.cc.cc ];
 in
 stdenv.mkDerivation rec {
-  name    = "kdbplus-${version}";
+  pname = "kdbplus";
   version = "3.3";
 
   src = requireFile {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip ];
 
   phases = "unpackPhase installPhase";
-  unpackPhase = "mkdir ${name} && cd ${name} && unzip -qq ${src}";
+  unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}";
   installPhase = ''
     mkdir -p $out/bin $out/libexec
 
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index 8a3aaf202a7..36734a97516 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }:
 
 stdenv.mkDerivation rec {
-  name = "keepassx2-${version}";
+  pname = "keepassx2";
   version = "2.0.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 85dfda405b0..dc73f2b27bb 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -31,7 +31,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "keepassxc-${version}";
+  pname = "keepassxc";
   version = "2.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix
index 05ad9b05abb..7adbcb86c50 100644
--- a/pkgs/applications/misc/keepassx/default.nix
+++ b/pkgs/applications/misc/keepassx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }:
 
 stdenv.mkDerivation rec {
-  name = "keepassx-${version}";
+  pname = "keepassx";
   version = "0.4.4";
 
   src = fetchurl {
-    url = "https://www.keepassx.org/releases/${version}/${name}.tar.gz";
+    url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry";
   };
 
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 4fb2227ee20..99b9c38d53f 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -18,7 +18,7 @@ let
 
 in with python.pkgs; buildPythonApplication rec {
   version = "0.14.0";
-  name = "khard-${version}";
+  pname = "khard";
   namePrefix = "";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 01aef93e5e5..89778f670ff 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -31,10 +31,10 @@ let
 
   pugixml = stdenv.mkDerivation rec {
     version = "1.2";
-    name = "pugixml-${version}";
+    pname = "pugixml";
 
     src = fetchurl {
-      url = "http://download.kiwix.org/dev/${name}.tar.gz";
+      url = "http://download.kiwix.org/dev/${pname}-${version}.tar.gz";
       sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg";
     };
 
@@ -42,8 +42,8 @@ let
 
     unpackPhase = ''
       # not a nice src archive: all the files are in the root :(
-      mkdir ${name}
-      cd ${name}
+      mkdir ${pname}-${version}
+      cd ${pname}-${version}
       tar -xf ${src}
 
       # and the build scripts are in there :'(
@@ -54,7 +54,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "kiwix-${version}";
+  pname = "kiwix";
   version = "0.9";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index bdbdef45fe7..0bd91994418 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -4,12 +4,11 @@
 mkDerivation rec {
   pname = "latte-dock";
   version = "0.8.9";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
+    url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
     sha256 = "1kkpxa39crjpqgamrcpgp1mrcdg0aq9850yb6cf7lw7d3x2fdrxj";
-    name = "${name}.tar.xz";
+    name = "${pname}-${version}.tar.xz";
   };
 
   buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ];
diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix
index 9018a592642..76abe7c9b4b 100644
--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/pkgs/applications/misc/lenmus/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lenmus-${version}";
+  pname = "lenmus";
   version = "5.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index c9583961de4..9667c7466cb 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libosmocore-${version}";
+  pname = "libosmocore";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index c049ed2374f..09089a072b3 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   version = "2.1.3";
-  name = "librecad-${version}";
+  pname = "librecad";
 
   src = fetchurl {
     url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
-    name = name + ".tar.gz";
+    name = "${pname}-${version}" + ".tar.gz";
     sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx";
   };
 
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 948ae7b14a1..38078d11931 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -30,7 +30,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "lilyterm-${version}";
+  pname = "lilyterm";
 
   inherit (stuff) src version;
 
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 5ae652d750d..c66ef21416b 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -4,7 +4,7 @@ libGLU_combined, freetype, xclip, inotify-tools, procps }:
 assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
 
 stdenv.mkDerivation rec {
-  name = "llpp-${version}";
+  pname = "llpp";
   version = "30";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix
index 4972aa28e58..42905fa3cb4 100644
--- a/pkgs/applications/misc/ltwheelconf/default.nix
+++ b/pkgs/applications/misc/ltwheelconf/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "ltwheelconf";
   version = "0.2.7";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "thk";
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index 7ccd4d6e5e9..5435080e831 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -30,7 +30,7 @@ let
   ];
 
 in buildPythonApplication rec {
-  name = "lutris-original-${version}";
+  pname = "lutris-original";
   version = "0.5.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index ad3bd499cde..744d124f84d 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.3.0";
-  name = "lyx-${version}";
+  pname = "lyx";
 
   src = fetchurl {
-    url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${name}.tar.xz";
+    url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
     sha256 = "0axri2h8xkna4mkfchfyyysbjl7s486vx80p5hzj9zgsvdm5a3ri";
   };
 
diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix
index f2dacb7890f..9a134343d29 100644
--- a/pkgs/applications/misc/madonctl/default.nix
+++ b/pkgs/applications/misc/madonctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "madonctl-${version}";
+  pname = "madonctl";
   version = "1.1.0";
 
   goPackagePath = "github.com/McKael/madonctl";
diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index a6af1762e28..f2585f78146 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.4.0";
-  name = "makeself-${version}";
+  pname = "makeself";
 
   src = fetchFromGitHub {
     owner = "megastep";
@@ -15,15 +15,15 @@ stdenv.mkDerivation rec {
   patches = [ ./Use-rm-from-PATH.patch ];
 
   postPatch = ''
-    sed -e "s|^HEADER=.*|HEADER=$out/share/${name}/makeself-header.sh|" -i makeself.sh
+    sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i makeself.sh
   '';
 
   installPhase = ''
-    mkdir -p $out/{bin,share/{${name},man/man1}}
-    cp makeself.lsm README.md $out/share/${name}
+    mkdir -p $out/{bin,share/{${pname}-${version},man/man1}}
+    cp makeself.lsm README.md $out/share/${pname}-${version}
     cp makeself.sh $out/bin/makeself
     cp makeself.1  $out/share/man/man1/
-    cp makeself-header.sh $out/share/${name}
+    cp makeself-header.sh $out/share/${pname}-${version}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index 6c58dde00d3..03f30d64fb2 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.15";
-  name = "mdp-${version}";
+  pname = "mdp";
 
   src = fetchFromGitHub {
     owner = "visit1985";
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 8e6965bfc4f..9eb4a0897d4 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "19.07";
-  name = "mediainfo-gui-${version}";
+  pname = "mediainfo-gui";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
     sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44";
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 8bbb179d9d5..78c2506ff00 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "19.04";
-  name = "mediainfo-${version}";
+  pname = "mediainfo";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
     sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5";
diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index b3e73986417..ee6cfdb729f 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -24,7 +24,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "megasync-${version}";
+  pname = "megasync";
   version = "4.1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix
index 0b802bedf8d..ed0bbc4cb48 100644
--- a/pkgs/applications/misc/memo/default.nix
+++ b/pkgs/applications/misc/memo/default.nix
@@ -7,7 +7,7 @@ assert pandocSupport -> pandoc != null;
 
 stdenv.mkDerivation rec {
 
-  name = "memo-${version}";
+  pname = "memo";
 
   version = "0.8";
 
diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix
index 718f2e46fa0..e06f2a88ade 100644
--- a/pkgs/applications/misc/menumaker/default.nix
+++ b/pkgs/applications/misc/menumaker/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "menumaker-${version}";
+  pname = "menumaker";
   version = "0.99.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/menumaker/${name}.tar.gz";
+    url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz";
     sha256 = "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx";
   };
 
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index dec55e9c1e5..3023a5b5930 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -2,7 +2,7 @@
 , qtbase, qtsvg, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  name = "merkaartor-${version}";
+  pname = "merkaartor";
   version = "0.18.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix
index 602d4a032ef..318c7c25242 100644
--- a/pkgs/applications/misc/metamorphose2/default.nix
+++ b/pkgs/applications/misc/metamorphose2/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "metamorphose2-${version}";
+  pname = "metamorphose2";
   version = "0.9.0beta";
 
   # exif-py vendored via submodule
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index 09c4d1db290..6c1dcd5e150 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }:
 
 stdenv.mkDerivation rec {
-  name = "milu-nightly-${version}";
+  pname = "milu-nightly";
   version = "2016-05-09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix
index 6aa7eea3d7e..95ceaddb4f0 100644
--- a/pkgs/applications/misc/minergate-cli/default.nix
+++ b/pkgs/applications/misc/minergate-cli/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "8.2";
-  name = "minergate-cli-${version}";
+  pname = "minergate-cli";
   src = fetchurl {
     url = "https://minergate.com/download/ubuntu-cli";
     sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8";
diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix
index d11e889e932..fdd1238d870 100644
--- a/pkgs/applications/misc/minergate/default.nix
+++ b/pkgs/applications/misc/minergate/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "8.1";
-  name = "minergate-${version}";
+  pname = "minergate";
   src = fetchurl {
     url = "https://minergate.com/download/ubuntu";
     sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13";
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 46ba9d450c8..d3e7f9e8cd4 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mlterm-${version}";
+  pname = "mlterm";
   version = "3.8.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "1jq3fv2wqhszfipkzj8d0lykr6g0zzksn7xy4d3kwincmzfskv7k";
   };
 
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 920c1c3f095..08f510a2840 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "moonlight-embedded-${version}";
+  pname = "moonlight-embedded";
   version = "2.4.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix
index b9179bbe546..c0d41cda02d 100644
--- a/pkgs/applications/misc/mop/default.nix
+++ b/pkgs/applications/misc/mop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "mop-${version}";
+  pname = "mop";
   version = "0.2.0";
   rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
 
diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix
index eea166d8df7..0e8cc2ebcea 100644
--- a/pkgs/applications/misc/mqtt-bench/default.nix
+++ b/pkgs/applications/misc/mqtt-bench/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
-  name = "mqtt-bench-${version}";
+  pname = "mqtt-bench";
   version = "0.3.0";
   rev = "v${version}";
 
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 38f5075d10f..9219c4e2e42 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -15,10 +15,10 @@ let
 
 in stdenv.mkDerivation rec {
   version = "1.14.0";
-  name = "mupdf-${version}";
+  pname = "mupdf";
 
   src = fetchurl {
-    url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz";
+    url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
     sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4";
   };
 
diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix
index c08a21e8797..249d9ff1d40 100644
--- a/pkgs/applications/misc/mwic/default.nix
+++ b/pkgs/applications/misc/mwic/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.7";
-  name = "mwic-${version}";
+  pname = "mwic";
 
   src = fetchurl {
-    url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0l4anwiiqclymx0awwn4hzaj8n26ycg8nz76wjphsyscn7z2awad";
   };
 
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index cccd36d7ead..172f999223a 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -14,7 +14,6 @@ let
 in stdenv.mkDerivation rec {
   pname = "mysql-workbench";
   version = "8.0.15";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix
index 45b83b72748..deecc92d993 100644
--- a/pkgs/applications/misc/mystem/default.nix
+++ b/pkgs/applications/misc/mystem/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mystem-${version}";
+  pname = "mystem";
   version = "3.1";
 
   src = fetchurl {
-    url = "http://download.cdn.yandex.net/mystem/${name}-linux-64bit.tar.gz";
+    url = "http://download.cdn.yandex.net/mystem/${pname}-${version}-linux-64bit.tar.gz";
     sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10";
   };
 
diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix
index 022829040b8..b4d97c368ea 100644
--- a/pkgs/applications/misc/nanoblogger/default.nix
+++ b/pkgs/applications/misc/nanoblogger/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.5-rc1";
-  name = "nanoblogger-${version}";
+  pname = "nanoblogger";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nanoblogger/${name}.tar.gz";
+    url = "mirror://sourceforge/nanoblogger/${pname}-${version}.tar.gz";
     sha256 = "09mv52a5f0h3das8x96irqyznm69arfskx472b7w3b9q4a2ipxbq";
   };
 
diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix
index e8497dbc7bd..4d95f0b5238 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/pkgs/applications/misc/navit/default.nix
@@ -17,7 +17,7 @@ assert speechdSupport -> speechd != null;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "navit-${version}";
+  pname = "navit";
   version = "0.5.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/neap/default.nix b/pkgs/applications/misc/neap/default.nix
index 21a5ab0cd0f..4104d35cf10 100644
--- a/pkgs/applications/misc/neap/default.nix
+++ b/pkgs/applications/misc/neap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages }:
 
 stdenv.mkDerivation rec {
-  name = "neap-${version}";
+  pname = "neap";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
index 0bb86fdca95..c1ba5ba23b1 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -30,7 +30,7 @@ let
 in
 stdenv.mkDerivation rec {
 
-  name = "netsurf-${version}";
+  pname = "netsurf";
   version = "3.9";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
index 882bb75219d..24377028ce7 100644
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "netsurf-buildsystem-${version}";
+  pname = "netsurf-buildsystem";
   version = "1.7";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
index f343a886283..88ac4f0c3eb 100644
--- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix
+++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "netsurf-nsgenbind-${version}";
+  pname = "netsurf-nsgenbind";
   version = "0.7";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix
index 1cc7f419aa2..31afed3061a 100644
--- a/pkgs/applications/misc/nix-tour/default.nix
+++ b/pkgs/applications/misc/nix-tour/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, electron, runtimeShell } :
 
 stdenv.mkDerivation rec {
-  name = "nix-tour-${version}";
+  pname = "nix-tour";
   version = "0.0.1";
 
   buildInputs = [ electron ];
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix
index 145abfba5d5..dec8b4ba0a7 100644
--- a/pkgs/applications/misc/nixnote2/default.nix
+++ b/pkgs/applications/misc/nixnote2/default.nix
@@ -2,7 +2,7 @@
 , qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}:
 
 mkDerivation rec {
-  name = "nixnote2-${version}";
+  pname = "nixnote2";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix
index bcf2edd8f2f..db8139122ba 100644
--- a/pkgs/applications/misc/noice/default.nix
+++ b/pkgs/applications/misc/noice/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "noice-${version}";
+  pname = "noice";
   version = "0.6";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix
index d4f3db4ca6f..4568c3e8acc 100644
--- a/pkgs/applications/misc/notify-osd-customizable/default.nix
+++ b/pkgs/applications/misc/notify-osd-customizable/default.nix
@@ -13,7 +13,7 @@
 
 let baseURI = "https://launchpad.net/~leolik/+archive/leolik";
 in stdenv.mkDerivation rec {
-  name = "notify-osd-${version}";
+  pname = "notify-osd";
   version = "0.9.35+16.04.20160415";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix
index 5c60c7412c4..484ff62e9e6 100644
--- a/pkgs/applications/misc/notify-osd/default.nix
+++ b/pkgs/applications/misc/notify-osd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "notify-osd-${version}";
+  pname = "notify-osd";
   version = "0.9.34";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index e16d9354bb4..b9529981c7c 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ola-${version}";
+  pname = "ola";
   version = "0.10.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
index b87f11d7b05..3a0a548be0b 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version_name = "1.2.sakura.5";
   version = "1.2.5";
-  name = "oneko-${version}";
+  pname = "oneko";
   src = fetchurl {
     url = "http://www.daidouji.com/oneko/distfiles/oneko-${version_name}.tar.gz";
     sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
index 8ff9a2f44d5..8f7f74f7123 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }:
 
 stdenv.mkDerivation rec {
-  name = "openbox-menu-${version}";
+  pname = "openbox-menu";
   version = "0.8.0";
 
   src = fetchurl {
-    url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${name}.tar.bz2";
+    url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l";
   };
 
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index e4f2fd7ce8b..5c7e7355c66 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -2,7 +2,7 @@
   gettext, glib, portaudio }:
 
 stdenv.mkDerivation rec {
-  name = "opencpn-${version}";
+  pname = "opencpn";
   version = "5.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix
index bc6aa242f33..e404da974c4 100644
--- a/pkgs/applications/misc/orpie/default.nix
+++ b/pkgs/applications/misc/orpie/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocamlPackages, ncurses, gsl }:
 
 stdenv.mkDerivation rec {
-  name = "orpie-${version}";
+  pname = "orpie";
   version = "1.5.2";
 
   src = fetchurl {
-    url = "http://pessimization.com/software/orpie/${name}.tar.gz";
+    url = "http://pessimization.com/software/orpie/${pname}-${version}.tar.gz";
     sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy";
   };
 
diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix
index 9d0fb3fdeb7..8ffc8ec69fe 100644
--- a/pkgs/applications/misc/osm2xmap/default.nix
+++ b/pkgs/applications/misc/osm2xmap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } :
 
 stdenv.mkDerivation rec {
-  name = "osm2xmap-${version}";
+  pname = "osm2xmap";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix
index bb53782fb7d..4cbd7cb7119 100644
--- a/pkgs/applications/misc/osmctools/default.nix
+++ b/pkgs/applications/misc/osmctools/default.nix
@@ -17,7 +17,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "osmctools-${version}";
+  pname = "osmctools";
   version = "0.8.5plus1.4.0";
 
   buildInputs = [ zlib ];
diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix
index 2b35cb77038..616949af883 100644
--- a/pkgs/applications/misc/osmium-tool/default.nix
+++ b/pkgs/applications/misc/osmium-tool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libosmium, protozero, boost, bzip2, zlib, expat }:
 
 stdenv.mkDerivation rec {
-  name = "osmium-tool-${version}";
+  pname = "osmium-tool";
   version = "1.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index 7fdfbd84d2f..482ac7ad066 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "pcmanx-gtk2-${version}";
+  pname = "pcmanx-gtk2";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index f604684b19a..bc6f5965e89 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}:
 
 pythonPackages.buildPythonApplication rec {
-  name = "pdf-quench-${version}";
+  pname = "pdf-quench";
   version = "1.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix
index d55c7a2af12..fc4e5229c9c 100644
--- a/pkgs/applications/misc/pell/default.nix
+++ b/pkgs/applications/misc/pell/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "pell";
   version = "0.0.4";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "ebzzry";
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 7e7850668b8..86e10ae0943 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "pgadmin3-${version}";
+  pname = "pgadmin3";
   version = "1.22.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index 113a63f7fe1..241d5786468 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql, openssl } :
 
 stdenv.mkDerivation rec {
-  name = "pgmanage-${version}";
+  pname = "pgmanage";
   version = "11.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix
index 0cee74522ab..e8ddec91e62 100644
--- a/pkgs/applications/misc/phwmon/default.nix
+++ b/pkgs/applications/misc/phwmon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "phwmon-${version}";
+  pname = "phwmon";
   version = "2017-04-10";
 
   src = fetchFromGitLab {
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
index b44169adea8..3ecace18f92 100644
--- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
+++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, plasma-pa, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "plasma-applet-volumewin7mixer-${version}";
+  pname = "plasma-applet-volumewin7mixer";
   version = "24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 0bd28811d55..8021ffdc8f5 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -2,7 +2,7 @@
 
 {
   stable = with python27Packages; buildPythonPackage rec {
-    name    = "plover-${version}";
+    pname = "plover";
     version = "3.1.1";
 
     meta = with stdenv.lib; {
@@ -24,7 +24,7 @@
   };
 
   dev = with python36Packages; buildPythonPackage rec {
-    name    = "plover-${version}";
+    pname = "plover";
     version = "4.0.0.dev8";
 
     meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix
index 4b39e9291a8..16c49d5f946 100644
--- a/pkgs/applications/misc/pmenu/default.nix
+++ b/pkgs/applications/misc/pmenu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, python2Packages, gnome-menus }:
 
 stdenv.mkDerivation rec {
-  name = "pmenu-${version}";
+  pname = "pmenu";
   version = "2018-01-01";
 
   src = fetchFromGitLab {
diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index 81e3d80f516..8413f8c8f10 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -9,7 +9,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "polar-bookshelf-${version}";
+  pname = "polar-bookshelf";
   version = "1.13.10";
 
   # fetching a .deb because there's no easy way to package this Electron app
diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix
index 5ba8e1b6e31..344c3d7168a 100644
--- a/pkgs/applications/misc/projectlibre/default.nix
+++ b/pkgs/applications/misc/projectlibre/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }:
 
 stdenv.mkDerivation rec {
-  name = "projectlibre-${version}";
+  pname = "projectlibre";
   version = "1.7.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index cc6f63c0960..e5d73672eb7 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -8,7 +8,7 @@ let
                  else "2.4";
 in
 stdenv.mkDerivation rec {
-  name = "prusa-slicer-${version}";
+  pname = "prusa-slicer";
   version = "2.0.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix
index ae0fd61c33d..aae38f7d0f1 100644
--- a/pkgs/applications/misc/qlandkartegt/default.nix
+++ b/pkgs/applications/misc/qlandkartegt/default.nix
@@ -3,11 +3,11 @@
 , garmindev, gdal, gpsd, libdmtx, libexif, libGLU, proj }:
 
 mkDerivation rec {
-  name = "qlandkartegt-${version}";
+  pname = "qlandkartegt";
   version = "1.8.1";
 
   src = fetchurl {
-    url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz";
+    url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz";
     sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly";
   };
 
diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix
index f12a3021a19..a679a4f1112 100644
--- a/pkgs/applications/misc/qlandkartegt/garmindev.nix
+++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, libusb }:
 
 stdenv.mkDerivation rec {
-  name = "garmindev-${version}";
+  pname = "garmindev";
   version = "0.3.4";
 
   src = fetchurl {
-    url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz";
+    url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz";
     sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6";
   };
 
diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index df5f35102e0..8fc890f4243 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -4,7 +4,7 @@
 }:
 
 mkDerivation rec {
-  name = "qlcplus-${version}";
+  pname = "qlcplus";
   version = "4.12.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index 99a0acbcc8c..335c583998f 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,11 +1,11 @@
 { mkDerivation, lib, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
 
 mkDerivation rec {
-  name = "qmapshack-${version}";
+  pname = "qmapshack";
   version = "1.13.1";
 
   src = fetchurl {
-    url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
+    url = "https://bitbucket.org/maproom/qmapshack/downloads/${pname}-${version}.tar.gz";
     sha256 = "15x1b2q0hr1vx006f9hjc4cvfjvxvfdwybw32qvczdyc3crq0mc9";
   };
 
diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix
index e395ae9c070..ecc372dc674 100644
--- a/pkgs/applications/misc/qolibri/default.nix
+++ b/pkgs/applications/misc/qolibri/default.nix
@@ -2,7 +2,7 @@
 , qtmultimedia, qttools, qtwebengine }:
 
 stdenv.mkDerivation rec {
-  name = "qolibri-${version}";
+  pname = "qolibri";
   version = "2018-11-14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 6ae8f380fe2..71a433bded7 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -7,7 +7,7 @@
 
 mkDerivation rec {
   version = "0.5.8";
-  name = "qsyncthingtray-${version}";
+  pname = "qsyncthingtray";
 
   src = fetchFromGitHub {
     owner  = "sieren";
diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix
index b2616bf7b77..948bcf33d37 100644
--- a/pkgs/applications/misc/quicksynergy/default.nix
+++ b/pkgs/applications/misc/quicksynergy/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, pkgconfig, gtk2, synergy}:
 
 stdenv.mkDerivation rec {
-  name = "quicksynergy-${version}";
+  pname = "quicksynergy";
   version = "0.9.0";
   src = fetchurl {
     url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index bf4559e9117..25f9c6ed4c7 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -14,7 +14,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "redis-desktop-manager-${version}";
+  pname = "redis-desktop-manager";
   version = "0.9.1";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index d8512754f6a..d91eccdf8a4 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -12,7 +12,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "redshift-${version}";
+  pname = "redshift";
   version = "1.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix
index 703d7862124..ca362bab2ec 100644
--- a/pkgs/applications/misc/regextester/default.nix
+++ b/pkgs/applications/misc/regextester/default.nix
@@ -14,7 +14,7 @@
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "regextester-${version}";
+  pname = "regextester";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
index be365cb94e4..6c4522d81c8 100644
--- a/pkgs/applications/misc/robo3t/default.nix
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -2,7 +2,7 @@
   freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "robo3t-${version}";
+  pname = "robo3t";
   version = "1.1.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
index 76593eba5fc..8df4e960c18 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -2,7 +2,7 @@
   freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "robomongo-${version}";
+  pname = "robomongo";
   version = "0.9.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix
index 8e63cdb6d16..acdd21a1c21 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/misc/rxvt/default.nix
@@ -3,11 +3,11 @@
 , libX11, libXt, libXpm }:
 
 stdenv.mkDerivation rec {
-  name = "rxvt-${version}";
+  pname = "rxvt";
   version = "2.7.10";
 
   src = fetchurl {
-    url = "mirror://sourceforge/rxvt/${name}.tar.gz";
+    url = "mirror://sourceforge/rxvt/${pname}-${version}.tar.gz";
     sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1";
   };
 
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
index f872e800836..a4e03fa347f 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "urxvt-autocomplete-all-the-things-${version}";
+  pname = "urxvt-autocomplete-all-the-things";
   version = "1.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
index 544789e865b..b976388ae2c 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "urxvt-perls-${version}";
+  pname = "urxvt-perls";
   version = "2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index e8e5c524a35..2982c02cce9 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "urxvt-tabbedex-${version}";
+  pname = "urxvt-tabbedex";
   version = "19.21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix
index 30f54cdee7e..125170d36c2 100644
--- a/pkgs/applications/misc/safeeyes/default.nix
+++ b/pkgs/applications/misc/safeeyes/default.nix
@@ -4,7 +4,6 @@
 let inherit (python3Packages) python buildPythonApplication fetchPypi;
 
 in buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "safeeyes";
   version = "2.0.9";
   namePrefix = "";
diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 33df8e8f0a2..8510d501942 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "sakura-${version}";
+  pname = "sakura";
   version = "3.6.0";
 
   src = fetchurl {
-    url = "https://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
+    url = "https://launchpad.net/sakura/trunk/${version}/+download/${pname}-${version}.tar.bz2";
     sha256 = "1q463qm41ym7jb3kbzjz7b6x549vmgkb70arpkhsf86yxly1y5m1";
   };
 
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 280a42fde14..c95eba48bdf 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.0";
-  name = "sc-im-${version}";
+  pname = "sc-im";
 
   src = fetchFromGitHub {
     owner = "andmarti1424";
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix
index cc8c30043b2..3cebcc0101f 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/pkgs/applications/misc/sdcv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }:
 
 stdenv.mkDerivation rec {
-  name = "sdcv-${version}";
+  pname = "sdcv";
   version = "0.5.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix
index fc63745ebb8..114404c2597 100644
--- a/pkgs/applications/misc/sequelpro/default.nix
+++ b/pkgs/applications/misc/sequelpro/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, undmg }:
 
 stdenv.mkDerivation rec {
-  name = "sequel-pro-${version}";
+  pname = "sequel-pro";
   version = "1.1.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix
index fc6be074a07..d2d5e9548a0 100644
--- a/pkgs/applications/misc/slade/default.nix
+++ b/pkgs/applications/misc/slade/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }:
 
 stdenv.mkDerivation rec {
-  name = "slade-${version}";
+  pname = "slade";
   version = "3.1.1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index e012c3763b3..cf9e93b87b3 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.0";
-  name = "slic3r-${version}";
+  pname = "slic3r";
 
   src = fetchgit {
     url = "git://github.com/alexrj/Slic3r";
diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix
index f4a2e889cd4..bfb3d010a3c 100644
--- a/pkgs/applications/misc/slstatus/default.nix
+++ b/pkgs/applications/misc/slstatus/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "slstatus-${version}";
+  pname = "slstatus";
   version = "unstable-2018-04-16";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index 9f20b20f7f3..c116b587406 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -3,7 +3,7 @@
 , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }:
 
 stdenv.mkDerivation rec {
-  name = "spacefm-${version}";
+  pname = "spacefm";
   version = "1.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix
index a1d5ef153bb..103075024dd 100644
--- a/pkgs/applications/misc/sqliteman/default.nix
+++ b/pkgs/applications/misc/sqliteman/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, qt4, qscintilla }:
 
 stdenv.mkDerivation rec {
-  name = "sqliteman-${version}";
+  pname = "sqliteman";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix
index aee486ddf0c..eb408eaf6ee 100644
--- a/pkgs/applications/misc/ssocr/default.nix
+++ b/pkgs/applications/misc/ssocr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, imlib2, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "ssocr-${version}";
+  pname = "ssocr";
   version = "unstable-2018-08-11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix
index d3cd81f7f13..8c47de3afac 100644
--- a/pkgs/applications/misc/stog/default.nix
+++ b/pkgs/applications/misc/stog/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "stog-${version}";
+  pname = "stog";
   version = "0.18.0";
   src = fetchFromGitLab {
     domain = "framagit.org";
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index d545447cb13..340b59d5ff2 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -3,7 +3,7 @@
 , perlPackages, python27 }:
 
 stdenv.mkDerivation rec {
-  name    = "styx-${version}";
+  pname = "styx";
   version = "0.7.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 7bac1db813f..5967fa3ad77 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -30,7 +30,7 @@ let
   };
 
   googlemaps = stdenv.mkDerivation rec {
-    name = "googlemaps-${version}";
+    pname = "googlemaps";
 
     version = "2017-12-18";
 
diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix
index f16a0d29c40..a07fe0c7510 100644
--- a/pkgs/applications/misc/syncthing-tray/default.nix
+++ b/pkgs/applications/misc/syncthing-tray/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }:
 
 buildGoPackage rec {
-  name = "syncthing-tray-${version}";
+  pname = "syncthing-tray";
   version = "0.7";
 
   goPackagePath = "github.com/alex2108/syncthing-tray";
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 5f12bdb4dfc..377d83e5962 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -3,7 +3,7 @@
 , libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "synergy-${version}";
+  pname = "synergy";
   version = "1.8.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix
index 52e39b98a3b..fbb1832735b 100644
--- a/pkgs/applications/misc/tabula/default.nix
+++ b/pkgs/applications/misc/tabula/default.nix
@@ -2,7 +2,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "tabula-${version}";
+  pname = "tabula";
   version = "1.2.1";
 
 
diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
index 7ca421b49a3..0450cb40a55 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2017-05-15";
-  name = "tasknc-${version}";
+  pname = "tasknc";
 
   src = fetchFromGitHub {
     owner = "lharding";
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
index 6a30adb23da..feb06368de4 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake, readline }:
 
 stdenv.mkDerivation rec {
-  name = "tasksh-${version}";
+  pname = "tasksh";
   version = "1.2.0";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "https://taskwarrior.org/download/${name}.tar.gz";
+    url = "https://taskwarrior.org/download/${pname}-${version}.tar.gz";
     sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf";
   };
 
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index dc632f3ed75..ba919fbc626 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, libuuid, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "taskwarrior-${version}";
+  pname = "taskwarrior";
   version = "2.5.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix
index 7edb8dd5d1e..94eacb1fe06 100644
--- a/pkgs/applications/misc/termdown/default.nix
+++ b/pkgs/applications/misc/termdown/default.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
 
 buildPythonApplication rec {
 
-  name    = "termdown-${version}";
+  pname = "termdown";
   version = "1.16.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index 3599bd0030b..00300e65abb 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -1,7 +1,7 @@
 { stdenv, runtimeShell, lib, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "terminal-notifier-${version}";
+  pname = "terminal-notifier";
 
   version = "2.0.0";
 
diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix
index bdbea571790..6cacb621517 100644
--- a/pkgs/applications/misc/terminal-parrot/default.nix
+++ b/pkgs/applications/misc/terminal-parrot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "terminal-parrot-${version}";
+  pname = "terminal-parrot";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix
index 8518b72bc95..fce46d120de 100644
--- a/pkgs/applications/misc/terminus/default.nix
+++ b/pkgs/applications/misc/terminus/default.nix
@@ -13,7 +13,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "1.0.0-alpha.42";
-  name = "terminus-${version}";
+  pname = "terminus";
   src = fetchurl {
     url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb";
     sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb";
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index d4191a875bd..6a9de364446 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "termite-${version}";
+  pname = "termite";
   version = "15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index 4172660182d..39f54156fef 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "tilda-${version}";
+  pname = "tilda";
   version = "1.4.1";
 
   src = fetchzip {
-    url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz";
+    url = "https://github.com/lanoxx/tilda/archive/${pname}-${version}.tar.gz";
     sha256 = "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj";
   };
 
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index ca049ba04c9..d0419c414d7 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "timewarrior-${version}";
+  pname = "timewarrior";
   version = "1.1.1";
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 63bb7f4bb4a..e612fb10ff8 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tint2-${version}";
+  pname = "tint2";
   version = "16.7";
 
   src = fetchFromGitLab {
diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix
index 6cf1f27a104..cb70d57869c 100644
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.17";
-  name = "tnef-${version}";
+  pname = "tnef";
 
   src = fetchFromGitHub {
     owner  = "verdammelt";
diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix
index d4735c0baf5..d9dcee762cf 100644
--- a/pkgs/applications/misc/todoist/default.nix
+++ b/pkgs/applications/misc/todoist/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "todoist-${version}";
+  pname = "todoist";
   version = "0.13.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix
index 122567de2e1..240ad6e5fca 100644
--- a/pkgs/applications/misc/todolist/default.nix
+++ b/pkgs/applications/misc/todolist/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "todolist-${version}";
+  pname = "todolist";
   version = "v0.8.1";
 
   goPackagePath = "github.com/gammons/todolist";
diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix
index b268bdd0962..bf22cb0181d 100644
--- a/pkgs/applications/misc/toggldesktop/default.nix
+++ b/pkgs/applications/misc/toggldesktop/default.nix
@@ -12,7 +12,7 @@ let
   };
 
   bugsnag-qt = stdenv.mkDerivation rec {
-    name = "bugsnag-qt-${version}";
+    pname = "bugsnag-qt";
     version = "20180522.005732";
 
     src = fetchzip {
@@ -25,7 +25,7 @@ let
   };
 
   qxtglobalshortcut = stdenv.mkDerivation rec {
-    name = "qxtglobalshortcut-${version}";
+    pname = "qxtglobalshortcut";
     version = "f584471dada2099ba06c574bdfdd8b078c2e3550";
 
     src = fetchzip {
@@ -38,7 +38,7 @@ let
   };
 
   qt-oauth-lib = stdenv.mkDerivation rec {
-    name = "qt-oauth-lib-${version}";
+    pname = "qt-oauth-lib";
     version = "20190125.190943";
 
     src = fetchzip {
diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix
index 34952b9c0f4..eb3894c7b47 100644
--- a/pkgs/applications/misc/topydo/default.nix
+++ b/pkgs/applications/misc/topydo/default.nix
@@ -5,7 +5,6 @@ with python3Packages;
 buildPythonApplication rec {
   pname = "topydo";
   version = "0.13";
-  name  = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "bram85";
diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix
index 09322b47506..b955711d003 100644
--- a/pkgs/applications/misc/tpmmanager/default.nix
+++ b/pkgs/applications/misc/tpmmanager/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.1";
-  name = "tpmmanager-${version}";
+  pname = "tpmmanager";
 
   src = fetchgit {
     url = "https://github.com/Sirrix-AG/TPMManager";
diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix
index dbac56abaa1..76ac3f75b26 100644
--- a/pkgs/applications/misc/tthsum/default.nix
+++ b/pkgs/applications/misc/tthsum/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tthsum-${version}";
+  pname = "tthsum";
   version = "1.3.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/applications/misc/usync/default.nix
index d12120ca2f1..344c07d845b 100644
--- a/pkgs/applications/misc/usync/default.nix
+++ b/pkgs/applications/misc/usync/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "usync";
   version = "0.0.3";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "ebzzry";
diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix
index 6752b0182fe..5a12465c4c4 100644
--- a/pkgs/applications/misc/valentina/default.nix
+++ b/pkgs/applications/misc/valentina/default.nix
@@ -7,7 +7,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "valentina-${version}";
+  pname = "valentina";
   version = "0.6.1";
 
   src = fetchhg {
diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix
index 5cd8de43729..b25e7f76cef 100644
--- a/pkgs/applications/misc/vcal/default.nix
+++ b/pkgs/applications/misc/vcal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "vcal-${version}";
+  pname = "vcal";
   version = "2.8";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index 8b64bcca667..f0900a99e5d 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -4,7 +4,6 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "veracrypt";
-  name = "${pname}-${version}";
   version = "1.23";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix
index 05862444556..b6a8b567a50 100644
--- a/pkgs/applications/misc/verbiste/default.nix
+++ b/pkgs/applications/misc/verbiste/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "verbiste-${version}";
+  pname = "verbiste";
 
   version = "0.1.46";
 
   src = fetchurl {
-    url = "https://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz";
+    url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz";
     sha256 = "13l8b8mbkdds955sn42hzrjzj48lg1drpd7vhpcjxadckbvlh1p0";
   };
 
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 50f2012d34a..cda3b1a6f85 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -4,7 +4,7 @@
 , geoclue2, liboauth }:
 
 stdenv.mkDerivation rec {
-  name = "viking-${version}";
+  pname = "viking";
   version = "1.7";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index 5ebc98b5712..64645e00bd8 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -2,7 +2,6 @@
 , dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp
 }:
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "visidata";
   version = "1.5.2";
 
diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix
index 47b0385be68..e482e7e7c02 100644
--- a/pkgs/applications/misc/volnoti/default.nix
+++ b/pkgs/applications/misc/volnoti/default.nix
@@ -3,7 +3,7 @@
 , dbus-glib, autoreconfHook, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "volnoti-unstable-${version}";
+  pname = "volnoti-unstable";
   version = "2013-09-23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix
index e794b82e2f6..a59a25a144e 100644
--- a/pkgs/applications/misc/vp/default.nix
+++ b/pkgs/applications/misc/vp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }:
 
 stdenv.mkDerivation rec {
-  name = "vp-${version}";
+  pname = "vp";
   version = "1.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
index 1feec9e4550..d6404ca6596 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "vue-${version}";
+  pname = "vue";
   version = "3.3.0";
   src = fetchurl {
     url = "http://releases.atech.tufts.edu/jenkins/job/VUE/116/deployedArtifacts/download/artifact.1";
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index 48818ca3b8b..6dfe8e713c6 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, qmake, qtsvg }:
 
 stdenv.mkDerivation rec {
-  name = "vym-${version}";
+  pname = "vym";
   version = "2.6.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/vym/2.6.0/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/vym/2.6.0/${pname}-${version}.tar.bz2";
     sha256 = "1yznlb47jahd662a2blgh1ccwpl5dp5rjz9chsxjzhj3vbkzx3nl";
   };
 
diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix
index 1c6dc8f63c2..ff770f516bc 100644
--- a/pkgs/applications/misc/wcalc/default.nix
+++ b/pkgs/applications/misc/wcalc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, mpfr, readline }:
 
 stdenv.mkDerivation rec {
-  name = "wcalc-${version}";
+  pname = "wcalc";
   version = "2.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/w-calc/${name}.tar.bz2";
+    url = "mirror://sourceforge/w-calc/${pname}-${version}.tar.bz2";
     sha256 = "1vi8dl6rccqiq1apmpwawyg2ywx6a1ic1d3cvkf2hlwk1z11fb0f";
   };
 
diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix
index 90fa0166154..2748d576c69 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/pkgs/applications/misc/weather/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
     version = "2.3";
-    name = "weather-${version}";
+    pname = "weather";
 
     src = fetchurl {
-        url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz";
+        url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz";
         sha256 = "0inij30prqqcmzjwcmfzjjn0ya5klv18qmajgxipz1jr3lpqs546";
     };
 
diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index a3d3ace009e..03f3caa4c15 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "wego-${version}";
+  pname = "wego";
   version = "20170403-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c";
   
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index d8628b794d7..d38383c30ec 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonApplication rec {
   version = "1.4";
-  name = "wikicurses-${version}";
+  pname = "wikicurses";
 
   src = fetchFromGitHub {
     owner = "ids1024";
diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index 5d153a0e417..5a1093b4779 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.0";
-  name = "wordnet-${version}";
+  pname = "wordnet";
   src = fetchurl {
     url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2";
     sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 69421e288d3..bfc414c61c9 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -1,11 +1,11 @@
 { stdenv, libX11, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "worker-${version}";
+  pname = "worker";
   version = "4.0.0";
 
   src = fetchurl {
-    url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
+    url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
     sha256 = "0cs1sq7zpp787r1irhqk5pmxa26rjz55mbgda4823z9zkzwfxy19";
   };
 
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 1547d296211..a3c9d735ff8 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -6,7 +6,7 @@
 , gst-plugins-good, libsigcxx }:
 
 stdenv.mkDerivation rec {
-  name = "workrave-${version}";
+  pname = "workrave";
   version = "1.10.31";
 
   src = let
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index bf3d9b737a9..9040bb4318d 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.31";
-  name = "xautoclick-${version}";
+  pname = "xautoclick";
   src = fetchurl {
     url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
     sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm";
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 280b3012872..8c5a2e3d2db 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -2,7 +2,7 @@
 , libtool, openssl, qtbase, qttools }:
 
 mkDerivation rec {
-  name = "xca-${version}";
+  pname = "xca";
   version = "2.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix
index ed7f2b27c38..b7f8cfce2fb 100644
--- a/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/pkgs/applications/misc/xdgmenumaker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, txt2tags, python2Packages }:
 
 stdenv.mkDerivation rec {
-  name = "xdgmenumaker-${version}";
+  pname = "xdgmenumaker";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index 88ab52313b0..b7c6f938b19 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xiphos-${version}";
+  pname = "xiphos";
   version = "4.0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix
index 3023e830dc7..d6709ecc1a6 100644
--- a/pkgs/applications/misc/xkbd/default.nix
+++ b/pkgs/applications/misc/xkbd/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xkbd-${version}";
+  pname = "xkbd";
   version = "0.8.18";
 
   src = fetchFromGitHub {
     owner = "mahatma-kaganovich";
     repo = "xkbd";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "05ry6q75jq545kf6p20nhfywaqf2wdkfiyp6iwdpv9jh238hf7m9";
   };
 
diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix
index 3f3865d7688..abc808477a3 100644
--- a/pkgs/applications/misc/xkblayout-state/default.nix
+++ b/pkgs/applications/misc/xkblayout-state/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "xkblayout-state";
   version = "1b";
 
diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix
index 4fa1c833df5..dc618e4561e 100644
--- a/pkgs/applications/misc/xkbmon/default.nix
+++ b/pkgs/applications/misc/xkbmon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xkbmon-${version}";
+  pname = "xkbmon";
   version = "0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix
index fc5abf10989..ca1d104fb46 100644
--- a/pkgs/applications/misc/xmind/default.nix
+++ b/pkgs/applications/misc/xmind/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchzip, fetchurl, gtk2, jre, libXtst, makeWrapper, makeDesktopItem, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "xmind-${version}";
+  pname = "xmind";
   version = "8-update8";
 
   src = fetchzip {
-    url = "https://xmind.net/xmind/downloads/${name}-linux.zip";
+    url = "https://xmind.net/xmind/downloads/${pname}-${version}-linux.zip";
     stripRoot = false;
     sha256 = "1p68z0b4brgiyybz190alqv716ncql49vsksm41y90mcjd8s4jhn";
   };
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 9afe3cae07b..69e8c3d330f 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xmrig-${version}";
+  pname = "xmrig";
   version = "2.14.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix
index 4922d3c6aed..5aa52ff4dd7 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xmrig-proxy-${version}";
+  pname = "xmrig-proxy";
   version = "2.14.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 1cce7b155fd..0661a625e97 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -2,7 +2,7 @@
 , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
 
 stdenv.mkDerivation rec {
-   name = "xneur-${version}";
+   pname = "xneur";
    version = "0.20.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix
index 5db4a250839..bc91083892d 100644
--- a/pkgs/applications/misc/xpad/default.nix
+++ b/pkgs/applications/misc/xpad/default.nix
@@ -3,7 +3,7 @@
 , glib, intltool, gtk3, gtksourceview, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "xpad-${version}";
+  pname = "xpad";
   version = "5.4.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix
index bb3385ad016..41071012ae9 100644
--- a/pkgs/applications/misc/xrandr-invert-colors/default.nix
+++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.01";
-  name = "xrandr-invert-colors-${version}";
+  pname = "xrandr-invert-colors";
   src = fetchurl {
     url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz";
     sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75";
diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix
index 28ce4a0d500..517105d7e1f 100644
--- a/pkgs/applications/misc/xscope/default.nix
+++ b/pkgs/applications/misc/xscope/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libXt }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "xscope";
   version = "1.4.1";
 
   src = fetchurl {
-    url = "mirror://xorg/individual/app/${name}.tar.bz2";
+    url = "mirror://xorg/individual/app/${pname}-${version}.tar.bz2";
     sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k";
   };
 
diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix
index ef9ce339361..55ecd358c6c 100644
--- a/pkgs/applications/misc/xsuspender/default.nix
+++ b/pkgs/applications/misc/xsuspender/default.nix
@@ -4,7 +4,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "xsuspender-${version}";
+  pname = "xsuspender";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix
index 3e8acff00f8..aa851e14ab5 100644
--- a/pkgs/applications/misc/xsw/default.nix
+++ b/pkgs/applications/misc/xsw/default.nix
@@ -4,7 +4,7 @@ let
   makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
 
 in stdenv.mkDerivation rec {
-  name = "xsw-${version}";
+  pname = "xsw";
   version = "0.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix
index 6bc492833cc..856ddb8ff50 100644
--- a/pkgs/applications/misc/xteddy/default.nix
+++ b/pkgs/applications/misc/xteddy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, pkg-config, xorg, imlib2, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "xteddy-${version}";
+  pname = "xteddy";
   version = "2.2-5";
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix
index 21f95c65fa5..51575d62ed5 100644
--- a/pkgs/applications/misc/xtermcontrol/default.nix
+++ b/pkgs/applications/misc/xtermcontrol/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.7";
-  name = "xtermcontrol-${version}";
+  pname = "xtermcontrol";
 
   src = fetchurl {
     url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz";
diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix
index d273d27944a..2135c7fd617 100644
--- a/pkgs/applications/misc/yaft/default.nix
+++ b/pkgs/applications/misc/yaft/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.9";
-  name = "yaft-${version}";
+  pname = "yaft";
 
   src = fetchFromGitHub {
     owner = "uobikiemukot";
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index 8f8494ac45b..a3d32f1597f 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -21,10 +21,9 @@
 mkDerivation rec {
   pname = "yakuake";
   version = "3.0.5";
-  name = "${pname}-${version}";
 
     src = fetchurl {
-      url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
+      url = "http://download.kde.org/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
       sha256 = "021a9mnghffv2mrdl987mn7wbg8bk6bnf6xz8kn2nwsqxp9kpqh8";
     };
 
diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix
index a47fb93512d..06e12416baa 100644
--- a/pkgs/applications/misc/yarssr/default.nix
+++ b/pkgs/applications/misc/yarssr/default.nix
@@ -25,7 +25,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "git-2017-12-01";
-  name = "yarssr-${version}";
+  pname = "yarssr";
 
   src = fetchFromGitHub {
     owner = "JGRennison";
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 53d427e61c2..dc4f9429eea 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lib, qt4, openssl, autoconf, automake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "yate-${version}";
+  pname = "yate";
   version = "6.0.0-1";
 
   src = fetchurl {
-    url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${name}.tar.gz";
+    url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${pname}-${version}.tar.gz";
     sha256 = "05qqdhi3rp5660gq1484jkmxkm9vq81j0yr765h0gf0xclan1dqa";
   };
 
diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix
index eb2a0f1c1e1..7c2c8fb31ca 100644
--- a/pkgs/applications/misc/zathura/cb/default.nix
+++ b/pkgs/applications/misc/zathura/cb/default.nix
@@ -2,11 +2,11 @@
 , girara, gettext, libarchive }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-cb-${version}";
+  pname = "zathura-cb";
   version = "0.1.8";
 
   src = fetchurl {
-    url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz";
+    url = "https://pwmt.org/projects/zathura/plugins/download/${pname}-${version}.tar.xz";
     sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5";
   };
 
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 585b4eef9ea..79a277d9835 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -9,7 +9,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "zathura-core-${version}";
+  pname = "zathura-core";
   version = "0.4.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index f3cacd21236..2ebc640d683 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.4";
-  name = "zathura-pdf-mupdf-${version}";
+  pname = "zathura-pdf-mupdf";
 
   # pwmt.org server was down at the time of last update
   # src = fetchurl {
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 30ab053f923..5b38555eda1 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.9";
-  name = "zathura-pdf-poppler-${version}";
+  pname = "zathura-pdf-poppler";
 
   src = fetchurl {
-    url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${name}.tar.gz";
+    url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${pname}-${version}.tar.gz";
     sha256 = "0c15rnwh42m3ybrhax01bl36w0iynaq8xg6l08riml3cyljypi9l";
   };
 
diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix
index 05dee5b6154..ce5c7fb41f1 100644
--- a/pkgs/applications/networking/apache-directory-studio/default.nix
+++ b/pkgs/applications/networking/apache-directory-studio/default.nix
@@ -17,7 +17,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "apache-directory-studio-${version}";
+  pname = "apache-directory-studio";
   version = "2.0.0.v20170904-M13";
 
   src =
diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix
index 8b7bc0bb899..31eb4dd7378 100644
--- a/pkgs/applications/networking/brig/default.nix
+++ b/pkgs/applications/networking/brig/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "brig-${version}";
+  pname = "brig";
   version = "0.4.1";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix
index 32de4871186..57db827169e 100644
--- a/pkgs/applications/networking/browsers/arora/default.nix
+++ b/pkgs/applications/networking/browsers/arora/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
-  name = "arora-${version}";
+  pname = "arora";
   version = "0.11.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix
index 0797eea6f3b..c3f5cb13164 100644
--- a/pkgs/applications/networking/browsers/browsh/default.nix
+++ b/pkgs/applications/networking/browsers/browsh/default.nix
@@ -14,7 +14,7 @@ let
 in buildGoPackage rec {
   inherit version;
 
-  name = "browsh-${version}";
+  pname = "browsh";
 
   goPackagePath = "browsh";
 
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index eca2bc0d99f..aecebb08e0d 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -99,7 +99,7 @@ let
   };
 
   flash = stdenv.mkDerivation rec {
-    name = "flashplayer-ppapi-${version}";
+    pname = "flashplayer-ppapi";
     version = "32.0.0.223";
 
     src = fetchzip {
diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index 671ab03a2e2..8d6c99d2468 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -7,10 +7,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.5";
-  name = "dillo-${version}";
+  pname = "dillo";
 
   src = fetchurl {
-    url = "https://www.dillo.org/download/${name}.tar.bz2";
+    url = "https://www.dillo.org/download/${pname}-${version}.tar.bz2";
     sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv";
   };
 
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index c721a61591a..b6b5670ab55 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "falkon-${version}";
+  pname = "falkon";
   version = "3.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 59ba69c1c4d..f2cc277f3da 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.19";
-  name = "links2-${version}";
+  pname = "links2";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index d6b775107d0..3f4f96d33ef 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -7,7 +7,7 @@
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "lynx-${version}";
+  pname = "lynx";
   version = "2.8.9rel.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 32e4366a4e4..e8841a0ab6f 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -15,7 +15,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "bluejeans-${version}";
+  pname = "bluejeans";
 
   version = "2.180.71.8";
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
index 48d06d644dd..a2585758276 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.12.1.1142";
-  name = "esteidfirefoxplugin-${version}";
+  pname = "esteidfirefoxplugin";
 
   src = fetchurl {
     url = "https://installer.id.ee/media/ubuntu/pool/main/e/esteidfirefoxplugin/esteidfirefoxplugin_3.12.1.1142.orig.tar.xz";
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 8aa51366e47..04c98881215 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,7 +73,7 @@ let
       "";
 in
 stdenv.mkDerivation rec {
-  name = "flashplayer-${version}";
+  pname = "flashplayer";
   version = "32.0.0.223";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index c9081ee3d69..e9431866047 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -49,7 +49,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "flashplayer-standalone-${version}";
+  pname = "flashplayer-standalone";
   version = "32.0.0.223";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
index 30bae8792c2..101ae99d665 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "fribid-${version}";
+  pname = "fribid";
   version = "1.0.4";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "https://fribid.se/releases/source/${name}.tar.bz2";
+    url = "https://fribid.se/releases/source/${pname}-${version}.tar.bz2";
     sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649";
   };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 8a25036c70a..bde4ce15d7c 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -46,7 +46,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "google-talk-plugin-${version}";
+  pname = "google-talk-plugin";
 
   # You can get the upstream version and SHA-1 hash from the following URLs:
   # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1'
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
index c6c1d6a334c..fd956f62327 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, firefox, libX11, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "mozplugger-${version}";
+  pname = "mozplugger";
   version = "2.1.6";
 
   src = fetchurl {
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     cp mozplugger.so "$out/lib/mozilla/plugins"
     cp mozplugger.7 "$out/share/man/man7"
 
-    mkdir -p "$out/share/${name}/plugin"
-    ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${name}/plugin"
+    mkdir -p "$out/share/${pname}-${version}/plugin"
+    ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${pname}-${version}/plugin"
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix
index 1519c382ebb..083383f0ef5 100644
--- a/pkgs/applications/networking/browsers/qtchan/default.nix
+++ b/pkgs/applications/networking/browsers/qtchan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, qt, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "qtchan-${version}";
+  pname = "qtchan";
   version = "0.100";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 3a7612bb0fb..a4979d3bcf2 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "surf-${version}";
+  pname = "surf";
   version = "2.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 6632b116fc3..8471c0c97c7 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -113,7 +113,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "tor-browser-bundle-bin-${version}";
+  pname = "tor-browser-bundle-bin";
   inherit version;
 
   src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index dbe4ddca10f..f15bf165e82 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -72,7 +72,7 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  name = "tor-browser-bundle-${version}";
+  pname = "tor-browser-bundle";
   version = tor-browser-unwrapped.version;
 
   buildInputs = [ tor-browser-unwrapped tor ];
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
index bddac77d1d6..7356768f397 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
@@ -15,7 +15,7 @@
 
 {
   https-everywhere = stdenv.mkDerivation rec {
-    name = "https-everywhere-${version}";
+    pname = "https-everywhere";
     version = "2017.10.4";
 
     extid = "https-everywhere-eff@eff.org";
@@ -46,7 +46,7 @@
   };
 
   noscript = stdenv.mkDerivation rec {
-    name = "noscript-${version}";
+    pname = "noscript";
     version = "5.1.2";
 
     extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
@@ -64,7 +64,7 @@
   };
 
   torbutton = stdenv.mkDerivation rec {
-    name = "torbutton-${version}";
+    pname = "torbutton";
     version = "1.9.8.1";
 
     extid = "torbutton@torproject.org";
@@ -87,7 +87,7 @@
   };
 
   tor-launcher = stdenv.mkDerivation rec {
-    name = "tor-launcher-${version}";
+    pname = "tor-launcher";
     version = "0.2.13";
 
     extid = "tor-launcher@torproject.org";
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 1d08895f1b0..f86c4a84e58 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -5,7 +5,7 @@
 # but Python 2 + packages during runtime.
 
 stdenv.mkDerivation rec {
-  name = "uzbl-${version}";
+  pname = "uzbl";
   version = "0.9.0";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index cc9bc38bc4d..f82cc3535f2 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vimb-${version}";
+  pname = "vimb";
   version = "3.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 678f226816a..8a2e164b363 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.2";
-  name = "vimprobable2-${version}";
+  pname = "vimprobable2";
   src = fetchurl {
     url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2";
     sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr";
diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix
index 242abc2ece7..4495fc09579 100644
--- a/pkgs/applications/networking/c14/default.nix
+++ b/pkgs/applications/networking/c14/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "c14-cli-${version}";
+  pname = "c14-cli";
   version = "0.3";
 
   goPackagePath = "github.com/online-net/c14-cli";
diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index 3946bf88625..09be379b240 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -21,7 +21,7 @@ let
     };
 
   in stdenv.mkDerivation rec {
-      name = "charles-${version}";
+      pname = "charles";
       inherit version;
 
       src = fetchurl {
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 1bc7cea54eb..6712dcd486b 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name    = "cloudflared-${version}";
+  pname = "cloudflared";
   version = "2019.7.0";
 
   goPackagePath = "github.com/cloudflare/cloudflared";
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 647261a138f..92db34417f4 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "argo-${version}";
+  pname = "argo";
   version = "2.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix
index bc9023a222f..78be19cd81e 100644
--- a/pkgs/applications/networking/cluster/chronos/default.nix
+++ b/pkgs/applications/networking/cluster/chronos/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, makeWrapper, fetchgit, curl, jdk, maven, nodejs, mesos }:
 
 stdenv.mkDerivation rec {
-  name = "chronos-${version}";
+  pname = "chronos";
   version = "286b2ccb8e4695f8e413406ceca85b60d3a87e22";
 
   src = fetchgit {
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,libexec/chronos}
-    cp target/chronos*.jar $out/libexec/chronos/${name}.jar
+    cp target/chronos*.jar $out/libexec/chronos/${pname}-${version}.jar
 
     makeWrapper ${jdk.jre}/bin/java $out/bin/chronos \
-      --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${name}.jar com.airbnb.scheduler.Main" \
+      --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${pname}-${version}.jar com.airbnb.scheduler.Main" \
       --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY"
   '';
 
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 876630c559a..115dc3835fc 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "machine-${version}";
+  pname = "machine";
   version = "0.16.1";
 
   goPackagePath = "github.com/docker/machine";
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
index 181663513d3..de122dd2a5a 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }:
 
 buildGoPackage rec {
-  name = "docker-machine-kvm-${version}";
+  pname = "docker-machine-kvm";
   version = "0.10.0";
 
   goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
index d8fa1a04507..36c26001afc 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -2,7 +2,6 @@
 
 buildGoPackage rec {
   pname = "docker-machine-kvm2";
-  name = "${pname}-${version}";
   version = minikube.version;
 
   goPackagePath = "k8s.io/minikube";
diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
index 6b0440eb84a..1c2caff50d5 100644
--- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, Hypervisor, vmnet }:
 
 buildGoPackage rec {
-  name = "docker-machine-xhyve-${version}";
+  pname = "docker-machine-xhyve";
   version = "0.3.3";
 
   goPackagePath = "github.com/zchee/docker-machine-driver-xhyve";
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index c116e46684c..b32862bb4d6 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "2.14.2";
-  name = "helm-${version}";
+  pname = "helm";
 
   src = fetchFromGitHub {
     owner = "helm";
diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix
index cd0ef728f83..b9413577b10 100644
--- a/pkgs/applications/networking/cluster/heptio-ark/default.nix
+++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "heptio-ark-${version}";
+  pname = "heptio-ark";
   version = "0.10.0";
 
   goPackagePath = "github.com/heptio/ark";
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index 5eaf1d13d61..7938265d1b8 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "hetzner-kube-${version}";
+  pname = "hetzner-kube";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix
index 6274168b3da..52abc318990 100644
--- a/pkgs/applications/networking/cluster/kanif/default.nix
+++ b/pkgs/applications/networking/cluster/kanif/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.2";
-  name = "kanif-${version}";
+  pname = "kanif";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/26773/${pname}-${version}.tar.gz";
     sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879";
   };
 
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
index 19194c2d087..1a14e1ed273 100644
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "kompose-${version}";
+  pname = "kompose";
   version = "1.18.0";
 
   goPackagePath = "github.com/kubernetes/kompose";
diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
index 1e03efddc06..e38dc355d24 100644
--- a/pkgs/applications/networking/cluster/kontemplate/default.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name          = "kontemplate-${version}";
+  pname = "kontemplate";
   version       = "1.7.0";
   goPackagePath = "github.com/tazjin/kontemplate";
   goDeps        = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 190711e3096..e4adabd7581 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -14,7 +14,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "kubernetes-${version}";
+  pname = "kubernetes";
   version = "1.14.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
index 171ce3d3a54..ab8b7deae72 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lib, ... }:
 
 stdenv.mkDerivation rec {
-  name = "kubetail-${version}";
+  pname = "kubetail";
   version = "1.6.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 55a827f9cf9..982f36def69 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -22,7 +22,7 @@ let
 in
 
 buildGoPackage rec {
-  name = "kubeval-${version}";
+  pname = "kubeval";
   version = "0.7.3";
 
   goPackagePath = "github.com/garethr/kubeval";
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 49cac6d5063..72bd82be6c1 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, jdk, mesos, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "marathon-${version}";
+  pname = "marathon";
   version = "1.4.2";
 
   src = fetchurl {
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,libexec/marathon}
-    cp target/scala-*/marathon*.jar $out/libexec/marathon/${name}.jar
+    cp target/scala-*/marathon*.jar $out/libexec/marathon/${pname}-${version}.jar
 
     makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \
-      --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \
+      --add-flags "-Xmx512m -jar $out/libexec/marathon/${pname}-${version}.jar" \
       --set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_LIBRARY"
     '';
 
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 8cff2494bf8..0ffc7a1fb6f 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -26,13 +26,13 @@ let
 
 in stdenv.mkDerivation rec {
   version = "1.4.1";
-  name = "mesos-${version}";
+  pname = "mesos";
 
   enableParallelBuilding = true;
   dontDisableStatic = true;
 
   src = fetchurl {
-    url = "mirror://apache/mesos/${version}/${name}.tar.gz";
+    url = "mirror://apache/mesos/${version}/${pname}-${version}.tar.gz";
     sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr";
   };
 
diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index 5551f635bc3..43e960d9403 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -11,7 +11,7 @@ let
   openshiftVersion = "v3.11.0";
 
 in buildGoPackage rec {
-  name = "minishift-${version}";
+  pname = "minishift";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index fec737ddb2a..ce7b9beb4f8 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "nomad-${version}";
+  pname = "nomad";
   version = "0.9.4";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index dd57add14af..758786f586a 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -21,7 +21,7 @@ let
   k8sgitMajor = "0";
   k8sgitMinor = "1";
 in buildGoPackage rec {
-  name = "openshift-origin-${version}";
+  pname = "openshift-origin";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
index 618bea36de8..de0bb015852 100644
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "pachyderm-${version}";
+  pname = "pachyderm";
   version = "1.8.5";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix
index 052797db2f3..0835d268cd7 100644
--- a/pkgs/applications/networking/cluster/ssm-agent/default.nix
+++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name    = "${pname}-${version}";
   pname   = "amazon-ssm-agent";
   version = "2.0.633.0";
 
diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix
index 3218e6a25b3..8e9e6691a79 100644
--- a/pkgs/applications/networking/cluster/stern/default.nix
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@@ -3,7 +3,7 @@
 let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in
 
 buildGoPackage rec {
-  name = "stern-${version}";
+  pname = "stern";
   version = "1.11.0";
 
   goPackagePath = "github.com/wercker/stern";
diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
index c61896d8921..3423163f590 100644
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   version = "3.7.7";
-  name = "taktuk-${version}";
+  pname = "taktuk";
 
   buildInputs = [ perl ];
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/33412/${pname}-${version}.tar.gz";
     sha256 = "0w0h3ynlcxvq2nzm8hkj20g0805ww3vkw53g0qwj7wvp7p3gcvnr";
   };
 
diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix
index 2b39cebbbeb..606cd0370aa 100644
--- a/pkgs/applications/networking/cluster/terraform-docs/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -1,6 +1,5 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
-  name = "${pname}-${version}";
   pname = "terraform-docs";
   version = "0.6.0";
 
diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
index dd4a36807ea..1bb8df88d01 100644
--- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub}:
 
 buildGoPackage rec {
-  name = "terraform-inventory-${version}";
+  pname = "terraform-inventory";
   version = "0.7-pre";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
index 2b2c3caba86..bb634a78e23 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 buildGoPackage rec {
-  name = "terraform-provider-ansible-${version}";
+  pname = "terraform-provider-ansible";
   version = "1.0.3";
 
   goPackagePath = "github.com/nbering/terraform-provider-ansible";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
index ae456185a80..1aadbbc5ccd 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoModule }:
 buildGoModule rec {
-  name = "terraform-provider-elasticsearch-${version}";
+  pname = "terraform-provider-elasticsearch";
   version = "0.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
index 291698f3065..4571d368991 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 buildGoPackage rec {
-  name = "terraform-provider-gandi-${version}";
+  pname = "terraform-provider-gandi";
   version = "1.0.0";
 
   goPackagePath = "github.com/tiramiseb/terraform-provider-gandi";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
index fddf13795f3..06d7b8a9f07 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
@@ -11,7 +11,7 @@
 #
 
 buildGoPackage rec {
-  name = "terraform-provider-ibm-${version}";
+  pname = "terraform-provider-ibm";
   version = "0.11.1";
 
   goPackagePath = "github.com/terraform-providers/terraform-provider-ibm";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index 96b5c8a0fa1..23c4f4bfa8b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
@@ -18,7 +18,7 @@
 # https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples
 
 buildGoPackage rec {
-  name = "terraform-provider-libvirt-${version}";
+  pname = "terraform-provider-libvirt";
   version = "0.5.1";
 
   goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 56c30df37c5..ddeb5851037 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
 
 buildGoPackage rec {
-  name = "terragrunt-${version}";
+  pname = "terragrunt";
   version = "0.17.4";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 1ee2c694e0b..6dbc6954ef5 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.7.4";
-  name = "corebird-${version}";
+  pname = "corebird";
 
   src = fetchFromGitHub {
     owner = "baedert";
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index 34ebc84cea2..0967fd95dc0 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "drive-${version}";
+  pname = "drive";
   version = "0.3.8.1";
 
   goPackagePath = "github.com/odeke-em/drive";
diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
index 62fe4e2e662..c74f5789d84 100644
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "droopy-${version}";
+  pname = "droopy";
   version = "20160830";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index f89b8206dbe..5b1ab692abd 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "errbot-${version}";
+  pname = "errbot";
   version = "5.2.0";
 
   src = fetchurl {
-    url = "mirror://pypi/e/errbot/${name}.tar.gz";
+    url = "mirror://pypi/e/errbot/${pname}-${version}.tar.gz";
     sha256 = "0q5fg113s3gnym38d4y5mlnxw6vrm388zw5mlapf7b2zgx34r053";
   };
 
diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
index 4d17cc8bddd..67346d45b9f 100644
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -3,7 +3,6 @@
 with pythonPackages;
 
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "rss2email";
   version = "3.9"; # TODO: on next bump, the manpage will be updated.
   # Update nixos/modules/services/mail/rss2email.nix to point to it instead of
@@ -12,7 +11,7 @@ buildPythonApplication rec {
   propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ];
 
   src = fetchurl {
-    url = "mirror://pypi/r/rss2email/${name}.tar.gz";
+    url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz";
     sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5";
   };
 
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index c1a9fddb3c2..169b88f2718 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "rssguard";
   version = "3.5.9";
 
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index 459aee01f43..c0a6185309a 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cppcheck, libmrss }:
 
 stdenv.mkDerivation rec {
-  name = "rsstail-${version}";
+  pname = "rsstail";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index 335f393bc07..ab2ca160152 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "firehol-${version}";
+  pname = "firehol";
   version = "3.1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix
index bb245928f07..194dfc25eba 100644
--- a/pkgs/applications/networking/firehol/iprange.nix
+++ b/pkgs/applications/networking/firehol/iprange.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "iprange-${version}";
+  pname = "iprange";
   version = "1.0.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix
index 25ec5d29613..e1ba71ff2c8 100644
--- a/pkgs/applications/networking/ftp/taxi/default.nix
+++ b/pkgs/applications/networking/ftp/taxi/default.nix
@@ -5,8 +5,6 @@ stdenv.mkDerivation rec {
   pname = "taxi";
   version = "0.0.1";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "Alecaddd";
     repo = pname;
diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix
index d5ef1d7beaa..f16b6337d71 100644
--- a/pkgs/applications/networking/gdrive/default.nix
+++ b/pkgs/applications/networking/gdrive/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name    = "gdrive-${version}";
+  pname = "gdrive";
   version = "2.1.0";
   rev     = "${version}";
 
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index 15e0b5a07b4..830eae1fc28 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -2,7 +2,7 @@
 , ocaml, dune, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
 
 stdenv.mkDerivation rec {
-  name = "google-drive-ocamlfuse-${version}";
+  pname = "google-drive-ocamlfuse";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/pkgs/applications/networking/gopher/gopher/default.nix
index 9057fda2e60..4fcdf55777a 100644
--- a/pkgs/applications/networking/gopher/gopher/default.nix
+++ b/pkgs/applications/networking/gopher/gopher/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "gopher-${version}";
+  pname = "gopher";
   version = "3.0.11";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/gopher/gopherclient/default.nix b/pkgs/applications/networking/gopher/gopherclient/default.nix
index d36533fc9e5..45d9235afc9 100644
--- a/pkgs/applications/networking/gopher/gopherclient/default.nix
+++ b/pkgs/applications/networking/gopher/gopherclient/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit, makeWrapper, pkgconfig, qtbase, qtdeclarative, qtwebengine }:
 
 buildGoPackage rec {
-  name = "gopherclient-${version}";
+  pname = "gopherclient";
   version = "2016-10-02";
   rev = "91c41b5542d08001636708e2a5054521a6004702";
 
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index 0fdfbacb45c..88df3857ec1 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   version = "2.9.11.1";
-  name = "snort-${version}";
+  pname = "snort";
   
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://snort.org/downloads/archive/snort/${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
+    url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz";
     sha256 = "1ka67zrrhs32c729v4h76mvv2723mij0adxx0iaza2d1qpm3lswz";
   };
   
diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
index 163f0ba3f49..716989c7b56 100644
--- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
+++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost166 }:
 
 stdenv.mkDerivation rec {
-  name = "SkypeExport-${version}";
+  pname = "SkypeExport";
   version = "1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 75e1791644b..f01b8d387f8 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,7 +4,7 @@
 }:
 stdenv.mkDerivation rec {
   version = "0.6.3";
-  name = "baresip-${version}";
+  pname = "baresip";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
     sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068";
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
index e1e851b13bb..5094a13119f 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-discord-${version}";
+  pname = "bitlbee-discord";
   version = "0.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
index d6c8fae2b58..84067dc5f19 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-facebook-${version}";
+  pname = "bitlbee-facebook";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
index a034827c4ed..798dab2b646 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   version = "1.4.2";
-  name = "bitlbee-steam-${version}";
+  pname = "bitlbee-steam";
 
   src = fetchFromGitHub {
     rev = "v${version}";
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index bbdb2ae79f8..001eadbb01d 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -2,7 +2,7 @@
 , gnutls, libvpx, makeDesktopItem }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "blink-${version}";
+  pname = "blink";
   version = "3.0.3";
 
   src = fetchdarcs {
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index d76cebd11b0..21b21e25349 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bluejeans-${version}";
+  pname = "bluejeans";
   version = "1.36.9";
 
   src =
diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix
index 350d09078c4..daffb539676 100644
--- a/pkgs/applications/networking/instant-messengers/centerim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "5.0.1";
-  name = "centerim5-${version}";
+  pname = "centerim5";
 
   src = fetchurl {
-    url = "http://centerim.org/download/cim5/${name}.tar.gz";
+    url = "http://centerim.org/download/cim5/${pname}-${version}.tar.gz";
     sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
index fb47d8db8c8..3186009db58 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -2,7 +2,7 @@
   cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
 
 buildGoPackage rec {
-  name = "coyim-${version}";
+  pname = "coyim";
   version = "0.3.11";
 
   goPackagePath = "github.com/coyim/coyim";
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
index 2c27853c944..cc0bdf60394 100644
--- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "freetalk-${version}";
+  pname = "freetalk";
   version = "4.1";
   
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix
index 6878c9a870b..57b745057dc 100644
--- a/pkgs/applications/networking/instant-messengers/gitter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix
@@ -20,7 +20,6 @@ let gitterDirectorySuffix = "opt/gitter";
 in stdenv.mkDerivation rec {
   pname = "gitter";
   version = "4.1.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb";
diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index 689445d7dcb..e97db0b5312 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
 
 stdenv.mkDerivation rec {
   version = "2018-05-11";
-  name = "jackline-${version}";
+  pname = "jackline";
 
   src = fetchFromGitHub {
     owner  = "hannesm";
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 820a742245e..04a31ba403a 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "jitsi-${version}";
+  pname = "jitsi";
   version = "2.10.5550";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
index 1fb74314811..6f4e7e5b677 100644
--- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
@@ -37,18 +37,18 @@ let
 
 in
   stdenv.mkDerivation rec {
-    name = "mattermost-desktop-${version}";
+    pname = "mattermost-desktop";
     version = "4.2.0";
 
     src =
       if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
-          url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz";
+          url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
           sha256 = "0hka94gwpscjn61032c0grpjv5gjb0j8rkx6pgwci617n29xkyf6";
         }
       else if stdenv.hostPlatform.system == "i686-linux" then
         fetchurl {
-          url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz";
+          url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz";
           sha256 = "1nx2sgbnr60h6kn56wv54m7cvyx27d64bfprpb94hqd5c2z21x80";
         }
       else
diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index d86d62021fb..f4111123711 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mcabber-${version}";
+  pname = "mcabber";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index ea190db07a6..3e2718c9c57 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -18,7 +18,7 @@
 # rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix'
 
 stdenv.mkDerivation rec {
-  name = "mikutter-${version}";
+  pname = "mikutter";
   version = "3.8.7";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix
index a75835b3c7e..7b76154021a 100644
--- a/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitLab }:
 
 buildGoPackage rec {
-  name = "mm-${version}";
+  pname = "mm";
   version = "2016.11.04";
 
   goPackagePath = "gitlab.com/meutraa/mm";
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index d337c62ea09..f214f722143 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -22,7 +22,7 @@ let
   };
 in
 mkDerivation rec {
-  name = "nheko-${version}";
+  pname = "nheko";
   version = "0.6.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
index 64443461e37..ff260c9161b 100644
--- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
+++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
@@ -2,7 +2,7 @@
 fetchFromGitHub, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "oysttyer-${version}";
+  pname = "oysttyer";
   version = "2.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
index 60fd5af0a1a..079fc7d57fb 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
@@ -1,7 +1,7 @@
 { stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-carbons-${version}";
+  pname = "pidgin-carbons";
   version = "0.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
index 7e86a390edc..34755809e39 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-opensteamworks-${version}";
+  pname = "pidgin-opensteamworks";
   version = "unstable-2018-08-02";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
index f407ed6cabe..c418b2e992a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:
 
 stdenv.mkDerivation rec {
-  name = "pidgin-skypeweb-${version}";
+  pname = "pidgin-skypeweb";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
index ba1d64c8b92..1e998bcc806 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:
 
 stdenv.mkDerivation rec {
-  name = "purple-discord-${version}";
+  pname = "purple-discord";
   version = "unstable-2018-04-10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
index 61e8c2b58d9..d226490b275 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }:
 
 stdenv.mkDerivation rec {
-  name = "purple-hangouts-hg-${version}";
+  pname = "purple-hangouts-hg";
   version = "2018-12-02";
 
   src = fetchhg {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
index bcfcbee8556..e488ae73be0 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "purple-lurch-${version}";
+  pname = "purple-lurch";
   version = "0.6.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
index 6d75ba40ce0..41f205514e7 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "tox-prpl-${version}";
+  pname = "tox-prpl";
   version = "0.5.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix
index dfdc92cfd4b..8f86256069c 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pidgin } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-window-merge-${version}";
+  pname = "pidgin-window-merge";
   version = "0.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 8b6863384b3..71168e1a692 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -13,12 +13,12 @@
 # FIXME: clean the mess around choosing the SSL library (nss by default)
 
 let unwrapped = stdenv.mkDerivation rec {
-  name = "pidgin-${version}";
+  pname = "pidgin";
   majorVersion = "2";
   version = "${majorVersion}.13.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
+    url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2";
     sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix
index e7527bafcc6..1ddc603dc62 100644
--- a/pkgs/applications/networking/instant-messengers/pond/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pond/default.nix
@@ -5,7 +5,7 @@ let
   gui = true; # Might be implemented with nixpkgs config.
 in
 buildGoPackage rec {
-  name = "pond-${version}";
+  pname = "pond";
   version = "20150830-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
 
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 79a197d1a7a..bd88962c40d 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -21,7 +21,7 @@ assert omemoSupport        -> libsignal-protocol-c != null && libgcrypt != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "profanity-${version}";
+  pname = "profanity";
   version = "0.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index e1a2fb40c5a..b77407bd0c8 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "psi-plus-${version}";
+  pname = "psi-plus";
   version = "1.4.504";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 60a4dd39fb0..a23dbda6cb2 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -2,7 +2,7 @@
 , auth0ClientID, auth0Domain }:
 
 stdenv.mkDerivation rec {
-  name = "rambox-bare-${version}";
+  pname = "rambox-bare";
   version = "0.6.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
index efecebe169e..97c722f0935 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
@@ -17,7 +17,7 @@ in
 stdenv.mkDerivation rec {
   inherit version;
 
-  name = "sencha-bare-${version}";
+  pname = "sencha-bare";
   src = srcs.${stdenv.hostPlatform.system};
 
   nativeBuildInputs = [ gzip which unzip ];
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index a6aef5e6a2f..96ce9c32a7d 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ricochet-${version}";
+  pname = "ricochet";
   version = "1.1.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index 168719bf0e4..8dc053631e9 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -79,7 +79,7 @@ let
   });
 in
 stdenv.mkDerivation rec {
-  name = "ring-daemon-${version}";
+  pname = "ring-daemon";
   version = "2017-07-11";
 
   inherit src;
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
index 0546d2dae47..d1f1c033361 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "restbed-${version}";
+  pname = "restbed";
   version = "2016-09-15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 9a2e2df80f2..ba0f8c48fbd 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -4,7 +4,7 @@
 # Versions of `riot-web` and `riot-desktop` should be kept in sync.
 
 stdenv.mkDerivation rec {
-  name= "riot-web-${version}";
+  pname = "riot-web";
   version = "1.3.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 3336c05aae7..010ea1bff7c 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, makeWrapper, jre_headless }:
 
 stdenv.mkDerivation rec {
-  name = "signal-cli-${version}";
+  pname = "signal-cli";
   version = "0.6.2";
 
   # Building from source would be preferred, but is much more involved.
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 381d66c678e..d37cebd6ef9 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -56,7 +56,7 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "signal-desktop-${version}";
+  pname = "signal-desktop";
   version = "1.26.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix
index cf6031aa05b..cdc176be65b 100644
--- a/pkgs/applications/networking/instant-messengers/sky/default.nix
+++ b/pkgs/applications/networking/instant-messengers/sky/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   version_major = "2.1.7369";
   version_minor = "1";
   version = version_major + "." + version_minor;
-  name = "sky-${version}";
+  pname = "sky";
   unpackCmd = "ar x $curSrc; tar -xf data.tar.xz";
   src = fetchurl {
     url = "https://tel.red/repos/ubuntu/pool/non-free/sky_${version_major + "-" + version_minor}ubuntu+xenial_amd64.deb";
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index 79464f54232..6271e338a96 100644
--- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   # https://github.com/erroneousboat/slack-term
-  name = "slack-term-${version}";
+  pname = "slack-term";
   version = "0.4.1";
 
   goPackagePath = "github.com/erroneousboat/slack-term";
diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
index c24e2c4301e..58cc7a220b9 100644
--- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   rev = "e2a6a9cd9da70175881ab991220c86aa87179509";
   version = "2019-07-26";
-  name = "slack-theme-black-${version}";
+  pname = "slack-theme-black";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/laCour/slack-night-mode";
diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix
index 17a38479f82..7a9ab4d127c 100644
--- a/pkgs/applications/networking/instant-messengers/stride/default.nix
+++ b/pkgs/applications/networking/instant-messengers/stride/default.nix
@@ -34,7 +34,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "1.17.82";
-  name = "stride-${version}";
+  pname = "stride";
 
   src = fetchurl {
     url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb";
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
index 51e7f081d1e..db1d0a54dce 100644
--- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix
+++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swift-im-${version}";
+  pname = "swift-im";
   version = "4.0.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 21b9510a605..3c532fa506a 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -29,7 +29,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "teamspeak-client-${version}";
+  pname = "teamspeak-client";
 
   version = "3.3.0";
 
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 4f9bbe021d1..ce7f47fe4ff 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -7,7 +7,7 @@
 with lib;
 
 mkDerivation rec {
-  name = "telegram-desktop-${version}";
+  pname = "telegram-desktop";
   version = "1.8.0";
 
   # Telegram-Desktop with submodules
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index 4607961cdf0..3368ec1124e 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "telepathy-idle";
   version = "0.2.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    url = "http://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index c6b930fc590..11845ecfb26 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -4,7 +4,7 @@
 # should use that
 
 stdenv.mkDerivation rec {
-  name = "tensor-git-${version}";
+  pname = "tensor-git";
   version = "2017-02-21";
 
   src = fetchgit {
diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
index 06bcd7a0400..edfec97edf8 100644
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }:
 stdenv.mkDerivation rec {
 
-  name = "torchat-${version}";
+  pname = "torchat";
   version = "0.9.9.553";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 95879fef05a..540aa3fcea4 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -3,7 +3,7 @@
 , qrencode, gdk-pixbuf, libnotify }:
 
 stdenv.mkDerivation rec {
-  name = "toxic-${version}";
+  pname = "toxic";
   version = "0.8.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 349a1363259..5ef0d916242 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -3,7 +3,7 @@
 , libXrender, fontconfig, libXext, libXft, libsodium, libopus }:
 
 stdenv.mkDerivation rec {
-  name = "utox-${version}";
+  pname = "utox";
 
   version = "0.17.0";
 
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 109566b5d07..cd5109320c7 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -4,7 +4,7 @@
   , xz, zlib
 }:
 stdenv.mkDerivation rec {
-  name = "vacuum-im-${version}";
+  pname = "vacuum-im";
   version = "1.3.0.20160104";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index a4bf26a0b1a..b0824c78022 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "viber-${version}";
+  pname = "viber";
   version = "7.0.0.1035";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
index 980d21572cc..4047eba1fbb 100644
--- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
+++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "xmpp-client-${version}";
+  pname = "xmpp-client";
   version = "20160916-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e";
 
diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index 3719a69138c..3a2b32f0117 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "insync-${version}";
+  pname = "insync";
   version = "1.5.7.37371";
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
         sha256 = "1cm3q6y2crw6pcsvh21sbkmh1hin7xl4fyslc96nbyql8rxsky5n";
       }
     else
-      throw "${name} is not supported on ${stdenv.hostPlatform.system}";
+      throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 870e40d8128..426619908d6 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchgx, gx-go }:
 
 buildGoPackage rec {
-  name = "ipfs-cluster-${version}";
+  pname = "ipfs-cluster";
   version = "0.9.0";
   rev = "v${version}";
 
@@ -9,7 +9,7 @@ buildGoPackage rec {
 
   extraSrcPaths = [
     (fetchgx {
-      inherit name src;
+      inherit  src;name = "${pname}-${version}";
       sha256 = "1k7xcirvi07p5g9gr9jcx5h39wk7jxfsyjrn5yraa8xdqhn6b6nx";
     })
   ];
diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix
index f070c510937..39631bfc5c8 100644
--- a/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "ipfs-migrator-${version}";
+  pname = "ipfs-migrator";
   version = "7";
 
   goPackagePath = "github.com/ipfs/fs-repo-migrations";
diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix
index 45835248d0d..9f206a8f48f 100644
--- a/pkgs/applications/networking/ipget/default.nix
+++ b/pkgs/applications/networking/ipget/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:
 
 buildGoPackage rec {
-  name = "ipget-${version}";
+  pname = "ipget";
   version = "0.3.2";
   rev = "v${version}";
 
@@ -9,7 +9,7 @@ buildGoPackage rec {
 
   extraSrcPaths = [
     (fetchgx {
-      inherit name src;
+      inherit  src;name = "${pname}-${version}";
       sha256 = "07l9hpkhk5phr95zp1l5wd3ii38bw91hy4dlw2rsfbzcsc8bq4s8";
     })
   ];
diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix
index 746d79805f5..cdece4eb644 100644
--- a/pkgs/applications/networking/iptraf-ng/default.nix
+++ b/pkgs/applications/networking/iptraf-ng/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.4";
-  name = "iptraf-ng-${version}";
+  pname = "iptraf-ng";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${name}.tar.gz";
+    url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${pname}-${version}.tar.gz";
     sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r";
   };
 
diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix
index 7c40a4e12a6..0792aefe25f 100644
--- a/pkgs/applications/networking/irc/bip/default.nix
+++ b/pkgs/applications/networking/irc/bip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "bip-${version}";
+  pname = "bip";
   version = "0.8.9";
 
   # fetch sources from debian, because the creator's website provides
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index 917de745d27..8278f90d321 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -1,7 +1,7 @@
 { fetchgit, libcommuni, qtbase, qmake, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "communi-${version}";
+  pname = "communi";
   version = "3.5.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix
index 0b52515228b..a90446a87fa 100644
--- a/pkgs/applications/networking/irc/epic5/default.nix
+++ b/pkgs/applications/networking/irc/epic5/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "epic5-${version}";
+  pname = "epic5";
   version = "2.0.1";
 
   src = fetchurl {
-    url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${name}.tar.xz";
+    url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${pname}-${version}.tar.xz";
     sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm";
   };
 
diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix
index 8c5d2ffa35e..8bdb23d50dd 100644
--- a/pkgs/applications/networking/irc/glowing-bear/default.nix
+++ b/pkgs/applications/networking/irc/glowing-bear/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "glowing-bear-${version}";
+  pname = "glowing-bear";
   version = "0.7.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index 34c4fcf0c88..b3e77a145bc 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.12.4";
-  name = "hexchat-${version}";
+  pname = "hexchat";
 
   src = fetchFromGitHub {
     owner = "hexchat";
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 347b7b28ca9..2840d85bddd 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.1";
-  name = "irssi-${version}";
+  pname = "irssi";
 
   src = fetchurl {
-    url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "01lay6bxgsk2vzkiknw12zr8gvgnvk9xwg992496knsgakr0x2zx";
   };
 
diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index add4fa632c9..6f7cd2cda8b 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "irssi-otr-${version}";
+  pname = "irssi-otr";
   version = "1.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix
index cf72bef62b1..b081a6b3672 100644
--- a/pkgs/applications/networking/irc/sic/default.nix
+++ b/pkgs/applications/networking/irc/sic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "sic-${version}";
+  pname = "sic";
   version = "1.2";
 
   makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 5ae96d03f7c..3f8ad762218 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -28,7 +28,7 @@ let
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
       version = "2.5";
-      name = "weechat-${version}";
+      pname = "weechat";
 
       src = fetchurl {
         url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index de7974d4cbe..49616671507 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, substituteAll, buildEnv, fetchFromGitHub, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "wee-slack-${version}";
+  pname = "wee-slack";
   version = "2.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix
index add52d85d8b..6d9acdb68e5 100644
--- a/pkgs/applications/networking/irc/wraith/default.nix
+++ b/pkgs/applications/networking/irc/wraith/default.nix
@@ -4,7 +4,7 @@ with stdenv;
 with stdenv.lib;
 
 mkDerivation rec {
-  name = "wraith-${version}";
+  pname = "wraith";
   version = "1.4.7";
   src = fetchurl {
     url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz";
diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
index 34f332b003c..3f626a6ac48 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, jre, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "jmeter-${version}";
+  pname = "jmeter";
   version = "5.1.1";
   src = fetchurl {
-    url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz";
+    url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz";
     sha256 = "1bmlxnlcias781mwf3wzpd4935awswbq3w8ijck65bsaw07m2kc4";
   };
 
diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix
index 8967a5d824a..e2a8a2d56bd 100644
--- a/pkgs/applications/networking/jnetmap/default.nix
+++ b/pkgs/applications/networking/jnetmap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "jnetmap-${version}";
+  pname = "jnetmap";
   version = "0.5.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index 14ee8095247..daddf6adf7e 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "linssid-${version}";
+  pname = "linssid";
   version = "2.7";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix
index bb62014c77a..1417a8c7b1b 100644
--- a/pkgs/applications/networking/mailreaders/alpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/alpine/default.nix
@@ -4,11 +4,11 @@
 
 # NOTE: Please check if any changes here are applicable to ../realpine/ as well
 stdenv.mkDerivation rec {
-  name = "alpine-${version}";
+  pname = "alpine";
   version = "2.21";
 
   src = fetchurl {
-    url = "http://alpine.freeiz.com/alpine/release/src/${name}.tar.xz";
+    url = "http://alpine.freeiz.com/alpine/release/src/${pname}-${version}.tar.xz";
     sha256 = "0f3llxrmaxw7w9w6aixh752md3cdc91mwfmbarkm8s413f4bcc30";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index db3cd7782e8..15f707e06a2 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "balsa-${version}";
+  pname = "balsa";
   version = "2.5.7";
 
   src = fetchurl {
-    url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2";
+    url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2";
     sha256 = "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index bb4c6c54f16..d7df94f7e67 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -30,7 +30,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "claws-mail-${version}";
+  pname = "claws-mail";
   version = "3.17.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index e5a919af2e6..78b1aad03fb 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, lua, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "imapfilter-${version}";
+  pname = "imapfilter";
   version = "2.6.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index 4139b650fb7..189ac1e6aae 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -3,7 +3,7 @@
 , fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
 
 stdenv.mkDerivation rec {
-  name = "inboxer-${version}";
+  pname = "inboxer";
   version = "1.2.1";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix
index 05e78485655..ffa3e92d390 100644
--- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mailcheck-${version}";
+  pname = "mailcheck";
   version = "1.91.2";
 
   patches = [ ./mailcheck-Makefile.patch ];
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index d8151340662..4cbaee4488b 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -9,7 +9,7 @@
 let
   inherit (pythonPackages) python;
 in pythonPackages.buildPythonApplication rec {
-  name = "mailnag-${version}";
+  pname = "mailnag";
   version = "1.3.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix
index f00ec6e6566..6c3b3a69b1d 100644
--- a/pkgs/applications/networking/mailreaders/mblaze/default.nix
+++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "mblaze-${version}";
+  pname = "mblaze";
   version = "0.5.1";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index f259fdebf22..c694398bd7d 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -26,11 +26,11 @@ assert gpgmeSupport -> gpgme      != null && openssl != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "mutt-${version}";
+  pname = "mutt";
   version = "1.12.1";
 
   src = fetchurl {
-    url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
+    url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
     sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index f4b0846b98f..615b810d002 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "20180716";
-  name = "neomutt-${version}";
+  pname = "neomutt";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix
index 3e235400498..b87728dd2cd 100644
--- a/pkgs/applications/networking/mailreaders/notbit/default.nix
+++ b/pkgs/applications/networking/mailreaders/notbit/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "notbit-${version}";
+  pname = "notbit";
   version = "2018-01-09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
index e2b56f3b8af..2ee071fec57 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-bower-${version}";
+  pname = "notmuch-bower";
   version = "0.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 9ddedac0974..f6e6a8d747e 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -13,15 +13,15 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.28.4"; # not really, git
-  name = "notmuch-${version}";
+  pname = "notmuch";
 
   passthru = {
-    pythonSourceRoot = "${name}/bindings/python";
+    pythonSourceRoot = "${pname}-${version}/bindings/python";
     inherit version;
   };
 
   src = fetchurl {
-    url = "https://notmuchmail.org/releases/${name}.tar.gz";
+    url = "https://notmuchmail.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index e25dfe834f6..a0dbf98f276 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -3,12 +3,12 @@
 }:
 stdenv.mkDerivation rec {
   version = "5";
-  name = "muchsync-${version}";
+  pname = "muchsync";
   passthru = {
     inherit version;
   };
   src = fetchurl {
-    url = "http://www.muchsync.org/src/${name}.tar.gz";
+    url = "http://www.muchsync.org/src/${pname}-${version}.tar.gz";
     sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb";
   };
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
index 410e5e10ceb..7382b97ba81 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, perl, perlPackages, makeWrapper, coreutils, notmuch }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-mutt-${version}";
+  pname = "notmuch-mutt";
   version = notmuch.version;
 
   outputs = [ "out" ];
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 70f74dff309..986ee5fe3c9 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -7,11 +7,11 @@ assert sslSupport -> openssl != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "sylpheed-${version}";
+  pname = "sylpheed";
   version = "3.7.0";
 
   src = fetchurl {
-    url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz";
+    url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${pname}-${version}.tar.xz";
     sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 6921279b27f..da817731e07 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -23,7 +23,7 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation rec {
-  name = "thunderbird-${version}";
+  pname = "thunderbird";
   version = "60.8.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix
index 2d96d033613..7f7296cd700 100644
--- a/pkgs/applications/networking/mailreaders/trojita/default.nix
+++ b/pkgs/applications/networking/mailreaders/trojita/default.nix
@@ -8,11 +8,11 @@
 }:
 
 mkDerivation rec {
-  name = "trojita-${version}";
+  pname = "trojita";
   version = "0.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/trojita/trojita/${name}.tar.xz";
+    url = "mirror://sourceforge/trojita/trojita/${pname}-${version}.tar.xz";
     sha256 = "1n9n07md23ny6asyw0xpih37vlwzp7vawbkprl7a1bqwfa0si3g0";
   };
 
diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix
index d31f98ef4ba..2e61753346d 100644
--- a/pkgs/applications/networking/modem-manager-gui/default.nix
+++ b/pkgs/applications/networking/modem-manager-gui/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgconfig, python3, fetchhg, gtk3, glib, gdbm, gtkspell3, itstool, libappindicator-gtk3, perlPackages, glibcLocales, meson, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "modem-manager-gui-${version}";
+  pname = "modem-manager-gui";
   version = "0.0.19.1";
 
   src = fetchhg {
diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix
index 44355c2c181..5792aadf568 100644
--- a/pkgs/applications/networking/ndppd/default.nix
+++ b/pkgs/applications/networking/ndppd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gzip }:
 
 stdenv.mkDerivation rec {
-  name = "ndppd-${version}";
+  pname = "ndppd";
   version = "0.2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
index b89173820ee..b3001c96057 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -1,7 +1,7 @@
 { libsmbios, stdenv, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "netperf-${version}";
+  pname = "netperf";
   version = "20180613";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 898b7706bd6..002f142a53e 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "quiterss-${version}";
+  pname = "quiterss";
   version = "0.18.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 37eb248fb48..828ffc1664c 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nextcloud-client-${version}";
+  pname = "nextcloud-client";
   version = "2.5.2";
 
   src = fetchgit {
diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix
index 2c16fabc5c4..16cc0e3d50a 100644
--- a/pkgs/applications/networking/nload/default.nix
+++ b/pkgs/applications/networking/nload/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.4";
-  name = "nload-${version}";
+  pname = "nload";
 
   src = fetchurl {
-    url = "http://www.roland-riegel.de/nload/${name}.tar.gz";
+    url = "http://www.roland-riegel.de/nload/${pname}-${version}.tar.gz";
     sha256 = "1rb9skch2kgqzigf19x8bzk211jdfjfdkrcvaqyj89jy2pkm3h61";
   };
 
diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix
index 8795f32e829..58e1fffdbda 100644
--- a/pkgs/applications/networking/nntp-proxy/default.nix
+++ b/pkgs/applications/networking/nntp-proxy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "nntp-proxy-${version}";
+  pname = "nntp-proxy";
   version = "2014-01-06";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/applications/networking/omping/default.nix
index 1e127c1b1ec..dc52d767438 100644
--- a/pkgs/applications/networking/omping/default.nix
+++ b/pkgs/applications/networking/omping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "omping-${version}";
+  pname = "omping";
   version = "0.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index 962f10a99c0..3f48601d96f 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "ostinato-${version}";
+  pname = "ostinato";
   version = "0.9";
 
   src = fetchFromGitHub  {
diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix
index 9ed532acfe1..4dad5f4d6bd 100644
--- a/pkgs/applications/networking/owamp/default.nix
+++ b/pkgs/applications/networking/owamp/default.nix
@@ -2,7 +2,7 @@
 , autoconf, automake, mandoc }:
 
 stdenv.mkDerivation rec {
-  name = "owamp-${version}";
+  pname = "owamp";
   version = "3.5.6";
   buildInputs = [ autoconf automake mandoc ];
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 8ced53c972b..7907365a6a3 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "owncloud-client-${version}";
+  pname = "owncloud-client";
   version = "2.5.4.11654";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index f58f7e04e00..6e3b8a7293e 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "deluge-${version}";
+  pname = "deluge";
   version = "1.3.15";
 
   src = fetchurl {
-    url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
+    url = "http://download.deluge-torrent.org/source/${pname}-${version}.tar.bz2";
     sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w";
   };
 
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index db30da82bdb..77aee30d38b 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -2,7 +2,7 @@
 , fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "eiskaltdcpp-${version}";
+  pname = "eiskaltdcpp";
   version = "2.2.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index 1d98bf77675..5488baddef4 100644
--- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "6.7.4";
-  name = "frostwire-${version}";
+  pname = "frostwire";
 
   src = fetchurl {
     url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index c66c3ca05a4..6dd2fc34355 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ktorrent-${version}";
+  pname = "ktorrent";
   version = "${libktorrent.mainVersion}.0";
 
   src = fetchurl {
-    url    = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${name}.tar.xz";
+    url    = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz";
     sha256 = "18w6qh09k84qpzaxxb76a4g59k4mx5wk897vqp1wwv80g0pqhmrw";
   };
 
diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index 7f229be1b54..b28074a2fd6 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "ncdc-${version}";
+  pname = "ncdc";
   version = "1.22.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 7ffd79edba4..a579ae15181 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -9,7 +9,7 @@ assert guiSupport -> (dbus != null);
 with lib;
 
 mkDerivation rec {
-  name = "qbittorrent-${version}";
+  pname = "qbittorrent";
   version = "4.1.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 2d523cc07dd..f10714031ff 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -3,7 +3,7 @@
 , qtmultimedia, qtx11extras, qttools }:
 
 stdenv.mkDerivation rec {
-  name = "retroshare-${version}";
+  pname = "retroshare";
   version = "0.6.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index 104131e4775..bcfe8f01e4a 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -25,7 +25,7 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "soulseekqt-${version}";
+  pname = "soulseekqt";
   inherit version;
   src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index 87b331adf2d..850fc488bf3 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }:
 
 stdenv.mkDerivation rec {
-  name = "tixati-${version}";
+  pname = "tixati";
   version = "2.62";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
index fc803fa2745..e05ca43eb50 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "transmission-remote-cli-${version}";
+  pname = "transmission-remote-cli";
   version = "1.7.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 7d2f34c591e..bcaea5eb6dc 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -4,7 +4,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "transmission-remote-gtk-${version}";
+  pname = "transmission-remote-gtk";
   version = "1.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 29ec8158099..65abcf35a35 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -2,7 +2,7 @@
 , enablePlayer ? true, vlc ? null, qt5 }:
 
 stdenv.mkDerivation rec {
-  name = "tribler-${version}";
+  pname = "tribler";
   version = "7.1.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index cce44521a62..647b708e102 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -16,7 +16,7 @@ let
   boostPython = boost.override { enablePython = true; };
 
 in stdenv.mkDerivation rec {
-  name = "twister-${version}";
+  pname = "twister";
   version = "0.9.34";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix
index 8725d5263fe..b1d3c73129a 100644
--- a/pkgs/applications/networking/p2p/vuze/default.nix
+++ b/pkgs/applications/networking/p2p/vuze/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "vuze-${version}";
+  pname = "vuze";
   version = "5750";
 
   src = fetchsvn {
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 8a66c039b5a..c9df5d3fbe3 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openssl, libsamplerate, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "pjsip-${version}";
+  pname = "pjsip";
   version = "2.9";
 
   src = fetchurl {
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/bin
     cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
-    mkdir -p $out/share/${name}/samples
-    cp pjsip-apps/bin/samples/*/* $out/share/${name}/samples
+    mkdir -p $out/share/${pname}-${version}/samples
+    cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples
   '';
 
   # We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix
index 5b292fe7bec..be4cc5830d5 100644
--- a/pkgs/applications/networking/ps2client/default.nix
+++ b/pkgs/applications/networking/ps2client/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "unstable-2018-10-18";
-  name = "ps2client-${version}";
+  pname = "ps2client";
 
   src = fetchFromGitHub {
     owner = "ps2dev";
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 66edc203276..5255b492ec6 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -26,11 +26,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "anydesk-${version}";
+  pname = "anydesk";
   version = "4.0.1";
 
   src = fetchurl {
-    url = "https://download.anydesk.com/linux/${name}-${arch}.tar.gz";
+    url = "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz";
     inherit sha256;
   };
 
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 1f70cb56b54..9627fef7597 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -65,7 +65,7 @@ let
 
   citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }:
     stdenv.mkDerivation rec {
-      name     = "citrix-receiver-${version}";
+      pname = "citrix-receiver";
       version  = "${major}.${minor}.${patch}";
       inherit homepage;
 
diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix
index 745ad7a9c5d..faab83e9492 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/default.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix
@@ -69,7 +69,7 @@ let
 
   citrixWorkspaceForVersion = { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }:
     stdenv.mkDerivation rec {
-      name     = "citrix-workspace-${version}";
+      pname = "citrix-workspace";
       version  = "${major}.${minor}.${patch}";
       inherit homepage;
 
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 0653686c650..5963c6b6c95 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "freerdp-${version}";
+  pname = "freerdp";
   version = "2.0.0-rc4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix
index fdd367f97c0..3b7db7075bb 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/pkgs/applications/networking/remote/putty/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   version = "0.71";
-  name = "putty-${version}";
+  pname = "putty";
 
   src = fetchurl {
     urls = [
-      "https://the.earth.li/~sgtatham/putty/${version}/${name}.tar.gz"
-      "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${name}.tar.gz"
+      "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
+      "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
     ];
     sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
   };
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index 5f737cacb46..9c9abe55daa 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation (rec {
   pname = "rdesktop";
   version = "1.8.6";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = pname;
diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix
index 99835627f87..f85f6cbb7ba 100644
--- a/pkgs/applications/networking/remote/ssvnc/default.nix
+++ b/pkgs/applications/networking/remote/ssvnc/default.nix
@@ -2,11 +2,11 @@
 , libXaw, libXext, libXpm, openjpeg, openssl, tk, perl }:
 
 stdenv.mkDerivation rec {
-  name = "ssvnc-${version}";
+  pname = "ssvnc";
   version = "1.0.29";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ssvnc/${name}.src.tar.gz";
+    url = "mirror://sourceforge/ssvnc/${pname}-${version}.src.tar.gz";
     sha256 = "74df32eb8eaa68b07c9693a232ebe42154617c7f3cbe1d4e68d3fe7c557d618d";
   };
 
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 949c85bf942..c265d9356e1 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -2,7 +2,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "teamviewer-${version}";
+  pname = "teamviewer";
   version = "14.4.2669";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index 442881398f6..5d33f186df7 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -2,7 +2,7 @@
 
 let
   xorgxrdp = stdenv.mkDerivation rec {
-    name = "xorgxrdp-${version}";
+    pname = "xorgxrdp";
     version = "0.2.9";
 
     src = fetchFromGitHub {
@@ -35,7 +35,7 @@ let
 
   xrdp = stdenv.mkDerivation rec {
     version = "0.9.9";
-    name = "xrdp-${version}";
+    pname = "xrdp";
 
     src = fetchFromGitHub {
       owner = "volth";
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 1844711066b..ecce7172def 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -8,7 +8,7 @@ let
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
 
 in stdenv.mkDerivation rec {
-  name = "resilio-sync-${version}";
+  pname = "resilio-sync";
   version = "2.6.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 543afc696ea..1b12dde85db 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "6.2.11";
-  name = "seafile-client-${version}";
+  pname = "seafile-client";
 
   src = fetchFromGitHub {
     owner = "haiwen";
diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix
index 69ae40b7618..dc578dccd19 100644
--- a/pkgs/applications/networking/sieve-connect/default.nix
+++ b/pkgs/applications/networking/sieve-connect/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "sieve-connect-${version}";
+  pname = "sieve-connect";
   version = "0.90";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix
index 13d536ccf1b..2881f3b5377 100644
--- a/pkgs/applications/networking/sniffers/ettercap/default.nix
+++ b/pkgs/applications/networking/sniffers/ettercap/default.nix
@@ -3,7 +3,7 @@
 , fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "ettercap-${version}";
+  pname = "ettercap";
   version = "0.8.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix
index 0c793c41c55..0005a5d230d 100644
--- a/pkgs/applications/networking/sniffers/kismet/default.nix
+++ b/pkgs/applications/networking/sniffers/kismet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpcap, ncurses, expat, pcre, libnl }:
 
 stdenv.mkDerivation rec {
-  name = "kismet-${version}";
+  pname = "kismet";
   version = "2016-07-R1";
 
   src = fetchurl {
-    url = "https://www.kismetwireless.net/code/${name}.tar.xz";
+    url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz";
     sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx";
   };
 
diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix
index 10bb465b8a1..301802d322b 100644
--- a/pkgs/applications/networking/sniproxy/default.nix
+++ b/pkgs/applications/networking/sniproxy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }:
 
 stdenv.mkDerivation rec {
-  name = "sniproxy-${version}";
+  pname = "sniproxy";
   version = "0.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix
index 1034acf0b90..9de525d9324 100644
--- a/pkgs/applications/networking/soapui/default.nix
+++ b/pkgs/applications/networking/soapui/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, writeText, jdk, maven, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "soapui-${version}";
+  pname = "soapui";
   version = "5.5.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
index 706dd670324..c70723284fd 100644
--- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   version = "2.12.0";
 
-  name = "patchwork-classic-${version}";
+  pname = "patchwork-classic";
 
   src = fetchurl {
     url    = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb";
diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix
index e4ba29d3a9f..669ab4d1e3e 100644
--- a/pkgs/applications/networking/sync/acd_cli/default.nix
+++ b/pkgs/applications/networking/sync/acd_cli/default.nix
@@ -3,7 +3,6 @@
 , fusepy, sqlalchemy }:
 
 buildPythonApplication rec {
-  name = pname + "-" + version;
   pname = "acd_cli";
   version = "0.3.2";
 
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index fae838a7d5f..36c4dd46222 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -5,7 +5,7 @@ let
 in stdenv.mkDerivation rec {
   version = "1.1.24";
 
-  name = "backintime-common-${version}";
+  pname = "backintime-common";
 
   src = fetchFromGitHub {
     owner = "bit-team";
diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix
index 26288f9f6e6..fb47d9bc510 100644
--- a/pkgs/applications/networking/sync/backintime/qt4.nix
+++ b/pkgs/applications/networking/sync/backintime/qt4.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   inherit (backintime-common) version src installFlags;
 
-  name = "backintime-qt4-${version}";
+  pname = "backintime-qt4";
 
   buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ];
 
diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix
index 8d9b941e26e..1eb5e44ba24 100644
--- a/pkgs/applications/networking/sync/casync/default.nix
+++ b/pkgs/applications/networking/sync/casync/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "casync-${version}";
+  pname = "casync";
   version = "2-152-ge4a3c5e";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix
index 6dcd451533a..d38f8b53dbb 100644
--- a/pkgs/applications/networking/sync/desync/default.nix
+++ b/pkgs/applications/networking/sync/desync/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "desync-${version}";
+  pname = "desync";
   version = "0.4.0";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index b0315ee3477..832f7c63f27 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -2,7 +2,7 @@
   asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "lsyncd-${version}";
+  pname = "lsyncd";
   version = "2.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix
index 4325c8ea88a..00edcd411fd 100644
--- a/pkgs/applications/networking/sync/rclone/browser.nix
+++ b/pkgs/applications/networking/sync/rclone/browser.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "rclone-browser-${version}";
+  pname = "rclone-browser";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index ad5a35eb251..bc93b743f8b 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation (rec {
 
-  name = "unison-${version}";
+  pname = "unison";
   version = "2.51.2";
   src = fetchFromGitHub {
     owner = "bcpierce00";
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 763c740c817..3e5d3187e9b 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }:
 
 buildPythonApplication rec {
-  name = "syncplay-${version}";
+  pname = "syncplay";
   version = "1.6.4";
 
   format = "other";
diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index 328561529ce..9317ccab4ea 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -6,7 +6,7 @@
 
 buildPythonApplication rec {
   version = "0.9.4";
-  name = "syncthing-gtk-${version}";
+  pname = "syncthing-gtk";
 
   src = fetchFromGitHub {
     owner = "syncthing";
diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/applications/networking/tsung/default.nix
index 050c8502e07..6f5a3f3ec16 100644
--- a/pkgs/applications/networking/tsung/default.nix
+++ b/pkgs/applications/networking/tsung/default.nix
@@ -5,7 +5,7 @@
   gnuplot }:
 
 stdenv.mkDerivation rec {
-  name = "tsung-${version}";
+  pname = "tsung";
   version = "1.7.0";
   src = fetchurl {
     url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz";
diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix
index a1fe790b119..1a19c8c96b3 100644
--- a/pkgs/applications/networking/umurmur/default.nix
+++ b/pkgs/applications/networking/umurmur/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, openssl, protobufc, libconfig }:
 
 stdenv.mkDerivation rec {
-  name = "umurmur-${version}";
+  pname = "umurmur";
   version = "0.2.17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 08fa53a6e38..238864311ef 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -12,11 +12,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "znc-${version}";
+  pname = "znc";
   version = "1.7.4";
 
   src = fetchurl {
-    url = "https://znc.in/releases/archive/${name}.tar.gz";
+    url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz";
     sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi";
   };
 
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 6808a81bec1..a2b14443c1a 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "abiword-${version}";
+  pname = "abiword";
   version = "3.0.2";
 
   src = fetchurl {
-    url = "https://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
+    url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz";
     sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
   };
 
diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index 91b12d8a33c..6ef6e51527e 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "atlassian-cli-${version}";
+  pname = "atlassian-cli";
   version = "8.5.0";
   
   src = fetchzip {
-    url  = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip";
+    url  = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
     sha256  = "0c9jq7q0bx0db0zhdh89bv1ijfg7cddbx04v451vl8caqcyhkfgz";
     extraPostFetch = "chmod go-w $out";
   };
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 4a050eb5d74..4855fbc63c3 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -16,10 +16,9 @@
 mkDerivation rec {
   pname = "calligra";
   version = "3.1.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
     sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638";
   };
 
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
index 461d428787b..0043648146f 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
   pname = "cb2bib";
   version = "2.0.0";
   src = fetchurl {
-    url = "https://www.molspaces.com/dl/progs/${name}.tar.gz";
+    url = "https://www.molspaces.com/dl/progs/${pname}-${version}.tar.gz";
     sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h";
   };
   buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index e4a89b513e9..d3ab02fabd3 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -24,11 +24,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gnucash-${version}";
+  pname = "gnucash";
   version = "3.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
+    url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
     sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi";
   };
 
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     rm $out/bin/gnucash-valgrind
 
     wrapProgram "$out/bin/gnucash" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" \
       --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
       --prefix PERL5LIB ":" "$PERL5LIB" \
       --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix
index 338cdc17065..752ad70cd09 100644
--- a/pkgs/applications/office/grisbi/default.nix
+++ b/pkgs/applications/office/grisbi/default.nix
@@ -2,11 +2,11 @@
 , hicolor-icon-theme, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "grisbi-${version}";
+  pname = "grisbi";
   version = "1.2.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/grisbi/${name}.tar.bz2";
+    url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2";
     sha1 = "1159c5491967fa7afd251783013579ffb45b891b";
   };
 
diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix
index b39617e02db..372414c1a76 100644
--- a/pkgs/applications/office/ib/controller/default.nix
+++ b/pkgs/applications/office/ib/controller/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.14.0";
-  name = "ib-controller-${version}";
+  pname = "ib-controller";
 
   src = fetchurl {
     url = "https://github.com/ib-controller/ib-controller/archive/${version}.tar.gz";
diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix
index 59ecb5a5c3b..a88f1af02c6 100644
--- a/pkgs/applications/office/ib/tws/default.nix
+++ b/pkgs/applications/office/ib/tws/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "9542";
-  name = "ib-tws-${version}";
+  pname = "ib-tws";
 
   src = requireFile rec {
     name = "ibtws_${version}.jar";
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index ebd5a14ad04..b249186c2f1 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.8.1";
-  name = "jabref-${version}";
+  pname = "jabref";
 
   src = fetchurl {
     url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar";
diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
index e28a2d0852b..adad5c8680f 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/pkgs/applications/office/kexi/default.nix
@@ -10,10 +10,9 @@
 mkDerivation rec {
   pname = "kexi";
   version = "3.2.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
     sha256 = "1zy1q7q9rfdaws3rwf3my22ywkn6g747s3ixfcg9r80mm2g3z0bs";
   };
 
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 363c484fa28..0cb23abea66 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -15,11 +15,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "kmymoney-${version}";
+  pname = "kmymoney";
   version = "5.0.5";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
     sha256 = "1hghs4676kn2giwpwz1y7p6djpmi41x64idf3ybiz8ky14a5s977";
   };
 
diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 276134efd73..99e09a8f36f 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -2,7 +2,7 @@
 , texinfo, gnused, usePython ? true }:
 
 stdenv.mkDerivation rec {
-  name = "ledger-${version}";
+  pname = "ledger";
   version = "3.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
index cdda46d4837..7c054ba5204 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/pkgs/applications/office/marp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "marp-${version}";
+  pname = "marp";
   version = "0.0.14";
 
   src = fetchurl {
diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix
index 3e666b0f627..6b4a3869af9 100644
--- a/pkgs/applications/office/moneyplex/default.nix
+++ b/pkgs/applications/office/moneyplex/default.nix
@@ -19,7 +19,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "moneyplex-${version}";
+  pname = "moneyplex";
   version = "16.0.22424";
 
   src = fetchurl (if stdenv.hostPlatform.system == "i686-linux" then src_i686
diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix
index 20f8b428f0d..b1311428c61 100644
--- a/pkgs/applications/office/osmo/default.nix
+++ b/pkgs/applications/office/osmo/default.nix
@@ -2,11 +2,11 @@
 , libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "osmo-${version}";
+  pname = "osmo";
   version = "0.4.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/osmo-pim/${name}.tar.gz";
+    url = "mirror://sourceforge/osmo-pim/${pname}-${version}.tar.gz";
     sha256 = "1gjd4w9jckfpqr9n0bw0w25h3qhfyzw1xvilh3hqdadfinwyal2v";
   };
 
diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix
index f1dd10e9420..af2fd82ddb0 100644
--- a/pkgs/applications/office/paperless/default.nix
+++ b/pkgs/applications/office/paperless/default.nix
@@ -33,7 +33,7 @@
 
 let
   paperless = stdenv.mkDerivation rec {
-    name = "paperless-${version}";
+    pname = "paperless";
     version = "2.7.0";
 
     src = fetchFromGitHub {
diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix
index 7e6da96db80..14756c3557f 100644
--- a/pkgs/applications/office/pinpoint/default.nix
+++ b/pkgs/applications/office/pinpoint/default.nix
@@ -2,10 +2,10 @@
 , gdk-pixbuf, cairo, clutter-gtk }:
 
 stdenv.mkDerivation rec {
-  name = "pinpoint-${version}";
+  pname = "pinpoint";
   version = "0.1.8";
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.xz";
+    url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${pname}-${version}.tar.xz";
     sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s";
   };
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index ecd38627ac5..42fddb972c9 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -6,11 +6,11 @@
 }:
 
 mkDerivation rec {
-  name = "skrooge-${version}";
+  pname = "skrooge";
   version = "2.20.0";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
+    url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
     sha256 = "0rakfngp7j2x7h1isg6lbc5kva6k1kg99dz0zl43dc28s15can1w";
   };
 
diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index a69fb7a1c6c..450ee34262b 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -6,7 +6,6 @@ in
 buildPythonApplication rec {
   pname = "todoman";
   version = "3.5.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index 951b61e43ef..000fa7ff101 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, wxGTK, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name    = "treesheets-${version}";
+  pname = "treesheets";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index c1e2fdcc7df..877dfba88c0 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -12,7 +12,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "trilium-${version}";
+  pname = "trilium";
   version = "0.33.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix
index 89a3d128796..a4734f45460 100644
--- a/pkgs/applications/office/tudu/default.nix
+++ b/pkgs/applications/office/tudu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 stdenv.mkDerivation rec {
 
-  name = "tudu-${version}";
+  pname = "tudu";
   version = "0.10.3";
 
   src = fetchurl {
-    url = "https://code.meskio.net/tudu/${name}.tar.gz";
+    url = "https://code.meskio.net/tudu/${pname}-${version}.tar.gz";
     sha256 = "0140pw457cd05ysws998yhd3b087j98q8m0g3s4br942l65b8n2y";
   };
 
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix
index 4271e3d17aa..3e4ca0ae975 100644
--- a/pkgs/applications/office/wordgrinder/default.nix
+++ b/pkgs/applications/office/wordgrinder/default.nix
@@ -2,7 +2,7 @@
 , lua52Packages, libXft, ncurses, ninja, readline, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "wordgrinder-${version}";
+  pname = "wordgrinder";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index f8785616c5e..6f4f9c43b0f 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -10,7 +10,6 @@
 mkDerivation rec {
   pname = "zanshin";
   version = "2017-11-25";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "KDE";
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 3d4f98ddd44..70e5f82694d 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -33,7 +33,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "zotero-${version}";
+  pname = "zotero";
   version = "5.0.71";
 
   src = fetchurl {
diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix
index 07bf0a542fa..14badd6c55c 100644
--- a/pkgs/applications/radio/cubicsdr/default.nix
+++ b/pkgs/applications/radio/cubicsdr/default.nix
@@ -2,7 +2,7 @@
   pkgconfig, soapysdr-with-plugins, wxGTK, enableDigitalLab ? false }:
 
 stdenv.mkDerivation rec {
-  name = "cubicsdr-${version}";
+  pname = "cubicsdr";
   version = "0.2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix
index 7125e37f7f9..f718854224c 100644
--- a/pkgs/applications/radio/dmrconfig/default.nix
+++ b/pkgs/applications/radio/dmrconfig/default.nix
@@ -2,7 +2,7 @@
 , libusb1, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "dmrconfig-${version}";
+  pname = "dmrconfig";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix
index 713755d8a65..49149a2d82a 100644
--- a/pkgs/applications/radio/fllog/default.nix
+++ b/pkgs/applications/radio/fllog/default.nix
@@ -8,10 +8,9 @@
 stdenv.mkDerivation rec {
   version = "1.2.6";
   pname = "fllog";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+    url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
     sha256 = "18nwqbbg5khpkwlr7dn41g6zf7ms2wzxykd42fwdsj4m4z0ysyyg";
   };
 
diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/applications/radio/flwrap/default.nix
index b96f3c2b327..6bdab0a925d 100644
--- a/pkgs/applications/radio/flwrap/default.nix
+++ b/pkgs/applications/radio/flwrap/default.nix
@@ -8,10 +8,9 @@
 stdenv.mkDerivation rec {
   version = "1.3.5";
   pname = "flwrap";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+    url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
     sha256 = "0qqivqkkravcg7j45740xfky2q3k7czqpkj6y364qff424q2pppg";
   };
 
diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix
index 747015d80ee..ba37b7ecad2 100644
--- a/pkgs/applications/radio/gnss-sdr/default.nix
+++ b/pkgs/applications/radio/gnss-sdr/default.nix
@@ -19,7 +19,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnss-sdr-${version}";
+  pname = "gnss-sdr";
   version = "0.0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix
index 7c6db61b529..6b23858aee4 100644
--- a/pkgs/applications/radio/gnuradio/ais.nix
+++ b/pkgs/applications/radio/gnuradio/ais.nix
@@ -6,7 +6,7 @@
 assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
-  name = "gr-ais-${version}";
+  pname = "gr-ais";
   version = "2015-12-20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index f9a50313c47..016540c1e67 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -25,7 +25,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnuradio-${version}";
+  pname = "gnuradio";
   version = "3.7.13.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix
index 119b7f7600f..80583c0ff3b 100644
--- a/pkgs/applications/radio/gnuradio/gsm.nix
+++ b/pkgs/applications/radio/gnuradio/gsm.nix
@@ -6,7 +6,7 @@
 assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
-  name = "gr-gsm-${version}";
+  pname = "gr-gsm";
   version = "2016-08-25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix
index c3c8721be25..d357db91344 100644
--- a/pkgs/applications/radio/gnuradio/nacl.nix
+++ b/pkgs/applications/radio/gnuradio/nacl.nix
@@ -6,7 +6,7 @@
 assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
-  name = "gr-nacl-${version}";
+  pname = "gr-nacl";
   version = "2017-04-10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix
index df2a88033c4..b8cc60544c9 100644
--- a/pkgs/applications/radio/gnuradio/osmosdr.nix
+++ b/pkgs/applications/radio/gnuradio/osmosdr.nix
@@ -13,7 +13,7 @@
 assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
-  name = "gr-osmosdr-${version}";
+  pname = "gr-osmosdr";
   version = "2018-08-15";
 
   src = fetchgit {
diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix
index b56e0d22687..e4a55fe5098 100644
--- a/pkgs/applications/radio/gnuradio/rds.nix
+++ b/pkgs/applications/radio/gnuradio/rds.nix
@@ -5,7 +5,7 @@
 assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
-  name = "gr-rds-${version}";
+  pname = "gr-rds";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index cd5f8b0db9e..03acf9e1135 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -8,7 +8,7 @@
 assert pulseaudioSupport -> libpulseaudio != null;
 
 mkDerivation rec {
-  name = "gqrx-${version}";
+  pname = "gqrx";
   version = "2.11.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix
index 81a66bf503c..09b4c84c131 100644
--- a/pkgs/applications/radio/hackrf/default.nix
+++ b/pkgs/applications/radio/hackrf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, libusb, fftwSinglePrec }:
 
 stdenv.mkDerivation rec {
-  name = "hackrf-${version}";
+  pname = "hackrf";
   version = "2018.01.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix
index 8d179e8eed1..55cd14cf70d 100644
--- a/pkgs/applications/radio/minimodem/default.nix
+++ b/pkgs/applications/radio/minimodem/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   version = "0.24-1";
   pname = "minimodem";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "kamalmostafa";
diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix
index c8401cdbf49..db1bfbb3f89 100644
--- a/pkgs/applications/radio/qsstv/default.nix
+++ b/pkgs/applications/radio/qsstv/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "9.2.6";
-  name = "qsstv-${version}";
+  pname = "qsstv";
 
   src = fetchurl {
     url = "http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz";
diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix
index a4d5b2cad1e..4e9badaa6c5 100644
--- a/pkgs/applications/radio/rtl-sdr/default.nix
+++ b/pkgs/applications/radio/rtl-sdr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "rtl-sdr-${version}";
+  pname = "rtl-sdr";
   version = "0.6.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix
index 88dc64471ec..a06ac2d7a03 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/pkgs/applications/radio/rtl_433/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation rec {
 
   version = "18.12";
-  name = "rtl_433-${version}";
+  pname = "rtl_433";
 
   src = fetchFromGitHub {
     owner = "merbanan";
diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix
index 2aeba5fb5f4..fe31fd133e7 100644
--- a/pkgs/applications/radio/unixcw/default.nix
+++ b/pkgs/applications/radio/unixcw/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}:
 stdenv.mkDerivation rec {
-  name = "unixcw-${version}";
+  pname = "unixcw";
   version = "3.5.1";
   src = fetchurl {
     url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz";
diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix
index 212f93fb093..e802f0d84c4 100644
--- a/pkgs/applications/radio/wsjtx/default.nix
+++ b/pkgs/applications/radio/wsjtx/default.nix
@@ -3,7 +3,7 @@
   qtmultimedia, qtserialport, qttools, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "wsjtx-${version}";
+  pname = "wsjtx";
   version = "2.1.0";
 
   # This is a "superbuild" tarball containing both wsjtx and a hamlib fork
diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
index 3150d41ca9f..32d89866b5a 100644
--- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
+++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "astrolabe-generator-${version}";
+  pname = "astrolabe-generator";
   version = "3.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 9f65c63f7a6..968d8769caa 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -9,7 +9,7 @@ in
 stdenv.mkDerivation rec {
   srcVersion = "jul19a";
   version = "20190701_a";
-  name = "gildas-${version}";
+  pname = "gildas";
 
   src = fetchurl {
     # For each new release, the upstream developers of Gildas move the
diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix
index dc7c7c920a1..cfdd320d201 100644
--- a/pkgs/applications/science/astronomy/openspace/default.nix
+++ b/pkgs/applications/science/astronomy/openspace/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.11.1";
-  name    = "openspace-${version}";
+  pname = "openspace";
 
   src = fetchFromGitHub {
     owner  = "OpenSpace";
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index e3c66199f11..ecca9141d9f 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation rec {
-  name = "stellarium-${version}";
+  pname = "stellarium";
   version = "0.19.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix
index fef4ca1907f..e9fc0607998 100644
--- a/pkgs/applications/science/astronomy/xearth/default.nix
+++ b/pkgs/applications/science/astronomy/xearth/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, imake, gccmakedep, libXt, libXext }:
 
 stdenv.mkDerivation rec {
-  name = "xearth-${version}";
+  pname = "xearth";
   version = "1.1";
 
   src = fetchurl {
-    url = "http://xearth.org/${name}.tar.gz";
+    url = "http://xearth.org/${pname}-${version}.tar.gz";
     sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c";
   };
 
diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index 539d7c22446..d8ffbb74e6b 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "bcftools";
   version = "1.9";
 
   src = fetchurl {
-    url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2";
+    url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg";
   };
 
diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix
index 2cdd7fda38e..b5bc3b622b9 100644
--- a/pkgs/applications/science/biology/bedtools/default.nix
+++ b/pkgs/applications/science/biology/bedtools/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}:
 
 stdenv.mkDerivation rec {
-  name = "bedtools-${version}";
+  pname = "bedtools";
   version = "2.28.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/applications/science/biology/bftools/default.nix
index 24a6e052df9..15829104934 100644
--- a/pkgs/applications/science/biology/bftools/default.nix
+++ b/pkgs/applications/science/biology/bftools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, makeWrapper, fetchzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "bftools-${version}";
+  pname = "bftools";
   version = "5.9.2";
 
   src = fetchzip {
diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix
index 21e2f56bdf9..962428d67cf 100644
--- a/pkgs/applications/science/biology/bowtie2/default.nix
+++ b/pkgs/applications/science/biology/bowtie2/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "bowtie2";
   version = "2.3.5.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "BenLangmead";
diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix
index d1dbacf053f..5e39320bf83 100644
--- a/pkgs/applications/science/biology/bwa/default.nix
+++ b/pkgs/applications/science/biology/bwa/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name    = "bwa-${version}";
+  pname = "bwa";
   version = "0.7.17";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bio-bwa/${name}.tar.bz2";
+    url = "mirror://sourceforge/bio-bwa/${pname}-${version}.tar.bz2";
     sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy";
   };
 
diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix
index 3464e134ee8..00acc25028c 100644
--- a/pkgs/applications/science/biology/clustal-omega/default.nix
+++ b/pkgs/applications/science/biology/clustal-omega/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
-  name = "clustal-omega-${version}";
+  pname = "clustal-omega";
 
   src = fetchurl {
-    url = "http://www.clustal.org/omega/${name}.tar.gz";
+    url = "http://www.clustal.org/omega/${pname}-${version}.tar.gz";
     sha256 = "1vm30mzncwdv881vrcwg11vzvrsmwy4wg80j5i0lcfk6dlld50w6";
   };
 
diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix
index 0e2b5d8b25f..63d51de9930 100644
--- a/pkgs/applications/science/biology/dcm2niix/default.nix
+++ b/pkgs/applications/science/biology/dcm2niix/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.20190410";
-  name = "dcm2niix-${version}";
+  pname = "dcm2niix";
 
   src = fetchFromGitHub {
     owner = "rordenlab";
diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix
index 1a15dcf6197..e1e84c9423b 100644
--- a/pkgs/applications/science/biology/freebayes/default.nix
+++ b/pkgs/applications/science/biology/freebayes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib, bzip2, lzma }:
 
 stdenv.mkDerivation rec {
-  name    = "freebayes-${version}";
+  pname = "freebayes";
   version = "2017-08-23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix
index 9d41fed0691..82485630114 100644
--- a/pkgs/applications/science/biology/hisat2/default.nix
+++ b/pkgs/applications/science/biology/hisat2/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, which, python, perl}:
 
 stdenv.mkDerivation rec {
-  name = "hisat2-${version}";
+  pname = "hisat2";
   version = "2.1.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix
index e43d48db55f..3adbaf0079e 100644
--- a/pkgs/applications/science/biology/hmmer/default.nix
+++ b/pkgs/applications/science/biology/hmmer/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.2.1";
-  name = "hmmer-${version}";
+  pname = "hmmer";
 
   src = fetchurl {
-    url = "http://eddylab.org/software/hmmer/${name}.tar.gz";
+    url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz";
     sha256 = "171bivy6xhgjsz5nv53n81pc3frnwz29ylblawk2bv46szwjjqd5";
   };
 
diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index 95dc2b612e2..412b55f5916 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "igv-${version}";
+  pname = "igv";
   version = "2.4.19";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix
index 0c8c7313bf2..1ba8cdf22ba 100644
--- a/pkgs/applications/science/biology/itsx/default.nix
+++ b/pkgs/applications/science/biology/itsx/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.1";
-  name = "itsx-${version}";
+  pname = "itsx";
 
   src = fetchurl {
     url = "http://microbiology.se/sw/ITSx_${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index d80ffea9a78..16639db1781 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, hdf5, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "kallisto-${version}";
+  pname = "kallisto";
   version = "0.43.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix
index dbbf8d39a93..d485666f393 100644
--- a/pkgs/applications/science/biology/messer-slim/default.nix
+++ b/pkgs/applications/science/biology/messer-slim/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.2.1"; 
-  name = "messer-slim-${version}";
+  pname = "messer-slim";
 
   src = fetchurl {
     url = "https://github.com/MesserLab/SLiM/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix
index 84c65feb093..bff2bcf428b 100644
--- a/pkgs/applications/science/biology/minimap2/default.nix
+++ b/pkgs/applications/science/biology/minimap2/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "minimap2";
   version = "2.17";
 
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 1bdb31616e4..717b8c3ab2f 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -16,7 +16,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "mosdepth-${version}";
+  pname = "mosdepth";
   version = "0.2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
index 875e98499f5..4e6d3494c72 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "neuron-${version}";
+  pname = "neuron";
   version = "7.5";
 
   nativeBuildInputs = [ which pkgconfig automake autoconf libtool ];
diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix
index 9f1cb8db43d..6379f2c3282 100644
--- a/pkgs/applications/science/biology/niftyreg/default.nix
+++ b/pkgs/applications/science/biology/niftyreg/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname   = "niftyreg";
   version = "1.3.9";
-  name    = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/nifty_reg-${version}/nifty_reg-${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix
index e7221855503..689d3e42c97 100644
--- a/pkgs/applications/science/biology/niftyseg/default.nix
+++ b/pkgs/applications/science/biology/niftyseg/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname   = "niftyseg";
   version = "1.0";
-  name = "${pname}-${version}";
   src = fetchurl {
     url    = "https://github.com/KCL-BMEIS/NiftySeg/archive/v${version}.tar.gz";
     sha256 = "11q6yldsxp3k6gfp94c0xhcan2y3finzv8lzizmrc79yps3wjkn0";
diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix
index 0a2074a06e9..9d81e08d729 100644
--- a/pkgs/applications/science/biology/octopus/default.nix
+++ b/pkgs/applications/science/biology/octopus/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "octopus";
   version = "0.6.3-beta";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "luntergroup";
diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index 68efc2030e5..161188f7ef1 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/pkgs/applications/science/biology/paml/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.9i";
-  name = "paml-${version}";
+  pname = "paml";
   src = fetchurl {
     url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
     sha256 = "1k5lcyls6c33ppp5fxl8ply2fy7i2k0gcqaifsl7gnc81d8ay4dw";
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 70c72779c52..7b95334eec2 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, jre, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "picard-tools-${version}";
+  pname = "picard-tools";
   version = "2.20.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix
index 323ca90f0a2..fc6cfbb158c 100644
--- a/pkgs/applications/science/biology/platypus/default.nix
+++ b/pkgs/applications/science/biology/platypus/default.nix
@@ -3,7 +3,7 @@
 let python = python27.withPackages (ps: with ps; [ cython ]);
 
 in stdenv.mkDerivation rec {
-  name = "platypus-unstable-${version}";
+  pname = "platypus-unstable";
   version = "2018-07-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix
index 2efb59f536f..52f8f70b779 100644
--- a/pkgs/applications/science/biology/plink-ng/default.nix
+++ b/pkgs/applications/science/biology/plink-ng/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib, openblas, darwin}:
 
 stdenv.mkDerivation rec {
-  name = "plink-ng-${version}";
+  pname = "plink-ng";
   version = "1.90b3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix
index 3bb9ea06fd4..8a19ae135e8 100755
--- a/pkgs/applications/science/biology/poretools/default.nix
+++ b/pkgs/applications/science/biology/poretools/default.nix
@@ -3,7 +3,6 @@
 pythonPackages.buildPythonPackage rec {
   pname = "poretools";
   version = "unstable-2016-07-10";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     repo = pname;
diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix
index 140f7032319..d7ee54bfbcf 100644
--- a/pkgs/applications/science/biology/raxml/default.nix
+++ b/pkgs/applications/science/biology/raxml/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   pname = "RAxML";
   version = "8.2.12";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "stamatak";
diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index c4b4bb522c4..dd1a53472db 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "samtools";
   version = "1.9";
 
   src = fetchurl {
-    url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2";
+    url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2";
     sha256 = "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8";
   };
 
diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
index a811bc4412f..72d125ef8b6 100644
--- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
+++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "samtools";
   version = "0.1.19";
 
   src = fetchurl {
-    url = "mirror://sourceforge/samtools/${name}.tar.bz2";
+    url = "mirror://sourceforge/samtools/${pname}-${version}.tar.bz2";
     sha256 = "d080c9d356e5f0ad334007e4461cbcee3c4ca97b8a7a5a48c44883cf9dee63d4";
   };
 
diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix
index 17cf903ae49..69dece88c27 100644
--- a/pkgs/applications/science/biology/seaview/default.nix
+++ b/pkgs/applications/science/biology/seaview/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.7";
-  name = "seaview-${version}";
+  pname = "seaview";
 
   src = fetchurl {
     url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix
index dc224690334..d700ee50a9c 100644
--- a/pkgs/applications/science/biology/snpeff/default.nix
+++ b/pkgs/applications/science/biology/snpeff/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, jre, unzip, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "snpeff-${version}";
+  pname = "snpeff";
   version = "4.3t";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix
index 4bbd6a32003..1961c71f43b 100644
--- a/pkgs/applications/science/biology/somatic-sniper/default.nix
+++ b/pkgs/applications/science/biology/somatic-sniper/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, cmake, zlib, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "somatic-sniper-${version}";
+  pname = "somatic-sniper";
   version = "1.0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix
index e7f5eab8bfa..84c90d89556 100644
--- a/pkgs/applications/science/biology/strelka/default.nix
+++ b/pkgs/applications/science/biology/strelka/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, cmake, zlib, python2}:
 
 stdenv.mkDerivation rec {
-  name = "strelka-${version}";
+  pname = "strelka";
   version = "2.9.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix
index f685031e87e..697a444193b 100644
--- a/pkgs/applications/science/biology/varscan/default.nix
+++ b/pkgs/applications/science/biology/varscan/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, jre, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "varscan-${version}";
+  pname = "varscan";
   version = "2.4.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix
index a6f52ae97b5..f6c9ad029c1 100755
--- a/pkgs/applications/science/biology/vcftools/default.nix
+++ b/pkgs/applications/science/biology/vcftools/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "vcftools";
   version = "0.1.16";
 
diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index 948aed03fe5..391ed54dfcb 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -3,7 +3,6 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "marvin";
   version = "19.1.0";
 
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix
index 274afd5fc3d..d5810860c10 100644
--- a/pkgs/applications/science/chemistry/molden/default.nix
+++ b/pkgs/applications/science/chemistry/molden/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.1";
-  name = "molden-${version}";
+  pname = "molden";
 
   src = fetchurl {
     url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index 5e1c77e2475..ea80e9fd5ca 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.4.1";
-  name = "quantum-espresso-${version}";
+  pname = "quantum-espresso";
 
   src = fetchurl {
     url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz";
diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix
index eb17a68b8aa..a27355afdc8 100644
--- a/pkgs/applications/science/chemistry/siesta/default.nix
+++ b/pkgs/applications/science/chemistry/siesta/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.1-b3";
-  name = "siesta-${version}";
+  pname = "siesta";
 
   src = fetchurl {
     url = "https://launchpad.net/siesta/4.1/4.1-b3/+download/siesta-4.1-b3.tar.gz";
diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix
index 236225959f7..8b95e73b891 100644
--- a/pkgs/applications/science/electronics/adms/default.nix
+++ b/pkgs/applications/science/electronics/adms/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.3.6";
-  name = "adms-${version}";
+  pname = "adms";
 
   src = fetchFromGitHub {
     owner = "Qucs";
diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix
index 63bc0911d25..b351c892c2c 100644
--- a/pkgs/applications/science/electronics/alliance/default.nix
+++ b/pkgs/applications/science/electronics/alliance/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "alliance-${version}";
+  pname = "alliance";
   version = "5.1.1";
 
   src = fetchurl {
-    url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${name}.tar.bz2";
+    url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${pname}-${version}.tar.bz2";
     sha256 = "046c9qwl1vbww0ljm4xyxf5jpz9nq62b2q0wdz9xjimgh4c207w1";
   };
 
diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index 8f81a03044b..ff41a498ae7 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
 
 stdenv.mkDerivation rec {
-  name = "caneda-${version}";
+  pname = "caneda";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix
index 55e8a7b4ffe..d188365db1d 100644
--- a/pkgs/applications/science/electronics/dsview/default.nix
+++ b/pkgs/applications/science/electronics/dsview/default.nix
@@ -4,7 +4,7 @@ libusb, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl
 }:
 
 stdenv.mkDerivation rec {
-  name = "dsview-${version}";
+  pname = "dsview";
 
   version = "0.99";
 
diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
index c42b70c041a..8aa8275510c 100644
--- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
+++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
@@ -6,7 +6,7 @@ systemd, alsaLib, dsview
 stdenv.mkDerivation rec {
   inherit (dsview) version src;
 
-  name = "libsigrok4dsl-${version}";
+  pname = "libsigrok4dsl";
 
   postUnpack = ''
     export sourceRoot=$sourceRoot/libsigrok4DSL
diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
index 214f7766343..12d375cf88a 100644
--- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
+++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
@@ -5,7 +5,7 @@ glib, check, python3, dsview
 stdenv.mkDerivation rec {
   inherit (dsview) version src;
 
-  name = "libsigrokdecode4dsl-${version}";
+  pname = "libsigrokdecode4dsl";
 
   postUnpack = ''
     export sourceRoot=$sourceRoot/libsigrokdecode4DSL
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index ba1b9e174be..3168fc19d05 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -12,7 +12,7 @@ let
     ];
   in
   stdenv.mkDerivation rec {
-    name = "eagle-${version}";
+    pname = "eagle";
     version = "9.4.2";
 
     src = fetchurl {
diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix
index 69b111562ab..a9528b05a31 100644
--- a/pkgs/applications/science/electronics/eagle/eagle7.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle7.nix
@@ -13,7 +13,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "eagle-${version}";
+  pname = "eagle";
   version = "7.7.0";
 
   src =
diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix
index e6e7219ff87..a3b2945ac3d 100644
--- a/pkgs/applications/science/electronics/fped/default.nix
+++ b/pkgs/applications/science/electronics/fped/default.nix
@@ -5,7 +5,7 @@
 
 with lib;
 stdenv.mkDerivation rec {
-  name = "fped-${version}";
+  pname = "fped";
   version = "unstable-2017-05-11";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index ab508854310..127e9c05624 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fritzing-${version}";
+  pname = "fritzing";
   version = "0.9.3b";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix
index 93fe7b6ba77..71101d7cd74 100644
--- a/pkgs/applications/science/electronics/geda/default.nix
+++ b/pkgs/applications/science/electronics/geda/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }:
 
 stdenv.mkDerivation rec {
-  name = "geda-${version}";
+  pname = "geda";
   version = "1.8.2-20130925";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix
index c0821c8a9ab..3f61a13eab8 100644
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/pkgs/applications/science/electronics/gerbv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "gerbv-${version}";
+  pname = "gerbv";
   version = "2015-10-08";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 4830e2a032a..8dffe580cc6 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
 
 stdenv.mkDerivation rec {
-  name = "gtkwave-${version}";
+  pname = "gtkwave";
   version = "3.3.101";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
+    url    = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz";
     sha256 = "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz";
   };
 
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 6608661364a..6f0d8e51448 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -26,7 +26,7 @@ let
   } // attrs);
 
 in stdenv.mkDerivation rec {
-  name = "kicad-${version}";
+  pname = "kicad";
   series = "5.0";
   version = "5.1.2";
 
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index a9a4c32a0b4..7475170d6a7 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -11,7 +11,7 @@ assert ngspiceSupport -> libngspice != null;
 
 with lib;
 stdenv.mkDerivation rec {
-  name = "kicad-unstable-${version}";
+  pname = "kicad-unstable";
   version = "2018-06-12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 277574ce2f1..110552d1d64 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qtbase, qttools, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "librepcb-${version}";
+  pname = "librepcb";
   version = "0.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 194804a21a6..78240a40bac 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -2,7 +2,7 @@
 , readline, libX11, libICE, libXaw, libXmu, libXext, libXt, fftw }:
 
 stdenv.mkDerivation rec {
-  name = "ngspice-${version}";
+  pname = "ngspice";
   version = "30";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix
index b9bbcd695f1..7514aed9f24 100644
--- a/pkgs/applications/science/electronics/pcb/default.nix
+++ b/pkgs/applications/science/electronics/pcb/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pcb-${version}";
+  pname = "pcb";
   version = "20140316";
 
   src = fetchurl {
-    url = "http://ftp.geda-project.org/pcb/pcb-20140316/${name}.tar.gz";
+    url = "http://ftp.geda-project.org/pcb/pcb-20140316/${pname}-${version}.tar.gz";
     sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42";
   };
 
diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix
index 1a5fbf90d10..1bfe6df5ff5 100644
--- a/pkgs/applications/science/electronics/qucs/default.nix
+++ b/pkgs/applications/science/electronics/qucs/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.0.19";
-  name = "qucs-${version}";
+  pname = "qucs";
 
   src = fetchFromGitHub {
     owner = "Qucs";
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index b531563c5c1..9a989919250 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name    = "verilator-${version}";
+  pname = "verilator";
   version = "4.016";
 
   src = fetchurl {
-    url    = "https://www.veripool.org/ftp/${name}.tgz";
+    url    = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
     sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij";
   };
 
diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index e233b91bbc9..e8ae4d01a6d 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -2,13 +2,13 @@
 , intltool, libtool, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "drgeo-${version}";
+  pname = "drgeo";
   version = "1.1.0";
 
   hardeningDisable = [ "format" ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/ofset/${name}.tar.gz";
+    url = "mirror://sourceforge/ofset/${pname}-${version}.tar.gz";
     sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc";
   };
   patches = [ ./struct.patch ];
diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix
index 6e7a3cfc88a..fd50fc825a0 100644
--- a/pkgs/applications/science/logic/abc/default.nix
+++ b/pkgs/applications/science/logic/abc/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv, readline, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "abc-verifier-${version}";
+  pname = "abc-verifier";
   version = "2018-07-08";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix
index bc23454edfc..7078fd454a0 100644
--- a/pkgs/applications/science/logic/abella/default.nix
+++ b/pkgs/applications/science/logic/abella/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, rsync, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "abella-${version}";
+  pname = "abella";
   version = "2.0.6";
 
   src = fetchurl {
-    url = "http://abella-prover.org/distributions/${name}.tar.gz";
+    url = "http://abella-prover.org/distributions/${pname}-${version}.tar.gz";
     sha256 = "164q9gngckg6q69k13lwx2pq3cnc9ckw1qi8dnpxqfjgwfqr7xyi";
   };
 
diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix
index 03524fc6b22..10d94e2bb8c 100644
--- a/pkgs/applications/science/logic/aiger/default.nix
+++ b/pkgs/applications/science/logic/aiger/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, picosat }:
 
 stdenv.mkDerivation rec {
-  name = "aiger-${version}";
+  pname = "aiger";
   version = "1.9.9";
 
   src = fetchurl {
-    url    = "http://fmv.jku.at/aiger/${name}.tar.gz";
+    url    = "http://fmv.jku.at/aiger/${pname}-${version}.tar.gz";
     sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y";
   };
 
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 234b7474997..f83480cfbaf 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, which, dune, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "alt-ergo-${version}";
+  pname = "alt-ergo";
   version = "2.3.0";
 
   src = fetchurl {
-    url    = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz";
-    name   = "${name}.tar.gz";
+    url    = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${pname}-${version}.tar.gz";
+    name   = "${pname}-${version}.tar.gz";
     sha256 = "1ycr3ff0gacq1aqzs16n6swgfniwpim0m7rvhcam64kj0a80c6bz";
   };
 
diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix
index 6c2d2f0a062..668fd9fea72 100644
--- a/pkgs/applications/science/logic/avy/default.nix
+++ b/pkgs/applications/science/logic/avy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, zlib, boost }:
 
 stdenv.mkDerivation rec {
-  name = "avy-${version}";
+  pname = "avy";
   version = "2017.10.16";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix
index 8e0ad22bba1..f1f74bcb581 100644
--- a/pkgs/applications/science/logic/boolector/default.nix
+++ b/pkgs/applications/science/logic/boolector/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "boolector-${version}";
+  pname = "boolector";
   version = "3.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix
index ed3d9e63812..9d6c866faea 100644
--- a/pkgs/applications/science/logic/btor2tools/default.nix
+++ b/pkgs/applications/science/logic/btor2tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "btor2tools-${version}";
+  pname = "btor2tools";
   version = "pre55_8c150b39";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix
index ae57724e4f8..e2f48b34029 100644
--- a/pkgs/applications/science/logic/clprover/clprover.nix
+++ b/pkgs/applications/science/logic/clprover/clprover.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "clprover-${version}";
+  pname = "clprover";
   version = "1.0.3";
 
   src = fetchzip {
diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix
index c9516a135c0..b4c4cb7c047 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python3, xxd, boost }:
 
 stdenv.mkDerivation rec {
-  name = "cryptominisat-${version}";
+  pname = "cryptominisat";
   version = "5.6.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix
index 09801f54e7e..6877060d36d 100644
--- a/pkgs/applications/science/logic/cryptoverif/default.nix
+++ b/pkgs/applications/science/logic/cryptoverif/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "cryptoverif-${version}";
+  pname = "cryptoverif";
   version = "2.01pl1";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix
index 91eaaeeb0e4..cd41e1ca64b 100644
--- a/pkgs/applications/science/logic/cubicle/default.nix
+++ b/pkgs/applications/science/logic/cubicle/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "cubicle-${version}";
+  pname = "cubicle";
   version = "1.1.2";
   src = fetchurl {
     url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz";
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix
index 703ce6fd508..dfb04ad90e9 100644
--- a/pkgs/applications/science/logic/cvc3/default.nix
+++ b/pkgs/applications/science/logic/cvc3/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex, bison, gmp, perl }:
 
 stdenv.mkDerivation rec {
-    name = "cvc3-${version}";
+    pname = "cvc3";
     version = "2.4.1";
 
     src = fetchurl {
-      url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz";
+      url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz";
       sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym";
     };
 
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix
index cddcbef7a03..c0c7a53ebd4 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cvc4-${version}";
+  pname = "cvc4";
   version = "1.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index dab509706a8..1f6fced2233 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, which }:
 
 stdenv.mkDerivation rec {
-  name = "eprover-${version}";
+  pname = "eprover";
   version = "2.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix
index bc8d372ce42..0a8fad484da 100644
--- a/pkgs/applications/science/logic/glucose/default.nix
+++ b/pkgs/applications/science/logic/glucose/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, zlib }:
 stdenv.mkDerivation rec {
-  name = "glucose-${version}";
+  pname = "glucose";
   version = "4.1";
 
   src = fetchurl {
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   makeFlags = [ "r" ];
   installPhase = ''
     install -Dm0755 glucose_release $out/bin/glucose
-    mkdir -p "$out/share/doc/${name}/"
-    install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
+    mkdir -p "$out/share/doc/${pname}-${version}/"
+    install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/applications/science/logic/glucose/syrup.nix
index 30af3216737..816f8504a52 100644
--- a/pkgs/applications/science/logic/glucose/syrup.nix
+++ b/pkgs/applications/science/logic/glucose/syrup.nix
@@ -1,6 +1,6 @@
 { stdenv, zlib, glucose }:
 stdenv.mkDerivation rec {
-  name = "glucose-syrup-${version}";
+  pname = "glucose-syrup";
   version = glucose.version;
 
   src = glucose.src;
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   makeFlags = [ "r" ];
   installPhase = ''
     install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup
-    mkdir -p "$out/share/doc/${name}/"
-    install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
+    mkdir -p "$out/share/doc/${pname}-${version}/"
+    install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index 46b29e3dd27..85fe52239ad 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml, eprover, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "iprover-${version}";
+  pname = "iprover";
   version = "2018_Jul_24_11h";
 
   src = fetchurl {
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin"
     cp iproveropt "$out/bin"
 
-    mkdir -p "$out/share/${name}"
-    cp *.p "$out/share/${name}"
+    mkdir -p "$out/share/${pname}-${version}"
+    cp *.p "$out/share/${pname}-${version}"
     echo -e "#! ${stdenv.shell}\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover
     chmod a+x  "$out"/bin/iprover
   '';
diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix
index a95d1201cbd..61ca78d85ed 100644
--- a/pkgs/applications/science/logic/jonprl/default.nix
+++ b/pkgs/applications/science/logic/jonprl/default.nix
@@ -1,7 +1,7 @@
 { fetchgit, stdenv, smlnj, which }:
 
 stdenv.mkDerivation rec {
-  name    = "jonprl-${version}";
+  pname = "jonprl";
   version = "0.1.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix
index d7f047b84e0..4775384a3dd 100644
--- a/pkgs/applications/science/logic/lci/default.nix
+++ b/pkgs/applications/science/logic/lci/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, readline}: 
 stdenv.mkDerivation rec {
   version = "0.6";
-  name = "lci-${version}";
+  pname = "lci";
   src = fetchurl {
-    url = "mirror://sourceforge/lci/${name}.tar.gz";
+    url = "mirror://sourceforge/lci/${pname}-${version}.tar.gz";
     sha256="204f1ca5e2f56247d71ab320246811c220ed511bf08c9cb7f305cf180a93948e";
   };
   buildInputs = [readline];
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 407244ef183..9bf54a5f094 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "lean-${version}";
+  pname = "lean";
   version = "3.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix
index 4e1415d3961..22177798647 100644
--- a/pkgs/applications/science/logic/lean2/default.nix
+++ b/pkgs/applications/science/logic/lean2/default.nix
@@ -2,7 +2,7 @@
 , gperftools, ninja, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "lean2-${version}";
+  pname = "lean2";
   version = "2017-07-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix
index be337a1c258..b50848a1820 100644
--- a/pkgs/applications/science/logic/leo2/default.nix
+++ b/pkgs/applications/science/logic/leo2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "leo2-${version}";
+  pname = "leo2";
   version = "1.6.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix
index 000587a22e6..dbd34f1da6e 100644
--- a/pkgs/applications/science/logic/lingeling/default.nix
+++ b/pkgs/applications/science/logic/lingeling/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lingeling-${version}";
+  pname = "lingeling";
   # This is the version used in satcomp2018, which was
   # relicensed, and also known as version 'bcj'
   version = "pre1_03b4860d";
diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix
index c77e0327fb6..02e9844115e 100644
--- a/pkgs/applications/science/logic/ltl2ba/default.nix
+++ b/pkgs/applications/science/logic/ltl2ba/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "ltl2ba-${version}";
+  pname = "ltl2ba";
   version = "1.2";
 
   src = fetchurl {
-    url    = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${name}.tar.gz";
+    url    = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${pname}-${version}.tar.gz";
     sha256 = "0vzv5g7v87r41cvdafxi6yqnk7glzxrzgavy8213k59f6v11dzlx";
   };
 
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix
index dc32e84279a..93212c5b854 100644
--- a/pkgs/applications/science/logic/mcrl2/default.nix
+++ b/pkgs/applications/science/logic/mcrl2/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "201707";
   build_nr = "1";
-  name = "mcrl2-${version}";
+  pname = "mcrl2";
 
   src = fetchurl {
     url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz";
diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix
index 1601a74e189..7e46dbeb074 100644
--- a/pkgs/applications/science/logic/metis-prover/default.nix
+++ b/pkgs/applications/science/logic/metis-prover/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl, mlton }:
 
 stdenv.mkDerivation rec {
-  name = "metis-prover-${version}";
+  pname = "metis-prover";
   version = "2.3.20160713";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix
index 4b2116680d5..34051a1da40 100644
--- a/pkgs/applications/science/logic/minisat/default.nix
+++ b/pkgs/applications/science/logic/minisat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "minisat-${version}";
+  pname = "minisat";
   version = "2.2.0";
 
   src = fetchurl {
-    url = "http://minisat.se/downloads/${name}.tar.gz";
+    url = "http://minisat.se/downloads/${pname}-${version}.tar.gz";
     sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj";
   };
 
diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix
index f9f021b15f0..9e5ebe008b8 100644
--- a/pkgs/applications/science/logic/opensmt/default.nix
+++ b/pkgs/applications/science/logic/opensmt/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensmt-${version}";
+  pname = "opensmt";
   version = "20101017";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
index d21487ef92f..40c66dd699d 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "ott-${version}";
+  pname = "ott";
   version = "0.28";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix
index 638996e853b..547bd31e8b4 100644
--- a/pkgs/applications/science/logic/picosat/default.nix
+++ b/pkgs/applications/science/logic/picosat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "picosat-${version}";
+  pname = "picosat";
   version = "965";
 
   src = fetchurl {
-    url = "http://fmv.jku.at/picosat/${name}.tar.gz";
+    url = "http://fmv.jku.at/picosat/${pname}-${version}.tar.gz";
     sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm";
   };
 
diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix
index 2f765572f9a..c833b22e49b 100644
--- a/pkgs/applications/science/logic/poly/default.nix
+++ b/pkgs/applications/science/logic/poly/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchFromGitHub, gmp, cmake, python}:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "libpoly";
   version = "0.1.7";
 
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index 4abfdf9162c..2b368a0e673 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchzip, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "clingo";
   version = "5.3.0";
 
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index 1f6620a2872..d4feb5c9e28 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "prooftree-${version}";
+  pname = "prooftree";
   version = "0.13";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix
index aca06ffbfb7..931ad2fc4f3 100644
--- a/pkgs/applications/science/logic/proverif/default.nix
+++ b/pkgs/applications/science/logic/proverif/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "proverif-${version}";
+  pname = "proverif";
   version = "2.00";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index b9dd90f601f..7249eb991d3 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}:
 stdenv.mkDerivation rec {
-  name = "satallax-${version}";
+  pname = "satallax";
   version = "2.7";
 
   buildInputs = [ocaml zlib which eprover makeWrapper coq];
   src = fetchurl {
-    url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz";
+    url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz";
     sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
   };
 
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index 32ebdad51d9..3f8305ff403 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -23,7 +23,7 @@ let
     };
 in
 stdenv.mkDerivation rec {
-  name    = "saw-tools-${version}";
+  pname = "saw-tools";
   version = "0.1.1-20150731";
 
   src = saw-bin;
diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix
index 2bb2b911d49..2645aa102d9 100644
--- a/pkgs/applications/science/logic/spass/default.nix
+++ b/pkgs/applications/science/logic/spass/default.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "spass-${version}";
+  pname = "spass";
   version = "${baseVersion}.${minorVersion}";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/applications/science/logic/statverif/default.nix
index 9676b991679..e0efb28819d 100644
--- a/pkgs/applications/science/logic/statverif/default.nix
+++ b/pkgs/applications/science/logic/statverif/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "statverif-${version}";
+  pname = "statverif";
   version = "1.86pl4";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix
index 081dc788163..5e186a395fc 100644
--- a/pkgs/applications/science/logic/stp/default.nix
+++ b/pkgs/applications/science/logic/stp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.2.0";
-  name = "stp-${version}";
+  pname = "stp";
 
   src = fetchFromGitHub {
     owner = "stp";
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 8ba77159693..0fc7220c43b 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, yosys, bash, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "symbiyosys-${version}";
+  pname = "symbiyosys";
   version = "2019.04.18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix
index b1eb171b20b..b1c72d7c5ee 100644
--- a/pkgs/applications/science/logic/tlaplus/default.nix
+++ b/pkgs/applications/science/logic/tlaplus/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tlaplus-${version}";
+  pname = "tlaplus";
   version = "1.5.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix
index 7d35f5f91df..7c8389688d9 100644
--- a/pkgs/applications/science/logic/tlaplus/tlaps.nix
+++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tlaps-${version}";
+  pname = "tlaps";
   version = "1.4.3";
   src = fetchurl {
     url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz";
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index 7f68a8e647e..4c63f8e72a3 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, yap, tcsh, perl, patchelf }:
 
 stdenv.mkDerivation rec {
-  name = "TPTP-${version}";
+  pname = "TPTP";
   version = "7.2.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix
index 74f8875fceb..161da6e4b23 100644
--- a/pkgs/applications/science/logic/twelf/default.nix
+++ b/pkgs/applications/science/logic/twelf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, smlnj, rsync }:
 
 stdenv.mkDerivation rec {
-  name = "twelf-${version}";
+  pname = "twelf";
   version = "1.7.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix
index 08ab243fb96..35be32f458c 100644
--- a/pkgs/applications/science/logic/vampire/default.nix
+++ b/pkgs/applications/science/logic/vampire/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.2.2";
-  name = "vampire-${version}";
+  pname = "vampire";
 
   src = fetchFromGitHub {
     owner = "vprover";
diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
index 360f75cc6f0..3e3e2670861 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -19,11 +19,11 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name    = "verifast-${version}";
+  pname = "verifast";
   version = "18.02";
 
   src = fetchurl {
-    url    = "https://github.com/verifast/verifast/releases/download/${version}/${name}-linux.tar.gz";
+    url    = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz";
     sha256 = "19050be23b6d5e471690421fee59f84c58b29e38379fb86b8f3713a206a4423e";
   };
 
diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix
index ca3673d7bf9..a04ab46c669 100644
--- a/pkgs/applications/science/logic/verit/default.nix
+++ b/pkgs/applications/science/logic/verit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, gmp, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "veriT-${version}";
+  pname = "veriT";
   version = "2016";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index bd538dc6c75..3cb14d7da21 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -2,7 +2,7 @@
 , ocamlPackages, coqPackages, rubber, hevea, emacs }:
 
 stdenv.mkDerivation rec {
-  name    = "why3-${version}";
+  pname = "why3";
   version = "1.2.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix
index 313fe5a9f1d..2f972c92b52 100644
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/pkgs/applications/science/logic/workcraft/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "workcraft-${version}";
+  pname = "workcraft";
   version = "3.1.9";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 40a4c391e1d..76ed934fb39 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gmp-static, gperf, autoreconfHook, libpoly }:
 
 stdenv.mkDerivation rec {
-  name    = "yices-${version}";
+  pname = "yices";
   version = "2.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
index c0536b36cfe..7bcc915daec 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix
+++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
@@ -15,7 +15,7 @@ else assert licenseAccepted;
 let maps = callPackage ./maps.nix {};
 in stdenv.mkDerivation rec {
   version = "4.7.1";
-  name = "sc2-headless-${version}";
+  pname = "sc2-headless";
 
   src = fetchurl {
     url = "https://blzdistsc2-a.akamaihd.net/Linux/SC2.${version}.zip";
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index 8de78092bd8..be15bba979f 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -16,7 +16,6 @@ assert opencvSupport -> opencv != null;
 stdenv.mkDerivation rec {
   pname = "shogun";
   version = "6.0.0";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = pname + "-toolbox";
diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix
index e0b0bc11f05..6909cfd8ef6 100644
--- a/pkgs/applications/science/math/LiE/default.nix
+++ b/pkgs/applications/science/math/LiE/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.2.2";
      # The current version of LiE is 2.2.2, which is more or less unchanged
      # since about the year 2000. Minor bugfixes do get applied now and then.
-  name = "lie-${version}";
+  pname = "lie";
 
   meta = {
     description = "A Computer algebra package for Lie group computations";
diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix
index 61eb1fd3ce4..74adcab4e70 100644
--- a/pkgs/applications/science/math/bcal/default.nix
+++ b/pkgs/applications/science/math/bcal/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "bcal-${version}";
+  pname = "bcal";
   version = "1.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix
index 1b7a9736007..37504fceb14 100644
--- a/pkgs/applications/science/math/bliss/default.nix
+++ b/pkgs/applications/science/math/bliss/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, doxygen }:
 
 stdenv.mkDerivation rec {
-  name = "bliss-${version}";
+  pname = "bliss";
   version = "0.73";
 
   src = fetchurl {
-    url = "http://www.tcs.hut.fi/Software/bliss/${name}.zip";
+    url = "http://www.tcs.hut.fi/Software/bliss/${pname}-${version}.zip";
     sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84";
   };
 
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index e8171bcb256..5068abbf307 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -36,7 +36,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "caffe-${version}";
+  pname = "caffe";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index 24cddfb9a1c..eb306439a0a 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -2,13 +2,13 @@
 , enableReadline ? true, readline, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "calc-${version}";
+  pname = "calc";
   version = "2.12.7.2";
 
   src = fetchurl {
     urls = [
-      "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"
-      "http://www.isthe.com/chongo/src/calc/${name}.tar.bz2"
+      "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
+      "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
     ];
     sha256 = "147wmbajcxv6wp92j6pizq4plrr1sb7jirifr1477bx33hc49bsp";
   };
diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix
index 0beee1eb291..0eb57c75692 100644
--- a/pkgs/applications/science/math/clp/default.nix
+++ b/pkgs/applications/science/math/clp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.17.2";
-  name = "clp-${version}";
+  pname = "clp";
   src = fetchurl {
     url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz";
     sha256 = "1fkmgpn0zaraymi6s3isrrscgjxggcs2yjrx7jfy4hb1jacx71zz";
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index 465c7318c0e..c20a6954c3c 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -17,7 +17,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "CNTK-${version}";
+  pname = "CNTK";
   version = "2.7";
 
   # Submodules
diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix
index 94e0a44226d..13a75ce4db2 100644
--- a/pkgs/applications/science/math/colpack/default.nix
+++ b/pkgs/applications/science/math/colpack/default.nix
@@ -4,7 +4,6 @@ stdenv.mkDerivation rec {
 
   pname = "ColPack";
   version = "1.0.10";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "CSCsw";
diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix
index a14839d3ecc..ec13f5252f1 100644
--- a/pkgs/applications/science/math/cplex/default.nix
+++ b/pkgs/applications/science/math/cplex/default.nix
@@ -8,7 +8,7 @@
 # different for every user.
 
 stdenv.mkDerivation rec {
-  name = "cplex-${version}";
+  pname = "cplex";
   version = "128";
   
   src =
diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix
index 23ab2184266..eb42315f015 100644
--- a/pkgs/applications/science/math/form/default.nix
+++ b/pkgs/applications/science/math/form/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.2.1";
-  name = "form-${version}";
+  pname = "form";
 
   # This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub
   src = fetchurl {
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index 3232d08aa33..8f38a24f40d 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, language ? "en_US" }:
 
 stdenv.mkDerivation rec {
-  name = "geogebra-${version}";
+  pname = "geogebra";
   version = "5-0-535-0";
 
   preferLocalBuild = true;
diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix
index 74e4b052fdb..3ccd89cf2c1 100644
--- a/pkgs/applications/science/math/getdp/default.nix
+++ b/pkgs/applications/science/math/getdp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, gfortran, openblas, openmpi, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "getdp-${version}";
+  pname = "getdp";
   version = "3.0.4";
   src = fetchurl {
     url = "http://getdp.info/src/getdp-${version}-source.tgz";
diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix
index d2d1ddb6584..33b003b2b56 100644
--- a/pkgs/applications/science/math/gfan/default.nix
+++ b/pkgs/applications/science/math/gfan/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, gmp, mpir, cddlib}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "gfan";
   version = "0.6.2";
 
diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix
index ee9bdcc6f1b..4ac7c411c2d 100644
--- a/pkgs/applications/science/math/gurobi/default.nix
+++ b/pkgs/applications/science/math/gurobi/default.nix
@@ -3,7 +3,7 @@
 let
   majorVersion = "8.1";
 in stdenv.mkDerivation rec {
-  name = "gurobi-${version}";
+  pname = "gurobi";
   version = "${majorVersion}.0";
 
   src = with stdenv.lib; fetchurl {
diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix
index 9eab9ca3999..45a13d02889 100644
--- a/pkgs/applications/science/math/hmetis/default.nix
+++ b/pkgs/applications/science/math/hmetis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ghostscript }:
 
 stdenv.mkDerivation rec {
-  name = "hmetis-${version}";
+  pname = "hmetis";
   version = "1.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index 0cf834c8cde..f39c6a04d19 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "lp_solve-${version}";
+  pname = "lp_solve";
   version = "5.5.2.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix
index 9e02b08c8ad..eecb37dd743 100644
--- a/pkgs/applications/science/math/lrcalc/default.nix
+++ b/pkgs/applications/science/math/lrcalc/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   version = "1.2";
   pname = "lrcalc";
-  name = "${pname}-${version}";
 
   src = fetchFromBitbucket {
     owner = "asbuch";
diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix
index c6802c3719e..4204b139913 100644
--- a/pkgs/applications/science/math/mathematica/10.nix
+++ b/pkgs/applications/science/math/mathematica/10.nix
@@ -26,7 +26,7 @@ in
 stdenv.mkDerivation rec {
   version = "10.0.2";
 
-  name = "mathematica-${version}";
+  pname = "mathematica";
 
   src = requireFile rec {
     name = "Mathematica_${version}_LINUX.sh";
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index e2e4ba63b07..bd4725ce73c 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -7,7 +7,7 @@
 assert cudnnSupport -> cudaSupport;
 
 stdenv.mkDerivation rec {
-  name = "mxnet-${version}";
+  pname = "mxnet";
   version = "1.4.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index 226e13c004d..c86354234e3 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 }:
 stdenv.mkDerivation rec {
-  name = "nauty-${version}";
+  pname = "nauty";
   version = "26r11";
   src = fetchurl {
     url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index 86bd2e84367..e743c8ae95b 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "gp2c-${version}";
+  pname = "gp2c";
   version = "0.0.11pl2";
 
   src = fetchurl {
-    url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
+    url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz";
     sha256 = "0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g";
   };
 
diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix
index 3e7d9898a65..167ab9275fa 100644
--- a/pkgs/applications/science/math/pcalc/default.nix
+++ b/pkgs/applications/science/math/pcalc/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "pcalc-${version}";
+  pname = "pcalc";
   version = "20141224";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix
index 4fba231f094..fdc4de7b028 100644
--- a/pkgs/applications/science/math/polymake/default.nix
+++ b/pkgs/applications/science/math/polymake/default.nix
@@ -7,7 +7,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "polymake";
   version = "3.2.rc4";
 
diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix
index 2dd4778234d..71d16fb626c 100644
--- a/pkgs/applications/science/math/ratpoints/default.nix
+++ b/pkgs/applications/science/math/ratpoints/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, gmp }:
 stdenv.mkDerivation rec {
-  name = "ratpoints-${version}";
+  pname = "ratpoints";
   version = "2.1.3.p4";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix
index 591fa192d56..af5c96c093c 100644
--- a/pkgs/applications/science/math/sage/sage-tests.nix
+++ b/pkgs/applications/science/math/sage/sage-tests.nix
@@ -25,7 +25,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = src.version;
-  name = "sage-tests-${version}";
+  pname = "sage-tests";
   inherit src;
 
   buildInputs = [
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index e4b1aeae016..524085e8c01 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -87,7 +87,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = src.version;
-  name = "sage-with-env-${version}";
+  pname = "sage-with-env";
   src = sage-env.lib.src;
 
   inherit buildInputs;
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index f6dc21d0018..4fa8ae6270b 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -21,7 +21,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = src.version;
-  name = "sage-${version}";
+  pname = "sage";
   src = sage-with-env.env.lib.src;
 
   buildInputs = [
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix
index 91c880673a1..bf618fe64f4 100644
--- a/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/pkgs/applications/science/math/sage/sagedoc.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   version = src.version;
-  name = "sagedoc-${version}";
+  pname = "sagedoc";
   src = sage-with-env.env.lib.src;
 
 
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 1040d6d4ba1..6eac84aaa86 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -60,7 +60,7 @@
 buildPythonPackage rec {
   format = "other";
   version = src.version;
-  name = "sagelib-${version}";
+  pname = "sagelib";
   src = sage-src;
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix
index 01fb58403ca..432280a18fb 100644
--- a/pkgs/applications/science/math/scilab/default.nix
+++ b/pkgs/applications/science/math/scilab/default.nix
@@ -13,9 +13,9 @@
 
 stdenv.mkDerivation rec {
   version = "4.1.2";
-  name = "scilab-${version}";
+  pname = "scilab";
   src = fetchurl {
-    url = "https://www.scilab.org/download/${version}/${name}-src.tar.gz";
+    url = "https://www.scilab.org/download/${version}/${pname}-${version}-src.tar.gz";
     sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc";
   };
 
diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix
index 8fa020ba07c..610f1ef05c0 100644
--- a/pkgs/applications/science/math/scotch/default.nix
+++ b/pkgs/applications/science/math/scotch/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.0.4";
-  name = "scotch-${version}";
+  pname = "scotch";
   src_name = "scotch_${version}";
 
   buildInputs = [ bison openmpi flex zlib ];
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 24063216db0..ccb139203ac 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "singular-${version}";
+  pname = "singular";
   version = "4.1.1p2";
 
   src = let
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index d36b135531c..67561658eb2 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, fetchgit, cmake, qtbase, qttools }:
 
 mkDerivation rec {
-  name = "speedcrunch-${version}";
+  pname = "speedcrunch";
   version = "0.12.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index bc971606cd0..18daabb9e7e 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -3,7 +3,7 @@
 , fetchpatch
 }:
 stdenv.mkDerivation rec {
-  name = "symmetrica-${version}";
+  pname = "symmetrica";
   version = "2.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix
index 3bfb22dad93..90278a744f1 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, unzip, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "weka-${version}";
+  pname = "weka";
   version = "3.9.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip";
+    url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip";
     sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
   };
 
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 13ccd70c83f..406d74c4cd3 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -3,7 +3,7 @@
 , maxima, wxGTK, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "wxmaxima-${version}";
+  pname = "wxmaxima";
   version = "19.03.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix
index c02ef73df11..bae0d9a18c6 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/applications/science/math/yacas/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "yacas-${version}";
+  pname = "yacas";
   version = "1.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index d1da5a74e85..c806b558da0 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -9,10 +9,10 @@ in
 
 stdenv.mkDerivation rec {
   version = "${majorVersion}.${minorVersion}";
-  name = "boinc-${version}";
+  pname = "boinc";
 
   src = fetchFromGitHub {
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     owner = "BOINC";
     repo = "boinc";
     rev = "client_release/${majorVersion}/${version}";
diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index 2262e342fc9..2e19012af87 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "cytoscape-${version}";
+  pname = "cytoscape";
   version = "3.7.1";
 
   src = fetchurl {
-    url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "1mhsngbwbgdwl70wj7850zg94534lasihwv2ryifardm35mkh48k";
   };
 
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 8b6c7497e54..b394639fd0c 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -2,11 +2,11 @@
 , proj, boost, cmake, python2, doxygen, graphviz, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "gplates-${version}";
+  pname = "gplates";
   version = "2.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gplates/${name}-unixsrc.tar.bz2";
+    url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2";
     sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw";
   };
 
diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix
index 76f958cc3a8..b412c4ef81a 100644
--- a/pkgs/applications/science/misc/netlogo/default.nix
+++ b/pkgs/applications/science/misc/netlogo/default.nix
@@ -14,7 +14,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "netlogo-${version}";
+  pname = "netlogo";
   version = "6.0.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
index 4139c88ffb0..121e953f43a 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3";
-  name = "openmvg-${version}";
+  pname = "openmvg";
 
   src = fetchgit {
     url = "https://www.github.com/openmvg/openmvg.git";
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix
index 0199373b082..2145d7e71d3 100644
--- a/pkgs/applications/science/misc/root/5.nix
+++ b/pkgs/applications/science/misc/root/5.nix
@@ -3,7 +3,7 @@
 , Cocoa, OpenGL, noSplash ? false }:
 
 stdenv.mkDerivation rec {
-  name = "root-${version}";
+  pname = "root";
   version = "5.34.36";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 2ec1ded68a2..690dc920d5c 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -3,7 +3,7 @@
 , Cocoa, OpenGL, noSplash ? false }:
 
 stdenv.mkDerivation rec {
-  name = "root-${version}";
+  pname = "root";
   version = "6.12.06";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
index 1986f3b75ec..c7692dde13a 100644
--- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.10";
-  name = "DL_POLY_Classic-${version}";
+  pname = "DL_POLY_Classic";
 
   src = fetchurl {
     url = "https://ccpforge.cse.rl.ac.uk/gf/download/frsrelease/574/8924/dl_class_1.10.tar.gz";
diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
index f4491053e4c..83f8b88ba31 100644
--- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
@@ -13,7 +13,7 @@ in
 stdenv.mkDerivation rec {
   # LAMMPS has weird versioning converted to ISO 8601 format
   version = "stable_22Aug2018";
-  name = "lammps-${version}";
+  pname = "lammps";
 
   src = fetchFromGitHub {
     owner = "lammps";
diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/applications/science/physics/quantomatic/default.nix
index ad86ff61471..b22b9d412fd 100644
--- a/pkgs/applications/science/physics/quantomatic/default.nix
+++ b/pkgs/applications/science/physics/quantomatic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "quantomatic-${version}";
+  pname = "quantomatic";
   version = "0.7";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix
index d43a05f1c61..dd092a2ce9a 100644
--- a/pkgs/applications/science/physics/sacrifice/default.nix
+++ b/pkgs/applications/science/physics/sacrifice/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "sacrifice-${version}";
+  pname = "sacrifice";
   version = "1.0.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix
index 1d61c612563..045a77cea27 100644
--- a/pkgs/applications/science/physics/sherpa/default.nix
+++ b/pkgs/applications/science/physics/sherpa/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "sherpa-${version}";
+  pname = "sherpa";
   version = "2.2.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix
index ae5307f155b..2af93961e02 100644
--- a/pkgs/applications/science/physics/xfitter/default.nix
+++ b/pkgs/applications/science/physics/xfitter/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, liblapack, libyaml, lynx, mela, root5, qcdnum, which }:
 
 stdenv.mkDerivation rec {
-  name = "xfitter-${version}";
+  pname = "xfitter";
   version = "2.0.0";
 
   src = fetchurl {
-    name = "${name}.tgz";
-    url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${name}.tgz";
+    name = "${pname}-${version}.tgz";
+    url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${pname}-${version}.tgz";
     sha256 = "0j47s8laq3aqjlgp769yicvgyzqjb738a3rqss51d9fjrihi2515";
   };
 
diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix
index c454ad37768..ebfb6471c63 100644
--- a/pkgs/applications/science/programming/plm/default.nix
+++ b/pkgs/applications/science/programming/plm/default.nix
@@ -6,12 +6,12 @@ stdenv.mkDerivation rec {
   major = "2";
   minor = "5";
   version = "${major}-${minor}";
-  name = "plm-${version}";
+  pname = "plm";
 
   src = fetchurl {
     url = "http://webloria.loria.fr/~quinson/Teaching/PLM/plm-${major}_${minor}.jar";
     sha256 = "0m17cxa3nxi2cbswqvlfzp0mlfi3wrkw8ry2xhkxy6aqzm2mlgcc";
-    name = "${name}.jar";
+    name = "${pname}-${version}.jar";
   };
 
   buildInputs = [ makeWrapper jre gcc valgrind ];
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
index 69f355c7b84..678a2ada6d2 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/pkgs/applications/science/robotics/apmplanner2/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "apmplanner2-${version}";
+  pname = "apmplanner2";
   # TODO revert Qt511 to Qt5 in pkgs/top-level/all-packages.nix on next release
   version = "2.0.27-rc1";
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index 98ccd92c4ee..a3ebda463b9 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -24,10 +24,10 @@
 
 stdenv.mkDerivation rec {
   inherit version;
-  name = "gazebo-${version}";
+  pname = "gazebo";
 
   src = fetchurl {
-    url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2";
+    url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pname}-${version}.tar.bz2";
     sha256 = src-sha256;
   };
 
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index eae5d3766d6..1863757adbc 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qgroundcontrol-${version}";
+  pname = "qgroundcontrol";
   version = "3.3.0";
 
   qtInputs = [
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 507481cddab..d14c0bb0fe8 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "yarp-${version}";
+  pname = "yarp";
   version = "2.3.70.2";
   src = fetchFromGitHub {
     owner = "robotology";
diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/applications/search/grepcidr/default.nix
index 69fc0e76932..06b2aee0392 100644
--- a/pkgs/applications/search/grepcidr/default.nix
+++ b/pkgs/applications/search/grepcidr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "grepcidr-${version}";
+  pname = "grepcidr";
   version = "2.0";
 
   src = fetchurl {
-    url = "http://www.pc-tools.net/files/unix/${name}.tar.gz";
+    url = "http://www.pc-tools.net/files/unix/${pname}-${version}.tar.gz";
     sha256 = "1yzpa1nigmmp4hir6377hrkpp0z6jnxgccaw2jbqgydbglvnm231";
   };
 
diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix
index 99c149b79d9..f3fc1e24401 100644
--- a/pkgs/applications/search/grepm/default.nix
+++ b/pkgs/applications/search/grepm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perlPackages, mutt }:
 
 stdenv.mkDerivation rec {
-  name = "grepm-${version}";
+  pname = "grepm";
   version = "0.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix
index 26397380d57..e092a604142 100644
--- a/pkgs/applications/version-management/bitkeeper/default.nix
+++ b/pkgs/applications/version-management/bitkeeper/default.nix
@@ -3,7 +3,7 @@
 , libtomcrypt, libtommath, lz4 }:
 
 stdenv.mkDerivation rec {
-  name = "bitkeeper-${version}";
+  pname = "bitkeeper";
   version = "7.3.1ce";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix
index 569606d2fdb..3f445e427a5 100644
--- a/pkgs/applications/version-management/blackbox/default.nix
+++ b/pkgs/applications/version-management/blackbox/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   version = "1.20170611";
   pname   = "blackbox";
-  name    = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner  = "stackexchange";
diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix
index 6301acdf134..7d1de378f53 100644
--- a/pkgs/applications/version-management/bugseverywhere/default.nix
+++ b/pkgs/applications/version-management/bugseverywhere/default.nix
@@ -7,7 +7,7 @@
 #
 pythonPackages.buildPythonApplication rec {
     version = "1.1.1";
-    name = "bugseverywhere-${version}";
+    pname = "bugseverywhere";
 
     src = fetchurl {
       url =
diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix
index aa3bcb27394..71130a2e283 100644
--- a/pkgs/applications/version-management/cvsps/default.nix
+++ b/pkgs/applications/version-management/cvsps/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, cvs, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "cvsps-${version}";
+  pname = "cvsps";
   version = "2.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix
index fa6d4fe1890..fc591dd710e 100644
--- a/pkgs/applications/version-management/diffuse/default.nix
+++ b/pkgs/applications/version-management/diffuse/default.nix
@@ -4,10 +4,10 @@ let
   inherit (python27Packages) pygtk python;
 in stdenv.mkDerivation rec {
   version = "0.4.8";
-  name = "diffuse-${version}";
+  pname = "diffuse";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0ayz8bywmk1z3zicb0a7hbxliqpc7xym60s0mawzqllkpadvgly1";
   };
 
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index d4b60a4f538..cc029881133 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fossil-${version}";
+  pname = "fossil";
   version = "2.9";
 
   src = fetchurl {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
       [
         "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
       ];
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     sha256 = "0kwb7pkp7y2my916rhyl6kmcf0fk8gkzaxzy13hfgqs35nlsvchw";
   };
 
diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix
index 0475a8ae76c..350eea240ec 100644
--- a/pkgs/applications/version-management/gerrit/default.nix
+++ b/pkgs/applications/version-management/gerrit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gerrit-${version}";
+  pname = "gerrit";
   version = "2.14.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 6b25ef8518c..20392655062 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cgit-${version}";
+  pname = "cgit";
   version = "1.2.1";
 
   src = fetchurl {
-    url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
+    url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz";
     sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w";
   };
 
diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
index 1af1870928b..0e28258915f 100644
--- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }:
 
 stdenv.mkDerivation rec {
-  name = "darcs-to-git-${version}";
+  pname = "darcs-to-git";
   version = "2015-06-04";
 
   src = fetchgit {
diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index 1af2170e169..1eff8420fc3 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -1,7 +1,7 @@
 {stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}:
 
 stdenv.mkDerivation rec {
-  name = "diff-so-fancy-${version}";
+  pname = "diff-so-fancy";
   version = "1.2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index 52494d4ab7e..3c0653529ce 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "ghq-${version}";
+  pname = "ghq";
   version = "0.10.2";
 
   goPackagePath = "github.com/motemen/ghq";
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
index ba64a065d28..3118eaab19b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }:
 
 buildPythonApplication rec {
-  name = "git-annex-metadata-gui-${version}";
+  pname = "git-annex-metadata-gui";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
index 4d0f33730e4..55a9dd18f72 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "git-annex-remote-b2-${version}";
+  pname = "git-annex-remote-b2";
   version = "20151212-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
index c368dcd487e..5d4d9b86d83 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rclone, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "git-annex-remote-rclone-${version}";
+  pname = "git-annex-remote-rclone";
   version = "0.6";
   rev = "v${version}";
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
index 185ed38b5db..daa0af43879 100644
--- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "git-appraise-unstable-${version}";
+  pname = "git-appraise-unstable";
   version = "2018-02-26";
   rev = "2414523905939525559e4b2498c5597f86193b61";
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index 0baf09918d4..edc5f9d7bfb 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "git-bug-${version}";
+  pname = "git-bug";
   version = "0.5.0";
   rev = "8d7a2c076a38c89085fd3191a2998efb659650c2";
   goPackagePath = "github.com/MichaelMure/git-bug";
diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index c14a027b4ab..e502c73adfd 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -3,7 +3,7 @@
 , pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "git-bz-${version}";
+  pname = "git-bz";
   version = "3.2015-09-08";
 
   src = fetchgit {
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 316b664c070..6945e24ee46 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -4,7 +4,7 @@ let
   inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;
 
 in buildPythonApplication rec {
-  name = "git-cola-${version}";
+  pname = "git-cola";
   version = "3.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index c036a0ffe4b..09c9169e434 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "git-extras-${version}";
+  pname = "git-extras";
   version = "4.7.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index ded9bcc2ffd..193133d6d3e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gitMinimal, python2Packages }:
 
 stdenv.mkDerivation rec {
-  name = "git-hub-${version}";
+  pname = "git-hub";
   version = "1.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
index 10e78622271..76b29135f66 100644
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "git-imerge-${version}";
+  pname = "git-imerge";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
index f8d871bdcf3..a7abd1eeaf4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "git-octopus-${version}";
+  pname = "git-octopus";
   version = "1.4";
 
   installFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
index dc3fbbed199..1cc3f365ea8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
@@ -1,7 +1,7 @@
 {stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "git-open-${version}";
+  pname = "git-open";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
index d72df802875..9fb9d4de6e3 100644
--- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub}:
 
 stdenv.mkDerivation rec {
-  name = "git-radar-${version}";
+  pname = "git-radar";
   version = "0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index d1dce046979..ff0f702269c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "git-remote-gcrypt-${version}";
+  pname = "git-remote-gcrypt";
   version = "1.2";
   rev = version;
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
index 03435ec834a..c0de46264d0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, git, gnused }:
 
 stdenv.mkDerivation rec {
-  name = "git-reparent-${version}";
+  pname = "git-reparent";
   version = "unstable-2017-09-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
index 211685c8edb..c1a40b12cde 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, git, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "git-secrets-${version}";
+  pname = "git-secrets";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
index 6a52983e83c..e8eaf885c71 100644
--- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, ... }:
 
 stdenv.mkDerivation rec {
-  name = "git-stree-${version}";
+  pname = "git-stree";
   version = "0.4.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
index 7ba7d8ec243..7fa15c66809 100644
--- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "git-sync-${version}";
+  pname = "git-sync";
   version = "20151024";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/pkgs/applications/version-management/git-and-tools/git-test/default.nix
index 1150f008299..e55799c2752 100644
--- a/pkgs/applications/version-management/git-and-tools/git-test/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-test/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, git }:
 
 stdenv.mkDerivation rec {
-  name = "git-test-${version}";
+  pname = "git-test";
   version = "1.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index 26f9f8c756e..57af13f597a 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -5,7 +5,6 @@ with pkgs.lib;
 stdenv.mkDerivation rec {
   pname = "gitflow";
   version = "1.12.2";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "petervanderdoes";
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index e9862cb4897..9d4cbf2f74c 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -5,12 +5,11 @@
 stdenv.mkDerivation rec {
   pname = "tig";
   version = "2.4.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "jonas";
     repo = pname;
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd";
   };
 
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index cea588f76ca..3b8affb57ed 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "transcrypt-${version}";
+  pname = "transcrypt";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix
index fd999dc17d4..ec03c5bed5b 100644
--- a/pkgs/applications/version-management/git-crecord/default.nix
+++ b/pkgs/applications/version-management/git-crecord/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "git-crecord-${version}";
+  pname = "git-crecord";
   version = "20161216.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix
index 3cde046a2ad..e3190667259 100644
--- a/pkgs/applications/version-management/git-lfs/1.nix
+++ b/pkgs/applications/version-management/git-lfs/1.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "git-lfs-${version}";
+  pname = "git-lfs";
   version = "1.5.6";
   rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0";
   
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 92ba5738250..d9b5e170497 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "git-lfs-${version}";
+  pname = "git-lfs";
   version = "2.7.2";
 
   goPackagePath = "github.com/git-lfs/git-lfs";
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 2c427bb1824..f51e447d88d 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "git-repo-${version}";
+  pname = "git-repo";
   version = "1.13.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix
index 9c5ab20d364..7a92679583b 100644
--- a/pkgs/applications/version-management/git-sizer/default.nix
+++ b/pkgs/applications/version-management/git-sizer/default.nix
@@ -2,7 +2,6 @@
 
 buildGoPackage rec {
   pname = "git-sizer";
-  name = "${pname}-${version}";
   version = "1.0.0";
 
   goPackagePath = "github.com/github/git-sizer";
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 5b7fc119b5b..4f0651a3a76 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,7 +12,7 @@ let
   curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
 in
 stdenv.mkDerivation rec {
-  name = "gitkraken-${version}";
+  pname = "gitkraken";
   version = "6.1.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index a946c7fa7ca..993f0fe6947 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -18,7 +18,7 @@ let
   };
 in buildGoPackage rec {
   version = "1.47.0";
-  name = "gitaly-${version}";
+  pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index faeed38c918..cd4784b36c8 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "9.3.0";
-  name = "gitlab-shell-${version}";
+  pname = "gitlab-shell";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 23cf3483f7a..12f354bc2fb 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, git, go }:
 
 stdenv.mkDerivation rec {
-  name = "gitlab-workhorse-${version}";
+  pname = "gitlab-workhorse";
 
   version = "8.7.0";
 
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 42c09100788..7c157191ab9 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, git, nettools, perl }:
 
 stdenv.mkDerivation rec {
-  name = "gitolite-${version}";
+  pname = "gitolite";
   version = "3.6.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix
index 64b6e2107f6..5d29c8fcb6c 100644
--- a/pkgs/applications/version-management/gitstats/default.nix
+++ b/pkgs/applications/version-management/gitstats/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }:
 
 stdenv.mkDerivation rec {
-  name = "gitstats-${version}";
+  pname = "gitstats";
   version = "2016-01-08";
 
   # upstream does not make releases
   src = fetchzip {
     url = "https://github.com/hoxu/gitstats/archive/55c5c285558c410bb35ebf421245d320ab9ee9fa.zip";
     sha256 = "1bfcwhksylrpm88vyp33qjby4js31zcxy7w368dzjv4il3fh2i59";
-    name = name + "-src";
+    name = "${pname}-${version}" + "-src";
   };
 
   buildInputs = [ perl python ];
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 0587bc9af76..c2153ebea89 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -7,7 +7,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "gogs-${version}";
+  pname = "gogs";
   version = "0.11.86";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 0d2c4d74267..0a24cfbb3a0 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.49";
-  name = "gource-${version}";
+  pname = "gource";
 
   src = fetchurl {
-    url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
+    url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9";
   };
 
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index 3c052a26cde..bee1c82e11b 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -9,12 +9,12 @@ let graphviz_2_0 = import ./graphviz-2.0.nix {
     }; in
 stdenv.mkDerivation rec {
   version = "1.0.2";
-  name = "monotone-viz-${version}";
+  pname = "monotone-viz";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4];
   src = fetchurl {
-    url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz";
+    url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
     sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
   };
 
diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index 8150203814d..23278e9e748 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mr-${version}";
+  pname = "mr";
   version = "1.20180726";
 
   src = fetchgit {
diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index 18fb672226f..bb2b4b3e0b8 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -2,7 +2,6 @@
 
 with python2Packages;
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   version = "0.3.1";
   pname = "nbstripout";
 
diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix
index 8fb1095dc58..db9afdc0a74 100644
--- a/pkgs/applications/version-management/nitpick/default.nix
+++ b/pkgs/applications/version-management/nitpick/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "nitpick";
   version = "1.1";
-  name = "${pname}-${version}";
 
   format = "other";
   disabled = !isPy27;
diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix
index 314c379c4e6..0020c8c2189 100644
--- a/pkgs/applications/version-management/p4v/default.nix
+++ b/pkgs/applications/version-management/p4v/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "p4v-${version}";
+  pname = "p4v";
   version = "2017.3.1601999";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index e799d5fac43..60486e20116 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }:
 
 stdenv.mkDerivation rec {
-  name = "rapidsvn-${version}";
+  pname = "rapidsvn";
   version = "0.12.1";
 
   src = fetchurl {
-    url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz";
+    url = "http://www.rapidsvn.org/download/release/${version}/${pname}-${version}.tar.gz";
     sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
   };
 
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 049f2756a55..a3fcd209efc 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, rcs, git, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "src-${version}";
+  pname = "src";
   version = "1.26";
 
   src = fetchurl {
-    url = "http://www.catb.org/~esr/src/${name}.tar.gz";
+    url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz";
     sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23";
   };
 
diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix
index 8753d4f6f57..693af89d978 100644
--- a/pkgs/applications/version-management/srcml/default.nix
+++ b/pkgs/applications/version-management/srcml/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.9.5_beta";
-  name = "srcml-${version}";
+  pname = "srcml";
 
   src = fetchurl {
     url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz";
diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
index c2bf0a4183c..2ad6b6f2f62 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchhg, autoconf, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "vcprompt-${version}";
+  pname = "vcprompt";
   version = "1.2.1";
 
   src = fetchhg {
diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix
index 4089e68d85d..577f2f01416 100644
--- a/pkgs/applications/version-management/vcsh/default.nix
+++ b/pkgs/applications/version-management/vcsh/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.20170915";       # date of commit we're pulling
-  name = "vcsh-${version}";
+  pname = "vcsh";
 
   src = fetchFromGitHub {
     owner = "RichiH";
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 3df61682480..2734035b6de 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -21,11 +21,11 @@ assert portaudioSupport -> (portaudio != null);
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "aegisub-${version}";
+  pname = "aegisub";
   version = "3.2.2";
 
   src = fetchurl {
-    url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz";
+    url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz";
     sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
   };
 
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 8e87a0589c5..72568ab0f5c 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -24,7 +24,7 @@ assert default != "qt5" -> default == "cli";
 assert !withQT -> default != "qt5";
 
 stdenv.mkDerivation rec {
-  name = "avidemux-${version}";
+  pname = "avidemux";
   version = "2.7.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
index a76608bdd90..3d598086329 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "avxsynth-${version}";
+  pname = "avxsynth";
   version = "2015-04-07";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix
index d98b3979660..64b9613363c 100644
--- a/pkgs/applications/video/bino3d/default.nix
+++ b/pkgs/applications/video/bino3d/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "bino-${version}";
+  pname = "bino";
   version = "1.6.7";
 
   src = fetchurl {
-    url = "https://bino3d.org/releases/${name}.tar.xz";
+    url = "https://bino3d.org/releases/${pname}-${version}.tar.xz";
     sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k";
   };
 
diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix
index 4b97db56e97..1cba1d0e949 100644
--- a/pkgs/applications/video/bombono/default.nix
+++ b/pkgs/applications/video/bombono/default.nix
@@ -8,7 +8,7 @@ fetchpatch {
   url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
 }; in
 stdenv.mkDerivation rec {
-  name = "bombono-${version}";
+  pname = "bombono";
   version = "1.2.4";
   src = fetchFromGitHub {
     owner = "muravjov";
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index bbac1014034..9ff65483f26 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -30,7 +30,7 @@ assert cddaSupport -> libcdda != null;
 assert youtubeSupport -> youtube-dl != null;
 
 stdenv.mkDerivation rec {
-  name = "bomi-${version}";
+  pname = "bomi";
   version = "0.9.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index ea8cb5aa3ff..0f1b185ed22 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.3.alpha";
-  name = "byzanz-${version}";
+  pname = "byzanz";
 
   src = fetchgit {
     url = git://github.com/GNOME/byzanz;
diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix
index 34c80e1050b..53d257dd9d0 100644
--- a/pkgs/applications/video/clickshare-csc1/default.nix
+++ b/pkgs/applications/video/clickshare-csc1/default.nix
@@ -24,7 +24,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "clickshare-csc1-${version}";
+  pname = "clickshare-csc1";
   version = "01.07.00.033";
   src = fetchurl {
     name = "clickshare-csc1-${version}.zip";
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 9b29e18d0bc..e31b2575f86 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -4,13 +4,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "clipgrab-${version}";
+  pname = "clipgrab";
   version = "3.8.3";
 
   src = fetchurl {
     sha256 = "1v8vvlqgjqy3gyzwaz9iq0m4fwlkimy5gzg6z3bqwp61p9zzw0zf";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
-    url = "https://download.clipgrab.org/${name}.tar.gz";
+    url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
   };
 
   buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
index 344c47eb934..61894bd22f8 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -28,11 +28,11 @@ let
     '';
 
 in stdenv.mkDerivation rec {
-  name = "dvd-slideshow-${version}";
+  pname = "dvd-slideshow";
   version = "0.8.4-2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dvd-slideshow/files/${name}.tar.gz";
+    url = "mirror://sourceforge/dvd-slideshow/files/${pname}-${version}.tar.gz";
     sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5";
   };
 
diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix
index 4712dfac757..54be20d5faf 100644
--- a/pkgs/applications/video/dvdbackup/default.nix
+++ b/pkgs/applications/video/dvdbackup/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.2";
-  name = "dvdbackup-${version}";
+  pname = "dvdbackup";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dvdbackup/${name}.tar.xz";
+    url = "mirror://sourceforge/dvdbackup/${pname}-${version}.tar.xz";
     sha256 = "1rl3h7waqja8blmbpmwy01q9fgr5r0c32b8dy3pbf59bp3xmd37g";
   };
 
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
index 76db1cd9e64..6d0d33cf40d 100644
--- a/pkgs/applications/video/dvdstyler/default.nix
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -13,7 +13,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "dvdstyler-${version}";
+  pname = "dvdstyler";
   srcName = "DVDStyler-${version}";
   version = "3.1";
 
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index fd8cc8d8630..3e26b4d68c2 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -2,7 +2,7 @@
 , libnotify, libpulseaudio, mplayer, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-mplayer-${version}";
+  pname = "gnome-mplayer";
   version = "1.0.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix
index 1c625de0dbc..f81f394ed0b 100644
--- a/pkgs/applications/video/gpac/default.nix
+++ b/pkgs/applications/video/gpac/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.0";
-  name = "gpac-${version}";
+  pname = "gpac";
 
   src = fetchFromGitHub {
     owner = "gpac";
diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
index 02a0f275f57..037331cad9e 100644
--- a/pkgs/applications/video/k9copy/default.nix
+++ b/pkgs/applications/video/k9copy/default.nix
@@ -7,10 +7,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.3";
-  name = "k9copy-${version}";
+  pname = "k9copy";
 
   src = fetchurl {
-    url = "mirror://sourceforge/k9copy-reloaded/${name}.tar.gz";
+    url = "mirror://sourceforge/k9copy-reloaded/${pname}-${version}.tar.gz";
     sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg";
   };
 
diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix
index bc6cd015b86..7dc350da647 100644
--- a/pkgs/applications/video/key-mon/default.nix
+++ b/pkgs/applications/video/key-mon/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gnome2, librsvg, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "key-mon-${version}";
+  pname = "key-mon";
   version = "1.17";
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${pname}-${version}.tar.gz";
     sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q";
   };
 
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index 44313f9499f..33ff1821640 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -10,7 +10,7 @@ mkDerivation rec {
   majorMinorVersion = "0.12";
   patchVersion = "0b";
   version = "${majorMinorVersion}.${patchVersion}";
-  name = "kmplayer-${version}";
+  pname = "kmplayer";
 
   src = fetchurl {
     url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2";
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index b4d4312c0fa..0dc97410f54 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -20,7 +20,7 @@ let
 
   lightworks = stdenv.mkDerivation rec {
     version = "14.0.0";
-    name = "lightworks-${version}";
+    pname = "lightworks";
 
     src =
       if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -28,7 +28,7 @@ let
           url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb";
           sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033";
         }
-      else throw "${name} is not supported on ${stdenv.hostPlatform.system}";
+      else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
 
     buildInputs = [ dpkg makeWrapper ];
 
diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix
index 717853af745..0a422bb7f50 100644
--- a/pkgs/applications/video/linuxstopmotion/default.nix
+++ b/pkgs/applications/video/linuxstopmotion/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.8";
-  name = "linuxstopmotion-${version}";
+  pname = "linuxstopmotion";
   
   src = fetchgit {
     url = "git://git.code.sf.net/p/linuxstopmotion/code";
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index 4dd2e019d1d..c302ae1730f 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -13,7 +13,7 @@ with stdenv;
 mkDerivation rec {
 
   version = "0.6.1";
-  name = "mapmap-${version}";
+  pname = "mapmap";
 
   src = fetchFromGitHub {
     owner = "mapmapteam";
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix
index cceed556f97..a5de209854b 100644
--- a/pkgs/applications/video/mediathekview/default.nix
+++ b/pkgs/applications/video/mediathekview/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "13.2.1";
-  name = "mediathekview-${version}";
+  pname = "mediathekview";
   src = fetchurl {
     url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz";
     sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a";
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 5ee437a19be..a9876da234f 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -6,7 +6,7 @@
 , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
 
 stdenv.mkDerivation rec {
-  name = "minitube-${version}";
+  pname = "minitube";
   version = "2.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
index 70dc156d680..14db747d2ce 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "mjpg-streamer-${version}";
+  pname = "mjpg-streamer";
   version = "unstable-2019-05-24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index e3dcf6b3d3b..684390d3c5c 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -2,7 +2,7 @@
 , ffmpeg, libjpeg, libmicrohttpd }:
 
 stdenv.mkDerivation rec {
-  name = "motion-${version}";
+  pname = "motion";
   version = "4.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index 81b48e25b96..efa495a45af 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }:
 
 stdenv.mkDerivation rec {
-  name = "mpc-qt-${version}";
+  pname = "mpc-qt";
   version = "18.08";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index dcfeae52aae..d225eecb1e6 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -95,7 +95,7 @@ let
   luaEnv = lua.withPackages(ps: with ps; [ luasocket ]);
 
 in stdenv.mkDerivation rec {
-  name = "mpv-${version}";
+  pname = "mpv";
   version = "0.29.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 74167a67bd2..d5c46491cf4 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mythtv-${version}";
+  pname = "mythtv";
   version = "29.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index 6299cd7e593..4617d1d17dc 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -12,7 +12,7 @@ let
   };
   seexpr = stdenv.mkDerivation rec {
     version = "1.0.1";
-    name = "seexpr-${version}";
+    pname = "seexpr";
     src = fetchurl {
       url = "https://github.com/wdas/SeExpr/archive/rel-${version}.tar.gz";
       sha256 = "1ackh0xs4ip7mk34bam8zd4qdymkdk0dgv8x0f2mf6gbyzzyh7lp";
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 983bdff106e..cdcdea3dd26 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -36,7 +36,7 @@
 let
   optional = stdenv.lib.optional;
 in mkDerivation rec {
-  name = "obs-studio-${version}";
+  pname = "obs-studio";
   version = "23.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix
index 14f40ad8901..52aa57bf198 100644
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix
@@ -9,7 +9,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "obs-linuxbrowser-${version}";
+  pname = "obs-linuxbrowser";
   version = "0.6.1";
   src = fetchFromGitHub {
     owner = "bazukas";
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 1c124df3023..bef9537b806 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -12,7 +12,7 @@ let
   # don't bother exposing the package to all of nixpkgs.
   gst-transcoder = stdenv.mkDerivation rec {
     version = "1.14.1";
-    name = "gst-transcoder-${version}";
+    pname = "gst-transcoder";
     src = fetchFromGitHub {
       owner = "pitivi";
       repo = "gst-transcoder";
diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index 4bd4d5fdaad..25623b47716 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -35,7 +35,7 @@ let
     };
   };
 in mkDerivation rec {
-  name = "plex-media-player-${version}";
+  pname = "plex-media-player";
   version = "2.36.0.988";
   vsnHash = "0150ae52";
 
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index ea4816ad6d0..327a2034265 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -5,10 +5,9 @@
 stdenv.mkDerivation rec {
   pname = "qstopmotion";
   version = "2.4.1";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${name}-Source.tar.gz";
+    url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}-Source.tar.gz";
     sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";
   };
 
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index c3204cc9c0c..8f9e3131d8a 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libquvi-${version}";
+  pname = "libquvi";
   version="0.9.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
index 603534be4c8..e54fc0eae4b 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "quvi-scripts-${version}";
+  pname = "quvi-scripts";
   version="0.9.20131130";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
index 333f4e6ab4d..972e08bb61b 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "quvi-${version}";
+  pname = "quvi";
   version="0.9.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/recordmydesktop/default.nix b/pkgs/applications/video/recordmydesktop/default.nix
index 8797ad8f953..e4d6e14d098 100644
--- a/pkgs/applications/video/recordmydesktop/default.nix
+++ b/pkgs/applications/video/recordmydesktop/default.nix
@@ -2,7 +2,7 @@
 , libICE, libSM, libX11, libXext, libXfixes, libXdamage }:
 
 stdenv.mkDerivation rec {
-  name = "recordmydesktop-${version}";
+  pname = "recordmydesktop";
   version = "0.3.8.1-svn${rev}";
   rev = "602";
 
diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix
index 984b623cee7..d59b02d4b0a 100644
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ b/pkgs/applications/video/recordmydesktop/gtk.nix
@@ -5,7 +5,7 @@ let
   binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
 
 in stdenv.mkDerivation rec {
-  name = "gtk-recordmydesktop-${version}";
+  pname = "gtk-recordmydesktop";
   version = "0.3.8-svn${recordmydesktop.rev}";
 
   src = fetchsvn {
diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix
index 56080135151..0864edfcf38 100644
--- a/pkgs/applications/video/recordmydesktop/qt.nix
+++ b/pkgs/applications/video/recordmydesktop/qt.nix
@@ -5,7 +5,7 @@ let
   binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
 
 in stdenv.mkDerivation rec {
-  name = "qt-recordmydesktop-${version}";
+  pname = "qt-recordmydesktop";
   version = "0.3.8-svn${recordmydesktop.rev}";
 
   src = fetchsvn {
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 1b80e379008..b34b832baf0 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -6,7 +6,7 @@ assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
 assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
 
 mkDerivation rec {
-  name = "shotcut-${version}";
+  pname = "shotcut";
   version = "19.07.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index b456d8ee9a6..603557b062d 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "simplescreenrecorder-${version}";
+  pname = "simplescreenrecorder";
   version = "0.3.11";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 41f82a8bdd5..50e82a4bab6 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "19.6.0";
-  name = "smtube-${version}";
+  pname = "smtube";
 
   src = fetchurl {
-    url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm";
   };
 
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 79f092a882c..a5efddc9f1a 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonApplication rec {
   version = "1.1.1";
-  name = "streamlink-${version}";
+  pname = "streamlink";
 
   src = fetchFromGitHub {
     owner = "streamlink";
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 8979e9790b4..b3d98dd41de 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -24,11 +24,11 @@ with stdenv.lib;
 assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null);
 
 stdenv.mkDerivation rec {
-  name = "vlc-${version}";
+  pname = "vlc";
   version = "3.0.7.1";
 
   src = fetchurl {
-    url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
+    url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz";
     sha256 = "1xb4c8n0hkwijzfdlbwadhxnx9z8rlhmrdq4c7q74rq9f51q0m86";
   };
 
diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix
index 2bf74da3d0f..3c4f607c6af 100644
--- a/pkgs/applications/video/w_scan/default.nix
+++ b/pkgs/applications/video/w_scan/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "w_scan-${version}";
+  pname = "w_scan";
   version = "20170107";
 
   src = fetchurl {
-    url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2";
+    url = "http://wirbel.htpc-forum.de/w_scan/${pname}-${version}.tar.bz2";
     sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q";
   };
 
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix
index 0c28b4d5737..8258f858309 100644
--- a/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -38,7 +38,7 @@
     udev
     ]);
   in stdenv.mkDerivation rec {
-    name = "webtorrent-desktop-${version}";
+    pname = "webtorrent-desktop";
     version = "0.20.0";
 
     src =
diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix
index 64fcf0ba04a..176d9a87aed 100644
--- a/pkgs/applications/video/wxcam/default.nix
+++ b/pkgs/applications/video/wxcam/default.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "wxcam-${version}";
+  pname = "wxcam";
   version = "1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${pname}-${version}.tar.gz";
     sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859";
   };
 
diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix
index ae048f1bdac..ba72763cdaf 100644
--- a/pkgs/applications/video/xscast/default.nix
+++ b/pkgs/applications/video/xscast/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "xscast-unstable-${version}";
+  pname = "xscast-unstable";
   version = "2016-07-26";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index 15d98dc9be5..6e61ef098f3 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -6,7 +6,7 @@ assert sdlSupport -> (SDL != null);
 
 stdenv.mkDerivation rec {
 
-  name = "8086tiny-${version}";
+  pname = "8086tiny";
   version = "1.25";
 
   src = fetchurl {
diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix
index e7cd5b7bde6..02fb256b38c 100644
--- a/pkgs/applications/virtualization/aqemu/default.nix
+++ b/pkgs/applications/virtualization/aqemu/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aqemu-${version}";
+  pname = "aqemu";
   version = "0.9.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index f9d7128330f..72db4f1e5aa 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -18,11 +18,11 @@ assert curlSupport -> (curl != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "bochs-${version}";
+  pname = "bochs";
   version = "2.6.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz";
     sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf";
   };
 
diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix
index 13060a50290..9cdaec1c698 100644
--- a/pkgs/applications/virtualization/cbfstool/default.nix
+++ b/pkgs/applications/virtualization/cbfstool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, iasl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "cbfstool-${version}";
+  pname = "cbfstool";
   version = "4.9";
 
   src = fetchurl {
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index d21bc8cc32b..b770c6ed0a5 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "containerd-${version}";
+  pname = "containerd";
   version = "1.2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix
index 0af9abc852e..ed4db853c38 100644
--- a/pkgs/applications/virtualization/docker/distribution.nix
+++ b/pkgs/applications/virtualization/docker/distribution.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "distribution-${version}";
+  pname = "distribution";
   version = "2.6.2";
   rev = "v${version}";
 
diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix
index 946014e5cc9..351353ceb96 100644
--- a/pkgs/applications/virtualization/driver/win-virtio/default.nix
+++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, p7zip }:
 stdenv.mkDerivation rec {
-  name = "win-virtio-${version}";
+  pname = "win-virtio";
   version = "0.1.141-1";
 
   phases = [ "buildPhase" "installPhase" ];
diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix
index cce5a674f7c..6f35257b50f 100644
--- a/pkgs/applications/virtualization/dynamips/default.nix
+++ b/pkgs/applications/virtualization/dynamips/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, libelf, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dynamips";
   version = "0.2.21";
 
diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix
index ab971fe64c9..691c74301e3 100644
--- a/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name    = "${pname}-${version}";
   pname   = "amazon-ecs-agent";
   version = "1.18.0";
 
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix
index afb2088c6a6..9420a40805d 100644
--- a/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "looking-glass-client-${version}";
+  pname = "looking-glass-client";
   version = "a12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix
index 197b3045cf2..b58a5108eba 100644
--- a/pkgs/applications/virtualization/nvidia-docker/default.nix
+++ b/pkgs/applications/virtualization/nvidia-docker/default.nix
@@ -25,7 +25,7 @@ with lib; let
   };
 
   nvidia-container-runtime-hook = buildGoPackage rec {
-    name = "nvidia-container-runtime-hook-${version}";
+    pname = "nvidia-container-runtime-hook";
     version = "1.4.0";
 
     goPackagePath = "nvidia-container-runtime-hook";
@@ -46,7 +46,7 @@ with lib; let
   });
 
 in stdenv.mkDerivation rec {
-  name = "nvidia-docker-${version}";
+  pname = "nvidia-docker";
   version = "2.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
index 46b8e3ba43c..71c02ab4de5 100644
--- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
+++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
@@ -12,7 +12,7 @@ with lib; let
   };
 
 in stdenv.mkDerivation rec {
-  name = "libnvidia-container-${version}";
+  pname = "libnvidia-container";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 200542f4de8..ee241abda7f 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -5,7 +5,7 @@
   withX ? true }:
 
 stdenv.mkDerivation rec {
-  name = "open-vm-tools-${version}";
+  pname = "open-vm-tools";
   version = "10.3.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 8d264f3062c..f4854d9b361 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "podman-${version}";
+  pname = "podman";
   version = "1.4.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index 8777f7cc2db..d8a2878e3f7 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "remotebox-${version}";
+  pname = "remotebox";
   version = "2.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 0f53ede188c..fd0bd92faa6 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -13,8 +13,8 @@ let
 
 in stdenv.mkDerivation rec {
   version = "1.30.0";
-  name = "rkt-${version}";
-  BUILDDIR="build-${name}";
+  pname = "rkt";
+  BUILDDIR="build-${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "coreos";
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 10c7d17209c..6357f9fadff 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -4,7 +4,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "runc-${version}";
+  pname = "runc";
   version = "1.0.0-rc8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix
index 5aa73528e9d..32528627a3c 100644
--- a/pkgs/applications/virtualization/seabios/default.nix
+++ b/pkgs/applications/virtualization/seabios/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "seabios-${version}";
+  pname = "seabios";
   version = "1.11.0";
 
   src = fetchurl {
-    url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz";
+    url = "http://code.coreboot.org/p/seabios/downloads/get/${pname}-${version}.tar.gz";
     sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2";
   };
 
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 8ec9ec6c8b4..beec7b92b79 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -14,7 +14,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "singularity-${version}";
+  pname = "singularity";
   version = "3.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
index 25c19cd79c7..39508412333 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.18.0";
-  name = "tini-${version}";
+  pname = "tini";
 
   src = fetchFromGitHub {
     owner = "krallin";
diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix
index a8f11330725..224f77ed32d 100644
--- a/pkgs/applications/virtualization/tinyemu/default.nix
+++ b/pkgs/applications/virtualization/tinyemu/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, openssl, curl, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "tinyemu-${version}";
+  pname = "tinyemu";
   version = "2018-09-23";
   src = fetchurl {
-    url = "https://bellard.org/tinyemu/${name}.tar.gz";
+    url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz";
     sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v";
   };
   buildInputs = [ openssl curl SDL ];
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index c1dbad94250..5a98e71c916 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation rec {
-  name = "virt-manager-qt-${version}";
+  pname = "virt-manager-qt";
   version = "0.70.91";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index 493307d0d07..382ebba3c57 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, ocamlPackages, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "virt-top-${version}";
+  pname = "virt-top";
   version = "2017-11-18-unstable";
 
   src = fetchgit {
diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix
index 8a339ac8322..7ea83b01559 100644
--- a/pkgs/applications/virtualization/virt-what/default.nix
+++ b/pkgs/applications/virtualization/virt-what/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "virt-what-${version}";
+  pname = "virt-what";
   version = "1.19";
 
   src = fetchurl {
-    url = "https://people.redhat.com/~rjones/virt-what/files/${name}.tar.gz";
+    url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz";
     sha256 = "00nhwly5q0ps8yv9cy3c2qp8lfshf3s0kdpwiy5zwk3g77z96rwk";
   };
 
diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix
index 3d6efcfc844..464fe46b499 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/pkgs/applications/virtualization/vpcs/default.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, glibc }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "vpcs";
   version = "0.8";
 
   src = fetchurl {
-    name = "${name}.tar.bz2";
-    url = "mirror://sourceforge/project/${pname}/${version}/${name}-src.tbz";
+    name = "${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz";
     sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw";
   };
 
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix
index 59d64210837..ea8a24e57a3 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }:
 stdenv.mkDerivation rec {
-  name = "x11docker-${version}";
+  pname = "x11docker";
   version = "6.0.0";
   src = fetchFromGitHub {
     owner = "mviereck";
diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix
index d3990a70bca..26b55b364f1 100644
--- a/pkgs/applications/virtualization/xhyve/default.nix
+++ b/pkgs/applications/virtualization/xhyve/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc, zlib }:
 
 stdenv.mkDerivation rec {
-  name    = "xhyve-${version}";
+  pname = "xhyve";
   version = "20190124";
 
   src = fetchurl {
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index 116180f5ec3..4b61fe3d7e6 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2";
-  name = "2bwm-${version}";
+  pname = "2bwm";
 
   src = fetchFromGitHub {
     owner  = "venam";
diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix
index 46a86da1d66..5fcbff26b15 100644
--- a/pkgs/applications/window-managers/afterstep/default.nix
+++ b/pkgs/applications/window-managers/afterstep/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "afterstep-${version}";
+  pname = "afterstep";
   version = "2.2.12";
   sourceName = "AfterStep-${version}";
 
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 5c897926432..2551ea80550 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -13,7 +13,7 @@
 assert gtk3Support -> gtk3 != null;
 
 with luaPackages; stdenv.mkDerivation rec {
-  name = "awesome-${version}";
+  pname = "awesome";
   version = "4.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix
index 582f9cb61f8..40cebb572af 100644
--- a/pkgs/applications/window-managers/bevelbar/default.nix
+++ b/pkgs/applications/window-managers/bevelbar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libX11, libXrandr, libXft }:
 
 stdenv.mkDerivation rec {
-  name = "bevelbar-${version}";
+  pname = "bevelbar";
   version = "16.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 8fd85aaeb86..3895bafb5a9 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bspwm-${version}";
+  pname = "bspwm";
   version = "0.9.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix
index f55c55110a2..cf90b1fad63 100644
--- a/pkgs/applications/window-managers/btops/default.nix
+++ b/pkgs/applications/window-managers/btops/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "btops-${version}";
+  pname = "btops";
   version = "0.1.0";
 
   goPackagePath = "github.com/cmschuetz/btops";
diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix
index 0c13691a36a..cf45dfa8640 100644
--- a/pkgs/applications/window-managers/fbpanel/default.nix
+++ b/pkgs/applications/window-managers/fbpanel/default.nix
@@ -3,10 +3,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fbpanel-${version}";
+  pname = "fbpanel";
   version = "6.1";
   src = fetchurl {
-    url = "mirror://sourceforge/fbpanel/${name}.tbz2";
+    url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2";
     sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965";
   };
   buildInputs =
diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix
index c92b70153a7..404044fa3fa 100644
--- a/pkgs/applications/window-managers/fluxbox/default.nix
+++ b/pkgs/applications/window-managers/fluxbox/default.nix
@@ -7,11 +7,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "fluxbox-${version}";
+  pname = "fluxbox";
   version = "1.3.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/fluxbox/${name}.tar.xz";
+    url = "mirror://sourceforge/fluxbox/${pname}-${version}.tar.xz";
     sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w";
   };
 
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index 20a95f36cee..27657c10a7e 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -10,10 +10,9 @@ assert gestures -> libstroke != null;
 stdenv.mkDerivation rec {
   pname = "fvwm";
   version = "2.6.8";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv";
   };
 
diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix
index 83fe3ef163a..c62edd6d71a 100644
--- a/pkgs/applications/window-managers/i3/blocks-gaps.nix
+++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix
@@ -12,7 +12,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "i3blocks-gaps-${version}";
+  pname = "i3blocks-gaps";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index bd088db8a36..2246d77173a 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "i3blocks-${version}";
+  pname = "i3blocks";
   version = "unstable-2019-02-07";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 3e9618f6e5d..a8a769887a3 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -4,11 +4,11 @@
 , xorgserver, xvfb_run }:
 
 stdenv.mkDerivation rec {
-  name = "i3-${version}";
+  pname = "i3";
   version = "4.17";
 
   src = fetchurl {
-    url = "https://i3wm.org/downloads/${name}.tar.bz2";
+    url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1z8qmkkq9dhqmqy8sjw3rnpnmnb8v7lr456bs0qzp23bgpj17gjf";
   };
 
diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
index 54f23831706..33aac1cf4b6 100644
--- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix
+++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "i3ipc-glib-${version}";
+  pname = "i3ipc-glib";
   version = "0.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index fa88a7e26be..2fb6fb44833 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.12.c";
-  name = "i3lock-color-${version}";
+  pname = "i3lock-color";
 
   src = fetchFromGitHub {
     owner = "PandorasFox";
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 9d02dbafa5d..3e976f8919f 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -2,11 +2,11 @@
   xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
 
 stdenv.mkDerivation rec {
-  name = "i3lock-${version}";
+  pname = "i3lock";
   version = "2.12";
 
   src = fetchurl {
-    url = "https://i3wm.org/i3lock/${name}.tar.bz2";
+    url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2";
     sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh";
   };
 
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 2f6199122f1..71a4ec3549a 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "icewm-${version}";
+  pname = "icewm";
   version = "1.4.2";
 
   buildInputs =
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 6a7c1436b09..3668b344be5 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -4,7 +4,7 @@
   librsvg, freetype, fontconfig }:
 
 stdenv.mkDerivation rec {
-  name = "jwm-${version}";
+  pname = "jwm";
   version = "1685";
   
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
index 3b764e7095b..7df2847669f 100644
--- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
+++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }:
 
 stdenv.mkDerivation rec {
-  name = "jwm-settings-manager-${version}";
+  pname = "jwm-settings-manager";
   version = "2018-10-19";
   
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix
index 9abbd891e31..3c537d6c931 100644
--- a/pkgs/applications/window-managers/matchbox/default.nix
+++ b/pkgs/applications/window-managers/matchbox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }:
 
 stdenv.mkDerivation rec {
-  name = "matchbox-${version}";
+  pname = "matchbox";
   version = "1.2";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix
index 722566ea2e9..026ee2e1287 100644
--- a/pkgs/applications/window-managers/neocomp/default.nix
+++ b/pkgs/applications/window-managers/neocomp/default.nix
@@ -23,7 +23,7 @@ let
   rev   = "v0.6-17-g271e784";
 in
 stdenv.mkDerivation rec {
-  name    = "neocomp-unstable-${version}";
+  pname = "neocomp-unstable";
   version = "2019-03-12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index 8c6926dd2c6..c8d526b6d28 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -3,7 +3,7 @@
 , imlib2, pango, libstartup_notification, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "openbox-${version}";
+  pname = "openbox";
   version = "3.6.1";
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "http://openbox.org/dist/openbox/${name}.tar.gz";
+    url = "http://openbox.org/dist/openbox/${pname}-${version}.tar.gz";
     sha256 = "1xvyvqxlhy08n61rjkckmrzah2si1i7nmc7s8h07riqq01vc0jlb";
   };
 
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix
index 00ff6252010..d449fc91c0d 100644
--- a/pkgs/applications/window-managers/oroborus/default.nix
+++ b/pkgs/applications/window-managers/oroborus/default.nix
@@ -7,7 +7,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "oroborus-${version}";
+  pname = "oroborus";
   version = "2.0.20";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix
index b2677218e85..38255dce722 100644
--- a/pkgs/applications/window-managers/pekwm/default.nix
+++ b/pkgs/applications/window-managers/pekwm/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "pekwm-${version}";
+  pname = "pekwm";
   version = "0.1.17";
 
   src = fetchurl {
-    url = "https://www.pekwm.org/projects/pekwm/files/${name}.tar.bz2";
+    url = "https://www.pekwm.org/projects/pekwm/files/${pname}-${version}.tar.bz2";
     sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa";
   };
 
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index 0a1a095e0ce..11a69020ee6 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ratpoison-${version}";
+  pname = "ratpoison";
   version = "1.4.9";
 
   src = fetchurl {
-    url = "mirror://savannah/ratpoison/${name}.tar.xz";
+    url = "mirror://savannah/ratpoison/${pname}-${version}.tar.xz";
     sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr";
   };
 
diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix
index d8bb58c21b6..f9bcb28e455 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/pkgs/applications/window-managers/sawfish/default.nix
@@ -10,7 +10,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
 
-  name = "sawfish-${version}";
+  pname = "sawfish";
   version = "1.12.90";
   sourceName = "sawfish_${version}";
 
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix
index 81901be0e60..7233ff2410b 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "spectrwm-${version}";
+  pname = "spectrwm";
   version = "2.7.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix
index 64fa600765b..f0f724d6cf0 100644
--- a/pkgs/applications/window-managers/stalonetray/default.nix
+++ b/pkgs/applications/window-managers/stalonetray/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "stalonetray-${version}";
+  pname = "stalonetray";
   version = "0.8.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/stalonetray/${name}.tar.bz2";
+    url = "mirror://sourceforge/stalonetray/${pname}-${version}.tar.bz2";
     sha256 = "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n";
   };
 
diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/applications/window-managers/stumpish/default.nix
index 56d2515ed7b..a6f2961ed3f 100644
--- a/pkgs/applications/window-managers/stumpish/default.nix
+++ b/pkgs/applications/window-managers/stumpish/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "stumpish";
   version = "0.0.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "stumpwm";
diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix
index 595197a3f6f..86301492c46 100644
--- a/pkgs/applications/window-managers/sway/bg.nix
+++ b/pkgs/applications/window-managers/sway/bg.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swaybg-${version}";
+  pname = "swaybg";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix
index c9daed461c5..bc917e76f97 100644
--- a/pkgs/applications/window-managers/sway/idle.nix
+++ b/pkgs/applications/window-managers/sway/idle.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swayidle-${version}";
+  pname = "swayidle";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix
index 80d6ed4e072..fe445a6b7ad 100644
--- a/pkgs/applications/window-managers/sway/lock.nix
+++ b/pkgs/applications/window-managers/sway/lock.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swaylock-${version}";
+  pname = "swaylock";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix
index 2e58928e34c..2327e4f8b80 100644
--- a/pkgs/applications/window-managers/sxhkd/default.nix
+++ b/pkgs/applications/window-managers/sxhkd/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sxhkd-${version}";
+  pname = "sxhkd";
   version = "0.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/way-cooler/wlc.nix b/pkgs/applications/window-managers/way-cooler/wlc.nix
index 3f2891ffd51..03d0b3023f7 100644
--- a/pkgs/applications/window-managers/way-cooler/wlc.nix
+++ b/pkgs/applications/window-managers/way-cooler/wlc.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "wlc-${version}";
+  pname = "wlc";
   version = "0.0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index a88281369e8..99416fcf778 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -9,11 +9,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "weston-${version}";
+  pname = "weston";
   version = "6.0.1";
 
   src = fetchurl {
-    url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
     sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz";
   };
 
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
index d83c4493acc..8ad63999289 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -3,7 +3,7 @@
 , imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }:
 
 stdenv.mkDerivation rec {
-  name = "windowmaker-${version}";
+  pname = "windowmaker";
   version = "0.95.8";
   srcName = "WindowMaker-${version}";
 
diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix
index d615b4fe010..ad611f8dabe 100644
--- a/pkgs/applications/window-managers/wmfs/default.nix
+++ b/pkgs/applications/window-managers/wmfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnumake,
   libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }:
 stdenv.mkDerivation rec {
-  name = "wmfs-${version}";
+  pname = "wmfs";
 
   version = "201902";
 
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
index 5a8b68df364..e0f2243827c 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation rec {
   rev = "2823";
   version = "hg-2012-12-09";
-  name = "wmii-${version}";
+  pname = "wmii";
 
   src = fetchurl {
     url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip;
diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix
index aca4e340e26..d9300188498 100644
--- a/pkgs/build-support/templaterpm/default.nix
+++ b/pkgs/build-support/templaterpm/default.nix
@@ -1,7 +1,7 @@
 {stdenv, makeWrapper, python, toposort, rpm}:
 
 stdenv.mkDerivation rec {
-  name = "nix-template-rpm-${version}";
+  pname = "nix-template-rpm";
   version = "0.1";
 
   buildInputs = [ makeWrapper python toposort rpm ];
diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix
index 51ebe704bea..a53ead29c1e 100644
--- a/pkgs/data/documentation/bgnet/default.nix
+++ b/pkgs/data/documentation/bgnet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, python, zip, fop }:
 
 stdenv.mkDerivation rec {
-  name = "bgnet-${version}";
+  pname = "bgnet";
   version = "3.0.21";
 
   src = fetchurl {
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index c4ce2750172..8b0696408e6 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-${version}";
+  pname = "man-pages";
   version = "5.02";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
+    url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
     sha256 = "1s4pdz2pwf0kvhdwx2s6lqn3xxzi38yz5jfyq5ymdmswc9gaiyn2";
   };
 
diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/data/documentation/mustache-spec/default.nix
index 08690b7cecf..b2a6eaa1535 100644
--- a/pkgs/data/documentation/mustache-spec/default.nix
+++ b/pkgs/data/documentation/mustache-spec/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "mustache-spec-${version}";
+  pname = "mustache-spec";
   version = "1.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix
index 25df45258a6..81fa0ea945d 100644
--- a/pkgs/data/documentation/stdman/default.nix
+++ b/pkgs/data/documentation/stdman/default.nix
@@ -1,7 +1,7 @@
 { stdenv, curl, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "stdman-${version}";
+  pname = "stdman";
   version = "2018.03.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 9bca390f96e..2566b162d65 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -3,7 +3,7 @@
 , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms  }:
 
 mkDerivation rec {
-  name = "zeal-${version}";
+  pname = "zeal";
   version = "0.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix
index 27306a0ef05..061bbb445fb 100644
--- a/pkgs/data/fonts/dina-pcf/default.nix
+++ b/pkgs/data/fonts/dina-pcf/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.92";
-  name = "dina-font-pcf-${version}";
+  pname = "dina-font-pcf";
 
   src = fetchurl {
     url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix
index 4837425d19a..81a1b5649b3 100644
--- a/pkgs/data/fonts/dosemu-fonts/default.nix
+++ b/pkgs/data/fonts/dosemu-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  name = "dosemu-fonts-${version}";
+  pname = "dosemu-fonts";
   version = "1.4.0";
 
   src = fetchurl {
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
index 3e71352f802..171ec10c8f1 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
 
 stdenv.mkDerivation rec {
-  name = "emojione-${version}";
+  pname = "emojione";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index 59ac4ec850b..1f861afcf83 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gohufont-${version}";
+  pname = "gohufont";
   version = "2.1";
 
   src = fetchurl {
-    url = "http://font.gohu.org/${name}.tar.gz";
+    url = "http://font.gohu.org/${pname}-${version}.tar.gz";
     sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm";
   };
 
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index d743d2ccbd4..707beb41231 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "google-fonts-${version}";
+  pname = "google-fonts";
   version = "2019-07-14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix
index 7eded5deab4..94c43b11285 100644
--- a/pkgs/data/fonts/inconsolata/default.nix
+++ b/pkgs/data/fonts/inconsolata/default.nix
@@ -1,7 +1,7 @@
 { stdenv, google-fonts }:
 
 stdenv.mkDerivation rec {
-  name = "inconsolata-${version}";
+  pname = "inconsolata";
 
   inherit (google-fonts) src version;
 
diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix
index 8b557008175..aec48b12086 100644
--- a/pkgs/data/fonts/inconsolata/lgc.nix
+++ b/pkgs/data/fonts/inconsolata/lgc.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, fontforge}:
 
 stdenv.mkDerivation rec {
-  name = "inconsolata-lgc-${version}";
+  pname = "inconsolata-lgc";
   version = "1.3";
 
   src = fetchFromGitHub {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
     find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \;
-    install -m444 -Dt $out/share/doc/${name} LICENSE README
+    install -m444 -Dt $out/share/doc/${pname}-${version} LICENSE README
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix
index 4910ef21f9a..d079ae59b0d 100644
--- a/pkgs/data/fonts/input-fonts/default.nix
+++ b/pkgs/data/fonts/input-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, requireFile, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "input-fonts-${version}";
+  pname = "input-fonts";
   version = "2017-08-10"; # date of the download and checksum
 
   src = requireFile {
diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix
index ec932ab978c..7a68c9deb5a 100644
--- a/pkgs/data/fonts/libre-caslon/default.nix
+++ b/pkgs/data/fonts/libre-caslon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "libre-caslon-${version}";
+  pname = "libre-caslon";
   version = "1.002";
 
   srcs = [
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype
-    mkdir -p $out/share/doc/${name}
+    mkdir -p $out/share/doc/${pname}-${version}
     cp -v "libre-caslon-text-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/
     cp -v "libre-caslon-display-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/
-    cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name}
+    cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${pname}-${version}
   '';
 
   outputHashAlgo = "sha256";
diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix
index d9e7ec66ee6..773b53c8892 100644
--- a/pkgs/data/fonts/lobster-two/default.nix
+++ b/pkgs/data/fonts/lobster-two/default.nix
@@ -50,15 +50,15 @@ let
 in
 
   stdenv.mkDerivation rec {
-    name = "lobstertwo-${version}";
+    pname = "lobstertwo";
     version = "1.006";
 
     phases = ["installPhase"];
 
     installPhase = ''
       mkdir -p $out/share/fonts/opentype
-      mkdir -p $out/share/doc/${name}
-      cp -v ${fontlog.file} $out/share/doc/${name}/${fontlog.name}
+      mkdir -p $out/share/doc/${pname}-${version}
+      cp -v ${fontlog.file} $out/share/doc/${pname}-${version}/${fontlog.name}
       cp -v ${bold.file} $out/share/fonts/opentype/${bold.name}
       cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name}
       cp -v ${italic.file} $out/share/fonts/opentype/${italic.name}
diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix
index f990575def0..a041f9ce907 100644
--- a/pkgs/data/fonts/meslo-lg/default.nix
+++ b/pkgs/data/fonts/meslo-lg/default.nix
@@ -3,17 +3,17 @@
 stdenv.mkDerivation rec {
   version = "1.2.1";
 
-  name = "meslo-lg-${version}";
+  pname = "meslo-lg";
 
   meslo-lg = fetchurl {
     url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true";
-    name="${name}";
+    name="${pname}-${version}";
     sha256="1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h";
   };
 
   meslo-lg-dz = fetchurl {
     url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20DZ%20v${version}.zip?raw=true";
-    name="${name}-dz";
+    name="${pname}-${version}-dz";
     sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875";
   };
 
diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix
index 228952aaa56..8a089ea9e79 100644
--- a/pkgs/data/fonts/migmix/default.nix
+++ b/pkgs/data/fonts/migmix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "migmix-${version}";
+  pname = "migmix";
   version = "20150712";
 
   srcs = [
diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix
index 193e98d01a4..775d1766894 100644
--- a/pkgs/data/fonts/migu/default.nix
+++ b/pkgs/data/fonts/migu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "migu-${version}";
+  pname = "migu";
   version = "20150712";
 
   srcs = [
diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix
index 2bc5a82fa94..c4cf4f14251 100644
--- a/pkgs/data/fonts/monoid/default.nix
+++ b/pkgs/data/fonts/monoid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python, fontforge }:
 
 stdenv.mkDerivation rec {
-  name = "monoid-${version}";
+  pname = "monoid";
   version = "2016-07-21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
index c08630335d4..59b0f89e45e 100644
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
-  name = "nerdfonts-${version}";
+  pname = "nerdfonts";
   src = fetchFromGitHub {
     owner = "ryanoasis";
     repo = "nerd-fonts";
diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix
index a9d45128c5b..7db2d9ef75a 100644
--- a/pkgs/data/fonts/noto-fonts/tools.nix
+++ b/pkgs/data/fonts/noto-fonts/tools.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonPackage rec {
   version = "2017-09-25";
-  name = "nototools-${version}";
+  pname = "nototools";
 
   src = fetchFromGitHub {
     owner = "googlei18n";
diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix
index 2667562b1b0..ab794992e45 100644
--- a/pkgs/data/fonts/ricty/default.nix
+++ b/pkgs/data/fonts/ricty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, google-fonts, migu, fontforge, which }:
 
 stdenv.mkDerivation rec {
-  name = "ricty-${version}";
+  pname = "ricty";
   version = "4.1.1";
 
   src = fetchurl {
diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
index 2bdb96228d9..2e83d5b12d4 100644
--- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, fontforge, pythonFull }:
 
 stdenv.mkDerivation rec {
-  name = "rictydiminished-with-firacode-${version}";
+  pname = "rictydiminished-with-firacode";
   version = "0.0.1";
   src = fetchgit {
     url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix
index 175acb22d7b..d55e3b753dd 100644
--- a/pkgs/data/fonts/roboto-mono/default.nix
+++ b/pkgs/data/fonts/roboto-mono/default.nix
@@ -5,7 +5,7 @@ let
   commit = "883939708704a19a295e0652036369d22469e8dc";
 in
 stdenv.mkDerivation rec {
-  name = "roboto-mono-${version}";
+  pname = "roboto-mono";
   version = "2016-01-11";
 
   srcs = [
diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix
index c5ce13ad7ae..548414152dd 100644
--- a/pkgs/data/fonts/roboto-slab/default.nix
+++ b/pkgs/data/fonts/roboto-slab/default.nix
@@ -5,7 +5,7 @@ let
   commit = "883939708704a19a295e0652036369d22469e8dc";
 in
 stdenv.mkDerivation rec {
-  name = "roboto-slab-${version}";
+  pname = "roboto-slab";
   version = "2016-01-11";
 
   srcs = [
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 57356398004..358ab959cd0 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -2,11 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "terminus-font";
-  version = "4.48";
-  name = "${pname}-${version}"; # set here for use in URL below
+  version = "4.48"; # set here for use in URL below
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l";
   };
 
diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix
index 494f48fd36e..78700992831 100644
--- a/pkgs/data/fonts/tlwg/default.nix
+++ b/pkgs/data/fonts/tlwg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, fontforge }:
 
 stdenv.mkDerivation rec {
-  name = "tlwg-${version}";
+  pname = "tlwg";
   version = "0.6.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index 996d1192397..f1545e3d5b4 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  name = "ucs-fonts-${version}";
+  pname = "ucs-fonts";
   version = "20090406";
 
   srcs = [
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index b3c6d585b8b..a80beee342b 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, mkfontscale, mkfontdir }:
 
 stdenv.mkDerivation rec {
-  name = "unifont-${version}";
+  pname = "unifont";
   version = "12.1.03";
 
   ttf = fetchurl {
-    url = "mirror://gnu/unifont/${name}/${name}.ttf";
+    url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
     sha256 = "10igjlf05d97h3vcggr2ahxmq9ljby4ypja2g4s9bvxs2w1si51p";
   };
 
   pcf = fetchurl {
-    url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
+    url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
     sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf";
   };
 
diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix
index 6d169e940cf..cd4d0dc42cd 100644
--- a/pkgs/data/fonts/unscii/default.nix
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -1,11 +1,10 @@
 {stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "unscii";
   version = "1.1";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
-    url = "http://pelulamu.net/${pname}/${name}-src.tar.gz";
+    url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz";
     sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
   };
   nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix
index 553c1dbde22..24e9f2a3935 100644
--- a/pkgs/data/fonts/xits-math/default.nix
+++ b/pkgs/data/fonts/xits-math/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages, fontforge }:
 
 stdenv.mkDerivation rec {
-  name = "xits-math-${version}";
+  pname = "xits-math";
   version = "1.200";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix
index ce7bb11522b..2e99c3d9232 100644
--- a/pkgs/data/icons/bibata-cursors/default.nix
+++ b/pkgs/data/icons/bibata-cursors/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, gnome-themes-extra, inkscape, stdenv, xcursorgen }:
 
 stdenv.mkDerivation rec {
-  name = "bibata-cursors-${version}";
+  pname = "bibata-cursors";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index 4b42f0b6ee9..f276b573019 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "elementary-xfce-icon-theme-${version}";
+  pname = "elementary-xfce-icon-theme";
   version = "0.13.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix
index a4ffefe1f26..99488a26f2b 100644
--- a/pkgs/data/icons/faba-mono-icons/default.nix
+++ b/pkgs/data/icons/faba-mono-icons/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "faba-mono-icons";
   version = "2016-04-30";
 
diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
index ee45a186f29..f7015621853 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "iconpack-obsidian-${version}";
+  pname = "iconpack-obsidian";
   version = "4.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix
index 7b4ed7a6680..49d289cac39 100644
--- a/pkgs/data/icons/maia-icon-theme/default.nix
+++ b/pkgs/data/icons/maia-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "maia-icon-theme-${version}";
+  pname = "maia-icon-theme";
   version = "2018-02-24";
 
   src = fetchFromGitLab {
diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix
index 17892679a7e..83c4b19472a 100644
--- a/pkgs/data/icons/moka-icon-theme/default.nix
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "moka-icon-theme";
   version = "5.4.0";
 
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 1a2eb6504d9..e41373f536f 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "numix-icon-theme";
   version = "18.07.17";
 
diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
index de808e44ea6..5359b2229f3 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "paper-icon-theme";
   version = "2018-06-24";
 
diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix
index b6def37def6..c4a8fd44a61 100644
--- a/pkgs/data/icons/vanilla-dmz/default.nix
+++ b/pkgs/data/icons/vanilla-dmz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchzip, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "vanilla-dmz-${version}";
+  pname = "vanilla-dmz";
   version = "0.4.4";
   src = fetchzip {
     url = "http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.gz";
diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/data/misc/combinatorial_designs/default.nix
index 18331b5ada9..5df7343f3be 100644
--- a/pkgs/data/misc/combinatorial_designs/default.nix
+++ b/pkgs/data/misc/combinatorial_designs/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "combinatorial_designs-${version}";
+  pname = "combinatorial_designs";
   version = "20140630";
 
   src = fetchurl {
diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix
index fec422b33ac..48b538fe183 100644
--- a/pkgs/data/misc/conway_polynomials/default.nix
+++ b/pkgs/data/misc/conway_polynomials/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "conway_polynomials-${version}";
+  pname = "conway_polynomials";
   version = "0.5";
 
   pythonEnv = python.withPackages (ps: with ps; [ six ]);
diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix
index 528486328c6..49b8736b084 100644
--- a/pkgs/data/misc/elliptic_curves/default.nix
+++ b/pkgs/data/misc/elliptic_curves/default.nix
@@ -6,7 +6,6 @@
 stdenv.mkDerivation rec {
   pname = "elliptic_curves";
   version = "0.8";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 309ae47a851..38662bef0af 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -7,7 +7,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "geolite-legacy-${version}";
+  pname = "geolite-legacy";
   version = "2017-12-02";
 
   srcGeoIP = fetchDB
diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix
index aea5feef46c..14551c6a4a4 100644
--- a/pkgs/data/misc/graphs/default.nix
+++ b/pkgs/data/misc/graphs/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   pname = "graphs";
   version = "20161026";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix
index 343071fcf59..cb446e9b0bc 100644
--- a/pkgs/data/misc/libkkc-data/default.nix
+++ b/pkgs/data/misc/libkkc-data/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "libkkc-data";
   version = "0.2.7";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${libkkc.version}/${name}.tar.xz";
+    url = "${meta.homepage}/releases/download/v${libkkc.version}/${pname}-${version}.tar.xz";
     sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy";
   };
 
diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix
index 222fd2f8870..1b6b60f104e 100644
--- a/pkgs/data/misc/pari-galdata/default.nix
+++ b/pkgs/data/misc/pari-galdata/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "20080411";
-  name = "pari-galdata-${version}";
+  pname = "pari-galdata";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz";
diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix
index 967122c1bd4..2d3d52f697e 100644
--- a/pkgs/data/misc/pari-seadata-small/default.nix
+++ b/pkgs/data/misc/pari-seadata-small/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "20090618";
-  name = "pari-seadata-small-${version}";
+  pname = "pari-seadata-small";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata-small.tgz";
diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/data/misc/polytopes_db/default.nix
index 85f2cff09db..8fec9a85426 100644
--- a/pkgs/data/misc/polytopes_db/default.nix
+++ b/pkgs/data/misc/polytopes_db/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   pname = "polytopes_db";
   version = "20170220";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix
index c90b8aa7e37..f15a7534e26 100644
--- a/pkgs/data/misc/scowl/default.nix
+++ b/pkgs/data/misc/scowl/default.nix
@@ -3,7 +3,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "scowl";
   version = "2018.04.16";
 
diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix
index 043d3d65b84..355a2c2c577 100644
--- a/pkgs/data/misc/sound-theme-freedesktop/default.nix
+++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "sound-theme-freedesktop-${version}";
+  pname = "sound-theme-freedesktop";
   version = "0.8";
 
   src = fetchurl {
     sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb";
-    url = "https://people.freedesktop.org/~mccann/dist/${name}.tar.bz2";
+    url = "https://people.freedesktop.org/~mccann/dist/${pname}-${version}.tar.bz2";
   };
 
   nativeBuildInputs = [ intltool ];
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 0d19d8c9dca..c1f9153c585 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildPackages }:
 
 stdenv.mkDerivation rec {
-  name = "tzdata-${version}";
+  pname = "tzdata";
   version = "2019a";
 
   srcs =
diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix
index e1136299260..12acc424b9d 100644
--- a/pkgs/data/misc/xorg-rgb/default.nix
+++ b/pkgs/data/misc/xorg-rgb/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, pkgconfig, xorgproto}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "rgb";
   version = "1.0.6";
 
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 762ab3eac3e..09ca8897a21 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "matcha-${version}";
+  pname = "matcha";
   version = "2019-06-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix
index c4265875390..d1cfb800001 100644
--- a/pkgs/data/themes/nordic-polar/default.nix
+++ b/pkgs/data/themes/nordic-polar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "nordic-polar-${version}";
+  pname = "nordic-polar";
   version = "1.5.0";
 
   srcs = [
diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix
index 1f0e110488b..5172b2992cc 100644
--- a/pkgs/data/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "nordic-${version}";
+  pname = "nordic";
   version = "1.6.5";
 
   srcs = [
diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix
index ee0c81d7d39..3a0695f3fb8 100644
--- a/pkgs/desktops/deepin/dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dbus-factory/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dbus-factory";
   version = "3.1.17";
 
@@ -24,7 +23,7 @@ stdenv.mkDerivation rec {
     sed -i -e 's:/share/gocode:/share/go:' Makefile
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Generates static DBus bindings for Golang and QML at build-time";
diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
index 608096951b6..b052a104240 100644
--- a/pkgs/desktops/deepin/dde-api/default.nix
+++ b/pkgs/desktops/deepin/dde-api/default.nix
@@ -23,7 +23,6 @@
 }:
 
 buildGoPackage rec {
-  name = "${pname}-${version}";
   pname = "dde-api";
   version = "3.18.4.1";
 
@@ -114,7 +113,7 @@ buildGoPackage rec {
     searchHardCodedPaths $out  # debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Go-lang bindings for dde-daemon";
diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix
index 0d25d9083eb..427cb1249c9 100644
--- a/pkgs/desktops/deepin/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/dde-calendar/default.nix
@@ -3,7 +3,6 @@
 }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-calendar";
   version = "1.2.10";
 
@@ -38,7 +37,7 @@ mkDerivation rec {
       -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Calendar for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix
index 88c3639ff2e..0871e004e5f 100644
--- a/pkgs/desktops/deepin/dde-control-center/default.nix
+++ b/pkgs/desktops/deepin/dde-control-center/default.nix
@@ -7,7 +7,6 @@
 }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-control-center";
   version = "4.10.11";
 
@@ -100,7 +99,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Control panel of Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index 4fb0272a3ce..19089a6b050 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -7,7 +7,6 @@
   deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }:
 
 buildGoPackage rec {
-  name = "${pname}-${version}";
   pname = "dde-daemon";
   version = "3.27.2.6";
 
@@ -122,7 +121,7 @@ buildGoPackage rec {
     searchHardCodedPaths $out  # debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Daemon for handling Deepin Desktop Environment session settings";
diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix
index 21c8221bd13..fc25d007f20 100644
--- a/pkgs/desktops/deepin/dde-dock/default.nix
+++ b/pkgs/desktops/deepin/dde-dock/default.nix
@@ -6,7 +6,6 @@
 
 let
 unwrapped = mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-dock";
   version = "4.10.3";
 
@@ -69,7 +68,7 @@ unwrapped = mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Dock for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix
index 3580eeb4304..081c93a65c8 100644
--- a/pkgs/desktops/deepin/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/dde-file-manager/default.nix
@@ -9,7 +9,6 @@
   xdg-user-dirs, xorg, zlib, wrapGAppsHook }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-file-manager";
   version = "4.8.6.4";
 
@@ -239,7 +238,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "File manager and desktop module for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix
index f8a05b86980..b36d87604e7 100644
--- a/pkgs/desktops/deepin/dde-launcher/default.nix
+++ b/pkgs/desktops/deepin/dde-launcher/default.nix
@@ -4,7 +4,6 @@
   which, xdg_utils, wrapGAppsHook }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-launcher";
   version = "4.6.13";
 
@@ -64,7 +63,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin Desktop Environment launcher module";
diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix
index 4fd08749ee4..5397439949b 100644
--- a/pkgs/desktops/deepin/dde-network-utils/default.nix
+++ b/pkgs/desktops/deepin/dde-network-utils/default.nix
@@ -2,7 +2,6 @@
   dde-qt-dbus-factory, proxychains, which, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-network-utils";
   version = "0.1.4";
 
@@ -42,7 +41,7 @@ mkDerivation rec {
     searchHardCodedPaths $out  # for debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin network utils";
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
index d1f1bed2775..9d181c188d4 100644
--- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
@@ -2,7 +2,6 @@
   dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-polkit-agent";
   version = "0.2.10";
 
@@ -39,7 +38,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "PolicyKit agent for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
index 0d063cbd848..a0e1e35ad85 100644
--- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, qmake, python3, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-qt-dbus-factory";
   version = "1.1.5";
 
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Qt DBus interface library for Deepin software";
diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix
index 8302e8e97bc..d6713fb3688 100644
--- a/pkgs/desktops/deepin/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/dde-session-ui/default.nix
@@ -6,7 +6,6 @@
   xkeyboard_config, xorg, xrandr, wrapGAppsHook }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-session-ui";
   version = "4.9.12";
 
@@ -115,7 +114,7 @@ mkDerivation rec {
     searchHardCodedPaths $out  # debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin desktop-environment - Session UI module";
diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix
index c768fa60ce7..619c66d9f5f 100644
--- a/pkgs/desktops/deepin/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/deepin-anything/default.nix
@@ -2,7 +2,6 @@
   dtkcore, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-anything";
   version = "0.1.0";
 
@@ -52,7 +51,7 @@ mkDerivation rec {
     searchHardCodedPaths $modsrc  # for debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin file search tool";
diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix
index 51f0b666cb1..97d2b53da70 100644
--- a/pkgs/desktops/deepin/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/deepin-calculator/default.nix
@@ -2,7 +2,6 @@
   dtkwidget, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-calculator";
   version = "1.0.11";
 
@@ -37,7 +36,7 @@ mkDerivation rec {
     searchHardCodedPaths $out  # debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Easy to use calculator for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
index f43909f37dc..ba826eb9063 100644
--- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, deepin-wallpapers, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-desktop-base";
   version = "2019.06.19";
 
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
     ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Base assets and definitions for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
index 5849bc78ac0..b6c20ef7129 100644
--- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
@@ -2,7 +2,6 @@
   deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-desktop-schemas";
   version = "3.13.6";
 
@@ -57,7 +56,7 @@ stdenv.mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "GSettings deepin desktop-wide schemas";
diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
index d9a6f370168..f4f4ae2971a 100644
--- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
+++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-gettext-tools";
   version = "1.0.8";
 
@@ -36,7 +35,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin Internationalization utilities";
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index 469a43efe32..4c0643a7ce5 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-gtk-theme";
   version = "17.10.11";
 
@@ -16,7 +15,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder ''out''}" ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin GTK Theme";
diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
index c5cf9e9ad3a..8ecb25f5a2e 100644
--- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-icon-theme";
   version = "15.12.71";
 
@@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
     cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Icons for the Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
index 89ef6247504..733f4846f5c 100644
--- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
@@ -4,7 +4,6 @@
 }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-image-viewer";
   version = "1.3.17";
 
@@ -42,7 +41,7 @@ mkDerivation rec {
       -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Image Viewer for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix
index 4292fb2d212..9aef8a15eb9 100644
--- a/pkgs/desktops/deepin/deepin-menu/default.nix
+++ b/pkgs/desktops/deepin/deepin-menu/default.nix
@@ -2,7 +2,6 @@
   qt5integration, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-menu";
   version = "3.4.8";
 
@@ -35,7 +34,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin menu service";
diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix
index a4aede5857c..18f54223301 100644
--- a/pkgs/desktops/deepin/deepin-metacity/default.nix
+++ b/pkgs/desktops/deepin/deepin-metacity/default.nix
@@ -4,7 +4,6 @@
   deepin, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-metacity";
   version = "3.22.24";
 
@@ -54,7 +53,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "2D window manager for Deepin";
diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
index 6e14f0fd804..046f589263b 100644
--- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
+++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
@@ -3,7 +3,6 @@
   libdvdnav, libdvdread, xorg, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-movie-reborn";
   version = "3.2.24";
 
@@ -45,7 +44,7 @@ mkDerivation rec {
     sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,'
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin movie player";
diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix
index 83afe1ee24f..9f2e8068d55 100644
--- a/pkgs/desktops/deepin/deepin-mutter/default.nix
+++ b/pkgs/desktops/deepin/deepin-mutter/default.nix
@@ -5,7 +5,6 @@
   deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-mutter";
   version = "3.20.38";
 
@@ -68,7 +67,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Base window manager for deepin, fork of gnome mutter";
diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix
index 256744828db..e77aa5e68c6 100644
--- a/pkgs/desktops/deepin/deepin-screenshot/default.nix
+++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix
@@ -3,7 +3,6 @@
   deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-screenshot";
   version = "4.2.1";
 
@@ -49,7 +48,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Easy-to-use screenshot tool for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
index 8c482d53405..62c6c7ed925 100644
--- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
@@ -2,7 +2,6 @@
   qt5integration, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-shortcut-viewer";
   version = "1.3.5";
 
@@ -26,7 +25,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Pop-up shortcut viewer for Deepin applications";
diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
index bb752cc1ca9..398be55398b 100644
--- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-sound-theme";
   version = "15.10.3";
 
@@ -14,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder ''out''}" ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin sound theme";
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 51156554f99..59789bd84bb 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -5,7 +5,6 @@
   libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-terminal";
   version = "3.2.6";
 
@@ -60,7 +59,7 @@ stdenv.mkDerivation rec {
     "-DVERSION=${version}"
   ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Default terminal emulator for Deepin";
diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix
index 1fe930ea490..299db533674 100644
--- a/pkgs/desktops/deepin/deepin-turbo/default.nix
+++ b/pkgs/desktops/deepin/deepin-turbo/default.nix
@@ -1,7 +1,6 @@
 { stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-turbo";
   version = "0.0.3";
 
@@ -32,7 +31,7 @@ mkDerivation rec {
     searchHardCodedPaths $out  # for debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "A daemon that helps to launch applications faster";
diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
index f99974ba9c2..e822cf6269d 100644
--- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix
+++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, dde-api, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-wallpapers";
   version = "1.7.7";
 
@@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
       $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Wallpapers for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix
index 986bee2f0dd..13b115e7042 100644
--- a/pkgs/desktops/deepin/deepin-wm/default.nix
+++ b/pkgs/desktops/deepin/deepin-wm/default.nix
@@ -4,7 +4,6 @@
   deepin-desktop-schemas, wrapGAppsHook, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-wm";
   version = "1.9.38";
 
@@ -64,7 +63,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin Window Manager";
diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
index 4baa2262cd6..f645be0f4d9 100644
--- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
+++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
@@ -2,7 +2,6 @@
   dde-polkit-agent, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dpa-ext-gnomekeyring";
   version = "0.1.0";
 
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
     fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "GNOME keyring extension for dde-polkit-agent";
diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix
index 2a527e3cc19..2ed10f99368 100644
--- a/pkgs/desktops/deepin/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/dtkcore/default.nix
@@ -1,7 +1,6 @@
 { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dtkcore";
   version = "2.0.14";
 
@@ -43,7 +42,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin tool kit core modules";
diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix
index 8487509e73b..54c4163fcd1 100644
--- a/pkgs/desktops/deepin/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/dtkwidget/default.nix
@@ -3,7 +3,6 @@
   dde-qt-dbus-factory, dtkcore, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dtkwidget";
   version = "2.0.14";
 
@@ -41,7 +40,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin graphical user interface library";
diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix
index c05eedd8857..4807c3d312b 100644
--- a/pkgs/desktops/deepin/dtkwm/default.nix
+++ b/pkgs/desktops/deepin/dtkwm/default.nix
@@ -2,7 +2,6 @@
   deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dtkwm";
   version = "2.0.11";
 
@@ -31,7 +30,7 @@ mkDerivation rec {
     "LIB_INSTALL_DIR=${outRef}/lib"
   ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin graphical user interface library";
diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix
index 044d5e2a2ea..1d97991dffd 100644
--- a/pkgs/desktops/deepin/go-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "go-dbus-factory";
   version = "0.9.0";
 
@@ -18,7 +17,7 @@ stdenv.mkDerivation rec {
     sed -i -e 's:/share/gocode:/share/go:' Makefile
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "GoLang DBus factory for the Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix
index 92cf3960c73..2c63fd5ebe6 100644
--- a/pkgs/desktops/deepin/go-dbus-generator/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, go, go-lib, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "go-dbus-generator";
   version = "0.6.6";
 
@@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
     "GOCACHE=$(TMPDIR)/go-cache"
   ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Convert dbus interfaces to go-lang or qml wrapper code";
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
index 4b79969970a..68504d756b1 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -2,7 +2,6 @@
   libgudev, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "go-gir-generator";
   version = "2.0.2";
 
@@ -32,7 +31,7 @@ stdenv.mkDerivation rec {
     "GOCACHE=$(TMPDIR)/go-cache"
   ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Generate static golang bindings for GObject";
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
index 6f3a851eb2f..fff92b595f8 100644
--- a/pkgs/desktops/deepin/go-lib/default.nix
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -2,7 +2,6 @@
   mobile-broadband-provider-info, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "go-lib";
   version = "1.10.2";
 
@@ -28,7 +27,7 @@ stdenv.mkDerivation rec {
     rm -r $out/share/go/src/pkg.deepin.io/lib/debian
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Go bindings for Deepin Desktop Environment development";
diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix
index b275174fa9f..ffbc230d2e2 100644
--- a/pkgs/desktops/deepin/qcef/default.nix
+++ b/pkgs/desktops/deepin/qcef/default.nix
@@ -39,7 +39,6 @@ let
 in
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "qcef";
   version = "1.1.6";
 
@@ -91,7 +90,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Qt5 binding of Chromium Embedded Framework";
diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
index f2e6eb0d123..d76bed1b9b7 100644
--- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
+++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
@@ -2,7 +2,6 @@
   mtdev, cairo, deepin, qtbase }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "qt5dxcb-plugin";
   version = "1.2.2";
 
@@ -31,7 +30,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Qt platform theme integration plugin for DDE";
diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix
index 8302e701b38..97e60be6d67 100644
--- a/pkgs/desktops/deepin/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/qt5integration/default.nix
@@ -3,7 +3,6 @@
   qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "qt5integration";
   version = "0.3.12";
 
@@ -41,7 +40,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Qt platform theme integration plugins for DDE";
diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix
index e7f735a4256..51c38f6d347 100644
--- a/pkgs/desktops/deepin/udisks2-qt5/default.nix
+++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix
@@ -1,7 +1,6 @@
 { stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "udisks2-qt5";
   version = "0.0.1";
 
@@ -29,7 +28,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "UDisks2 D-Bus interfaces binding for Qt5";
diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix
index 8e73682065d..93b0cb59650 100644
--- a/pkgs/desktops/enlightenment/econnman.nix
+++ b/pkgs/desktops/enlightenment/econnman.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "econnman-${version}";
+  pname = "econnman";
   version = "1.1";
 
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz";
+    url = "http://download.enlightenment.org/rel/apps/econnman/${pname}-${version}.tar.gz";
     sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
   };
 
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index a7f5eaf6339..f1b55607e3a 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -7,11 +7,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "efl-${version}";
+  pname = "efl";
   version = "1.22.2";
 
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
+    url = "http://download.enlightenment.org/rel/libs/efl/${pname}-${version}.tar.xz";
     sha256 = "1l0wdgzxqm2y919277b1p9d37xzg808zwxxaw0nn44arh8gqk68n";
   };
 
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 07aac3d611b..a15655ce2c9 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "enlightenment-${version}";
+  pname = "enlightenment";
   version = "0.22.4";
 
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
+    url = "http://download.enlightenment.org/rel/apps/enlightenment/${pname}-${version}.tar.xz";
     sha256 = "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r";
   };
 
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
index 409b3f7bb8d..f1455f68338 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "ephoto-${version}";
+  pname = "ephoto";
   version = "1.5";
 
   src = fetchurl {
-    url = "http://www.smhouston.us/stuff/${name}.tar.gz";
+    url = "http://www.smhouston.us/stuff/${pname}-${version}.tar.gz";
     sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb";
   };
 
diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix
index a1de3f95131..8362655f90e 100644
--- a/pkgs/desktops/enlightenment/rage.nix
+++ b/pkgs/desktops/enlightenment/rage.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "rage-${version}";
+  pname = "rage";
   version = "0.3.0";
 
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.xz";
+    url = "http://download.enlightenment.org/rel/apps/rage/${pname}-${version}.tar.xz";
     sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy";
   };
 
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
index 31dd985af2a..7d8365337aa 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation rec {
   ver_maj = "2.32";
   ver_min = "0";
   version = "${ver_maj}.${ver_min}";
-  name = "gnome-python-desktop-${version}";
+  pname = "gnome-python-desktop";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   # gnome-python-desktop expects that .pth file is already installed by PyGTK
   # in the same directory. This is not the case for Nix.
   postInstall = ''
-    echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth
+    echo "gtk-2.0" > $out/${python2.sitePackages}/${pname}-${version}.pth
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 03440c02c14..87d2931d274 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "gtksourceview-${version}";
+  pname = "gtksourceview";
   version = "2.10.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/2.10/${name}.tar.bz2";
+    url = "mirror://gnome/sources/gtksourceview/2.10/${pname}-${version}.tar.bz2";
     sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e";
   };
 
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index ac9a87299ab..10b99e4eb5d 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   rev = "9ae8768";
   version = "5.4";
-  name = "mail-notification-${version}";
+  pname = "mail-notification";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index df3de11e738..1a1848491b1 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python2, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "gconf-${version}";
+  pname = "gconf";
   version = "3.2.6";
 
   src = fetchurl {
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
index 3ea04048acc..33c2abef0fa 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "4.10.0";
-  name = "gtkhtml-${version}";
+  pname = "gtkhtml";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtkhtml/4.10/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtkhtml/4.10/${pname}-${version}.tar.xz";
     sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index f21e81237b2..b18e58f6f56 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -5,11 +5,11 @@
 , adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "cheese-${version}";
+  pname = "cheese";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 733b8ecca92..267a7f2f7d2 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -2,11 +2,11 @@
 , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
 
 stdenv.mkDerivation rec {
-  name = "file-roller-${version}";
+  pname = "file-roller";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 2dcd265e2e4..35d97a87a86 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -5,11 +5,11 @@
 , gnome3, gspell, perl, itstool, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
-  name = "gedit-${version}";
+  pname = "gedit";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index 4424eb4a3fd..92b38ed5eee 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -4,11 +4,11 @@
 , gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "glade-${version}";
+  pname = "glade";
   version = "3.22.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index c95d135e9e7..fe8977646f6 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -2,11 +2,11 @@
 , gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-characters-${version}";
+  pname = "gnome-characters";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1mpg125x9k879ryg8xgbm9w1amx6b3iq9sqv7xfii7kzaanjb4js";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index d2845bef2a1..38182f1f994 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -5,11 +5,11 @@
 , gnome3, gdk-pixbuf, geoclue2, libgweather }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-clocks-${version}";
+  pname = "gnome-clocks";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index e8796d49e9a..1301381e5aa 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -7,11 +7,11 @@
 , desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-documents-${version}";
+  pname = "gnome-documents";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index 4c215d34729..655e9e9fe34 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-getting-started-docs-${version}";
+  pname = "gnome-getting-started-docs";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index d46882deb41..8681a3c866c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -2,11 +2,11 @@
 , gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-logs-${version}";
+  pname = "gnome-logs";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index d21cfcfd72d..1e5a641f08f 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -2,11 +2,11 @@
 , libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-weather-${version}";
+  pname = "gnome-weather";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0jfxdfbjkrk3x48w6nxgbmazd6jw1fh4mfw12hlly4rs0cjw698s";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index ae360d73b87..c5377157ef0 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -2,11 +2,11 @@
 , libsecret, itstool, wrapGAppsHook, librsvg }:
 
 stdenv.mkDerivation rec {
-  name = "vinagre-${version}";
+  pname = "vinagre";
   version = "3.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 9ef94adcbd0..a7f4a637b17 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -2,11 +2,11 @@
 , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "adwaita-icon-theme-${version}";
+  pname = "adwaita-icon-theme";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 73c3f65a968..5e4bbf8cce1 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -10,11 +10,11 @@
 , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }:
 
 stdenv.mkDerivation rec {
-  name = "empathy-${version}";
+  pname = "empathy";
   version = "3.25.90";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 7b7b7f64aa4..85f31bfdce5 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -5,11 +5,11 @@
 , gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:
 
 stdenv.mkDerivation rec {
-  name = "epiphany-${version}";
+  pname = "epiphany";
   version = "3.32.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 078145e1231..dda45a71fe2 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -5,13 +5,13 @@
 , glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "evolution-data-server-${version}";
+  pname = "evolution-data-server";
   version = "3.32.4";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   prePatch = ''
-    substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas \
+    substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas \
       --subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas"
     patches="$patches $PWD/hardcode-gsettings.patch"
   '';
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 420a0d3e6b1..a4d2fd2be5a 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -4,11 +4,11 @@
 , librsvg, coreutils, xwayland }:
 
 stdenv.mkDerivation rec {
-  name = "gdm-${version}";
+  pname = "gdm";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 4e43d5f9d50..303377b8631 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -3,11 +3,11 @@
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "gjs-${version}";
+  pname = "gjs";
   version = "1.56.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index 1e332502db5..e4c772cb1d4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-backgrounds-${version}";
+  pname = "gnome-backgrounds";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 9214aa0a9a7..df43371a497 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -3,11 +3,11 @@
 , gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-calculator-${version}";
+  pname = "gnome-calculator";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
index d0ab339a504..f2eb65e50bb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, which, gnome3, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-common-${version}";
+  pname = "gnome-common";
   version = "3.18.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 4beeb190f02..9d798c2811b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -3,13 +3,13 @@
 , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-desktop-${version}";
+  pname = "gnome-desktop";
   version = "3.32.2";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index 613de6c3c16..98398311882 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
@@ -3,11 +3,11 @@
 , gnome3, gtk3, glib, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-dictionary-${version}";
+  pname = "gnome-dictionary";
   version = "3.26.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 8e09b152e83..d6d9f927252 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -4,11 +4,11 @@
 , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-disk-utility-${version}";
+  pname = "gnome-disk-utility";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 317c7e91584..976829acd4c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -3,11 +3,11 @@
 , wrapGAppsHook, gnome3, harfbuzz }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-font-viewer-${version}";
+  pname = "gnome-font-viewer";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index f36d3f4a6e0..4148843d4ab 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -3,11 +3,11 @@
 , docbook_xsl, docbook_xml_dtd_43, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-keyring-${version}";
+  pname = "gnome-keyring";
   version = "3.31.91";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index ed4c1a3da13..93da1f8abec 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -3,11 +3,11 @@
 , tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-online-miners-${version}";
+  pname = "gnome-online-miners";
   version = "3.30.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 38adf7137f7..f13ad9f47aa 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -3,11 +3,11 @@
 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-session-${version}";
+  pname = "gnome-session";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index 21281f15a5c..76121660012 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -2,11 +2,11 @@
 , gnome3, gnome-menus, substituteAll }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extensions-${version}";
+  pname = "gnome-shell-extensions";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "07libf6z24n42hpdsq163w0j8xyrav0lxqrwxrvq5kbz8zxv5ch2";
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     # Fixup adapted from export-zips.sh in the source.
 
     extensiondir=$out/share/gnome-shell/extensions
-    schemadir=$out/share/gsettings-schemas/${name}/glib-2.0/schemas/
+    schemadir=$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/
 
     glib-compile-schemas $schemadir
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 1363cf6d669..a1d8f2c599a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -13,11 +13,11 @@ let
   pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] );
 
 in stdenv.mkDerivation rec {
-  name = "gnome-shell-${version}";
+  pname = "gnome-shell";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 6d487597900..12081bbae5b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -10,11 +10,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gnome-software-${version}";
+  pname = "gnome-software";
   version = "3.32.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 5c332c4135c..a9f8367a548 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -3,11 +3,11 @@
 , gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-system-monitor-${version}";
+  pname = "gnome-system-monitor";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1wd43qdgjav6xamq5z5cy8fri5zr01jga3plc9w95gcia0rk3ha8";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index c9f5229f870..75d4b117e77 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -3,11 +3,11 @@
 , desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-terminal-${version}";
+  pname = "gnome-terminal";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 1a8582626e3..7915e71a73c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnome3, itstool, libxml2, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-user-docs-${version}";
+  pname = "gnome-user-docs";
   version = "3.32.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
index cfdda920e27..56104aff484 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, gnome3 }:
 stdenv.mkDerivation rec {
-  name = "unicode-data-${version}";
+  pname = "unicode-data";
   version = "12.0.0";
   srcs = [
     (fetchurl {
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 4f57c5247d9..de56b14d46f 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -3,11 +3,11 @@
 , libxml2, sane-backends, vala, gnome3, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "simple-scan-${version}";
+  pname = "simple-scan";
   version = "3.32.2.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 5554dbdfe30..86675f21f06 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -4,11 +4,11 @@
 , gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "sushi-${version}";
+  pname = "sushi";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 4953b7ec7a8..a5388f2eae1 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -6,11 +6,11 @@
 , gdk-pixbuf, tracker, nautilus, xvfb_run }:
 
 stdenv.mkDerivation rec {
-  name = "totem-${version}";
+  pname = "totem";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index b3f06c2dcc1..4153a7ed955 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -7,11 +7,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "vino-${version}";
+  pname = "vino";
   version = "3.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/vino/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/vino/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
index aac21626258..43863bf7f85 100644
--- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "yelp-tools-${version}";
+  pname = "yelp-tools";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index f1a39311728..fc5b0268df7 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -2,11 +2,11 @@
 , itstool, libxml2, libxslt, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "yelp-xsl-${version}";
+  pname = "yelp-xsl";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 24a49413960..7e326dd1657 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -4,11 +4,11 @@
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "yelp-${version}";
+  pname = "yelp";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index 89d0fd7a3b9..5023ffce6b9 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -2,11 +2,11 @@
 , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "zenity-${version}";
+  pname = "zenity";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index d1e5179063f..573259b7e7d 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -3,11 +3,11 @@
   itstool, python3, ncurses, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "anjuta-${version}";
+  pname = "anjuta";
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 80a3770b703..23a58011e02 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -3,11 +3,11 @@
 , webkitgtk, gettext, itstool, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "devhelp-${version}";
+  pname = "devhelp";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index 647e7163d0b..81f63941729 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-devel-docs-${version}";
+  pname = "gnome-devel-docs";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0xqpgf975rws60qxilq635pblbpgwspyykgzxnb4awd9zrs5lbx0";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
index 9fbce7c6cc0..7ebacc99c52 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
@@ -3,11 +3,11 @@
   gtksourceviewmm, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "nemiver-${version}";
+  pname = "nemiver";
   version = "0.9.6";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
   };
 
diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index 568a6cace72..6f289fd74d9 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-appindicator-${version}";
+  pname = "gnome-shell-extension-appindicator";
   version = "29";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
index afedd5f98e1..b7bde83915c 100644
--- a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-battery-status-${version}";
+  pname = "gnome-shell-extension-battery-status";
   version = "6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
index e627bec8b93..95a68505c7c 100644
--- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, gettext, bash }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-caffeine-${version}";
+  pname = "gnome-shell-extension-caffeine";
   version = "unstable-2019-04-02";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
index e41227e8513..0faadbcd2b6 100644
--- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-clipboard-indicator-${version}";
+  pname = "gnome-shell-extension-clipboard-indicator";
   version = "30";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index 06e7d27c544..e80149e5005 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-dash-to-dock-${version}";
+  pname = "gnome-shell-dash-to-dock";
   version = "66";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
index 0d48b8359c9..30f9ad7d2ab 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-dash-to-panel-${version}";
+  pname = "gnome-shell-dash-to-panel";
   version = "19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index dd2a02b6be8..0d9d54167ff 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -3,7 +3,7 @@
 , glib, gtk3, at-spi2-core, upower, openssh, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-gsconnect-${version}";
+  pname = "gnome-shell-gsconnect";
   version = "23";
 
   src = fetchFromGitHub {
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib"
-    "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas"
+    "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas"
     "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
     "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts"
     "-Dopenssl_path=${openssl}/bin/openssl"
diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
index d08e6f3a57d..8214300a531 100644
--- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-icon-hider-${version}";
+  pname = "gnome-shell-extension-icon-hider";
   version = "23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix
index 24b4c1cf703..b36f3489b57 100644
--- a/pkgs/desktops/gnome-3/extensions/impatience.nix
+++ b/pkgs/desktops/gnome-3/extensions/impatience.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-impatience-${version}";
+  pname = "gnome-shell-impatience";
   version = "0.4.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
index 686d7be91a4..f09822415a6 100644
--- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extensions-mediaplayer-${version}";
+  pname = "gnome-shell-extensions-mediaplayer";
   version = "unstable-2019-03-21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
index 8c075a11bdc..f9f72bd77f0 100644
--- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-no-title-bar-${version}";
+  pname = "gnome-shell-extension-no-title-bar";
   version = "9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
index 21ff70140be..e2b5288e886 100644
--- a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-nohotcorner-${version}";
+  pname = "gnome-shell-extension-nohotcorner";
   version = "19.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
index 5faa55652d8..d9ea670db09 100644
--- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-remove-dropdown-arrows-${version}";
+  pname = "gnome-shell-extension-remove-dropdown-arrows";
   version = "11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 7046e673726..285733d5f7c 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-system-monitor-${version}";
+  pname = "gnome-shell-system-monitor";
   version = "36";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
index c72d72cce12..745541b7cf4 100644
--- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-taskwhisperer-${version}";
+  pname = "gnome-shell-extension-taskwhisperer";
   version = "12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
index 604b7433ccb..f841ef2403d 100644
--- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-timepp-${version}";
+  pname = "gnome-shell-extension-timepp";
   version = "unstable-2019-03-30";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
index 9a151a6ac8f..f0f6279fe2e 100644
--- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-topicons-plus-${version}";
+  pname = "gnome-shell-extension-topicons-plus";
   version = "22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
index 19ced0b5252..072d31b84fe 100644
--- a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
+++ b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-volume-mixer-${version}";
+  pname = "gnome-shell-volume-mixer";
   version = "844ed80ad448855d8f6218847183a80474b523c7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
index 10aee5cafe6..811e9911f62 100644
--- a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
+++ b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-workspace-grid-${version}";
+  pname = "gnome-shell-workspace-grid";
   version = "0f3a430e7d04bb5465a17c1225aab0f574426d6b";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index 21f089b324e..b4c6eaaec1b 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -2,11 +2,11 @@
 , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }:
 
 stdenv.mkDerivation rec {
-  name = "five-or-more-${version}";
+  pname = "five-or-more";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 94428d6640d..5b233c48385 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -3,11 +3,11 @@
 , python3, ninja, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
-  name = "four-in-a-row-${version}";
+  pname = "four-in-a-row";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index c6c24be4be8..d7001e1c527 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -2,11 +2,11 @@
 , gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-chess-${version}";
+  pname = "gnome-chess";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index ee55b5a65a5..9d173945cdd 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-mahjongg-${version}";
+  pname = "gnome-mahjongg";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index b2c8e99e823..1ac7e51357e 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -2,11 +2,11 @@
 , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-mines-${version}";
+  pname = "gnome-mines";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index cbac95c8f41..659339c3b77 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -3,11 +3,11 @@
 , libxml2, libgee, libgnome-games-support }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-nibbles-${version}";
+  pname = "gnome-nibbles";
   version = "3.31.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0wg0l3aghkxcwp74liw115qjzy6w18hn80mhsz4lrjpnbpaivi18";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 2b40548d37c..46723867f8a 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -3,11 +3,11 @@
 , libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-robots-${version}";
+  pname = "gnome-robots";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index 5c3fafd3d02..a555ee31cf3 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -2,11 +2,11 @@
 , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-sudoku-${version}";
+  pname = "gnome-sudoku";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 06914d9817c..b6c60362265 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-taquin-${version}";
+  pname = "gnome-taquin";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index ab0f0f0faf2..29141530211 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-tetravex-${version}";
+  pname = "gnome-tetravex";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 86a1bd6485b..114551ed4ee 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "iagno-${version}";
+  pname = "iagno";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 5801c293563..9c582f037a2 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -3,11 +3,11 @@
 , meson, ninja, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "lightsoff-${version}";
+  pname = "lightsoff";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index d9f3e5fc5ff..fdda4930645 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tali-${version}";
+  pname = "tali";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0s5clkn0qm298mvphx1xdymg67w1p8vvgvypvs97k6lfjqijkx3v";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index c80c8b977cf..c8d26988391 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-autoar-${version}";
+  pname = "gnome-autoar";
   version = "0.2.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index d819961d281..ea9a79de40e 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -2,11 +2,11 @@
 , gtk3, systemd, wrapGAppsHook, desktop-file-utils, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-packagekit-${version}";
+  pname = "gnome-packagekit";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index a35067587e0..d8a78686e49 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.32.0";
-  name = "gpaste-${version}";
+  pname = "gpaste";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     substituteInPlace src/gnome-shell/prefs.js \
       --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
     substituteInPlace src/libgpaste/settings/gpaste-settings.c \
-      --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas"
+      --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
index 543453a2bd3..a607a6eb6a0 100644
--- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
@@ -2,11 +2,11 @@
 , gnome3, enchant, isocodes, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gtkhtml-${version}";
+  pname = "gtkhtml";
   version = "4.10.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3";
   };
 
diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix
index 6e8644b19b0..550e98c9dcc 100644
--- a/pkgs/desktops/lxde/core/lxmenu-data.nix
+++ b/pkgs/desktops/lxde/core/lxmenu-data.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "lxmenu-data-${version}";
+  pname = "lxmenu-data";
   version = "0.1.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lxde/${name}.tar.xz";
+    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
     sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
   };
 
diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index ca601531b68..104ab20835f 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }:
 
 stdenv.mkDerivation rec {
-  name = "lxtask-${version}";
+  pname = "lxtask";
   version = "0.1.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lxde/${name}.tar.xz";
+    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
     sha256 = "0cv4hx5dg01hbyi5p10pl78n0a40xajpq4wx9c7886pkmpq8isj1";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index 75ec5aa06ed..fee4e02dd30 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "lxqt-archiver";
   version = "0.0.96";
 
diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index f5bdcf064fd..ae4fb28f06a 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, qtbase, qttools }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "qlipper";
   version = "5.1.1";
 
diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index 5ef080ef50b..15dea9b1018 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "atril-${version}";
+  pname = "atril";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0i2wgsksgwhrmajj1lay3iym4dcyj8cdd813yh5mrfz4rkv49190";
   };
 
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index 108e8fe1e0b..ba21cb00d35 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "caja-extensions-${version}";
+  pname = "caja-extensions";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1h866jmdd3qpjzi7wjj11krwiaadnlf21844g1zqfb4jgrzj773p";
   };
 
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 8fad6cac879..675648363f5 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "engrampa-${version}";
+  pname = "engrampa";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "06z38vfs15f5crrrgvcsqfb557fhpq1mqkj5fd9wb0hvi77hasrk";
   };
 
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 72e509d59af..cc683ab2db2 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "eom-${version}";
+  pname = "eom";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "03lpxqvyaqhz4wmi07nxcyn5q73ym3dzm41cdid53f2dp9lk1mv4";
   };
 
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index bd6488d2c2c..d6709c375e6 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }:
 
 stdenv.mkDerivation rec {
-  name = "libmatekbd-${version}";
+  pname = "libmatekbd";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8";
   };
 
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index bf2a91971dd..17fee5d61cb 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -5,11 +5,11 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "libmatemixer-${version}";
+  pname = "libmatemixer";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9";
   };
 
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index 664b85fc287..e4976f71ae6 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }:
 
 stdenv.mkDerivation rec {
-  name = "libmateweather-${version}";
+  pname = "libmateweather";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1ribgcwl4ncfbcf9bkcbxrgc7yzajdnxg12837psngymkqswlp6a";
   };
 
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 4f77b303501..9899256018a 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "marco-${version}";
+  pname = "marco";
   version = "1.22.2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0sc7x14229yj22ka1vlzbaqndwcgh6idypjmm9rydkj4n968jwry";
   };
 
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index 7fbd192ac2c..ec7ad2b4294 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-applets-${version}";
+  pname = "mate-applets";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "19sjm2180ir8a264rz8m528qaqjpl3q3cq095ab0sbkp2igksrfx";
   };
 
diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
index f5c151d01f7..2667c25959e 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "mate-backgrounds-${version}";
+  pname = "mate-backgrounds";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9";
   };
 
diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index 85631f03e1d..64ede5101c7 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-calc-${version}";
+  pname = "mate-calc";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0zin3w03zrkpb12rvay23bfk9fnjpybkr5mqzkpn9xfnqamhk8ld";
   };
 
diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index 3b154fd9812..f85dd632bd1 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mate-common-${version}";
+  pname = "mate-common";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "11lwckndizawbq993ws8lqp59vsc873zri0m8s1i5zyc4qx9f69z";
   };
 
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 6e54b137ba1..a06c24b9c72 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mate-control-center-${version}";
+  pname = "mate-control-center";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0w9w3wkxksbhzyd96y1x6yxb0q5lkp16y8i42564b6njvwqch5a0";
   };
 
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 0bfcab58663..58515a492b5 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-desktop-${version}";
+  pname = "mate-desktop";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1hr4r69855csqrcaqpbcyplsy4cwjfz7gabps2pzkh5132jycfr0";
   };
 
diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index ba0cbd526f9..7db01f59816 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "mate-icon-theme-faenza-${version}";
+  pname = "mate-icon-theme-faenza";
   version = "1.20.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna";
   };
 
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 8f0f15fac2d..9df0d0ce5a8 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "mate-icon-theme-${version}";
+  pname = "mate-icon-theme";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1pn1xbmr4w4mi45nwk1qh18z9rlngmkhp9bw671yn4k6sii8fi3k";
   };
 
diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix
index 623e7f24096..e1a6e874d1d 100644
--- a/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-indicator-applet-${version}";
+  pname = "mate-indicator-applet";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0zad81qvcin4m329hfxhv4a5j8gf4gj8944mvjrdgdh71bzan2x1";
   };
 
diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 7185181d747..93c765a9953 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-media-${version}";
+  pname = "mate-media";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "13g1n2ddgr1yxgl4fsqj3sgb9344b756kam9v3sq6vh0bxlr4yf2";
   };
 
diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index bb09b0a4849..e37a270f9dc 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "mate-menus-${version}";
+  pname = "mate-menus";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1lkakbf2f1815c146z4xp5f0h4lim6jzr02681wbvzalc6k97v5c";
   };
 
diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
index 049e0a4bb69..51d23e475ff 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-netbook-${version}";
+  pname = "mate-netbook";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "00n162bskbvxhy4k2w14f9zwlsg3wgi43228ssx7sc2p95psmm64";
   };
 
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 45d483503aa..d53ae8efa35 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -2,11 +2,11 @@
   libnotify, libwnck3, gtk3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-notification-daemon-${version}";
+  pname = "mate-notification-daemon";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "06z3xczhz5diy4kk7b8lrzljrnql6fz0n1jyy916cf8pnnanpg0j";
   };
 
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index bbb49c20347..39d2c1812cb 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-panel-${version}";
+  pname = "mate-panel";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0pb9dpgsfjp6gsldg4ad2jz23xdvjfarmz4cjwkpakygkq5i6dma";
   };
 
diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix
index f5b6d62dd59..253472e3987 100644
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }:
 
 stdenv.mkDerivation rec {
-  name = "mate-polkit-${version}";
+  pname = "mate-polkit";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0";
   };
 
diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 7f4d1c85015..6ba6ac205ce 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-power-manager-${version}";
+  pname = "mate-power-manager";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "06vs2w44l1s25j0mifkid02yncw0nvdxw8r4pp2jm18kxan4frms";
   };
 
diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index 53a89bec4c1..d1c1e481d70 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-screensaver-${version}";
+  pname = "mate-screensaver";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0c4qq5szsbfrz8hgkmlby2k7f1qs8kgqf2shd63z0pc8p6f47vvc";
   };
 
diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
index c5ad4628c54..bd9ed9f6cbe 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-sensors-applet-${version}";
+  pname = "mate-sensors-applet";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3";
   };
 
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 3448e8327f5..b7735ec77fe 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mate-session-manager-${version}";
+  pname = "mate-session-manager";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1ix8picxgc28m5zd0ww3zvzw6rz38wvzsrbqw28hghrfg926h6ig";
   };
 
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 00d967a2d5c..5ee995402ec 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -4,11 +4,11 @@
   wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-settings-daemon-${version}";
+  pname = "mate-settings-daemon";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0yr5v6b9hdk20j29smbw1k4fkyg82i5vlflmgly0vi5whgc74gym";
   };
 
diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix
index f7cdf036ceb..6f5993cfc35 100644
--- a/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-system-monitor-${version}";
+  pname = "mate-system-monitor";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0yh1sh5snd7ivchh6l9rbn1s7ia4j5ihhzhqkyjnhr8ln59dvcbm";
   };
 
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index 2339ad8fb1b..7ec9944aa0e 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-terminal-${version}";
+  pname = "mate-terminal";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn";
   };
 
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index a4724049f7c..9ed5515ea3e 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -2,11 +2,11 @@
   gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
-  name = "mate-themes-${version}";
+  pname = "mate-themes";
   version = "3.22.20";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx";
   };
 
diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index eae425b1892..a9a0e171231 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, itstool, libxml2, yelp }:
 
 stdenv.mkDerivation rec {
-  name = "mate-user-guide-${version}";
+  pname = "mate-user-guide";
   version = "1.22.2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "01kcszsjiriqp4hf1k4fhazi2yfqlkn415sfgx0jw0p821bzqf2h";
   };
 
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index f152515d60e..999bee2e5d1 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-user-share-${version}";
+  pname = "mate-user-share";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k";
   };
 
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index 606a473cfaa..7775173611e 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-utils-${version}";
+  pname = "mate-utils";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0768y6x33ljc9dxjlfmvplsn4lrxj5xhjddbyab9h6pqav8527rg";
   };
 
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index 171d8971c4e..cfbe33dd380 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "pluma-${version}";
+  pname = "pluma";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "14d5c5fg31d7br9h1y3gdcr53j4sxlgybf326jvdcw8mgy91k3dg";
   };
 
diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
index c3b39e85925..42a8e328a16 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "python-caja-${version}";
+  pname = "python-caja";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1zwdjvxci72j0181nlfq6912lw3aq8j3746brlp7wlzn22qp7b0k";
   };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
index 79f0800ff34..2782decf6c4 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
@@ -3,12 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname  = "xfce4-hardware-monitor-plugin";
   version = "1.6.0";
 
   src = fetchurl {
-    url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2";
+    url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${pname}-${version}.tar.bz2";
     sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b";
   };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
index 7134d29c9ff..f67ba7af8aa 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }:
 stdenv.mkDerivation rec {
-  name = "vala-panel-appmenu-xfce-${version}";
+  pname = "vala-panel-appmenu-xfce";
   version = "0.6.94";
 
   src = "${fetchFromGitHub {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
index 694f6772282..144291da86d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
@@ -3,7 +3,7 @@
   xfce, libwnck3, libdbusmenu, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "xfce4-vala-panel-appmenu-plugin-${version}";
+  pname = "xfce4-vala-panel-appmenu-plugin";
   version = "0.6.94";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix
index 2178226ab9d..827c5137bf8 100644
--- a/pkgs/development/arduino/arduino-mk/default.nix
+++ b/pkgs/development/arduino/arduino-mk/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.0";
-  name = "arduino-mk-${version}";
+  pname = "arduino-mk";
 
   src = fetchFromGitHub {
     owner  = "sudar";
diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index c48b36e5aba..accedf9a7af 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, ant, jre, jdk}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "abcl";
   version = "1.5.0";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix
index e8759ec073b..ed6b2b2ff24 100644
--- a/pkgs/development/compilers/apache-flex-sdk/default.nix
+++ b/pkgs/development/compilers/apache-flex-sdk/default.nix
@@ -7,11 +7,11 @@ let
     sha256 = "0qw2bgls8qsmp80j8vpd4c7s0c8anlrk0ac8z42w89bajcdbwk2f";
   };
 in stdenv.mkDerivation rec {
-  name = "apache-flex-sdk-${version}";
+  pname = "apache-flex-sdk";
   version = "4.16.1";
 
   src = fetchurl {
-    url = "https://www.apache.org/dist/flex/${version}/binaries/${name}-bin.tar.gz";
+    url = "https://www.apache.org/dist/flex/${version}/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p";
   };
 
diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index ad68382c13a..3058e926c3f 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -3,7 +3,7 @@
 with builtins;
 
 stdenv.mkDerivation rec {
-  name = "arachne-pnr-${version}";
+  pname = "arachne-pnr";
   version = "2018.09.09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix
index ce754813dda..3cbb7577f34 100644
--- a/pkgs/development/compilers/asn1c/default.nix
+++ b/pkgs/development/compilers/asn1c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "asn1c-${version}";
+  pname = "asn1c";
   version = "0.9.28";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix
index 002f34daa13..f086c36468d 100644
--- a/pkgs/development/compilers/ats/default.nix
+++ b/pkgs/development/compilers/ats/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name    = "ats-${version}";
+  pname = "ats";
   version = "0.2.12";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index df61ea2b791..a1e5927e349 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -26,7 +26,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name    = "ats2-${version}";
+  pname = "ats2";
   version = versionPkg;
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix
index 387ae906b88..34d1e64c484 100644
--- a/pkgs/development/compilers/avian/default.nix
+++ b/pkgs/development/compilers/avian/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
 
 stdenv.mkDerivation rec {
-  name = "avian-${version}";
+  pname = "avian";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix
index bf2272a75c1..6e768e65091 100644
--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/pkgs/development/compilers/bigloo/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "bigloo-${version}";
+  pname = "bigloo";
   version = "4.1a-2";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 1b53a142d12..f0299f7e41e 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   rev = if emscriptenRev == null
         then "version_${version}"
         else emscriptenRev;
-  name = "binaryen-${version}";
+  pname = "binaryen";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 646963eedbc..6fac183125f 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -33,7 +33,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name     = "ccl-${version}";
+  pname = "ccl";
   version  = "1.11.5";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index 9216c779143..1bac7eb9b95 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "chez-scheme-${version}";
+  pname = "chez-scheme";
   version = "9.5.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
index a1e29951ddb..664d8492113 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -56,7 +56,6 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "clasp";
   version = "0.8.99.20181128";
 
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index e9e97361825..d9f2a588d8f 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "closure-compiler-${version}";
+  pname = "closure-compiler";
   version = "20190215";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index 237a80280ec..cc8e9f827b7 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "colm-${version}";
+  pname = "colm";
   version = "0.13.0.7";
 
   src = fetchurl {
-    url = "https://www.colm.net/files/colm/${name}.tar.gz";
+    url = "https://www.colm.net/files/colm/${pname}-${version}.tar.gz";
     sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4";
   };
 
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 33957b5a8dc..20506508b9c 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -11,7 +11,7 @@ let
   ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux";
 in
 stdenv.mkDerivation rec {
-  name    = "compcert-${version}";
+  pname = "compcert";
   version = "3.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 8be482e2150..00816fca36b 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -18,7 +18,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "coreclr-${version}";
+  pname = "coreclr";
   version = "2.0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 5b9e9010ef0..8aab9580232 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -16,7 +16,7 @@ let
     }:
 
     stdenv.mkDerivation rec {
-      name = "cudatoolkit-${version}";
+      pname = "cudatoolkit";
       inherit version runPatches;
 
       dontPatchELF = true;
diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix
index 514075651e1..839ee821d00 100644
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dev86-${version}";
+  pname = "dev86";
   version = "0.16.21";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index b3b58e83621..332ded31df6 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -22,7 +22,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "dmd-${version}";
+  pname = "dmd";
   inherit version;
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix
index 4635c6d0a4e..a22862c4292 100644
--- a/pkgs/development/compilers/eli/default.nix
+++ b/pkgs/development/compilers/eli/default.nix
@@ -28,11 +28,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "eli-${version}";
+  pname = "eli";
   version = "4.8.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${pname}-${version}.tar.bz2";
     sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj";
   };
 
diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix
index 1128fbe64ec..cb960227beb 100644
--- a/pkgs/development/compilers/eql/default.nix
+++ b/pkgs/development/compilers/eql/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = src.rev;
-  name = "eql-git-${version}";
+  pname = "eql-git";
   src = fetchgit {
     rev = "9097bf98446ee33c07bb155d800395775ce0d9b2";
     url = "https://gitlab.com/eql/eql.git";
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index 405aa8aa3ca..ef445faec92 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -4,7 +4,7 @@
   mesa, xorg, openssl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "factor-lang-${version}";
+  pname = "factor-lang";
   version = "0.98";
   rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";
 
diff --git a/pkgs/development/compilers/fasm/default.nix b/pkgs/development/compilers/fasm/default.nix
index 47b90469234..4b20c4051a8 100644
--- a/pkgs/development/compilers/fasm/default.nix
+++ b/pkgs/development/compilers/fasm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   inherit (fasm-bin) version src meta;
 
-  name = "fasm-${version}";
+  pname = "fasm";
 
   nativeBuildInputs = [ fasm-bin ];
 
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index b516019ffc9..a2b73f61c27 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -4,7 +4,7 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
 
 stdenv.mkDerivation rec {
   version = "3.0.0";
-  name = "fpc-${version}";
+  pname = "fpc";
 
   src = fetchurl {
     url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 3fe72e6b505..1b3f4d168ee 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -3,7 +3,7 @@
 , libXi, xorgproto, libX11, libXext
 }:
 stdenv.mkDerivation rec {
-  name = "lazarus-${version}";
+  pname = "lazarus";
   version = "1.8.4";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 2de487cc9c8..bcb95d9ca90 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }:
 
 stdenv.mkDerivation rec {
-  name = "fsharp-${version}";
+  pname = "fsharp";
   version = "4.0.1.1";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix
index e0094c73098..b41c32be18f 100644
--- a/pkgs/development/compilers/fsharp41/default.nix
+++ b/pkgs/development/compilers/fsharp41/default.nix
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, dotnetbuildhelpers, dotnetPackages }:
 
 stdenv.mkDerivation rec {
-  name = "fsharp-${version}";
+  pname = "fsharp";
   version = "4.1.7";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index 94836e84fd6..9306eec817f 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "fstar-${version}";
+  pname = "fstar";
   version = "0.9.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix
index 65cd67f527d..eca2cba7775 100644
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoconf, ... }:
 
 stdenv.mkDerivation rec {
-  name    = "gambit-bootstrap-${version}";
+  pname = "gambit-bootstrap";
   version = "4.9.3";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
index 9e5a172eed8..940dec0338c 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses5, python27 }:
 
 stdenv.mkDerivation rec {
-  name = "gcc-arm-embedded-${version}";
+  pname = "gcc-arm-embedded";
   version = "6-2017-q2-update";
   subdir = "6-2017q2";
 
diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
index 80e042b5c2e..90f9d5957bb 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "gcc-arm-embedded-${version}";
+  pname = "gcc-arm-embedded";
   version = "7-2018-q2-update";
   subdir = "7-2018q2";
 
diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
index ee57dcc8c14..b6420827c85 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "gcc-arm-embedded-${version}";
+  pname = "gcc-arm-embedded";
   version = "8-2018-q4-major";
   subdir = "8-2018q4";
 
diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix
index 16450cf24ab..1c3df80645a 100644
--- a/pkgs/development/compilers/gcl/2.6.13-pre.nix
+++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix
@@ -8,7 +8,7 @@ assert stdenv.cc ? libc ;
 assert stdenv.cc.libc != null ;
 
 stdenv.mkDerivation rec {
-  name = "gcl-${version}";
+  pname = "gcl";
   version = "2.6.13pre50";
 
   src = fetchgit {
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 50d397d2cd4..e3c2d0e09de 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -8,12 +8,12 @@ assert stdenv.cc ? libc ;
 assert stdenv.cc.libc != null ;
 
 stdenv.mkDerivation rec {
-  name = "gcl-${version}";
+  pname = "gcl";
   version = "2.6.12";
 
   src = fetchurl {
     sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f";
-    url = "http://gnu.spinellicreations.com/gcl/${name}.tar.gz";
+    url = "http://gnu.spinellicreations.com/gcl/${pname}-${version}.tar.gz";
   };
 
   patches = [(fetchurl {
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index 3c46dfc107b..79ad90e77a6 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }:
 stdenv.mkDerivation rec {
-  name = "glslang-${version}";
+  pname = "glslang";
   version = "7.11.3113";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix
index ae27964ae8f..df5202cb1c2 100644
--- a/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/pkgs/development/compilers/gnu-cobol/default.nix
@@ -6,7 +6,7 @@ let
   lib = stdenv.lib;
 in
 stdenv.mkDerivation rec {
-  name = "gnu-cobol-${version}";
+  pname = "gnu-cobol";
   inherit version;
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index 41c325c2b1a..1035091654a 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -18,7 +18,7 @@ let # The gnu-smalltalk project has a dependency to the libsigsegv library.
 in stdenv.mkDerivation rec {
 
   version = "3.2.5";
-  name = "gnu-smalltalk-${version}";
+  pname = "gnu-smalltalk";
 
   src = fetchurl {
     url = "mirror://gnu/smalltalk/smalltalk-${version}.tar.xz";
diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix
index 69507685f29..e051d41993c 100644
--- a/pkgs/development/compilers/go-jsonnet/default.nix
+++ b/pkgs/development/compilers/go-jsonnet/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-jsonnet-${version}";
+  pname = "go-jsonnet";
   version = "0.13.0";
 
   goPackagePath = "github.com/google/go-jsonnet";
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 39de36293c8..3b924f58bfe 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -23,7 +23,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "go-${version}";
+  pname = "go";
   version = "1.10.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 95312f9e1ea..97c243439e8 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "go-${version}";
+  pname = "go";
   version = "1.4-bootstrap-20161024";
   revision = "79d85a4965ea7c46db483314c3981751909d7883";
 
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index be03e1aeeed..61e3b6c16ae 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -214,7 +214,7 @@ in rec {
 
   jvmci8 = stdenv.mkDerivation rec {
     version = "19.2-b01";
-    name = "jvmci-${version}";
+    pname = "jvmci";
     src = fetchFromGitHub {
       owner  = "graalvm";
       repo   = "graal-jvmci-8";
@@ -280,7 +280,7 @@ in rec {
 
   graalvm8 = stdenv.mkDerivation rec {
     inherit version;
-    name = "graal-${version}";
+    pname = "graal";
     src = fetchFromGitHub {
       owner  = "oracle";
       repo   = "graal";
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 010dacd0c71..24e88f9ee2e 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "hhvm-${version}";
+  pname = "hhvm";
   version = "3.23.2";
 
   # use git version since we need submodules
diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 2b589125604..b1b31aecae1 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, bison, flex}:
 
 stdenv.mkDerivation rec {
-  name = "iasl-${version}";
+  pname = "iasl";
   version = "20181213";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix
index 73dd90ab4a1..a166954dc21 100644
--- a/pkgs/development/compilers/icedtea-web/default.nix
+++ b/pkgs/development/compilers/icedtea-web/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }:
 
 stdenv.mkDerivation rec {
-  name = "icedtea-web-${version}";
+  pname = "icedtea-web";
 
   version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "AdoptOpenJDK";
     repo = "IcedTea-Web";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq";
   };
 
diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix
index f601dc254a4..6640c4aa89a 100644
--- a/pkgs/development/compilers/intercal/default.nix
+++ b/pkgs/development/compilers/intercal/default.nix
@@ -6,11 +6,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "intercal-${version}";
+  pname = "intercal";
   version = "0.30";
 
   src = fetchurl {
-    url = "http://catb.org/esr/intercal/${name}.tar.gz";
+    url = "http://catb.org/esr/intercal/${pname}-${version}.tar.gz";
     sha256 = "058ppvvgz9r5603ia9jkknbrciypgg4hjbczrv9v1d9w3ak652xk";
   };
 
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 1cbe95232eb..f240deda0bf 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   inherit testedTargets;
 
-  name = "ispc-${version}";
+  pname = "ispc";
 
   src = fetchFromGitHub {
     owner = "ispc";
diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix
index 06f321bc39c..f49d3d6e210 100644
--- a/pkgs/development/compilers/javacard-devkit/default.nix
+++ b/pkgs/development/compilers/javacard-devkit/default.nix
@@ -3,7 +3,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "javacard-devkit";
   version = "2.2.2";
   uscoreVersion = builtins.replaceStrings ["."] ["_"] version;
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index d407fb46b9b..1349b7f0ddd 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -8,7 +8,6 @@
 let drv = stdenv.mkDerivation rec {
   pname = "jetbrainsjdk";
   version = "164";
-  name = pname + "-" + version;
 
   src = if stdenv.hostPlatform.system == "x86_64-linux" then
     fetchurl {
diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index 7bbad0e1201..460ff405b94 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "jsonnet-${version}";
+  pname = "jsonnet";
   version = "0.13.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix
index d8d521952bd..c0414c6259f 100644
--- a/pkgs/development/compilers/julia/shared.nix
+++ b/pkgs/development/compilers/julia/shared.nix
@@ -77,10 +77,9 @@ in
 stdenv.mkDerivation rec {
   pname = "julia";
   inherit version;
-  name = "${pname}-${version}";
 
   src = fetchzip {
-    url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = src_sha256;
   };
   prePatch = ''
diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix
index 9800b33e7a9..b2db09e1c18 100644
--- a/pkgs/development/compilers/jwasm/default.nix
+++ b/pkgs/development/compilers/jwasm/default.nix
@@ -3,7 +3,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "jwasm-${version}";
+  pname = "jwasm";
   version = "git-2017-11-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 32659d5be56..754ab020d51 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -4,7 +4,7 @@ let
   version = "1.3.41";
 in stdenv.mkDerivation rec {
   inherit version;
-  name = "kotlin-${version}";
+  pname = "kotlin";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix
index 19833e4d3d4..9660be4df11 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix
@@ -1,7 +1,7 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
   inherit version;
   src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
 
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
index be18a315f12..da2a5cfb58a 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -1,7 +1,7 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
   inherit version;
   src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl";
 
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index 989529ff8cc..e9cc6dfc1db 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -1,6 +1,6 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
   inherit version;
   src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";
 
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 25db273d7e3..a846221638a 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -1,6 +1,6 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
   inherit version;
   src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
 
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index efbf8561b7f..1c0bdf47987 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -3,7 +3,7 @@
 let
   rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
 in stdenv.mkDerivation rec {
-  name = "manticore-${version}";
+  pname = "manticore";
   version = "2018.09.29";
  
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix
index b7fc3e4dd77..0327e0dc215 100644
--- a/pkgs/development/compilers/mercury/default.nix
+++ b/pkgs/development/compilers/mercury/default.nix
@@ -2,7 +2,7 @@
 , readline }:
 
 stdenv.mkDerivation rec {
-  name    = "mercury-${version}";
+  pname = "mercury";
   version = "14.01.1";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix
index f15a7624327..a18202b9f88 100644
--- a/pkgs/development/compilers/microscheme/default.nix
+++ b/pkgs/development/compilers/microscheme/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, vim, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "microscheme-${version}";
+  pname = "microscheme";
   version = "0.9.3";
 
   src = fetchzip {
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz";
     sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976";
   };
diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index 1c8e9fb7eb2..2fa30d5578a 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -34,7 +34,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "0.5.0";
-  name = "mint-${version}";
+  pname = "mint";
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix
index 72626ec0014..405846343cf 100644
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/pkgs/development/compilers/mkcl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }:
 
 with stdenv.lib; stdenv.mkDerivation rec {
-  name = "mkcl-${version}";
+  pname = "mkcl";
   version = "1.1.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix
index 0589733cb3c..2b4998f91c9 100644
--- a/pkgs/development/compilers/mlton/20180207-binary.nix
+++ b/pkgs/development/compilers/mlton/20180207-binary.nix
@@ -3,15 +3,15 @@ let
   dynamic-linker = stdenv.cc.bintools.dynamicLinker;
 in
 stdenv.mkDerivation rec {
-  name = "mlton-${version}";
+  pname = "mlton";
   version = "20180207";
 
   src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
-    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-linux.tgz";
+    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux.tgz";
     sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf";
     })
   else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
-    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-darwin.gmp-static.tgz";
+    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin.gmp-static.tgz";
       sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv";
     })
   else
diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix
index 616ec420d2d..193e45bf55e 100644
--- a/pkgs/development/compilers/mono/llvm.nix
+++ b/pkgs/development/compilers/mono/llvm.nix
@@ -14,7 +14,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "llvm-${version}";
+  pname = "llvm";
   version = "3.6-mono-2017-02-15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix
index 89726f20c6b..bc79a64fd77 100644
--- a/pkgs/development/compilers/mosml/default.nix
+++ b/pkgs/development/compilers/mosml/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gmp, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mosml-${version}";
+  pname = "mosml";
   version = "2.10.1";
 
   buildInputs = [ gmp perl ];
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index bfb3c154a3c..8d92bc4eba2 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-  name = "nasm-${version}";
+  pname = "nasm";
   version = "2.14.02";
 
   src = fetchFromRepoOrCz {
     repo = "nasm";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa";
   };
 
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index e2aa5736c7a..74ccaac388f 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "neko-${version}";
+  pname = "neko";
   version = "2.2.0";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index d1c0db25351..ca35026b493 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -26,7 +26,7 @@ let
   });
 in
 stdenv.mkDerivation rec {
-  name = "nextpnr-${version}";
+  pname = "nextpnr";
   version = "2019.04.19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index 6bd4af05da3..fa49bf9dd73 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   date = "April2012";
 
-  name = "nvidia-cg-toolkit-${version}";
+  pname = "nvidia-cg-toolkit";
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix
index 0d171a474a2..8fd6f33740e 100644
--- a/pkgs/development/compilers/obliv-c/default.nix
+++ b/pkgs/development/compilers/obliv-c/default.nix
@@ -1,6 +1,6 @@
 { stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
 stdenv.mkDerivation rec {
-  name = "obliv-c-${version}";
+  pname = "obliv-c";
   version = "0.0pre20180624";
   buildInputs = [ perl ]
   ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix
index 4337de702e1..cd621c131ff 100644
--- a/pkgs/development/compilers/ocaml/3.08.0.nix
+++ b/pkgs/development/compilers/ocaml/3.08.0.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-${version}";
+  pname = "ocaml";
   version = "3.08.0";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = "http://tarballs.nixos.org/${name}.tar.gz";
+    url = "http://tarballs.nixos.org/${pname}-${version}.tar.gz";
     sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx";
   };
   configureScript = ./configure-3.08.0;
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index 99a65dec150..556aefd3704 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation (rec {
 
-  name = "ocaml-${version}";
+  pname = "ocaml";
   version = "3.10.0";
 
   src = fetchurl {
-    url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${pname}-${version}.tar.bz2";
     sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
   };
 
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix
index e65510c172e..4be41490534 100644
--- a/pkgs/development/compilers/ocaml/3.11.2.nix
+++ b/pkgs/development/compilers/ocaml/3.11.2.nix
@@ -8,11 +8,11 @@ in
 
 stdenv.mkDerivation rec {
   
-  name = "ocaml-${version}";
+  pname = "ocaml";
   version = "3.11.2";
   
   src = fetchurl {
-    url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2";
     sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
   };
 
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index 8636f670059..edb3acdbdb1 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -8,11 +8,11 @@ in
 
 stdenv.mkDerivation rec {
   
-  name = "ocaml-${version}";
+  pname = "ocaml";
   version = "3.12.1";
   
   src = fetchurl {
-    url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2";
     sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
   };
 
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
index 0a30ef1352c..2669e8224bf 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ocaml-${version}";
+  pname = "ocaml";
   version = "4.00.1";
   
   src = fetchurl {
-    url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2";
     sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
   };
 
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
index a933151de12..fb507b9836a 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
@@ -14,7 +14,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ber-metaocaml-${version}";
+  pname = "ber-metaocaml";
   version = metaocamlPatch;
 
   src = fetchurl {
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   postConfigure = ''
     tar -xvzf $metaocaml
-    cd ${name}
+    cd ${pname}-${version}
     make patch
     cd ..
   '';
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     make installopt
     mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
-    cd ${name}
+    cd ${pname}-${version}
     make all
   '';
 
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
   '';
 
   checkPhase = ''
-    cd ${name}
+    cd ${pname}-${version}
     make test
     make test-compile
     make test-native
diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
index e9adbeff490..881748c36ea 100644
--- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation (rec {
 
-  name = "metaocaml-${version}";
+  pname = "metaocaml";
   version = "3.09-alpha-30";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index 06ed7c51e9a..da1df6f30bb 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   pname = "opa";
   version = "4310";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "MLstate";
diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix
index 690707265b4..31e3800a6c9 100644
--- a/pkgs/development/compilers/openspin/default.nix
+++ b/pkgs/development/compilers/openspin/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "openspin-${version}";
+  pname = "openspin";
   version = "unstable-2018-10-02";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix
index ccd149bbb40..0625e2d8bbc 100644
--- a/pkgs/development/compilers/owl-lisp/default.nix
+++ b/pkgs/development/compilers/owl-lisp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, coreutils, which }:
 
 stdenv.mkDerivation rec {
-  name    = "owl-lisp-${version}";
+  pname = "owl-lisp";
   version = "0.1.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index b7feed84c37..eef972a2cc3 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
 
 stdenv.mkDerivation rec {
-  name = "polyml-${version}";
+  pname = "polyml";
   version = "5.7.1";
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 91a3bb45352..5ab13d5f761 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
 
 stdenv.mkDerivation rec {
-  name = "polyml-${version}";
+  pname = "polyml";
   version = "5.8";
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index 2aab6a99a1c..6719293af2a 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, ponyc }:
 
 stdenv.mkDerivation rec {
-  name = "pony-stable-${version}";
+  pname = "pony-stable";
   version = "0.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index eee4507d6ce..3856ced250e 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -5,7 +5,7 @@
 # in a published version.
 
 stdenv.mkDerivation rec {
-  name = "rgbds-${version}";
+  pname = "rgbds";
   version = "0.3.8";
   src = fetchFromGitHub {
     owner = "rednex";
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 056ad745460..0d2a10b6a99 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -43,7 +43,7 @@ let
 in
 assert builtins.hasAttr stdenv.hostPlatform.system options;
 stdenv.mkDerivation rec {
-  name    = "sbcl-bootstrap-${version}";
+  pname = "sbcl-bootstrap";
   version = cfg.version;
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index e2cc7adc26e..e5b36ad7890 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "sbcl-${version}";
+  pname = "sbcl";
   version = "1.5.3";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
+    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
     sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj";
   };
 
diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix
index ab42eae31a6..5a01e295e49 100644
--- a/pkgs/development/compilers/scala/dotty-bare.nix
+++ b/pkgs/development/compilers/scala/dotty-bare.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.14.0-RC1";
-  name = "dotty-bare-${version}";
+  pname = "dotty-bare";
 
   src = fetchurl {
     url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz";
diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index 4fd46c35a0a..1a450af2b94 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "sdcc-${version}";
+  pname = "sdcc";
   version = "3.9.0";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix
index a6abe6791d7..efcaf56110d 100644
--- a/pkgs/development/compilers/seexpr/default.nix
+++ b/pkgs/development/compilers/seexpr/default.nix
@@ -3,7 +3,7 @@ bison, flex, libGLU, pythonPackages
 }:
 
 stdenv.mkDerivation rec {
-  name = "seexpr-${version}";
+  pname = "seexpr";
   version = "2.11";
   src = fetchFromGitHub {
     owner  = "wdas";
diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix
index e9c6b706e5a..c9b4f9639d0 100644
--- a/pkgs/development/compilers/serpent/default.nix
+++ b/pkgs/development/compilers/serpent/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ... }:
 
 stdenv.mkDerivation rec {
-  name = "serpent-${version}";
+  pname = "serpent";
 
   # I can't find any version numbers, so we're just using the date
   # of the last commit.
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index 75717b5ba09..82cccc3befc 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -24,7 +24,7 @@ let
     sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2";
   };
 in stdenv.mkDerivation rec {
-  name = "shaderc-${version}";
+  pname = "shaderc";
   version = "2019.0";
 
   outputs = [ "out" "lib" "bin" "dev" "static" ];
diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix
index 21cfd408298..e2103fb718f 100644
--- a/pkgs/development/compilers/smlnj/bootstrap.nix
+++ b/pkgs/development/compilers/smlnj/bootstrap.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cpio, rsync, xar, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "smlnj-bootstrap-${version}";
+  pname = "smlnj-bootstrap";
 
   version = "110.91";
 
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 941f92fd322..6ab55fbd5c0 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -15,7 +15,7 @@ let
 in
 stdenv.mkDerivation rec {
 
-  name = "solc-${version}";
+  pname = "solc";
   version = "0.5.10";
 
   # upstream suggests avoid using archive generated by github
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index 219d5307790..a39a6c4a2e4 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -9,7 +9,7 @@ let
   toolsPath = stdenv.lib.makeBinPath [ mcpp ];
 in
 stdenv.mkDerivation rec {
-  name    = "souffle-${version}";
+  pname = "souffle";
   version = "1.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix
index 25ea47978fc..c8379fe9090 100644
--- a/pkgs/development/compilers/squeak/default.nix
+++ b/pkgs/development/compilers/squeak/default.nix
@@ -2,7 +2,7 @@
 , libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:
 
 stdenv.mkDerivation rec {
-  name = "squeak-${version}";
+  pname = "squeak";
   version = "4.10.2.2614";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index b1f9ee799e5..dea6df1b7aa 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "terra-git-${version}";
+  pname = "terra-git";
   version = "1.0.0-beta1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index a5c3db65857..338ba931249 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,7 +2,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "tcc-${version}";
+  pname = "tcc";
   version = "0.9.27";
 
   src = fetchFromRepoOrCz {
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 2300d63015b..01d4972a55d 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "urweb-${version}";
+  pname = "urweb";
   version = "20190217";
 
   src = fetchurl {
-    url = "https://github.com/urweb/urweb/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/urweb/urweb/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
   };
 
diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix
index 8cb1e8e5f2c..3196592da48 100644
--- a/pkgs/development/compilers/wcc/default.nix
+++ b/pkgs/development/compilers/wcc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }:
 
 stdenv.mkDerivation rec {
-  name = "wcc-unstable-${version}";
+  pname = "wcc-unstable";
   version = "2018-04-05";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
index 88666148da3..3d955c4394b 100644
--- a/pkgs/development/compilers/x11basic/default.nix
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -6,7 +6,6 @@
 stdenv.mkDerivation rec {
   pname = "X11basic";
   version = "1.26";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "kollokollo";
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index 3ad0bc25787..1cc96455be7 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "6.3.3";
-  name = "yap-${version}";
+  pname = "yap";
 
   src = fetchurl {
-    url = "https://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz";
+    url = "https://www.dcc.fc.up.pt/~vsc/Yap/${pname}-${version}.tar.gz";
     sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf";
   };
 
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index afb1bcd5a0b..e7f70136675 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -7,7 +7,7 @@
 with builtins;
 
 stdenv.mkDerivation rec {
-  name = "yosys-${version}";
+  pname = "yosys";
   version = "2019.04.23";
 
   srcs = [
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index cc42ee1dd3f..f0e0693d12c 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -26,7 +26,7 @@ let
 in stdenv.mkDerivation rec {
   inherit version openjdk platform hash extension;
 
-  name = "zulu-${version}";
+  pname = "zulu";
 
   src = fetchurl {
     url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}";
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index a43992164d2..d4c4c1f0ac3 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -26,7 +26,7 @@ let
 in stdenv.mkDerivation rec {
   inherit version openjdk platform hash extension;
 
-  name = "zulu-${version}";
+  pname = "zulu";
 
   src = fetchurl {
     url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}";
diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix
index f03e6e42739..d1e7ac882d7 100644
--- a/pkgs/development/em-modules/generic/default.nix
+++ b/pkgs/development/em-modules/generic/default.nix
@@ -7,10 +7,11 @@
 , meta ? {}, ... } @ args:
 
 pkgs.stdenv.mkDerivation (
-  args // 
+  args //
   {
 
-  name = "emscripten-${args.name}";
+  pname = "emscripten-${args.pname or (builtins.parseDrvName args.name).name}";
+  version = args.version or (builtins.parseDrvName args.name).version;
   buildInputs = [ emscripten python ] ++ buildInputs;
   nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs;
 
diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix
index 592e6ad8999..8377dad690f 100644
--- a/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/pkgs/development/guile-modules/guile-cairo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }:
 
 stdenv.mkDerivation rec {
-  name = "guile-cairo-${version}";
+  pname = "guile-cairo";
   version = "1.10.0";
 
   src = fetchurl {
-    url = "mirror://savannah/guile-cairo/${name}.tar.gz";
+    url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz";
     sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf";
   };
 
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index 26fffac0a13..80ce29799a8 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -5,12 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "guile-gnome-platform";
   version = "2.16.4";
 
   src = fetchurl {
-    url = "mirror://gnu/guile-gnome/${pname}/${name}.tar.gz";
+    url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz";
     sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3";
   };
 
diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix
index 35bcd7bfc2f..6ffcc153ec4 100644
--- a/pkgs/development/guile-modules/guile-reader/default.nix
+++ b/pkgs/development/guile-modules/guile-reader/default.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "guile-reader-${version}";
+  pname = "guile-reader";
   version = "0.6.2";
 
   src = fetchurl {
-    url = "http://download.savannah.nongnu.org/releases/guile-reader/${name}.tar.gz";
+    url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz";
     sha256 = "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx";
   };
 
diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix
index a606b3ecf28..41bfb2ef62a 100644
--- a/pkgs/development/guile-modules/guile-sdl/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl/default.nix
@@ -3,12 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "guile-sdl";
   version = "0.5.2";
 
   src = fetchurl {
-    url = "mirror://gnu/${pname}/${name}.tar.xz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
     sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01";
   };
 
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index a88d07d1655..d53337aca1a 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -11,7 +11,7 @@ revs = {
   "8.2" = "8.2";
 };
 in stdenv.mkDerivation rec {
-  name = "acl2-${version}";
+  pname = "acl2";
   version = "8.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index 85794b09ae0..744106bce5d 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, gnugrep }:
 
 stdenv.mkDerivation rec {
-  name = "bats-${version}";
+  pname = "bats";
   version = "1.1.0";
 
   src = fetchzip {
diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix
index b597ba6fe78..918c577356c 100644
--- a/pkgs/development/interpreters/clips/default.nix
+++ b/pkgs/development/interpreters/clips/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.30";
-  name = "clips-${version}";
+  pname = "clips";
   src = fetchurl {
     url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z";
     sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy";
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index 16f3e7f73e2..ab8e616ac6d 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -128,7 +128,7 @@ let # packageJSON=./package.json;
 
 in stdenv.mkDerivation rec {
   inherit version;
-  name = "lumo-${version}";
+  pname = "lumo";
 
   src = fetchurl {
     url    = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz";
diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix
index f79c30740a1..f968e04bbe9 100644
--- a/pkgs/development/interpreters/duktape/default.nix
+++ b/pkgs/development/interpreters/duktape/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "duktape-${version}";
+  pname = "duktape";
   version = "2.4.0";
   src = fetchurl {
     url = "http://duktape.org/duktape-${version}.tar.xz";
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index 857a1e5cd8d..744a0f76ff0 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "falcon-${version}";
+  pname = "falcon";
   version = "2013-09-19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
index a0d20b7ebe4..71542046af9 100644
--- a/pkgs/development/interpreters/gauche/default.nix
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gauche-${version}";
+  pname = "gauche";
   version = "0.9.8";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index cd7dacf6527..7f15c2b3184 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline, gettext, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "gnu-apl-${version}";
+  pname = "gnu-apl";
   version = "1.8";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index efbd72dcefa..793fa0a1b4d 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -3,7 +3,7 @@
 # at runtime, need jdk
 
 stdenv.mkDerivation rec {
-  name = "groovy-${version}";
+  pname = "groovy";
   version = "2.5.7";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix
index 56becd3d6c9..0d3fe100329 100644
--- a/pkgs/development/interpreters/icon-lang/default.nix
+++ b/pkgs/development/interpreters/icon-lang/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }:
 
 stdenv.mkDerivation rec {
-  name = "icon-lang-${version}";
+  pname = "icon-lang";
   version = "9.5.1";
   src = fetchFromGitHub {
     owner = "gtownsend";
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 11feb1170c2..791ac6dd338 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, readline, libedit, bc }:
 
 stdenv.mkDerivation rec {
-  name = "j-${version}";
+  pname = "j";
   version = "807";
   jtype = "release";
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix
index 704e3eb4031..91b4c0b9a9e 100644
--- a/pkgs/development/interpreters/jimtcl/default.nix
+++ b/pkgs/development/interpreters/jimtcl/default.nix
@@ -4,7 +4,7 @@ let
   makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL");
 
 in stdenv.mkDerivation rec {
-  name = "jimtcl-${version}";
+  pname = "jimtcl";
   version = "0.78";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index ba65c00f1e9..4ab9427934d 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "joker-${version}";
+  pname = "joker";
   version = "0.12.4";
 
   goPackagePath = "github.com/candid82/joker";
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 2e53ae1694f..e20cb3d7e55 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -4,7 +4,7 @@ let
 # The version number here is whatever is reported by the RUBY_VERSION string
 rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
 jruby = stdenv.mkDerivation rec {
-  name = "jruby-${version}";
+  pname = "jruby";
 
   version = "9.2.7.0";
 
diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
index f822fdd9c8f..0e1734565f2 100644
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/pkgs/development/interpreters/jython/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "jython-${version}";
+  pname = "jython";
 
   version = "2.7.1";
 
diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index 03c836d9251..a9922a38765 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "kona-${version}";
+  pname = "kona";
   version = "3.21";
   src = fetchurl {
     url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz";
diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix
index 284773fe660..3ef239e89a9 100644
--- a/pkgs/development/interpreters/lolcode/default.nix
+++ b/pkgs/development/interpreters/lolcode/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "lolcode-${version}";
+  pname = "lolcode";
   version = "0.11.2";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix
index 7aa41e95cc9..0ac1fa30e2f 100644
--- a/pkgs/development/interpreters/lua-5/filesystem.nix
+++ b/pkgs/development/interpreters/lua-5/filesystem.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.2";
-  name = "lua-filesystem-${version}";
+  pname = "lua-filesystem";
   isLibrary = true;
   src = fetchurl {
     url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix
index d8a789e9209..f0eb1becc57 100644
--- a/pkgs/development/interpreters/lua-5/sockets.nix
+++ b/pkgs/development/interpreters/lua-5/sockets.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lua5 }:
 
 stdenv.mkDerivation rec {
-  name    = "lua-sockets-${version}";
+  pname = "lua-sockets";
   version = "2.0.2";
   src = fetchurl {
       url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index e8e23cee830..cd325c94948 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "metamath-${version}";
+  pname = "metamath";
   version = "0.172";
 
   buildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index ceea3932063..aef23ad6881 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "mujs-${version}";
+  pname = "mujs";
   version = "1.0.6";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index d3dda7655c2..cc9f6fcc3c9 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -19,9 +19,9 @@ in
 
 stdenv.mkDerivation rec {
   version = "5.1.0";
-  name = "octave-${version}";
+  pname = "octave";
   src = fetchurl {
-    url = "mirror://gnu/octave/${name}.tar.gz";
+    url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
     sha256 = "15blrldzwyxma16rnd4n01gnsrriii0dwmyca6m7qz62r8j12sz3";
   };
 
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   # Keep a copy of the octave tests detailed results in the output
   # derivation, because someone may care
   postInstall = ''
-    cp test/fntests.log $out/share/octave/${name}-fntests.log || true
+    cp test/fntests.log $out/share/octave/${pname}-${version}-fntests.log || true
   '';
 
   passthru = {
diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index 62ab7b02585..6e57ad250bb 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, readline }:
 
 stdenv.mkDerivation rec {
-  name = "picoc-${version}";
+  pname = "picoc";
   version = "2015-05-04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 5adf41a0f3b..dc3b08acbd9 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -2,10 +2,10 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "picoLisp-${version}";
+  pname = "picoLisp";
   version = "19.6";
   src = fetchurl {
-    url = "https://www.software-lab.de/${name}.tgz";
+    url = "https://www.software-lab.de/${pname}-${version}.tgz";
     sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq";
   };
   buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk;
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index d1f2edce936..99c763615e3 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -30,7 +30,7 @@ let
   bin-path = stdenv.lib.concatStringsSep ":"
                (map (p: "${p}/bin") [ gcc ]);
   build = {flags, target}: stdenv.mkDerivation rec {
-    name = "pixie-${version}";
+    pname = "pixie";
     version = "0-r${commit-count}-${variant}";
     nativeBuildInputs = [ makeWrapper pkgconfig ];
     buildInputs = libs;
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 9e38e825074..0b9ddc0bb34 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -12,7 +12,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "python-boot-${version}";
+  pname = "python-boot";
   version = "2.7.12";
   libPrefix = "python2.7";
 
diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix
index 779039c6d6a..3b41e14be85 100644
--- a/pkgs/development/interpreters/qnial/default.nix
+++ b/pkgs/development/interpreters/qnial/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "qnial-${version}";
+  pname = "qnial";
   version = "6.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index e37c43a0bd6..35bd1729866 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -45,7 +45,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "racket-${version}";
+  pname = "racket";
   version = "7.3"; # always change at once with ./minimal.nix
 
   src = (stdenv.lib.makeOverridable ({ name, sha256 }:
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       inherit sha256;
     }
   )) {
-    inherit name;
+    inherit ;name = "${pname}-${version}";
     sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl";
   };
 
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 1244ad5ecd2..ab5493e8a9d 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
 , CoreServices, ApplicationServices }:
 
 stdenv.mkDerivation rec {
-  name = "rakudo-star-${version}";
+  pname = "rakudo-star";
   version = "2017.01";
 
   src = fetchurl {
-    url    = "http://rakudo.org/downloads/star/${name}.tar.gz";
+    url    = "http://rakudo.org/downloads/star/${pname}-${version}.tar.gz";
     sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq";
   };
 
diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix
index 4d98f18eee4..274b70b2c79 100644
--- a/pkgs/development/interpreters/rebol/default.nix
+++ b/pkgs/development/interpreters/rebol/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }:
 
 stdenv.mkDerivation rec {
-  name = "rebol-nightly-${version}";
+  pname = "rebol-nightly";
   version = "3-alpha";
   src = fetchFromGitHub {
     rev = "bd45d0de512ff5953e098301c3d610f6024515d6";
diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix
index 56ff0283174..2121f54a3b1 100644
--- a/pkgs/development/interpreters/red/default.nix
+++ b/pkgs/development/interpreters/red/default.nix
@@ -1,7 +1,7 @@
 { stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "red-${version}";
+  pname = "red";
   version = "0.6.3";
   src = fetchFromGitHub {
     rev = "6a43c767fa2e85d668b83f749158a18e62c30f70";
@@ -55,13 +55,13 @@ stdenv.mkDerivation rec {
     rm -rf $out/opt/red/rebol
     install -Dm755 console $out/bin/red
     install -Dm644 BSD-3-License.txt                          \
-        $out/share/licenses/${name}/BSD-3-License.txt
+        $out/share/licenses/${pname}-${version}/BSD-3-License.txt
     install -Dm644 BSL-License.txt                            \
-        $out/share/licenses/${name}/BSL-License.txt
+        $out/share/licenses/${pname}-${version}/BSL-License.txt
     install -Dm644 docs/red-system-quick-test.html            \
-        $out/share/doc/${name}/red-system-quick-test.html
+        $out/share/doc/${pname}-${version}/red-system-quick-test.html
     install -Dm644 docs/red-system-specs.html                 \
-        $out/share/doc/${name}/red-system-specs.html
+        $out/share/doc/${pname}-${version}/red-system-specs.html
 
     # PathElf
     patchelf --set-interpreter                            \
diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
index 1d67193a73c..ec19b0679f4 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "Regina-REXX-${version}";
+  pname = "Regina-REXX";
   version = "3.9.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz";
     sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx";
   };
 
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index f438e9fb13c..db68578d62a 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -6,7 +6,7 @@
 with pythonPackages;
 
 stdenv.mkDerivation rec {
-  name = "renpy-${version}";
+  pname = "renpy";
   version = "7.3.2";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix
index 594bbc05b7c..c6c8caa7cf3 100644
--- a/pkgs/development/interpreters/self/default.nix
+++ b/pkgs/development/interpreters/self/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   #   $ Self -s myimage.snap
   #
   version = "4.5.0";
-  name = "self-${version}";
+  pname = "self";
 
   src = fetchgit {
     url    = "https://github.com/russellallen/self";
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 9c81b230ada..e00af621347 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }:
 
 stdenv.mkDerivation rec {
-  name = "spidermonkey-${version}";
+  pname = "spidermonkey";
   version = "1.8.5";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
index 2c45ba58976..89bbd713a5c 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "38.8.0";
-  name = "spidermonkey-${version}";
+  pname = "spidermonkey";
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2";
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 057375182f5..2cacb339d75 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -8,7 +8,7 @@ let optional = stdenv.lib.optional;
 in
 
 stdenv.mkDerivation rec {
-  name = "supercollider-${version}";
+  pname = "supercollider";
   version = "3.10.2";
 
 
diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix
index f2c5fd938ce..ca897ec692c 100644
--- a/pkgs/development/interpreters/tinyscheme/default.nix
+++ b/pkgs/development/interpreters/tinyscheme/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tinyscheme-${version}";
+  pname = "tinyscheme";
   version = "1.41";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tinyscheme/${name}.tar.gz";
+    url = "mirror://sourceforge/tinyscheme/${pname}-${version}.tar.gz";
     sha256 = "168rk4zrlhsknbvldq2jsgabpwlqkx6la44gkqmijmf7jhs11h7a";
   };
 
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix
index 77154b54fd8..30ea124cf4b 100644
--- a/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/pkgs/development/interpreters/unicon-lang/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, libX11, libXt }:
 
 stdenv.mkDerivation rec {
-  name = "unicon-lang-${version}";
+  pname = "unicon-lang";
   version = "11.7";
   src = fetchurl {
     url = "http://unicon.org/dist/uni-2-4-2010.zip";
diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix
index c67d7270548..69cb24fc0b0 100644
--- a/pkgs/development/java-modules/postgresql_jdbc/default.nix
+++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchMavenArtifact }:
 
 stdenv.mkDerivation rec {
-  name = "postgresql-jdbc-${version}";
+  pname = "postgresql-jdbc";
   version = "42.2.5";
 
   src = fetchMavenArtifact {
diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix
index fbf9615f88a..f251d2bed0c 100644
--- a/pkgs/development/libraries/CoinMP/default.nix
+++ b/pkgs/development/libraries/CoinMP/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "CoinMP-${version}";
+  pname = "CoinMP";
   version = "1.8.4";
 
   src = fetchurl {
-    url = "https://www.coin-or.org/download/source/CoinMP/${name}.tgz";
+    url = "https://www.coin-or.org/download/source/CoinMP/${pname}-${version}.tgz";
     sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l";
   };
 
diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix
index 9522038df6a..418900ddeeb 100644
--- a/pkgs/development/libraries/LASzip/default.nix
+++ b/pkgs/development/libraries/LASzip/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.2.0";
-  name = "LASzip-${version}";
+  pname = "LASzip";
 
   src = fetchurl {
     url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index a8d5d608f89..610f1b768f2 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -14,11 +14,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name    = "SDL-${version}";
+  pname = "SDL";
   version = "1.2.15";
 
   src = fetchurl {
-    url    = "https://www.libsdl.org/release/${name}.tar.gz";
+    url    = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";
     sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
   };
 
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 94aca192852..d538a0969b0 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -23,11 +23,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "SDL2-${version}";
+  pname = "SDL2";
   version = "2.0.9";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";
     sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95";
   };
 
diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index 803cc97a8ae..d57bb6cbc94 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -1,12 +1,11 @@
 { stdenv, darwin, fetchurl, SDL2 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "SDL2_gfx";
   version = "1.0.4";
 
   src = fetchurl {
-    url = "http://www.ferzkopp.net/Software/${pname}/${name}.tar.gz";
+    url = "http://www.ferzkopp.net/Software/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33";
   };
 
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index ba33b1fbc1d..326d9d66264 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }:
 
 stdenv.mkDerivation rec {
-  name = "SDL2_image-${version}";
+  pname = "SDL2_image";
   version = "2.0.5";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz";
     sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx";
   };
 
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 61e15d621bc..826cf793cd2 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -4,11 +4,11 @@
 , enableNativeMidi ? false, fluidsynth ? null }:
 
 stdenv.mkDerivation rec {
-  name = "SDL2_mixer-${version}";
+  pname = "SDL2_mixer";
   version = "2.0.4";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_mixer/release/${pname}-${version}.tar.gz";
     sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl";
   };
 
diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix
index 1cb74ac1b2d..309102e70b5 100644
--- a/pkgs/development/libraries/SDL2_net/default.nix
+++ b/pkgs/development/libraries/SDL2_net/default.nix
@@ -1,11 +1,11 @@
 { stdenv, darwin, fetchurl, SDL2 }:
 
 stdenv.mkDerivation rec {
-  name = "SDL2_net-${version}";
+  pname = "SDL2_net";
   version = "2.0.1";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz";
     sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
   };
 
diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix
index b219922223f..50e47bc1d36 100644
--- a/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/pkgs/development/libraries/SDL2_ttf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, darwin, fetchurl, SDL2, freetype, libGL }:
 
 stdenv.mkDerivation rec {
-  name = "SDL2_ttf-${version}";
+  pname = "SDL2_ttf";
   version = "2.0.15";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
     sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59";
   };
 
diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix
index 68c8c16ed4e..74a31d94687 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/pkgs/development/libraries/SDL_gfx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "SDL_gfx-${version}";
+  pname = "SDL_gfx";
   version = "2.0.26";
 
   src = fetchurl {
-    url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz";
+    url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${pname}-${version}.tar.gz";
     sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw";
   };
 
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index 961a0a7f5aa..8e3078563e2 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
 
 stdenv.mkDerivation rec {
-  name = "SDL_image-${version}";
+  pname = "SDL_image";
   version = "1.2.12";
 
   src = fetchurl {
-    url    = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
+    url    = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz";
     sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b";
   };
 
diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
index 887319062be..427439f496e 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname   = "SDL_mixer";
   version = "1.2.12";
-  name    = "${pname}-${version}";
 
   src = fetchurl {
-    url    = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz";
+    url    = "http://www.libsdl.org/projects/${pname}/release/${pname}-${version}.tar.gz";
     sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n";
   };
 
diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix
index f1c5a5462d1..6ac91a6d129 100644
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/pkgs/development/libraries/SDL_net/default.nix
@@ -4,10 +4,8 @@ stdenv.mkDerivation rec {
   pname = "SDL_net";
   version = "1.2.8";
 
-  name = "${pname}-${version}";
-
   src = fetchurl {
-    url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
+    url = "http://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz";
     sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
   };
 
diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix
index 6279bfcb428..7b8fb67a30f 100644
--- a/pkgs/development/libraries/SDL_sixel/default.nix
+++ b/pkgs/development/libraries/SDL_sixel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, libsixel }:
 
 stdenv.mkDerivation rec {
-  name    = "SDL_sixel-${version}";
+  pname = "SDL_sixel";
   version = "1.2-nightly";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix
index 0e717c53035..94534ecd699 100644
--- a/pkgs/development/libraries/SDL_sound/default.nix
+++ b/pkgs/development/libraries/SDL_sound/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }:
 
 stdenv.mkDerivation rec {
-  name = "SDL_sound-${version}";
+  pname = "SDL_sound";
   version = "1.0.3";
 
   src = fetchurl {
-    url = "https://icculus.org/SDL_sound/downloads/${name}.tar.gz";
+    url = "https://icculus.org/SDL_sound/downloads/${pname}-${version}.tar.gz";
     sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r";
   };
 
diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix
index 7f276387c83..9695d51ed89 100644
--- a/pkgs/development/libraries/SDL_stretch/default.nix
+++ b/pkgs/development/libraries/SDL_stretch/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "SDL_stretch-${version}";
+  pname = "SDL_stretch";
   version = "0.3.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sdl-stretch/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/sdl-stretch/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw";
   };
 
diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index cf6b53021f7..96b60b1061f 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, SDL, freetype }:
 
 stdenv.mkDerivation rec {
-  name = "SDL_ttf-${version}";
+  pname = "SDL_ttf";
   version = "2.0.11";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
     sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j";
   };
 
diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix
index 4e1da866622..5795d0baa62 100644
--- a/pkgs/development/libraries/abseil-cpp/default.nix
+++ b/pkgs/development/libraries/abseil-cpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "abseil-cpp-${version}";
+  pname = "abseil-cpp";
   date = "20190322";
   rev = "eab2078b53c9e3d9d240135c09d27e3393acb50a";
   version = "${date}-${rev}";
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index a50c92924e9..0aace12569a 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "accounts-qt-${version}";
+  pname = "accounts-qt";
   version = "1.15";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index e0c46acb630..af94de525f7 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libtool, perl }:
 
 stdenv.mkDerivation rec {
-  name = "ace-${version}";
+  pname = "ace";
   version = "6.5.5";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
index 5170e384f77..f0d87c81133 100644
--- a/pkgs/development/libraries/afflib/default.nix
+++ b/pkgs/development/libraries/afflib/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.7.18";
-  name = "afflib-${version}";
+  pname = "afflib";
 
   src = fetchFromGitHub {
     owner = "sshock";
diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix
index 22e91ee61d7..a1d4c225909 100644
--- a/pkgs/development/libraries/aften/default.nix
+++ b/pkgs/development/libraries/aften/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-	name = "aften-${version}";
+	pname = "aften";
 	version = "0.0.8";
 	src = fetchurl {
-		url = "mirror://sourceforge/aften/${name}.tar.bz2";
+		url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2";
 		sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
 	};
 
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 5c25da92055..1e9496c1a1c 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec
 {
-  name = "alembic-${version}";
+  pname = "alembic";
   version = "1.7.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix
index f98c8fa480e..407aa557ea2 100644
--- a/pkgs/development/libraries/alkimia/default.nix
+++ b/pkgs/development/libraries/alkimia/default.nix
@@ -4,11 +4,11 @@
 }:
 
 mkDerivation rec {
-  name = "alkimia-${version}";
+  pname = "alkimia";
   version = "8.0.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/alkimia/${version}/${name}.tar.xz";
+    url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz";
     sha256 = "059i6vn36sdq5zn2vqzh4asvvgdgs7n478nk9phvb5gdys01fq7m";
   };
 
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 9f8ca69a70f..46e3d02963d 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "allegro-${version}";
+  pname = "allegro";
   version = "5.2.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index eca32b740e3..6b44ec1b598 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -4,11 +4,11 @@
 , libXxf86vm, openal, libGLU_combined }:
 
 stdenv.mkDerivation rec {
-  name = "allegro-${version}";
+  pname = "allegro";
   version="4.4.2";
 
   src = fetchurl {
-    url = "https://github.com/liballeg/allegro5/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
   };
 
diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix
index 95828c44f85..a4f3b714e1c 100644
--- a/pkgs/development/libraries/alure/default.nix
+++ b/pkgs/development/libraries/alure/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, openal }:
 
 stdenv.mkDerivation rec {
-  name = "alure-${version}";
+  pname = "alure";
   version = "1.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix
index 15331c22599..7525b3baab0 100644
--- a/pkgs/development/libraries/amrwb/default.nix
+++ b/pkgs/development/libraries/amrwb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "amrwb-${version}";
+  pname = "amrwb";
   version = "11.0.0.0";
 
   srcAmr = fetchurl {
diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix
index fc79cae36f8..9fc11555b69 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/pkgs/development/libraries/apache-activemq/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apache-activemq-${version}";
+  pname = "apache-activemq";
   version = "5.14.5";
 
   src = fetchurl {
     sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54";
-    url = "mirror://apache/activemq/${version}/${name}-bin.tar.gz";
+    url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 429da8de835..62d72844386 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "appstream-${version}";
+  pname = "appstream";
   version = "0.12.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix
index 0013764d779..307f57d20cf 100644
--- a/pkgs/development/libraries/appstream/qt.nix
+++ b/pkgs/development/libraries/appstream/qt.nix
@@ -3,7 +3,7 @@
 # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
 
 stdenv.mkDerivation rec {
-  name = "appstream-qt-${version}";
+  pname = "appstream-qt";
   inherit (appstream) version src prePatch;
 
   buildInputs = appstream.buildInputs ++ [ appstream qtbase ];
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index b26291469e7..8be98f061a8 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -5,14 +5,14 @@
 let
   inherit ((import ./sources.nix).aqbanking) sha256 releaseId version;
 in stdenv.mkDerivation rec {
-  name = "aqbanking-${version}";
+  pname = "aqbanking";
   inherit version;
 
   src = let
     qstring = "package=03&release=${releaseId}&file=02";
     mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
   in fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
     inherit sha256;
   };
diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index bb337e471cf..061ed77849f 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -13,14 +13,14 @@
 let
   inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId version;
 in stdenv.mkDerivation rec {
-  name = "gwenhywfar-${version}";
+  pname = "gwenhywfar";
   inherit version;
 
   src = let
     qstring = "package=01&release=${releaseId}&file=02";
     mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
   in fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
     inherit sha256;
   };
diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix
index 9a0b70e0d97..23c300ab48a 100644
--- a/pkgs/development/libraries/aqbanking/libchipcard.nix
+++ b/pkgs/development/libraries/aqbanking/libchipcard.nix
@@ -3,14 +3,14 @@
 let
   inherit ((import ./sources.nix).libchipcard) sha256 releaseId version;
 in stdenv.mkDerivation rec {
-  name = "libchipcard-${version}";
+  pname = "libchipcard";
   inherit version;
 
   src = let
     qstring = "package=02&release=${releaseId}&file=01";
     mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
   in fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
     inherit sha256;
   };
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index eb58003a5f6..ac67a101bc5 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "arb";
   version = "2.16.0";
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index f2b038aa379..27204e8e339 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "9.600.5";
-  name = "armadillo-${version}";
+  pname = "armadillo";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 7660ea81eaf..f763f98799d 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -10,7 +10,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "arrow-cpp-${version}";
+  pname = "arrow-cpp";
   version = "0.14.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
index 24e06b0d65a..d5a98b0ce92 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "assimp-${version}";
+  pname = "assimp";
   version = "4.1.0";
 
   src = fetchFromGitHub{
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index 6c3f3aa9fa2..00465a617f4 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -16,12 +16,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "at-spi2-atk";
   version = "2.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b";
   };
 
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index e5d5313eeb1..4e9a29b45b7 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -17,12 +17,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "at-spi2-core";
   version = "2.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw";
   };
 
diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix
index b79d85bcd7c..02409d6ace0 100644
--- a/pkgs/development/libraries/audio/jamomacore/default.nix
+++ b/pkgs/development/libraries/audio/jamomacore/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0-beta.1";
-  name = "JamomaCore-${version}";
+  pname = "JamomaCore";
 
   src = fetchFromGitHub {
     owner = "jamoma";
diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix
index 3a4c363e23c..2fde40327e9 100644
--- a/pkgs/development/libraries/audio/libbs2b/default.nix
+++ b/pkgs/development/libraries/audio/libbs2b/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "libbs2b-${version}";
+  pname = "libbs2b";
   version = "3.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bs2b/${name}.tar.bz2";
+    url = "mirror://sourceforge/bs2b/${pname}-${version}.tar.bz2";
     sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7";
   };
 
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
index 0f9f5f5aac6..0e0f0c5d425 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libmysofa-${version}";
+  pname = "libmysofa";
   version = "0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix
index fe0e0854a32..1c5a5302d71 100644
--- a/pkgs/development/libraries/audio/libsmf/default.nix
+++ b/pkgs/development/libraries/audio/libsmf/default.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation rec {
   version = "1.3";
-  name = "libsmf-${version}";
+  pname = "libsmf";
   src = fetchurl {
-    url = "https://github.com/stump/libsmf/archive/${name}.tar.gz";
+    url = "https://github.com/stump/libsmf/archive/${pname}-${version}.tar.gz";
     sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n";
   };
 
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 373d50a0a43..04752fd2951 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "lilv-${version}";
+  pname = "lilv";
   version = "0.24.4";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3";
   };
 
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index d026dd258bc..50593cab647 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "lv2-${version}";
+  pname = "lv2";
   version = "1.16.0";
 
   src = fetchurl {
-    url = "http://lv2plug.in/spec/${name}.tar.bz2";
+    url = "http://lv2plug.in/spec/${pname}-${version}.tar.bz2";
     sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy";
   };
 
diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix
index 81cc868f52c..978376eb4fa 100644
--- a/pkgs/development/libraries/audio/lv2/unstable.nix
+++ b/pkgs/development/libraries/audio/lv2/unstable.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "lv2-unstable-${version}";
+  pname = "lv2-unstable";
   version = "2017-07-08";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index 78763ca29e2..826c36db1a6 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "lvtk-${version}";
+  pname = "lvtk";
   version = "1.2.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
index ddd3940098a..7cb151e4203 100644
--- a/pkgs/development/libraries/audio/ntk/default.nix
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "ntk-${version}";
+  pname = "ntk";
   version = "1.3.1000";
   src = fetchFromGitHub {
     owner = "original-male";
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
index 2adec665e1c..dad36209ed8 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.1.0";
-  name = "rtaudio-${version}";
+  pname = "rtaudio";
 
   src = fetchFromGitHub {
     owner = "thestk";
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix
index 41bb9ca9f11..6cd7d06da9d 100644
--- a/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.0.0";
-  name = "rtmidi-${version}";
+  pname = "rtmidi";
 
   src = fetchFromGitHub {
     owner = "thestk";
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index 09a6230184a..21d6cdfb5d4 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "sratom-${version}";
+  pname = "sratom";
   version = "0.6.2";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a";
   };
 
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index 320fc41f76c..d91784ce14f 100644
--- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
+++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl , alsaLib, }:
 
 stdenv.mkDerivation rec {
-  name = "zita-alsa-pcmi-${version}";
+  pname = "zita-alsa-pcmi";
   version = "0.3.2";
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s";
   };
 
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix
index 4fc5c12ccc4..308aa020e36 100644
--- a/pkgs/development/libraries/audio/zita-convolver/default.nix
+++ b/pkgs/development/libraries/audio/zita-convolver/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, fftwFloat }:
 
 stdenv.mkDerivation rec {
-  name = "zita-convolver-${version}";
+  pname = "zita-convolver";
   version = "4.0.3";
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs";
   };
 
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
index e9cccab39f0..98e272d5dab 100644
--- a/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "zita-resampler-${version}";
+  pname = "zita-resampler";
   version = "1.6.2";
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3";
   };
 
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 7233a187053..1cc65b53b3e 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aws-sdk-cpp-${version}";
+  pname = "aws-sdk-cpp";
   version = "1.7.90";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix
index 42621a1792c..af727e394d1 100644
--- a/pkgs/development/libraries/backward-cpp/default.nix
+++ b/pkgs/development/libraries/backward-cpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "backward-${version}";
+  pname = "backward";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index 9d5063d8f07..de436864eda 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -3,7 +3,7 @@
 , xorgserver, dbus, python2, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "bamf-${version}";
+  pname = "bamf";
   version = "0.5.4";
 
   outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index 05ff5593205..05203d6c233 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -18,7 +18,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "beignet-${version}";
+  pname = "beignet";
   version = "unstable-2018.08.20";
 
   src = fetchFromGitHub {
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   ];
 
   passthru.utests = stdenv.mkDerivation rec {
-    name = "beignet-utests-${version}";
+    pname = "beignet-utests";
     inherit version src;
 
     preConfigure = ''
diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix
index e6702d0db64..16be4600ec6 100644
--- a/pkgs/development/libraries/biblesync/default.nix
+++ b/pkgs/development/libraries/biblesync/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
-  name = "biblesync-${version}";
+  pname = "biblesync";
   version = "1.1.2";
 
   src = fetchurl{
-    url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz";
+    url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${pname}-${version}.tar.gz";
     sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8";
   };
 
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 812ad546f86..c7520c89ef5 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -3,7 +3,7 @@
 , utillinux, yodl }:
 
 stdenv.mkDerivation rec {
-  name = "bobcat-${version}";
+  pname = "bobcat";
   version = "4.08.03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix
index 68f5d7afcf4..c2b5c7b6062 100644
--- a/pkgs/development/libraries/boehm-gc/7.6.6.nix
+++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "boehm-gc-${version}";
+  pname = "boehm-gc";
   version = "7.6.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index a241b42e187..cf76d9e7d24 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "boehm-gc-${version}";
+  pname = "boehm-gc";
   version = "8.0.4";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index ee62d5423a1..7db73f5ad47 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -2,7 +2,7 @@
 
 # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
 stdenv.mkDerivation rec {
-  name = "boringssl-${version}";
+  pname = "boringssl";
   version = "2017-02-23";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 2580b959bf2..18b1b47f6d3 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "botan-${version}";
+  pname = "botan";
   version = "${baseVersion}.${revision}";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index 102e7bfcc12..328ac434d85 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -2,7 +2,7 @@
 , libXi, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "box2d-${version}";
+  pname = "box2d";
   version = "2.3.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix
index b4a57396cc8..ba7b51bb0e4 100644
--- a/pkgs/development/libraries/brigand/default.nix
+++ b/pkgs/development/libraries/brigand/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "brigand-${version}";
+  pname = "brigand";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index b4a2133f7d8..f6041802a9c 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bullet-${version}";
+  pname = "bullet";
   version = "2.87";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix
index 12fc1834e90..97fe7e51299 100644
--- a/pkgs/development/libraries/bullet/roboschool-fork.nix
+++ b/pkgs/development/libraries/bullet/roboschool-fork.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bullet-${version}";
+  pname = "bullet";
   version = "2019-03-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix
index 1e2bda285a7..e763afc4a43 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/libraries/bwidget/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, tcl }:
 
 stdenv.mkDerivation rec {
-  name = "bwidget-${version}";
+  pname = "bwidget";
   version = "1.9.13";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
index 3603667fbf2..396e419406a 100644
--- a/pkgs/development/libraries/c-blosc/default.nix
+++ b/pkgs/development/libraries/c-blosc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "c-blosc-${version}";
+  pname = "c-blosc";
   version = "1.16.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 4a1ea394207..890e2996f5d 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "actor-framework-${version}";
+  pname = "actor-framework";
   version = "0.17.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index b175250872f..9020ccf08b5 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "capnproto-${version}";
+  pname = "capnproto";
   version = "0.7.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index c02633d880c..956fd74da58 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name    = "capstone-${version}";
+  pname = "capstone";
   version = "4.0.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index d83060fc24d..92e5c04e032 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "catch-${version}";
+  pname = "catch";
   version = "1.12.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 2d0fd4cb1bc..d7876affe2f 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "catch2-${version}";
+  pname = "catch2";
   version = "2.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix
index 2930ffa61e3..457b51dea7a 100644
--- a/pkgs/development/libraries/cctz/default.nix
+++ b/pkgs/development/libraries/cctz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "cctz-${version}";
+  pname = "cctz";
   version = "2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix
index 68d34c75c01..5f6b3766012 100644
--- a/pkgs/development/libraries/cddlib/default.nix
+++ b/pkgs/development/libraries/cddlib/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cddlib-${version}";
+  pname = "cddlib";
   version = "0.94j";
   src = fetchFromGitHub {
     owner = "cddlib";
diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index 4c311f07e01..8487435981c 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "cdk-${version}";
+  pname = "cdk";
   version ="5.0-20190224";
 
   buildInputs = [
diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix
index 7e5c768036f..eaeb6bf8e43 100644
--- a/pkgs/development/libraries/cegui/default.nix
+++ b/pkgs/development/libraries/cegui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, ogre, freetype, boost, expat }:
 
 stdenv.mkDerivation rec {
-  name = "cegui-${version}";
+  pname = "cegui";
   version = "0.8.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/crayzedsgui/${name}.tar.bz2";
+    url = "mirror://sourceforge/crayzedsgui/${pname}-${version}.tar.bz2";
     sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk";
   };
 
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 52e0f06eeec..3ce8c4ef080 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -11,7 +11,7 @@
 assert runTests -> gflags != null;
 
 stdenv.mkDerivation rec {
-  name = "ceres-solver-${version}";
+  pname = "ceres-solver";
   version = "1.14.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix
index df75d3a1f1d..39ed74d0075 100644
--- a/pkgs/development/libraries/cgui/default.nix
+++ b/pkgs/development/libraries/cgui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, texinfo, allegro, perl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "cgui-${version}";
+  pname = "cgui";
   version="2.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/cgui/${version}/${pname}-${version}.tar.gz";
     sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s";
   };
 
diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index ae8b6ca18df..08610d1e9af 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "check-${version}";
+  pname = "check";
   version = "0.12.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index f460b69a4f8..76f722f31aa 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "chipmunk-${version}";
+  pname = "chipmunk";
   majorVersion = "7";
   version = "${majorVersion}.0.1";
 
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index 02420735ff7..fd868884f98 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, boost, ffmpeg }:
 
 stdenv.mkDerivation rec {
-  name = "chromaprint-${version}";
+  pname = "chromaprint";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "https://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
+    url = "https://bitbucket.org/acoustid/chromaprint/downloads/${pname}-${version}.tar.gz";
     sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3";
   };
 
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index bab0a84ca79..904874b2290 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "cimg-${version}";
+  pname = "cimg";
   version = "2.6.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix
index 1890d2b25a0..a7d7a0ea982 100644
--- a/pkgs/development/libraries/cl/default.nix
+++ b/pkgs/development/libraries/cl/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
-  name = "cl-${version}";
+  pname = "cl";
 
   src = fetchFromGitHub {
     owner = "tonyrog";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   # 'cp' line taken from Arch recipe
   # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/erlang-sdl
   installPhase = ''
-    DIR=$out/lib/erlang/lib/${name}
+    DIR=$out/lib/erlang/lib/${pname}-${version}
     mkdir -p $DIR
     cp -ruv c_src doc ebin include priv src $DIR
   '';
diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix
index 086816655d3..11752423906 100644
--- a/pkgs/development/libraries/clipper/default.nix
+++ b/pkgs/development/libraries/clipper/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.4.2";
-  name = "Clipper-${version}";
+  pname = "Clipper";
   src = fetchurl {
     url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip";
     sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1";
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 7764e9c67ed..7adc2a365c5 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "cln-${version}";
+  pname = "cln";
   version = "1.3.4";
 
   src = fetchurl {
-    url = "${meta.homepage}${name}.tar.bz2";
+    url = "${meta.homepage}${pname}-${version}.tar.bz2";
     sha256 = "0j5p18hwbbrchsdbnc8d2bf9ncslhflri4i950gdnq7v6g2dg69d";
   };
 
diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index ede2049b6ee..e7c02312b66 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.29.0";
-  name = "cmark-${version}";
+  pname = "cmark";
 
   src = fetchFromGitHub {
     owner = "jgm";
diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix
index 8044d7165f7..11e719b36df 100644
--- a/pkgs/development/libraries/cmrt/default.nix
+++ b/pkgs/development/libraries/cmrt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }:
 
 stdenv.mkDerivation rec {
-  name = "cmrt-${version}";
+  pname = "cmrt";
   version = "1.0.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix
index 29ce216cadf..cc42407433c 100644
--- a/pkgs/development/libraries/concurrencykit/default.nix
+++ b/pkgs/development/libraries/concurrencykit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "concurrencykit-${version}";
+  pname = "concurrencykit";
   version = "0.6.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix
index 5630daa0d93..86f4485a900 100644
--- a/pkgs/development/libraries/coprthr/default.nix
+++ b/pkgs/development/libraries/coprthr/default.nix
@@ -2,7 +2,7 @@
 , bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "coprthr-${version}";
+  pname = "coprthr";
   version = "1.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index c2f3ce9b9b4..ea3eec825c7 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
 
 stdenv.mkDerivation rec {
-  name = "cpp-hocon-${version}";
+  pname = "cpp-hocon";
   version = "0.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix
index c13b32a67b0..2585a7abaed 100644
--- a/pkgs/development/libraries/cpp-ipfs-api/default.nix
+++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
 
 stdenv.mkDerivation rec {
-  name = "cpp-ipfs-api-${version}";
+  pname = "cpp-ipfs-api";
   version = "2017-01-04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix
index a2493e55fb0..7bb2bad9689 100644
--- a/pkgs/development/libraries/cppcms/default.nix
+++ b/pkgs/development/libraries/cppcms/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pcre, zlib, python, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "cppcms-${version}";
+  pname = "cppcms";
   version = "1.2.1";
 
   src = fetchurl {
-      url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
+      url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2";
       sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh";
   };
 
diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix
index 3423b29d76c..737122c57bf 100644
--- a/pkgs/development/libraries/cppdb/default.nix
+++ b/pkgs/development/libraries/cppdb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
 
 stdenv.mkDerivation rec {
-  name = "cppdb-${version}";
+  pname = "cppdb";
   version = "0.3.1";
 
   src = fetchurl {
-      url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
+      url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2";
       sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn";
   };
 
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index 3f8b2d896ac..76fd6db18b0 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "cppunit-${version}";
+  pname = "cppunit";
   version = "1.14.0";
 
   src = fetchurl {
-    url = "https://dev-www.libreoffice.org/src/${name}.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.gz";
     sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix";
   };
 
diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix
index 2dce60d4b2c..28ab31a08cc 100644
--- a/pkgs/development/libraries/cpputest/default.nix
+++ b/pkgs/development/libraries/cpputest/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.8";
-  name = "cpputest-${version}";
+  pname = "cpputest";
 
   src = fetchurl {
-    url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "0mk48xd3klyqi7wf3f4wn4zqxxzmvrhhl32r25jzrixzl72wq7f8";
   };
 
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index 5bffda607ee..2328bd53362 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, zeromq }:
 
 stdenv.mkDerivation rec {
-  name = "cppzmq-${version}";
+  pname = "cppzmq";
   version = "4.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix
index 74619cbaaae..a8c9233aebd 100644
--- a/pkgs/development/libraries/cre2/default.nix
+++ b/pkgs/development/libraries/cre2/default.nix
@@ -2,7 +2,7 @@
   libtool, pkgconfig, re2, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "cre2-${version}";
+  pname = "cre2";
   version = "0.3.0";
     
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index 61a825cd374..cb481fc7084 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "crypto++-${version}";
+  pname = "crypto++";
   majorVersion = "5.6";
   version = "${majorVersion}.5";
 
diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix
index fd81de5139d..5696684e91d 100644
--- a/pkgs/development/libraries/ctpl/default.nix
+++ b/pkgs/development/libraries/ctpl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "ctpl-${version}";
+  pname = "ctpl";
   version = "0.3.4";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix
index 5a2a53ef24d..ea2230909a2 100644
--- a/pkgs/development/libraries/ctpp2/default.nix
+++ b/pkgs/development/libraries/ctpp2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "ctpp2-${version}";
+  pname = "ctpp2";
   version = "2.8.3";
 
   src = fetchurl {
-    url = "http://ctpp.havoc.ru/download/${name}.tar.gz";
+    url = "http://ctpp.havoc.ru/download/${pname}-${version}.tar.gz";
     sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8";
   };
 
diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix
index a2188f687d1..647c80bf8ac 100644
--- a/pkgs/development/libraries/curlcpp/default.nix
+++ b/pkgs/development/libraries/curlcpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, curl }: 
 
 stdenv.mkDerivation rec {
-  name = "curlcpp-${version}";
+  pname = "curlcpp";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix
index 58f88e6d8eb..490f472a066 100644
--- a/pkgs/development/libraries/curlpp/default.nix
+++ b/pkgs/development/libraries/curlpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, curl }:
 
 stdenv.mkDerivation rec {
-  name = "curlpp-${version}";
+  pname = "curlpp";
   version = "0.8.1";
   src = fetchFromGitHub {
     owner = "jpbarrette";
diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix
index ba1d02380e2..1658f8a6fa7 100644
--- a/pkgs/development/libraries/cutee/default.nix
+++ b/pkgs/development/libraries/cutee/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "cutee";
   version = "0.4.2";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url    = "http://www.codesink.org/download/${pname}-${version}.tar.gz";
diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix
index 216b644b38e..e84fbe89aa9 100644
--- a/pkgs/development/libraries/cutelyst/default.nix
+++ b/pkgs/development/libraries/cutelyst/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cutelyst-${version}";
+  pname = "cutelyst";
   version = "2.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix
index 8be68a314e3..e668e653477 100644
--- a/pkgs/development/libraries/cxx-prettyprint/default.nix
+++ b/pkgs/development/libraries/cxx-prettyprint/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "cxx-prettyprint-unstable-${version}";
+  pname = "cxx-prettyprint-unstable";
   version = "2016-04-30";
   rev = "9ab26d228f2960f50b38ad37fe0159b7381f7533";
 
diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix
index 77b27640fd7..4c572cf781a 100644
--- a/pkgs/development/libraries/cxxtools/default.nix
+++ b/pkgs/development/libraries/cxxtools/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.2.1";
-  name = "cxxtools-${version}";
+  pname = "cxxtools";
 
   src = fetchurl {
-    url = "http://www.tntnet.org/download/${name}.tar.gz";
+    url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
     sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc";
   };
 
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 0bdaf1be955..a050dd8d9ca 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -4,13 +4,13 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "cyrus-sasl-${version}";
+  pname = "cyrus-sasl";
   version = "2.1.27";
 
   src = fetchurl {
     urls =
-      [ "http://www.cyrusimap.org/releases/${name}.tar.gz"
-        "http://www.cyrusimap.org/releases/old/${name}.tar.gz"
+      [ "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz"
+        "http://www.cyrusimap.org/releases/old/${pname}-${version}.tar.gz"
       ];
     sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6";
   };
diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix
index d418b879d1d..73a51cd2731 100644
--- a/pkgs/development/libraries/czmq/3.x.nix
+++ b/pkgs/development/libraries/czmq/3.x.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.2";
-  name = "czmq-${version}";
+  pname = "czmq";
 
   src = fetchurl {
-    url = "http://download.zeromq.org/${name}.tar.gz";
+    url = "http://download.zeromq.org/${pname}-${version}.tar.gz";
     sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb";
   };
 
diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix
index 13cee8fe86b..05e499c73d0 100644
--- a/pkgs/development/libraries/czmq/4.x.nix
+++ b/pkgs/development/libraries/czmq/4.x.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "4.2.0";
-  name = "czmq-${version}";
+  pname = "czmq";
 
   src = fetchurl {
-    url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/zeromq/czmq/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg";
   };
 
diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix
index 0c026b9f47a..079eb0806d2 100644
--- a/pkgs/development/libraries/czmqpp/default.nix
+++ b/pkgs/development/libraries/czmqpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }:
 
 stdenv.mkDerivation rec {
-  name = "czmqpp-${version}";
+  pname = "czmqpp";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix
index 163b0f4be88..2609f47b276 100644
--- a/pkgs/development/libraries/dbus-cplusplus/default.nix
+++ b/pkgs/development/libraries/dbus-cplusplus/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, dbus, glib, pkgconfig, expat }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-cplusplus-${version}";
+  pname = "dbus-cplusplus";
   version = "0.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw";
   };
 
diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
index 0f897d97467..22c0a9137ca 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-sharp-glib-${version}";
+  pname = "dbus-sharp-glib";
   version = "0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix
index cd020317f4c..496a109b58f 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/default.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-sharp-glib-${version}";
+  pname = "dbus-sharp-glib";
   version = "0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
index 18ea3ad3ecb..084beae5972 100644
--- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-sharp-${version}";
+  pname = "dbus-sharp";
   version = "0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index 14db5baea3f..0fd638dbf8e 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-sharp-${version}";
+  pname = "dbus-sharp";
   version = "0.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix
index da7549aeea3..b940315aed8 100644
--- a/pkgs/development/libraries/dbxml/default.nix
+++ b/pkgs/development/libraries/dbxml/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, db62, xercesc, xqilla }:
 
 stdenv.mkDerivation rec {
-  name = "dbxml-${version}";
+  pname = "dbxml";
   version = "6.1.4";
 
   src = fetchurl {
-    url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
+    url = "http://download.oracle.com/berkeley-db/${pname}-${version}.tar.gz";
     sha256 = "a8fc8f5e0c3b6e42741fa4dfc3b878c982ff8f5e5f14843f6a7e20d22e64251a";
   };
 
diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix
index 5b05d64f072..93e5da5b792 100644
--- a/pkgs/development/libraries/dirac/default.nix
+++ b/pkgs/development/libraries/dirac/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.2";
-  name = "dirac-${version}";
+  pname = "dirac";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dirac/${name}.tar.gz";
+    url = "mirror://sourceforge/dirac/${pname}-${version}.tar.gz";
     sha256 = "1z803yzp17cj69wn11iyb13swqdd9xdzr58dsk6ghpr3ipqicsw1";
   };
 
diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
index d52f1b6a2cf..643e7d3cc5d 100644
--- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix
+++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "dleyna-connector-dbus";
-  name = "${pname}-${version}";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index 67a56855bb7..e28b1add7e2 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   version = "19.16";
-  name = "dlib-${version}";
+  pname = "dlib";
 
   src = fetchFromGitHub {
     owner = "davisking";
diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix
index 83466b693f5..59578ef796e 100644
--- a/pkgs/development/libraries/docopt_cpp/default.nix
+++ b/pkgs/development/libraries/docopt_cpp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.2";
-  name = "docopt.cpp-${version}";
+  pname = "docopt.cpp";
 
   src = fetchFromGitHub {
     owner = "docopt";
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 095697762dd..bc4bc8b2352 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "double-conversion-${version}";
+  pname = "double-conversion";
   version = "3.1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index c85f6de0405..756a03503b3 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "drumstick-${version}";
+  pname = "drumstick";
   version = "1.1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0kljqyqj7s1i2z52i24x7ail1bywn6dcxxfbad5c59drm8wv94bp";
   };
 
diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index 9be19f51e7e..779e6b07762 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dssi-${version}";
+  pname = "dssi";
   version = "1.1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/dssi/dssi/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/dssi/dssi/${version}/${pname}-${version}.tar.gz";
     sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j";
   };
 
diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix
index 832b013123d..8d8b41e0609 100644
--- a/pkgs/development/libraries/dxflib/default.nix
+++ b/pkgs/development/libraries/dxflib/default.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation rec {
   version = "3.12.2";
-  name = "dxflib-${version}";
+  pname = "dxflib";
   src = fetchurl {
-    url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz";
+    url = "http://www.qcad.org/archives/dxflib/${pname}-${version}.src.tar.gz";
     sha256 = "20ad9991eec6b0f7a3cc7c500c044481a32110cdc01b65efa7b20d5ff9caefa9";
   };
 
diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
index 704f5c51c9c..a6ff37bee97 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dyncall-${version}";
+  pname = "dyncall";
   version = "1.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix
index 4ca9eab51bb..028cd221614 100644
--- a/pkgs/development/libraries/easyloggingpp/default.nix
+++ b/pkgs/development/libraries/easyloggingpp/default.nix
@@ -3,7 +3,7 @@
 # add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc)
 { stdenv, fetchFromGitHub, cmake, gtest }:
 stdenv.mkDerivation rec {
-  name = "easyloggingpp-${version}";
+  pname = "easyloggingpp";
   version = "9.96.7";
   src = fetchFromGitHub {
     owner = "muflihun";
diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 78f80d2baf4..a9a77f6a9da 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -5,7 +5,7 @@
 , enableOpenMPThreads ? false}:
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "eccodes-${version}";
+  pname = "eccodes";
   version = "2.12.5";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index 62f04e061cf..71229909431 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -13,7 +13,6 @@
 assert withFlint -> flint != null;
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "eclib";
   version = "20190226"; # upgrade might break the sage interface
   # sage tests to run:
diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index 6dfd4edd071..5f9c72f04af 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "editline-${version}";
+  pname = "editline";
   version = "1.16.1";
   src = fetchFromGitHub {
     owner = "troglobit";
diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix
index 710338842f8..566f8bfd8d1 100644
--- a/pkgs/development/libraries/elementary-cmake-modules/default.nix
+++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "elementary-cmake-modules-${version}";
+  pname = "elementary-cmake-modules";
   version = "0.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix
index c973c2bd944..4fc85aee69f 100644
--- a/pkgs/development/libraries/embree/2.x.nix
+++ b/pkgs/development/libraries/embree/2.x.nix
@@ -3,7 +3,7 @@ openimageio, libjpeg, libpng, libpthreadstubs, libX11
 }:
 
 stdenv.mkDerivation rec {
-  name = "embree-${version}";
+  pname = "embree";
   version = "2.17.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix
index b7303468cba..ed91f791149 100644
--- a/pkgs/development/libraries/enchant/1.x.nix
+++ b/pkgs/development/libraries/enchant/1.x.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   version = "1.6.1";
   pname = "enchant";
 
   src = fetchurl {
-    url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${name}.tar.gz";
+    url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${pname}-${version}.tar.gz";
     sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y";
   };
 
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index c4285eadabc..d45767058bb 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "epoxy-${version}";
+  pname = "epoxy";
   version = "1.5.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix
index 240f3c136ef..8e9b2a641cf 100644
--- a/pkgs/development/libraries/exosip/default.nix
+++ b/pkgs/development/libraries/exosip/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, libosip, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
- name = "libexosip2-${version}";
+ pname = "libexosip2";
  version = "4.1.0";
  
  src = fetchurl {
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index c568a670f55..7a5afd8e801 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -7,11 +7,11 @@ assert mp4v2Support -> (mp4v2 != null);
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "faac-${version}";
+  pname = "faac";
   version = "1.29.9.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/faac/${name}.tar.gz";
+    url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz";
     sha256 = "0wf781vp7rzmxkx5h0w8j2i4xc63iixxikgbvvkdljbwhffj0pyl";
   };
 
diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix
index e7e4835d2ed..29c0252482e 100644
--- a/pkgs/development/libraries/faad2/default.nix
+++ b/pkgs/development/libraries/faad2/default.nix
@@ -4,11 +4,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "faad2-${version}";
+  pname = "faad2";
   version = "2.8.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/faac/${name}.tar.gz";
+    url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz";
     sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl";
   };
 
diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix
index c23fc0bc59f..a29cbb9bbd1 100644
--- a/pkgs/development/libraries/farbfeld/default.nix
+++ b/pkgs/development/libraries/farbfeld/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "farbfeld-${version}";
+  pname = "farbfeld";
   version = "4";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix
index bac867978f4..75d9146c335 100644
--- a/pkgs/development/libraries/fastjson/default.nix
+++ b/pkgs/development/libraries/fastjson/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.99.8";
-  name = "fastjson-${version}";
+  pname = "fastjson";
   src = fetchFromGitHub {
     repo = "libfastjson";
     owner = "rsyslog";
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index de78647dc48..5eb7e3866ce 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "fcgi-${version}";
+  pname = "fcgi";
   version = "2.4.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 9b7cea3ebbc..70269002e2f 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -4,11 +4,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "fdk-aac-${version}";
+  pname = "fdk-aac";
   version = "2.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz";
+    url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz";
     sha256 = "0v6rbyw9f9lpfvcg3v1qyapga5hqfnb3wp3x5yaxpwcgjw7ydmpp";
   };
 
diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix
index eae0326c832..4a276db12c0 100644
--- a/pkgs/development/libraries/fflas-ffpack/1.nix
+++ b/pkgs/development/libraries/fflas-ffpack/1.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, autoreconfHook, givaro_3_7, pkgconfig, openblas, gmpxx}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fflas-ffpack";
   version = "1.6.0";
   src = fetchurl {
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index a67210e860c..858bc209391 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -2,7 +2,6 @@
 , gmpxx
 }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fflas-ffpack";
   version = "2.4.0";
 
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 65a48890e49..00131688f09 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -233,7 +233,7 @@ assert openglExtlib -> libGLU_combined != null;
 assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-full-${version}";
+  pname = "ffmpeg-full";
   version = "4.1.4";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix
index 4607d3e2f19..439342a50b8 100644
--- a/pkgs/development/libraries/ffmpeg-sixel/default.nix
+++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "ffmpeg-sixel-${version}";
+  pname = "ffmpeg-sixel";
   version = "nightly-2.3.x";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 72929e127bc..84260f3f57c 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -65,11 +65,11 @@ assert openglSupport -> libGLU_combined != null;
 
 stdenv.mkDerivation rec {
 
-  name = "ffmpeg-${version}";
+  pname = "ffmpeg";
   inherit version;
 
   src = fetchurl {
-    url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
+    url = "https://www.ffmpeg.org/releases/${pname}-${version}.tar.bz2";
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index a1cc11fb8c1..45238690fe0 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ffmpegthumbnailer-${version}";
+  pname = "ffmpegthumbnailer";
   version = "2.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 1ad861fc63d..c404a12f3df 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ffms-${version}";
+  pname = "ffms";
   version = "2.23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix
index 4a2bed6b497..07f1c7ec917 100644
--- a/pkgs/development/libraries/filter-audio/default.nix
+++ b/pkgs/development/libraries/filter-audio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "filter-audio-${version}";
+  pname = "filter-audio";
   version = "0.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
index 504b58b6aa4..d96ceb5d26b 100644
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "flatbuffers-${version}";
+  pname = "flatbuffers";
   version = "1.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix
index d92a0c61aab..20a80119b13 100644
--- a/pkgs/development/libraries/flint/default.nix
+++ b/pkgs/development/libraries/flint/default.nix
@@ -12,7 +12,7 @@
 assert withBlas -> openblas != null;
 
 stdenv.mkDerivation rec {
-  name = "flint-${version}";
+  pname = "flint";
   version = "2.5.2"; # remove libflint.so.MAJOR patch when updating
   src = fetchurl {
     url = "http://www.flintlib.org/flint-${version}.tar.gz";
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 2cfc87d6a2e..6ade5eb833a 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.3.0";
-  name = "fmt-${version}";
+  pname = "fmt";
 
   src = fetchFromGitHub {
     owner = "fmtlib";
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 3fba3db7a33..6a51154c459 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -2,7 +2,7 @@
 , gflags, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "folly-${version}";
+  pname = "folly";
   version = "2019.07.22.00";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index f730e3e3408..186560ae101 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -17,11 +17,11 @@ let
   configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations
 in
 stdenv.mkDerivation rec {
-  name = "fontconfig-${version}";
+  pname = "fontconfig";
   version = "2.12.6";
 
   src = fetchurl {
-    url = "http://fontconfig.org/release/${name}.tar.bz2";
+    url = "http://fontconfig.org/release/${pname}-${version}.tar.bz2";
     sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g";
   };
 
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 40430f34334..fa4a8c23e2f 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -2,11 +2,11 @@
 , CoreServices ? null }:
 
 stdenv.mkDerivation rec {
-  name = "fox-${version}";
+  pname = "fox";
   version = "1.7.9";
 
   src = fetchurl {
-    url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
+    url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz";
     sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg";
   };
 
diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix
index 952ecb0eade..1fd18254e10 100644
--- a/pkgs/development/libraries/fplll/20160331.nix
+++ b/pkgs/development/libraries/fplll/20160331.nix
@@ -2,7 +2,6 @@
 , gmp, mpfr
 }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fplll";
   version = "20160331";
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index 063217a4504..f06f7bf4a02 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -2,7 +2,6 @@
 , gmp, mpfr
 }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fplll";
   version = "5.2.1";
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix
index e15626a160e..feccfd1bfd2 100644
--- a/pkgs/development/libraries/frame/default.nix
+++ b/pkgs/development/libraries/frame/default.nix
@@ -2,10 +2,10 @@
 ,  stdenv, fetchurl, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "frame-${version}";
+  pname = "frame";
   version = "2.5.0";
   src = fetchurl {
-    url = "https://launchpad.net/frame/trunk/v${version}/+download/${name}.tar.xz";
+    url = "https://launchpad.net/frame/trunk/v${version}/+download/${pname}-${version}.tar.xz";
     sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a";
   };
 
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index 3771880d360..41480789a08 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -3,7 +3,7 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "freenect-${version}";
+  pname = "freenect";
   version = "0.5.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index ee63ce2f2f9..0ff9cea3d27 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -7,11 +7,11 @@ assert odbcSupport -> unixODBC != null;
 # Work is in progress to move to cmake so revisit that later
 
 stdenv.mkDerivation rec {
-  name = "freetds-${version}";
+  pname = "freetds";
   version = "1.1.6";
 
   src = fetchurl {
-    url    = "https://www.freetds.org/files/stable/${name}.tar.bz2";
+    url    = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
     sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2";
   };
 
diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix
index cdeddd82b71..560855c908b 100644
--- a/pkgs/development/libraries/frei0r/default.nix
+++ b/pkgs/development/libraries/frei0r/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "frei0r-plugins-${version}";
+  pname = "frei0r-plugins";
   version = "1.6.1";
 
   src = fetchurl {
-    url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz";
+    url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz";
     sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0";
   };
 
diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix
index 68f3c9d0ee5..5e8197d5e81 100644
--- a/pkgs/development/libraries/fstrcmp/default.nix
+++ b/pkgs/development/libraries/fstrcmp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, libtool, ghostscript, groff }:
 
 stdenv.mkDerivation rec {
-  name = "fstrcmp-${version}";
+  pname = "fstrcmp";
   version = "0.7";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix
index 3fcf218d6b5..380f64cf523 100644
--- a/pkgs/development/libraries/fstrm/default.nix
+++ b/pkgs/development/libraries/fstrm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "fstrm-${version}";
+  pname = "fstrm";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
index 7e35ed2e530..a990da4b010 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, gtest }:
 
 stdenv.mkDerivation rec {
-  name = "gbenchmark-${version}";
+  pname = "gbenchmark";
   version = "1.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix
index 4762d1fb119..2589b6cfa16 100644
--- a/pkgs/development/libraries/gcc/libstdc++/5.nix
+++ b/pkgs/development/libraries/gcc/libstdc++/5.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, flex, bison, file }:
 
 stdenv.mkDerivation rec {
-  name = "libstdc++5-${version}";
+  pname = "libstdc++5";
   version = "3.3.6";
 
   src = [
diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix
index 5ceded0546c..6f57d735980 100644
--- a/pkgs/development/libraries/gd/default.nix
+++ b/pkgs/development/libraries/gd/default.nix
@@ -11,11 +11,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gd-${version}";
+  pname = "gd";
   version = "2.2.5";
 
   src = fetchurl {
-    url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz";
+    url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz";
     sha256 = "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c";
   };
 
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix
index 14113d8b87e..baf847d4e0a 100644
--- a/pkgs/development/libraries/gdal/2.4.0.nix
+++ b/pkgs/development/libraries/gdal/2.4.0.nix
@@ -8,11 +8,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "gdal-${version}";
+  pname = "gdal";
   version = "2.4.0";
 
   src = fetchurl {
-    url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
+    url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz";
     sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3";
   };
 
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 0db16e2efe3..413d4e19dde 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -8,7 +8,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "gdal-${version}";
+  pname = "gdal";
   version = "3.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix
index 40308a95791..a6574053414 100644
--- a/pkgs/development/libraries/gdal/gdal-1_11.nix
+++ b/pkgs/development/libraries/gdal/gdal-1_11.nix
@@ -3,11 +3,11 @@
 , libpng }:
 
 stdenv.mkDerivation rec {
-  name = "gdal-${version}";
+  pname = "gdal";
   version = "1.11.5";
 
   src = fetchurl {
-    url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
+    url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz";
     sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl";
   };
 
diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix
index a9b79dac7b8..b7043b61c8a 100644
--- a/pkgs/development/libraries/gdata-sharp/default.nix
+++ b/pkgs/development/libraries/gdata-sharp/default.nix
@@ -3,7 +3,7 @@
 let
   newtonsoft-json = dotnetPackages.NewtonsoftJson;
 in stdenv.mkDerivation rec {
-  name = "gdata-sharp-${version}";
+  pname = "gdata-sharp";
   version = "2.2.0.0";
 
   src = fetchsvn {
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index fa99dbe1d9f..29a30a1b157 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.1";
-  name = "gdcm-${version}";
+  pname = "gdcm";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gdcm/${name}.tar.bz2";
+    url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2";
     sha256 = "1n206rr28f9ysd5yns6hc6vxwhwj1ck59p2j1wqyclm60zr84isq";
   };
 
diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix
index 32e1163e0f0..0d96b9b5a92 100644
--- a/pkgs/development/libraries/gecode/3.nix
+++ b/pkgs/development/libraries/gecode/3.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bash, perl }:
 
 stdenv.mkDerivation rec {
-  name = "gecode-${version}";
+  pname = "gecode";
   version = "3.7.3";
 
   src = fetchurl {
-    url = "http://www.gecode.org/download/${name}.tar.gz";
+    url = "http://www.gecode.org/download/${pname}-${version}.tar.gz";
     sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77";
   };
 
diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
index 9a6b5d9cf27..454e811447a 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "gecode-${version}";
+  pname = "gecode";
   version = "6.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 4b9f67b7aaf..97b9ba087e2 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -21,11 +21,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "geis-${version}";
+  pname = "geis";
   version = "2.2.17";
 
   src = fetchurl {
-    url = "https://launchpad.net/geis/trunk/${version}/+download/${name}.tar.xz";
+    url = "https://launchpad.net/geis/trunk/${version}/+download/${pname}-${version}.tar.xz";
     sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
   };
 
diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix
index 22e7d216e6c..0e0477cd24d 100644
--- a/pkgs/development/libraries/getdata/default.nix
+++ b/pkgs/development/libraries/getdata/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, libtool }:
 stdenv.mkDerivation rec {
-  name = "getdata-${version}";
+  pname = "getdata";
   version = "0.10.0";
   src = fetchurl {
-    url = "mirror://sourceforge/getdata/${name}.tar.xz";
+    url = "mirror://sourceforge/getdata/${pname}-${version}.tar.xz";
     sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym";
   };
 
diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix
index 0493071ee22..3a6c4ee1dbd 100644
--- a/pkgs/development/libraries/getdns/default.nix
+++ b/pkgs/development/libraries/getdns/default.nix
@@ -3,7 +3,6 @@
 
 stdenv.mkDerivation rec {
   pname = "getdns";
-  name = "${pname}-${version}";
   version = "1.5.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 6eb8bae435b..9547c6c31ad 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -2,11 +2,11 @@
 
 let allowBisonDependency = !stdenv.isDarwin; in
 stdenv.mkDerivation rec {
-  name = "gettext-${version}";
+  pname = "gettext";
   version = "0.19.8.1";
 
   src = fetchurl {
-    url = "mirror://gnu/gettext/${name}.tar.gz";
+    url = "mirror://gnu/gettext/${pname}-${version}.tar.gz";
     sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z";
   };
   patches = [
diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix
index a00e07376c7..b1a2524065a 100644
--- a/pkgs/development/libraries/gf2x/default.nix
+++ b/pkgs/development/libraries/gf2x/default.nix
@@ -4,7 +4,7 @@
 , optimize ? false # impure hardware optimizations
 }:
 stdenv.mkDerivation rec {
-  name = "gf2x-${version}";
+  pname = "gf2x";
   version = "1.2"; # remember to also update the url
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix
index b0a115eb4a5..86c5b7949a1 100644
--- a/pkgs/development/libraries/gio-sharp/default.nix
+++ b/pkgs/development/libraries/gio-sharp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }:
 
 stdenv.mkDerivation rec {
-  name = "gio-sharp-${version}";
+  pname = "gio-sharp";
   version = "0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix
index 3101bc64333..debddc6723f 100644
--- a/pkgs/development/libraries/givaro/3.7.nix
+++ b/pkgs/development/libraries/givaro/3.7.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "givaro";
   version = "3.7.2";
   src = fetchurl {
diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix
index d73a448f166..efed0926bb3 100644
--- a/pkgs/development/libraries/givaro/3.nix
+++ b/pkgs/development/libraries/givaro/3.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "givaro";
   version = "3.8.0";
   src = fetchurl {
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index 1a97150aa48..79fb7a8d738 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "givaro";
   version = "4.1.1";
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix
index aadc6986f5a..8b522c6e92b 100644
--- a/pkgs/development/libraries/gl2ps/default.nix
+++ b/pkgs/development/libraries/gl2ps/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.0";
-  name = "gl2ps-${version}";
+  pname = "gl2ps";
 
   src = fetchurl {
-    url = "http://geuz.org/gl2ps/src/${name}.tgz";
+    url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz";
     sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3";
   };
 
diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix
index d12b8a7c11d..6498419bc27 100644
--- a/pkgs/development/libraries/glbinding/default.nix
+++ b/pkgs/development/libraries/glbinding/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "glbinding";
   version = "3.1.0";
 
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 6944d5b9292..2ee36d405b3 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.2.1";
-  name = "glfw-${version}";
+  pname = "glfw";
 
   src = fetchFromGitHub {
     owner = "glfw";
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix
index 319a0359c58..e7d4c934db8 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/pkgs/development/libraries/glm/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.8.5";
-  name = "glm-${version}";
+  pname = "glm";
 
   src = fetchzip {
-    url = "https://github.com/g-truc/glm/releases/download/${version}/${name}.zip";
+    url = "https://github.com/g-truc/glm/releases/download/${version}/${pname}-${version}.zip";
     sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2";
   };
 
diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix
index 3ef279616f7..28d32765e30 100644
--- a/pkgs/development/libraries/globalplatform/default.nix
+++ b/pkgs/development/libraries/globalplatform/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, openssl, pcsclite }:
 
 stdenv.mkDerivation rec {
-  name = "globalplatform-${version}";
+  pname = "globalplatform";
   version  = "6.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/globalplatform/${name}.tar.gz";
+    url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
     sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy";
   };
 
diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
index 10df82196c2..b4900bb953d 100644
--- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
+++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, globalplatform, openssl, pcsclite }:
 
 stdenv.mkDerivation rec {
-  name = "gppcscconnectionplugin-${version}";
+  pname = "gppcscconnectionplugin";
   version  = "1.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/globalplatform/${name}.tar.gz";
+    url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
     sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad";
   };
 
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
index 9ae181e9453..6aa300e2b62 100644
--- a/pkgs/development/libraries/glog/default.nix
+++ b/pkgs/development/libraries/glog/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, perl }:
 
 stdenv.mkDerivation rec {
-  name = "glog-${version}";
+  pname = "glog";
   version = "0.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index 1d35c0696d2..84a7aff7107 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -14,10 +14,10 @@ assert withGmp -> gmp != null;
 
 stdenv.mkDerivation rec {
   version = "4.65";
-  name = "glpk-${version}";
+  pname = "glpk";
 
   src = fetchurl {
-    url = "mirror://gnu/glpk/${name}.tar.gz";
+    url = "mirror://gnu/glpk/${pname}-${version}.tar.gz";
     sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2";
   };
 
diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix
index b373095a814..3b4ad1393d0 100644
--- a/pkgs/development/libraries/gmime/2.nix
+++ b/pkgs/development/libraries/gmime/2.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.6.23";
-  name = "gmime-${version}";
+  pname = "gmime";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz";
+    url = "mirror://gnome/sources/gmime/2.6/${pname}-${version}.tar.xz";
     sha256 = "0slzlzcr3h8jikpz5a5amqd0csqh2m40gdk910ws2hnaf5m6hjbi";
   };
 
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 699d2854f3d..81546e5c127 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.2.3";
-  name = "gmime-${version}";
+  pname = "gmime";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz";
+    url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz";
     sha256 = "04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a";
   };
 
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index 6423e1fce98..63d9d8c2762 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gmm-${version}";
+  pname = "gmm";
   version = "5.3";
 
   src = fetchurl {
-    url = "mirror://savannah/getfem/stable/${name}.tar.gz";
+    url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz";
     sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46";
   };
 
diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix
index 0fac97aaa43..10d584c6ccb 100644
--- a/pkgs/development/libraries/gmtk/default.nix
+++ b/pkgs/development/libraries/gmtk/default.nix
@@ -2,7 +2,7 @@
 , libpulseaudio, mplayer, gnome_mplayer }:
 
 stdenv.mkDerivation rec {
-  name = "gmtk-${version}";
+  pname = "gmtk";
   version = "1.0.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix
index 5e525ad46af..36d42644e0b 100644
--- a/pkgs/development/libraries/gnome-sharp/default.nix
+++ b/pkgs/development/libraries/gnome-sharp/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-sharp-${version}";
+  pname = "gnome-sharp";
   version = "2.24.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix
index 7918fb7b9c4..e914f9d78ee 100644
--- a/pkgs/development/libraries/gnu-config/default.nix
+++ b/pkgs/development/libraries/gnu-config/default.nix
@@ -14,7 +14,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "gnu-config-${version}";
+  pname = "gnu-config";
   version = "2019-04-15";
 
   buildCommand = ''
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 036863c9c0b..af225cc50f2 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pciutils }: with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "gnu-efi-${version}";
+  pname = "gnu-efi";
   version = "3.0.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2";
+    url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2";
     sha256 = "1w3p4aqlc5j93q44la7dc8cr3hky20zvsd0h0k2lyzhwmrzfl5b7";
   };
 
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index c462f2e685a..26d5e9c88c7 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -12,11 +12,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gpgme-${version}";
+  pname = "gpgme";
   version = "1.13.1";
 
   src = fetchurl {
-    url = "mirror://gnupg/gpgme/${name}.tar.bz2";
+    url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2";
     sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4";
   };
 
diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix
index a48490ffae5..722fb79d5d6 100644
--- a/pkgs/development/libraries/grail/default.nix
+++ b/pkgs/development/libraries/grail/default.nix
@@ -2,11 +2,11 @@
   stdenv, fetchurl, pkgconfig, xorg, python3, frame }:
 
 stdenv.mkDerivation rec {
-  name = "grail-${version}";
+  pname = "grail";
   version = "3.1.1";
 
   src = fetchurl {
-    url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2";
+    url = "https://launchpad.net/grail/trunk/${version}/+download/${pname}-${version}.tar.bz2";
     sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay";
   };
 
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 52c087b1914..3b14efe8a5f 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }:
 
 mkDerivation rec {
-  name = "grantlee-${version}";
+  pname = "grantlee";
   version = "5.1.0";
   grantleeCompatVersion = "5.1";
   grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}";
@@ -9,7 +9,7 @@ mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
     sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
   };
 
   buildInputs = [ qtbase qtscript ];
diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix
index 1072c8f2cbf..dc3defac638 100644
--- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix
+++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "graphene-hardened-malloc-${version}";
+  pname = "graphene-hardened-malloc";
   version = "1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index 224cd125dce..38243ce5a6d 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -3,7 +3,7 @@
   enablePython ? false, pythonPackages }:
 
 stdenv.mkDerivation rec{
-  name = "grib-api-${version}";
+  pname = "grib-api";
   version = "1.28.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 81e90154aa5..af8fbcb9a54 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.22.0";
-  name = "grpc-${version}";
+  pname = "grpc";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
index d454ca63fd7..ffb8be85d3a 100644
--- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
@@ -6,11 +6,11 @@
 , gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gsettings-desktop-schemas-${version}";
+  pname = "gsettings-desktop-schemas";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d";
   };
 
diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix
index 744d9eb6de9..812128fb12f 100644
--- a/pkgs/development/libraries/gsettings-qt/default.nix
+++ b/pkgs/development/libraries/gsettings-qt/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gsettings-qt-${version}";
+  pname = "gsettings-qt";
   version = "0.1.20170824";
 
   src = fetchbzr {
diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
index 7c15e10620a..0ba3bf35423 100644
--- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "gsignond-plugin-lastfm-${version}";
+  pname = "gsignond-plugin-lastfm";
   version = "2018-05-07";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
index 887376d3187..d9afecc6d0c 100644
--- a/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -3,7 +3,7 @@
 , docbook_xsl, glibcLocales, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "gsignond-plugin-oauth-${version}";
+  pname = "gsignond-plugin-oauth";
   version = "2018-10-15";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
index 655f73931f6..b9eecaf0946 100644
--- a/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -2,7 +2,7 @@
 , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "gsignond-plugin-sasl-${version}";
+  pname = "gsignond-plugin-sasl";
   version = "2018-10-15";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 33583a4c6bb..1405d4782ad 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -8,11 +8,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gsm-${version}";
+  pname = "gsm";
   version = "1.0.18";
 
   src = fetchurl {
-    url = "http://www.quut.com/gsm/${name}.tar.gz";
+    url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz";
     sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4";
   };
 
diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix
index f099d3fabc0..a1a0da51017 100644
--- a/pkgs/development/libraries/gsoap/default.nix
+++ b/pkgs/development/libraries/gsoap/default.nix
@@ -4,7 +4,7 @@ let
   majorVersion = "2.8";
 
 in stdenv.mkDerivation rec {
-  name = "gsoap-${version}";
+  pname = "gsoap";
   version = "${majorVersion}.53";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 2ae0ad2b453..735ab4e6e18 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -51,7 +51,7 @@ let
   inherit (stdenv.lib) optional optionals;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-${version}";
+  pname = "gst-plugins-bad";
   version = "1.16.0";
 
   meta = with stdenv.lib; {
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-plugins-bad/${pname}-${version}.tar.xz";
     sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 87bbef227de..fb1d627d7b1 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -14,7 +14,7 @@
 , enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-${version}";
+  pname = "gst-plugins-base";
   version = "1.16.0";
 
   meta = with lib; {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-plugins-base/${pname}-${version}.tar.xz";
     sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index fa838d5ff77..f0f01a977fd 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-${version}";
+  pname = "gstreamer";
   version = "1.16.0";
 
   meta = with lib ;{
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
+    url = "${meta.homepage}/src/gstreamer/${pname}-${version}.tar.xz";
     sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 703fcb58898..810cee650ca 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-editing-services-${version}";
+  pname = "gstreamer-editing-services";
   version = "1.16.0";
 
   meta = with stdenv.lib; {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
+    url = "${meta.homepage}/src/gstreamer-editing-services/${pname}-${version}.tar.xz";
     sha256 = "1las94jkx83sxmzi5w6b0xm89dqqwzpdsb6h9w9ixndhnbpzm8w2";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 557e3caa722..c801684b065 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -25,7 +25,7 @@ let
   inherit (stdenv.lib) optional optionals;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-${version}";
+  pname = "gst-plugins-good";
   version = "1.16.0";
 
   meta = with stdenv.lib; {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-plugins-good/${pname}-${version}.tar.xz";
     sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 297c8ada884..1847b8d0c12 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,7 +9,7 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-${version}";
+  pname = "gst-libav";
   version = "1.16.0";
 
   meta = {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-libav/${pname}-${version}.tar.xz";
     sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index c4620a29e94..5c571fa4a1e 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-rtsp-server-${version}";
+  pname = "gst-rtsp-server";
   version = "1.16.0";
 
   meta = with stdenv.lib; {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-rtsp-server/${pname}-${version}.tar.xz";
     sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 5c3a56814ba..552ab1ec292 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-${version}";
+  pname = "gst-plugins-ugly";
   version = "1.16.0";
 
   meta = with lib; {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-plugins-ugly/${pname}-${version}.tar.xz";
     sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index c0541857e8b..7e64636d96d 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-vaapi-${version}";
+  pname = "gst-vaapi";
   version = "1.16.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index 06d275078f3..ad013d1570e 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-validate-${version}";
+  pname = "gst-validate";
   version = "1.16.0";
 
   meta = {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-validate/${pname}-${version}.tar.xz";
     sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck";
   };
 
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index 9ceb571983e..5fecd45b7da 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -2,7 +2,7 @@
 , static ? false }:
 
 stdenv.mkDerivation rec {
-  name = "gtest-${version}";
+  pname = "gtest";
   version = "1.8.1";
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix
index 7f35f088da2..1e3b7d45edd 100644
--- a/pkgs/development/libraries/gtk-sharp-beans/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }:
 
 stdenv.mkDerivation rec {
-  name = "gtk-sharp-beans-${version}";
+  pname = "gtk-sharp-beans";
   version = "2.14.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index 659dc14800e..615ea66f4d9 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -23,7 +23,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gtk-sharp-${version}";
+  pname = "gtk-sharp";
   version = "2.12.45";
 
   builder = ./builder.sh;
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index c2f05b51a65..d26cc969259 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -4,7 +4,7 @@
 let
   inherit (gst_all_1) gstreamer gst-plugins-base;
 in stdenv.mkDerivation rec {
-  name = "gtkd-${version}";
+  pname = "gtkd";
   version = "3.8.5";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index 9d1751afaf9..1b35221f066 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -2,11 +2,11 @@
 , libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
 
 stdenv.mkDerivation rec {
-  name = "gtksourceview-${version}";
+  pname = "gtksourceview";
   version = "3.24.11";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9";
   };
 
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 553e9fd9cbb..fde94e79f05 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -2,11 +2,11 @@
 , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
 
 stdenv.mkDerivation rec {
-  name = "gtksourceview-${version}";
+  pname = "gtksourceview";
   version = "4.2.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4";
   };
 
diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix
index 455cc4d4b81..1b66bfd031f 100644
--- a/pkgs/development/libraries/gtksourceviewmm/default.nix
+++ b/pkgs/development/libraries/gtksourceviewmm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gtksourceviewmm-${version}";
+  pname = "gtksourceviewmm";
   version = "3.21.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v";
   };
 
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index f0baecb1990..54b4b001d81 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}:
 
 stdenv.mkDerivation rec {
-  name = "gtkspell-${version}";
+  pname = "gtkspell";
   version = "3.0.10";
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix
index cb141f8c556..97f1a12c178 100644
--- a/pkgs/development/libraries/gtkspellmm/default.nix
+++ b/pkgs/development/libraries/gtkspellmm/default.nix
@@ -4,12 +4,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gtkspellmm-${version}";
+  pname = "gtkspellmm";
   version = "3.0.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" +
-          "${name}.tar.xz";
+          "${pname}-${version}.tar.xz";
     sha256 = "0i8mxwyfv5mskachafa4qlh315q0cfph7s66s1s34nffadbmm1sv";
   };
 
diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix
index d0da7f8cef6..9cc079d6103 100644
--- a/pkgs/development/libraries/gts/default.nix
+++ b/pkgs/development/libraries/gts/default.nix
@@ -2,11 +2,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "gts-${version}";
+  pname = "gts";
   version = "0.7.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gts/${name}.tar.gz";
+    url = "mirror://sourceforge/gts/${pname}-${version}.tar.gz";
     sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705";
   };
 
diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix
index 17ca323a5fe..2db8c1e6739 100644
--- a/pkgs/development/libraries/gumbo/default.nix
+++ b/pkgs/development/libraries/gumbo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "gumbo-${version}";
+  pname = "gumbo";
   version = "0.10.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 78a2d365033..2f39b03898d 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -3,7 +3,7 @@
 , glib, systemd, libusb1, vala, hwdata
 }:
 stdenv.mkDerivation rec {
-  name = "gusb-${version}";
+  pname = "gusb";
   version = "0.3.0";
 
   outputs = [ "bin" "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix
index d235c6cb086..063d416a8fc 100644
--- a/pkgs/development/libraries/half/default.nix
+++ b/pkgs/development/libraries/half/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.12.0";
-  name = "half-${version}";
+  pname = "half";
 
   src = fetchzip {
     url = "mirror://sourceforge/half/${version}/half-${version}.zip";
diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix
index b9cd31432fc..000af7fd74e 100644
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/pkgs/development/libraries/hamlib/default.nix
@@ -4,10 +4,9 @@
 stdenv.mkDerivation rec {
   pname = "hamlib";
   version = "3.3";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9";
   };
 
diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index a5f8f00a6bf..ec86db036e9 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.1.0";
-  name = "herqq-${version}";
+  pname = "herqq";
 
   nativeBuildInputs = [ qt5.qmake ];
   buildInputs = [ qt5.qtbase unzip qtmultimedia ];
diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix
index 13f7c421906..6dc3871e1c1 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/pkgs/development/libraries/hiredis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "hiredis-${version}";
+  pname = "hiredis";
   version = "0.14.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix
index 37f01372005..ca547faa2ab 100644
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@@ -2,11 +2,11 @@
 , perlPackages, libxml2, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "hivex-${version}";
+  pname = "hivex";
   version = "1.3.18";
 
   src = fetchurl {
-    url = "http://libguestfs.org/download/hivex/${name}.tar.gz";
+    url = "http://libguestfs.org/download/hivex/${pname}-${version}.tar.gz";
     sha256 = "0ibl186l6rd9qj4rqccfwbg1nnx6z07vspkhk656x6zav67ph7la";
   };
 
diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index 99777bbd6f0..a3a8c7baa09 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "hpx-${version}";
+  pname = "hpx";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix
index 1537f9cc480..f0968c47822 100644
--- a/pkgs/development/libraries/htmlcxx/default.nix
+++ b/pkgs/development/libraries/htmlcxx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "htmlcxx-${version}";
+  pname = "htmlcxx";
   version = "0.86";
 
   src = fetchurl {
-    url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz";
     sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07";
   };
 
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 3728c05e516..00e8dc3d4db 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.7.0";
-  name = "hunspell-${version}";
+  pname = "hunspell";
 
   src = fetchurl {
     url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix
index d4ebb5534d9..3d00d20f170 100644
--- a/pkgs/development/libraries/idnkit/default.nix
+++ b/pkgs/development/libraries/idnkit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "idnkit-${version}";
+  pname = "idnkit";
   version = "2.3";
 
   src = fetchurl {
-    url = "https://jprs.co.jp/idn/${name}.tar.bz2";
+    url = "https://jprs.co.jp/idn/${pname}-${version}.tar.bz2";
     sha256 = "0zp9yc84ff5s0g2i6v9yfyza2n2x4xh0kq7hjd3anhh0clbp3l16";
   };
 
diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix
index b97f62dcf25..6330347cd27 100644
--- a/pkgs/development/libraries/iksemel/default.nix
+++ b/pkgs/development/libraries/iksemel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "iksemel-${version}";
+  pname = "iksemel";
   version = "1.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 2d22788e1ec..5cc0f7c1f46 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }:
 
 stdenv.mkDerivation rec {
-  name = "ilmbase-${version}";
+  pname = "ilmbase";
   version = "2.3.0";
 
   src = fetchurl {
-    url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5";
   };
 
diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix
index b55d13ecc3f..5ad3e249fc3 100644
--- a/pkgs/development/libraries/iml/default.nix
+++ b/pkgs/development/libraries/iml/default.nix
@@ -1,6 +1,6 @@
 {stdenv, autoreconfHook, fetchurl, gmp, openblas}:
 stdenv.mkDerivation rec {
-  name = "iml-${version}";
+  pname = "iml";
   version = "1.0.5";
   src = fetchurl {
     url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index a4a009c6658..2beff09d0b4 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, tcl}:
 
 stdenv.mkDerivation rec {
-  name = "incrtcl-${version}";
+  pname = "incrtcl";
   version = "4.0.4";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix
index 36b637c62bb..f97f8b7d82d 100644
--- a/pkgs/development/libraries/indicator-application/gtk2.nix
+++ b/pkgs/development/libraries/indicator-application/gtk2.nix
@@ -6,7 +6,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "indicator-application-gtk2-${version}";
+  pname = "indicator-application-gtk2";
   version = "12.10.0.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index 8beda8663c5..51c6728e8b0 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "iniparser-${version}";
+  pname = "iniparser";
   version = "4.1";
 
   src = fetchFromGitHub {
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/include
     cp src/*.h $out/include
 
-    mkdir -p $out/share/doc/${name}
+    mkdir -p $out/share/doc/${pname}-${version}
     for i in AUTHORS INSTALL LICENSE README.md; do
-      bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
+      bzip2 -c -9 $i > $out/share/doc/${pname}-${version}/$i.bz2;
     done;
-    cp -r html $out/share/doc/${name}
+    cp -r html $out/share/doc/${pname}-${version}
 
     cp libiniparser.a $out/lib
     cp libiniparser.so.1 $out/lib
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 1212d3817d4..53b89f17ea5 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gmmlib-${version}";
+  pname = "intel-gmmlib";
   version = "19.2.3";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "gmmlib";
-    rev    = name;
+    rev    = "${pname}-${version}";
     sha256 = "0hki53czv1na7h5b06fcwkd8bhn690ywg6dwjfs3x9fa4g48kqjb";
   };
 
diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index e549067b11f..e3dbfa52db2 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "intel-media-driver-${version}";
+  pname = "intel-media-driver";
   version = "19.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
index 274058b7ec9..67bee86bfa9 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "intel-media-sdk-${version}";
+  pname = "intel-media-sdk";
   version = "19.1.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix
index a48908f41dd..50ae63f2d0d 100644
--- a/pkgs/development/libraries/ip2location-c/default.nix
+++ b/pkgs/development/libraries/ip2location-c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "ip2location-c-${version}";
+  pname = "ip2location-c";
   version = "7.0.2"; # meta.homepage might change after a major update
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index d28ae012e57..35ef14cbc13 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -2,11 +2,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "irrlicht-${version}";
+  pname = "irrlicht";
   version = "1.8.4";
 
   src = fetchzip {
-    url = "mirror://sourceforge/irrlicht/${name}.zip";
+    url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip";
     sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
   };
 
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 43ab20da8ae..599e8dcc597 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gettext, python3}:
 
 stdenv.mkDerivation rec {
-  name = "iso-codes-${version}";
+  pname = "iso-codes";
   version = "3.79";
 
   src = fetchurl {
-    url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${name}.tar.xz";
+    url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${pname}-${version}.tar.xz";
     sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb";
   };
 
diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix
index 29fabdbb3b6..26ec06fad7b 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/pkgs/development/libraries/jama/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, tnt}:
 
 stdenv.mkDerivation rec {
-  name = "jama-${version}";
+  pname = "jama";
   version = "1.2.5";
 
   src = fetchurl {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ tnt ];
 
   unpackPhase = ''
-      mkdir "${name}"
+      mkdir "${pname}-${version}"
       unzip "$src"
   '';
   installPhase = ''
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 946bc17e764..1bad3394b6a 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "jasper-${version}";
+  pname = "jasper";
   version = "2.0.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix
index 8d9b4e54fe8..4a2b030a3db 100644
--- a/pkgs/development/libraries/java/commons/bcel/default.nix
+++ b/pkgs/development/libraries/java/commons/bcel/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.2";
-  name    = "commons-bcel-${version}";
+  pname = "commons-bcel";
 
   src = fetchurl {
     url    = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz";
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index 3c729f42320..d418145e1b5 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.18";
-  name    = "commons-compress-${version}";
+  pname = "commons-compress";
 
   src = fetchurl {
-    url    = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
+    url    = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1";
   };
 
diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix
index 6fddc3cfe0c..0aca6bf8baa 100644
--- a/pkgs/development/libraries/java/commons/fileupload/default.nix
+++ b/pkgs/development/libraries/java/commons/fileupload/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.1";
-  name    = "commons-fileupload-${version}";
+  pname = "commons-fileupload";
 
   src = fetchurl {
-    url    = "mirror://apache/commons/fileupload/binaries/${name}-bin.tar.gz";
+    url    = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72";
   };
   installPhase = ''
diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix
index 03b083328da..c545ad68e72 100644
--- a/pkgs/development/libraries/java/commons/io/default.nix
+++ b/pkgs/development/libraries/java/commons/io/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.6";
-  name    = "commons-io-${version}";
+  pname = "commons-io";
 
   src = fetchurl {
-    url    = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz";
+    url    = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn";
   };
 
diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix
index 322cb486e93..675265ed4e3 100644
--- a/pkgs/development/libraries/java/commons/lang/default.nix
+++ b/pkgs/development/libraries/java/commons/lang/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.9";
-  name    = "commons-lang-${version}";
+  pname = "commons-lang";
 
   src = fetchurl {
     url    = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz";
diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix
index 10c39f03789..7c4fc5c632e 100644
--- a/pkgs/development/libraries/java/commons/math/default.nix
+++ b/pkgs/development/libraries/java/commons/math/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.6.1";
-  name    = "commons-math-${version}";
+  pname = "commons-math";
 
   src = fetchurl {
     url    = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz";
diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix
index de031a08fe8..e485eabe1cb 100644
--- a/pkgs/development/libraries/java/cup/default.nix
+++ b/pkgs/development/libraries/java/cup/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jdk, ant } :
 
 stdenv.mkDerivation rec {
-  name = "java-cup-${version}";
+  pname = "java-cup";
   version = "11b-20160615";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
index 7d1fac39b1c..68e2a737791 100644
--- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix
+++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
@@ -1,7 +1,7 @@
 { fetchgit, stdenv, ant, jdk }:
 
 stdenv.mkDerivation rec {
-  name = "hydra-ant-logger-${version}";
+  pname = "hydra-ant-logger";
   version = "2010.2";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
index 402f893034b..e25106e22c6 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }:
 
 stdenv.mkDerivation rec {
-  name = "jzmq-${version}";
+  pname = "jzmq";
   version = "3.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix
index 691b9905b04..c0eabe51657 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/pkgs/development/libraries/java/lucene/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl} :
 
 stdenv.mkDerivation rec {
-  name = "lucene-${version}";
+  pname = "lucene";
   version = "1.4.3";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "https://archive.apache.org/dist/jakarta/lucene/${name}.tar.gz";
+    url = "https://archive.apache.org/dist/jakarta/lucene/${pname}-${version}.tar.gz";
     sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
   };
 
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index c2acd234893..591de48d319 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -21,7 +21,7 @@ let
 in stdenv.mkDerivation rec {
   version = "4.5";
   fullVersion = "${version}-201506032000";
-  name = "swt-${version}";
+  pname = "swt";
 
   hardeningDisable = [ "format" ];
 
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
   # releases of SWT.  So we just grab a binary release and extract
   # "src.zip" from that.
   src = fetchurl {
-    url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${name}-${metadata.platform}.zip";
+    url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${pname}-${version}-${metadata.platform}.zip";
     sha256 = metadata.sha256;
   };
 
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index c14ac7c65ab..c41455a6544 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -12,11 +12,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "jemalloc-${version}";
+  pname = "jemalloc";
   inherit version;
 
   src = fetchurl {
-    url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2";
+    url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2";
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
index 175097ef785..726e00b58bb 100644
--- a/pkgs/development/libraries/jitterentropy/default.nix
+++ b/pkgs/development/libraries/jitterentropy/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "jitterentropy-${version}";
+  pname = "jitterentropy";
   version = "2.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix
index 47c87da065b..bc5be3172ec 100644
--- a/pkgs/development/libraries/jxrlib/default.nix
+++ b/pkgs/development/libraries/jxrlib/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, python }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "jxrlib";
   version = "1.1";
 
diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix
index 0cd8ab50356..4a403a19964 100644
--- a/pkgs/development/libraries/kdb/default.nix
+++ b/pkgs/development/libraries/kdb/default.nix
@@ -7,10 +7,9 @@
 mkDerivation rec {
   pname = "kdb";
   version = "3.2.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
     sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg";
   };
 
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index d2283f5c1d5..2eb9262d189 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -6,7 +6,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "heimdal-${version}";
+  pname = "heimdal";
   version = "7.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index abbb2457f6a..0a130c017c0 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -5,11 +5,11 @@
 let
   inherit (python2Packages) python pygtk;
 in stdenv.mkDerivation rec {
-  name = "keybinder-${version}";
+  pname = "keybinder";
   version = "0.3.0";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz";
     sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf";
   };
diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix
index 91ad59ad27a..ed2dd341f45 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/pkgs/development/libraries/keybinder3/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "keybinder3-${version}";
+  pname = "keybinder3";
   version = "0.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index d3733ea5f72..3f84706bffb 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/pkgs/development/libraries/kmsxx/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "kmsxx";
   version = "2018-10-23";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "tomba";
diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix
index c49402b74e8..991fd4d27a7 100644
--- a/pkgs/development/libraries/kproperty/default.nix
+++ b/pkgs/development/libraries/kproperty/default.nix
@@ -8,10 +8,9 @@
 mkDerivation rec {
   pname = "kproperty";
   version = "3.2.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
     sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7";
   };
 
diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix
index fc9c77e8fd6..46d55b1f550 100644
--- a/pkgs/development/libraries/kreport/default.nix
+++ b/pkgs/development/libraries/kreport/default.nix
@@ -7,10 +7,9 @@
 mkDerivation rec {
   pname = "kreport";
   version = "3.2.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
     sha256 = "1mycsvkz5rphi9df2i4ch4ykvprd4m76acsdzs3zis2ljrqnsw92";
   };
 
diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index 2f713cb5977..933d51b9575 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -22,11 +22,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lame-${version}";
+  pname = "lame";
   version = "3.100";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lame/${name}.tar.gz";
+    url = "mirror://sourceforge/lame/${pname}-${version}.tar.gz";
     sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx";
   };
 
diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix
index e93467fba0a..f401f231de2 100644
--- a/pkgs/development/libraries/lasso/default.nix
+++ b/pkgs/development/libraries/lasso/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "lasso-${version}";
+  pname = "lasso";
   version = "2.6.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix
index 839f0a75156..ae8fc1e22db 100644
--- a/pkgs/development/libraries/ldacbt/default.nix
+++ b/pkgs/development/libraries/ldacbt/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ldacBT-${version}";
+  pname = "ldacBT";
   version = "2.0.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 82496a54aea..1aa208c2044 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -4,10 +4,8 @@ stdenv.mkDerivation rec {
   pname = "ldns";
   version = "1.7.0";
 
-  name = "${pname}-${version}";
-
   src = fetchurl {
-    url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz";
+    url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz";
     sha256 = "1k56jw4hz8njspfxcfw0czf1smg0n48ylia89ziwyx5k9wdmp7y1";
   };
 
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index 95924050ff3..bf6efb9ef21 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, boost, cmake, curl, ruby }:
 
 stdenv.mkDerivation rec {
-  name = "leatherman-${version}";
+  pname = "leatherman";
   version = "1.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index f4018cbf961..6137638222e 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.95";
-  name = "lensfun-${version}";
+  pname = "lensfun";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lensfun/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/lensfun/${version}/${pname}-${version}.tar.gz";
     sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2";
   };
 
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index dd3c42e8b7f..62c01e4f356 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "leptonica-${version}";
+  pname = "leptonica";
   version = "1.78.0";
 
   src = fetchurl {
-    url = "http://www.leptonica.org/source/${name}.tar.gz";
+    url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz";
     sha256 = "122s9b8hi93va4lgwnwrbma50x5fp740npy0s92xybd2wy0jxvg2";
   };
 
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index b18af4cf834..17a754a027a 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "leveldb-${version}";
+  pname = "leveldb";
   version = "1.20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index 0d67c6b4dcb..bda7d560fcd 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -8,11 +8,11 @@
 # https://wiki.archlinux.org/index.php/BluRay
 
 stdenv.mkDerivation rec {
-  name = "libaacs-${version}";
+  pname = "libaacs";
   version  = "0.9.0";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27";
   };
 
diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix
index 6df7bc22772..11b31d62b5d 100644
--- a/pkgs/development/libraries/libaal/default.nix
+++ b/pkgs/development/libraries/libaal/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.6";
-  name = "libaal-${version}";
+  pname = "libaal";
 
   src = fetchurl {
-    url = "mirror://sourceforge/reiser4/${name}.tar.gz";
+    url = "mirror://sourceforge/reiser4/${pname}-${version}.tar.gz";
     sha256 = "176f2sns6iyxv3h9zyirdinjwi05gdak48zqarhib2s38rvm98di";
   };
 
diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix
index aa4a40cf32d..f953c170ab5 100644
--- a/pkgs/development/libraries/libabw/default.nix
+++ b/pkgs/development/libraries/libabw/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libabw-${version}";
+  pname = "libabw";
   version = "0.1.2";
 
   src = fetchurl {
-    url = "https://dev-www.libreoffice.org/src/libabw/${name}.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libabw/${pname}-${version}.tar.xz";
     sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb";
   };
 
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
index 525ec6e35f6..7f9dbf3a21f 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -2,7 +2,7 @@
 , libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "libaccounts-glib-${version}";
+  pname = "libaccounts-glib";
   version = "1.24";
 
   outputs = [ "out" "dev" "devdoc" "py" ];
diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix
index 49e5bcdd905..a8ddab2978d 100644
--- a/pkgs/development/libraries/libagar/default.nix
+++ b/pkgs/development/libraries/libagar/default.nix
@@ -5,7 +5,7 @@
 
 let srcs = import ./srcs.nix { inherit fetchurl; }; in
 stdenv.mkDerivation rec {
-  name = "libagar-${version}";
+  pname = "libagar";
   inherit (srcs) version src;
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix
index c1e9ba7d1c7..43d66b8251c 100644
--- a/pkgs/development/libraries/libagar/libagar_test.nix
+++ b/pkgs/development/libraries/libagar/libagar_test.nix
@@ -2,7 +2,7 @@
 
 let srcs = import ./srcs.nix { inherit fetchurl; }; in
 stdenv.mkDerivation rec {
-  name = "libagar-test-${version}";
+  pname = "libagar-test";
   inherit (srcs) version src;
 
   sourceRoot = "agar-1.5.0/tests";
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index cc6c9464de3..325a7d71598 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "libamqpcpp-${version}";
+  pname = "libamqpcpp";
   version = "4.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 826f72b1f5f..698182dbd4e 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.2";
-  name = "libao-${version}";
+  pname = "libao";
 
   # the github mirror is more up to date than downloads.xiph.org
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index 62e0a850bad..2d9a9f18fa2 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "libaom-${version}";
+  pname = "libaom";
   version = "1.0.0-errata1";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix
index dd3320005a4..5b9647d275c 100644
--- a/pkgs/development/libraries/libaosd/default.nix
+++ b/pkgs/development/libraries/libaosd/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.7-9-g177589f";
-  name = "libaosd-${version}";
+  pname = "libaosd";
 
   src = fetchFromGitHub {
     owner  = "atheme-legacy";
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 3cf8a6da736..e3927f34fab 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -9,7 +9,7 @@
 assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
-  name = "libarchive-${version}";
+  pname = "libarchive";
   version = "3.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix
index a06ae978d51..0c8f82138e7 100644
--- a/pkgs/development/libraries/libasr/default.nix
+++ b/pkgs/development/libraries/libasr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libevent, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "libasr-${version}";
+  pname = "libasr";
   version=  "1.0.2";
 
   src = fetchurl {
-    url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
+    url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
     sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6";
   };
 
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index d7ebf781a04..41406ce18ea 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -18,11 +18,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libass-${version}";
+  pname = "libass";
   version = "0.14.0";
 
   src = fetchurl {
-    url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8";
   };
 
diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix
index 313cb7f8d5d..348cfa9ed5b 100644
--- a/pkgs/development/libraries/libast/default.nix
+++ b/pkgs/development/libraries/libast/default.nix
@@ -2,11 +2,11 @@
 , pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libast-${version}";
+  pname = "libast";
   version = "0.7.1";
 
   src = fetchurl {
-    url = "http://www.eterm.org/download/${name}.tar.gz";
+    url = "http://www.eterm.org/download/${pname}-${version}.tar.gz";
     sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj";
   };
 
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 0df8ed0f969..b576896876e 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "libatomic_ops-${version}";
+  pname = "libatomic_ops";
   version = "7.6.10";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
index 6a7720b99bc..d39c12d58d5 100644
--- a/pkgs/development/libraries/libb2/default.nix
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:
 
 stdenv.mkDerivation rec {
-  name = "libb2-${version}";
+  pname = "libb2";
   version = "0.98.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix
index 09c5444a644..3c9a9768427 100644
--- a/pkgs/development/libraries/libb64/default.nix
+++ b/pkgs/development/libraries/libb64/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "libb64-${version}";
+  pname = "libb64";
   version = "1.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
index 2a129bc648f..b20850e88ff 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -2,7 +2,7 @@
   which }:
 
 stdenv.mkDerivation rec {
-  name = "libbap-${version}";
+  pname = "libbap";
   version = "master-2019-04-05";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index 3a1b7752514..3af98a578f2 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -8,11 +8,11 @@
 # https://wiki.archlinux.org/index.php/BluRay
 
 stdenv.mkDerivation rec {
-  name = "libbdplus-${version}";
+  pname = "libbdplus";
   version  = "0.1.2";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libbdplus/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libbdplus/${version}/${pname}-${version}.tar.bz2";
     sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
   };
 
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index 64b3832d335..5af8acb5ed7 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libbfd-${version}";
+  pname = "libbfd";
   inherit (binutils-unwrapped) version src;
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix
index d8f2426e477..d9639cf5c14 100644
--- a/pkgs/development/libraries/libbluedevil/default.nix
+++ b/pkgs/development/libraries/libbluedevil/default.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "libbluedevil";
   # bluedevil must have the same major version (x.y) as libbluedevil!
   # do not update this package without checking bluedevil
   version = "2.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
     sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c";
   };
 
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index b7ca9dda1ea..517251e137e 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -18,11 +18,11 @@ assert withFonts -> freetype != null;
 # https://wiki.archlinux.org/index.php/BluRay
 
 stdenv.mkDerivation rec {
-  name = "libbluray-${version}";
+  pname = "libbluray";
   version  = "1.1.2";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0hhbgkm11fw4pwbrklm76aiy54r6d7hk06yhl2fxq05i74i4bpd3";
   };
 
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index a8d1925e5c0..fe4af163a54 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libbsd-${version}";
+  pname = "libbsd";
   version = "0.9.1";
 
   src = fetchurl {
-    url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz";
     sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n";
   };
 
diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix
index 6244c3a351e..5bd6b11ac7a 100644
--- a/pkgs/development/libraries/libbson/default.nix
+++ b/pkgs/development/libraries/libbson/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, perl, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "libbson-${version}";
+  pname = "libbson";
   version = "1.9.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix
index f68141ef3b4..01588187936 100644
--- a/pkgs/development/libraries/libburn/default.nix
+++ b/pkgs/development/libraries/libburn/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libburn-${version}";
+  pname = "libburn";
   version = "1.5.0";
 
   src = fetchurl {
-    url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
+    url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq";
   };
 
diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix
index f116360474e..48402b9ad45 100644
--- a/pkgs/development/libraries/libcacard/default.nix
+++ b/pkgs/development/libraries/libcacard/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, nss }:
 
 stdenv.mkDerivation rec {
-  name = "libcacard-${version}";
+  pname = "libcacard";
   version = "2.6.1";
 
   src = fetchurl {
-    url = "https://www.spice-space.org/download/libcacard/${name}.tar.xz";
+    url = "https://www.spice-space.org/download/libcacard/${pname}-${version}.tar.xz";
     sha256 = "1w6y0kiakhg7dgyf8yqpm4jj6jiv17zhy9lp3d7z32q1pniccxk2";
   };
 
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
index 6838362c794..42a49713a0b 100644
--- a/pkgs/development/libraries/libcangjie/default.nix
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -1,7 +1,7 @@
 { stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "libcangjie-${version}";
+  pname = "libcangjie";
   version = "1.4_rev_${rev}";
   rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d";
 
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index ecba18cd58c..e161948db40 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -13,7 +13,7 @@ let
     ];
 in
 stdenv.mkDerivation rec {
-  name = "cef-binary-${version}";
+  pname = "cef-binary";
   version = "3.3497.1833.g13f506f";
   src = fetchurl {
     url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2";
diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix
index 410c83953aa..11617a0107c 100644
--- a/pkgs/development/libraries/libchardet/default.nix
+++ b/pkgs/development/libraries/libchardet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libchardet-${version}";
+  pname = "libchardet";
   version = "1.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix
index d3ef799ef60..3c234d780ef 100644
--- a/pkgs/development/libraries/libchewing/default.nix
+++ b/pkgs/development/libraries/libchewing/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, sqlite }:
 
 stdenv.mkDerivation rec{
-  name = "libchewing-${version}";
+  pname = "libchewing";
   version = "0.5.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
index f101eb22310..d896cf63733 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libcli-${version}";
+  pname = "libcli";
   version = "1.9.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
index a2f6858a05c..325afc56ae7 100644
--- a/pkgs/development/libraries/libclthreads/default.nix
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libclthreads-${version}";
+  pname = "libclthreads";
   version = "2.4.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
index 49bc2347ba7..d6e2ad398d7 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libclxclient-${version}";
+  pname = "libclxclient";
   version = "3.9.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index f247c48821f..8eb7ff303de 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libcommuni-${version}";
+  pname = "libcommuni";
   version = "3.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix
index ee3f511d435..cfef09c480a 100644
--- a/pkgs/development/libraries/libconfuse/default.nix
+++ b/pkgs/development/libraries/libconfuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, flex }:
 
 stdenv.mkDerivation rec {
-  name = "libconfuse-${version}";
+  pname = "libconfuse";
   version = "3.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 894faf0b910..23b39bca1f3 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "libcouchbase-${version}";
+  pname = "libcouchbase";
   version = "2.10.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix
index fff31a96ce7..ba9a6325b07 100644
--- a/pkgs/development/libraries/libcrafter/default.nix
+++ b/pkgs/development/libraries/libcrafter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "libcrafter-${version}";
+  pname = "libcrafter";
   version = "0.3";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix
index 3d32f4d0b95..4bf26bde228 100644
--- a/pkgs/development/libraries/libcsptr/default.nix
+++ b/pkgs/development/libraries/libcsptr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "libcsptr-${version}";
+  pname = "libcsptr";
   version = "2.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix
index 94dc733a69b..f4e2e621c28 100644
--- a/pkgs/development/libraries/libctemplate/default.nix
+++ b/pkgs/development/libraries/libctemplate/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "ctemplate-${version}";
+  pname = "ctemplate";
 
   version = "2.3";
 
diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index e50b8a13b95..8ebab123524 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "libcue-${version}";
+  pname = "libcue";
   version = "2.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index 86d14fe7974..df2e4c367bf 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   version = "3.20.4";
-  name = "libdap-${version}";
+  pname = "libdap";
 
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ libuuid curl libxml2 ];
 
   src = fetchurl {
-    url = "https://www.opendap.org/pub/source/${name}.tar.gz";
+    url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz";
     sha256 = "0x44igs389b49nb2psd656wpvmbx9bwmla2l5ahfa09vxb314s5i";
   };
 
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 32b0c9758f7..2ae4eec99ec 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "libdbusmenu-qt-${version}";
+  pname = "libdbusmenu-qt";
   version = "0.9.3+16";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix
index 86b9fcd0bef..0f2ba019d3f 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/pkgs/development/libraries/libdc1394/default.nix
@@ -2,11 +2,11 @@
 , libusb1, CoreServices }:
 
 stdenv.mkDerivation rec {
-  name = "libdc1394-${version}";
+  pname = "libdc1394";
   version = "2.2.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libdc1394/${name}.tar.gz";
+    url = "mirror://sourceforge/libdc1394/${pname}-${version}.tar.gz";
     sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b";
   };
 
diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix
index 6c9fabf5cae..3c31ba805d8 100644
--- a/pkgs/development/libraries/libde265/default.nix
+++ b/pkgs/development/libraries/libde265/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.3";
-  name = "libde265-${version}";
+  pname = "libde265";
 
   src = fetchFromGitHub {
     owner = "strukturag";
diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix
index db5448caa10..85aad4844ba 100644
--- a/pkgs/development/libraries/libdeflate/default.nix
+++ b/pkgs/development/libraries/libdeflate/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "libdeflate-${version}";
+  pname = "libdeflate";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 78e7490cd99..afbff3dc0cf 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "libdevil-${version}";
+  pname = "libdevil";
   version = "1.7.8";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix
index 7fe7319ff15..06ba10904a7 100644
--- a/pkgs/development/libraries/libdigidoc/default.nix
+++ b/pkgs/development/libraries/libdigidoc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
 
   version = "3.10.4";
-  name = "libdigidoc-${version}";
+  pname = "libdigidoc";
 
   src = fetchurl {
     url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index e3172c2fc1f..4aec6fdef91 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.13.7";
-  name = "libdigidocpp-${version}";
+  pname = "libdigidocpp";
 
   src = fetchurl {
      url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
index 287494b6b1f..d7d88b38386 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, pkgconfig, darwin }:
 
 stdenv.mkDerivation rec {
-  name = "libdiscid-${version}";
+  pname = "libdiscid";
   version = "0.6.2";
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
   
   src = fetchurl {
-    url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz";
+    url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz";
     sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";
   };
 
diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix
index c94806b50c1..5598e6b2fa7 100644
--- a/pkgs/development/libraries/libdivecomputer/default.nix
+++ b/pkgs/development/libraries/libdivecomputer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libdivecomputer-${version}";
+  pname = "libdivecomputer";
   version = "0.6.0";
 
   src = fetchurl {
-    url = "https://www.libdivecomputer.org/releases/${name}.tar.gz";
+    url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz";
     sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0";
   };
 
diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix
index 0984eb6e00b..aed6f05fec4 100644
--- a/pkgs/development/libraries/libdvbpsi/default.nix
+++ b/pkgs/development/libraries/libdvbpsi/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "libdvbpsi-${version}";
+  pname = "libdvbpsi";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libdvbpsi/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libdvbpsi/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1zn5hfv4qbahmydbwh59a3b480s3m5ss27r6ml35gqdip7r3jkmc";
   };
 
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index f18e0622d0c..fd89077a256 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, IOKit}:
 
 stdenv.mkDerivation rec {
-  name = "libdvdcss-${version}";
+  pname = "libdvdcss";
   version = "1.4.2";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
 
   src = fetchurl {
-    url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq";
   };
 
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index b0dfd1e8fc1..45a73a62488 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, libdvdread}:
 
 stdenv.mkDerivation rec {
-  name = "libdvdnav-${version}";
+  pname = "libdvdnav";
   version = "6.0.0";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2";
     sha256 = "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph";
   };
 
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 5f0f0827503..c133c0ba6f9 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libdvdcss}:
 
 stdenv.mkDerivation rec {
-  name = "libdvdread-${version}";
+  pname = "libdvdread";
   version = "6.0.1";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1gfmh8ii3s2fw1c8vn57piwxc0smd3va4h7xgp9s8g48cc04zki8";
   };
 
diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix
index 293b1c28e93..2fdb1d071b6 100644
--- a/pkgs/development/libraries/libeb/default.nix
+++ b/pkgs/development/libraries/libeb/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl, zlib }:
 stdenv.mkDerivation rec {
-  name = "libeb-${version}";
+  pname = "libeb";
   version = "4.4.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix
index 6a4078f92cf..16624a78079 100644
--- a/pkgs/development/libraries/libebur128/default.nix
+++ b/pkgs/development/libraries/libebur128/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
-  name = "libebur128-${version}";
+  pname = "libebur128";
 
   src = fetchFromGitHub {
     owner = "jiixyj";
diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix
index be9f5e772d9..855386114c1 100644
--- a/pkgs/development/libraries/libechonest/default.nix
+++ b/pkgs/development/libraries/libechonest/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, qt4, qjson, doxygen, boost }:
 
 stdenv.mkDerivation rec {
-  name = "libechonest-${version}";
+  pname = "libechonest";
   version = "2.3.0";
 
   src = fetchurl {
-    url = "http://files.lfranchi.com/${name}.tar.bz2";
+    url = "http://files.lfranchi.com/${pname}-${version}.tar.bz2";
     sha1 = "cf1b279c96f15c87c36fdeb23b569a60cdfb01db";
   };
 
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix
index 26fe2d90963..1835b924ec1 100644
--- a/pkgs/development/libraries/libelf-freebsd/default.nix
+++ b/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation (rec {
   version = "3258";
-  name = "libelf-freebsd-${version}";
+  pname = "libelf-freebsd";
 
   src = fetchsvn {
     url = svn://svn.code.sf.net/p/elftoolchain/code/trunk;
diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix
index 980cee2e687..8555449f28b 100644
--- a/pkgs/development/libraries/libesmtp/default.nix
+++ b/pkgs/development/libraries/libesmtp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libESMTP-${version}";
+  pname = "libESMTP";
   version = "1.0.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index 365c128239d..56710945ecb 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libev-${version}";
+  pname = "libev";
   version="4.27";
 
   src = fetchurl {
-    url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
+    url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz";
     sha256 = "0kil23cgsp0r5shvnwwbsy7fzxb62sxqzqbkbkfp5w54ipy2cm9d";
   };
 
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 611287b9aaa..5fb46bff075 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -5,7 +5,7 @@
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "libevent-${version}";
+  pname = "libevent";
   version = "2.1.10";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index d150d4a0033..fd1e203ed37 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "20171104";
-  name = "libewf-${version}";
+  pname = "libewf";
 
   src = fetchurl {
     url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix
index a61d51aa6b7..2eee9bafe44 100644
--- a/pkgs/development/libraries/libexecinfo/default.nix
+++ b/pkgs/development/libraries/libexecinfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "libexecinfo-${version}";
+  pname = "libexecinfo";
   version = "1.1";
 
   src = fetchurl {
-    url = "http://distcache.freebsd.org/local-distfiles/itetcu/${name}.tar.bz2";
+    url = "http://distcache.freebsd.org/local-distfiles/itetcu/${pname}-${version}.tar.bz2";
     sha256 = "07wvlpc1jk1sj4k5w53ml6wagh0zm9kv2l1jngv8xb7xww9ik8n9";
   };
 
diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix
index e36c4ee12b9..196f0e50bef 100644
--- a/pkgs/development/libraries/libfakekey/default.nix
+++ b/pkgs/development/libraries/libfakekey/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "libfakekey-${version}";
+  pname = "libfakekey";
   version = "0.1";
 
   src = fetchurl {
-    url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz";
+    url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${pname}-${version}.tar.gz";
     sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k";
   };
 
diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix
index f553afdfc70..62f1b087de5 100644
--- a/pkgs/development/libraries/libfaketime/default.nix
+++ b/pkgs/development/libraries/libfaketime/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libfaketime-${version}";
+  pname = "libfaketime";
   version = "0.9.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix
index 5ac7a244df2..5e1c985fe2c 100644
--- a/pkgs/development/libraries/libfann/default.nix
+++ b/pkgs/development/libraries/libfann/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "libfann-${version}";
+  pname = "libfann";
   version = "2.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix
index 513a4dc3d38..8d11cd86c45 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/pkgs/development/libraries/libffcall/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libffcall-${version}";
+  pname = "libffcall";
   version = "2.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix
index 4b02d651929..0c8a7084e09 100644
--- a/pkgs/development/libraries/libfive/default.nix
+++ b/pkgs/development/libraries/libfive/default.nix
@@ -3,7 +3,7 @@ zlib, libpng, boost, qt5, guile
 }:
 
 stdenv.mkDerivation rec {
-  name = "libfive-${version}";
+  pname = "libfive";
   version = "2018-07-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix
index 2d2d56dda4f..9c9b6c8034c 100644
--- a/pkgs/development/libraries/libfixposix/default.nix
+++ b/pkgs/development/libraries/libfixposix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name="libfixposix-${version}";
+  pname = "libfixposix";
   version="0.4.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix
index cfae74b4b9e..c0595ac93d1 100644
--- a/pkgs/development/libraries/libfreefare/default.nix
+++ b/pkgs/development/libraries/libfreefare/default.nix
@@ -2,7 +2,7 @@
 , libobjc ? null }:
 
 stdenv.mkDerivation rec {
-  name = "libfreefare-${version}";
+  pname = "libfreefare";
   version = "0.4.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix
index 5491fab3edf..ce7d615f4d3 100644
--- a/pkgs/development/libraries/libfsm/default.nix
+++ b/pkgs/development/libraries/libfsm/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "libfsm-${version}";
+  pname = "libfsm";
   version = "0.1pre1869_${builtins.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix
index a6fe2bc1435..d83b43a782e 100644
--- a/pkgs/development/libraries/libgaminggear/default.nix
+++ b/pkgs/development/libraries/libgaminggear/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libgaminggear-${version}";
+  pname = "libgaminggear";
   version = "0.15.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libgaminggear/${name}.tar.bz2";
+    url = "mirror://sourceforge/libgaminggear/${pname}-${version}.tar.bz2";
     sha256 = "0jf5i1iv8j842imgiixbhwcr6qcwa93m27lzr6gb01ri5v35kggz";
   };
 
diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix
index 42e812ec1f5..b6a8ae3c8df 100644
--- a/pkgs/development/libraries/libgap/default.nix
+++ b/pkgs/development/libraries/libgap/default.nix
@@ -7,7 +7,7 @@
 # - https://github.com/markuspf/gap/issues/2
 # - https://trac.sagemath.org/ticket/22626
 stdenv.mkDerivation rec {
-  name = "libgap-${version}";
+  pname = "libgap";
   # Has to be the same version as "gap"
   version = "4.8.6";
   src = fetchurl {
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 4d8a7eac27c..36a1b7d3720 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -5,11 +5,11 @@
 assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "libgcrypt-${version}";
+  pname = "libgcrypt";
   version = "1.8.4";
 
   src = fetchurl {
-    url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
+    url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
     sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n";
   };
 
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 51520eb0fe3..db75ff1784f 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.5.1";
-  name = "libgeotiff-${version}";
+  pname = "libgeotiff";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix
index 08fce9c521e..11affa5cbef 100644
--- a/pkgs/development/libraries/libgig/default.nix
+++ b/pkgs/development/libraries/libgig/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "libgig-${version}";
+  pname = "libgig";
   version = "4.1.0";
 
   src = fetchurl {
-    url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
+    url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
     sha256 = "02xx6bqxzgkvrawwnzrnxx1ypk244q4kpwfd58266f9ji8kq18h6";
   };
 
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 9bec00b9f52..24052ea4058 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -6,10 +6,9 @@
 stdenv.mkDerivation rec {
   version = "2.0.12";
   pname = "libgksu";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://people.debian.org/~kov/gksu/${name}.tar.gz";
+    url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz";
     sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92";
   };
 
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix
index 62c6b45c5d4..ed6139d48f6 100644
--- a/pkgs/development/libraries/libglvnd/default.nix
+++ b/pkgs/development/libraries/libglvnd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
-  name = "libglvnd-${version}";
+  pname = "libglvnd";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index e87f535a1f7..4c10a288474 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation rec {
   version = "7.64.0";
 
-  name = "libgnurl-${version}";
+  pname = "libgnurl";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix
index 89fcfdfde8d..76d7ebcc8cc 100644
--- a/pkgs/development/libraries/libgringotts/default.nix
+++ b/pkgs/development/libraries/libgringotts/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }:
 
 stdenv.mkDerivation rec {
-  name = "libgringotts-${version}";
+  pname = "libgringotts";
   version = "1.2.1";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/gringotts.berlios/files/${name}.tar.bz2";
+    url = "https://sourceforge.net/projects/gringotts.berlios/files/${pname}-${version}.tar.bz2";
     sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7";
   };
 
diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix
index bd5a5f06851..fd34f28c1e8 100644
--- a/pkgs/development/libraries/libgroove/default.nix
+++ b/pkgs/development/libraries/libgroove/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.3.0";
-  name = "libgroove-${version}";
+  pname = "libgroove";
 
   src = fetchFromGitHub {
     owner = "andrewrk";
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index e3d7741ba86..9b50ddd4b7f 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -10,7 +10,7 @@ assert appliance == null || stdenv.lib.isDerivation appliance;
 assert javaSupport -> jdk != null;
 
 stdenv.mkDerivation rec {
-  name = "libguestfs-${version}";
+  pname = "libguestfs";
   version = "1.38.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix
index d5d35678b4f..b82c547fb33 100644
--- a/pkgs/development/libraries/libgumath/default.nix
+++ b/pkgs/development/libraries/libgumath/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libgumath-${version}";
+  pname = "libgumath";
   version = "unstable-2018-11-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix
index 3182345bfd4..7e1bb2daa9e 100644
--- a/pkgs/development/libraries/libheif/default.nix
+++ b/pkgs/development/libraries/libheif/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.0";
-  name = "libheif-${version}";
+  pname = "libheif";
 
   src = fetchFromGitHub {
     owner = "strukturag";
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index b86a48ecd1b..d8881b929a0 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -2,7 +2,7 @@
 , python3, tzdata, glib, libxml2, icu }:
 
 stdenv.mkDerivation rec {
-  name = "libical-${version}";
+  pname = "libical";
   version = "3.0.4";
 
   outputs = [ "out" "dev" ]; #"devdoc" ];
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index c5379692ad3..7dc90d9ae3e 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -6,11 +6,11 @@
 # assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross
 
 stdenv.mkDerivation rec {
-  name = "libiconv-${version}";
+  pname = "libiconv";
   version = "1.16";
 
   src = fetchurl {
-    url = "mirror://gnu/libiconv/${name}.tar.gz";
+    url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz";
     sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6";
   };
 
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index 4b7d9bdc2e3..674862d694c 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, gperf}:
 
 stdenv.mkDerivation rec {
-  name = "libid3tag-${version}";
+  pname = "libid3tag";
   version = "0.15.1b";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 5ec5b8e04dd..7e7b691e3c1 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libidn2-${version}";
+  pname = "libidn2";
   version = "2.2.0";
 
   src = fetchurl {
-    url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
+    url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz";
     sha256 = "1zl1cc2xgxw31pdhvhr5ij36x4vvpy16jq667rspin06nlr4fwzw";
   };
 
diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix
index 4fa3addc0a6..936d165a6cf 100644
--- a/pkgs/development/libraries/libiec61883/default.nix
+++ b/pkgs/development/libraries/libiec61883/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
-  name = "libiec61883-${version}";
+  pname = "libiec61883";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/libi/libiec61883/libiec61883_${version}.orig.tar.gz";
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index df5035461af..9392061a269 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libiio-${version}";
+  pname = "libiio";
   version = "0.18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index 6464e4e5820..7eccfc37363 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -5,8 +5,6 @@ stdenv.mkDerivation rec {
   pname = "libimobiledevice";
   version = "2019-04-04";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
index c57590aad21..9be58ac537a 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -12,10 +12,10 @@ let
   mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature;
 
   self = stdenv.mkDerivation rec {
-    name = "libinfinity-${version}";
+    pname = "libinfinity";
     version = "0.7.1";
     src = fetchurl {
-      url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
+      url = "http://releases.0x539.de/libinfinity/${pname}-${version}.tar.gz";
       sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2";
     };
 
diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix
index 6fc507daf64..75cd1a00507 100644
--- a/pkgs/development/libraries/libinotify-kqueue/default.nix
+++ b/pkgs/development/libraries/libinotify-kqueue/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libinotify-kqueue-${version}";
+  pname = "libinotify-kqueue";
   version = "20180201";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 0c759835183..c1ee68a2470 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -26,11 +26,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-${version}";
+  pname = "libinput";
   version = "1.13.4";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
+    url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
     sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk";
   };
 
diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix
index fea5a86da44..c4dca659d36 100644
--- a/pkgs/development/libraries/libipfix/default.nix
+++ b/pkgs/development/libraries/libipfix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libipfix-${version}";
+  pname = "libipfix";
   version = "110209";
   src = fetchurl {
     url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz";
diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix
index 71238dda162..561a5248278 100644
--- a/pkgs/development/libraries/libircclient/default.nix
+++ b/pkgs/development/libraries/libircclient/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
   version = "1.10";
   pname   = "libircclient";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
+    url    = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tar.gz";
     sha256 = "0b9wa0h3xc31wpqlvgxgnvqp5wgx3kwsf5s9432m5cj8ycx6zcmv";
   };
 
diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix
index ce2028e805d..cefce19d465 100644
--- a/pkgs/development/libraries/libisoburn/default.nix
+++ b/pkgs/development/libraries/libisoburn/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }:
 
 stdenv.mkDerivation rec {
-  name = "libisoburn-${version}";
+  pname = "libisoburn";
   version = "1.5.0";
 
   src = fetchurl {
-    url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
+    url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs";
   };
 
diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix
index d5281448387..59726094c4a 100644
--- a/pkgs/development/libraries/libisofs/default.nix
+++ b/pkgs/development/libraries/libisofs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, acl, attr, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libisofs-${version}";
+  pname = "libisofs";
   version = "1.5.0";
 
   src = fetchurl {
-    url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
+    url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
     sha256 = "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys";
   };
 
diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 0b00cf90ba0..73801102ba3 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }:
 
 stdenv.mkDerivation rec {
-  name = "libite-${version}";
+  pname = "libite";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
index 9419046db4e..8d81597351c 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }:
 
 stdenv.mkDerivation rec {
-  name = "libivykis-${version}";
+  pname = "libivykis";
 
   version = "0.42.3";
 
diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix
index 68835c1414c..1790f3f68b2 100644
--- a/pkgs/development/libraries/libixp-hg/default.nix
+++ b/pkgs/development/libraries/libixp-hg/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   rev = "148";
   version = "hg-2012-12-02";
-  name = "libixp-${version}";
+  pname = "libixp";
 
   src = fetchurl {
     url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip;
diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix
index 2167b447703..9e81c932405 100644
--- a/pkgs/development/libraries/libjreen/default.nix
+++ b/pkgs/development/libraries/libjreen/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, qt4, pkgconfig, gsasl }:
 
 stdenv.mkDerivation rec {
-  name = "libjreen-${version}";
+  pname = "libjreen";
   version = "1.2.0";
 
   src = fetchurl {
-    url = "https://qutim.org/dwnl/73/${name}.tar.bz2";
+    url = "https://qutim.org/dwnl/73/${pname}-${version}.tar.bz2";
     sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582";
   };
 
diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index f352c8e9ed1..a7c9427080d 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libjson-rpc-cpp-${version}";
+  pname = "libjson-rpc-cpp";
   version = "0.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index 93f3b2a4f84..12205a6a63b 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "libkeyfinder-${version}";
+  pname = "libkeyfinder";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
index 24dd34d7a6a..67d525112cc 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -3,7 +3,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "liblangtag";
   version = "0.6.1";
 
diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix
index cafd6a66aa0..dd999db2759 100644
--- a/pkgs/development/libraries/liblaxjson/default.nix
+++ b/pkgs/development/libraries/liblaxjson/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.5";
-  name = "liblaxjson-${version}";
+  pname = "liblaxjson";
 
   src = fetchFromGitHub {
     owner = "andrewrk";
diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix
index 9870e024687..fe513d378cd 100644
--- a/pkgs/development/libraries/liblcf/default.nix
+++ b/pkgs/development/libraries/liblcf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }:
 
 stdenv.mkDerivation rec {
-  name = "liblcf-${version}";
+  pname = "liblcf";
   version = "0.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix
index 1a177dc2237..e8d8e971bc5 100644
--- a/pkgs/development/libraries/liblinear/default.nix
+++ b/pkgs/development/libraries/liblinear/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "liblinear-${version}";
+  pname = "liblinear";
   version = "2.30";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix
index 1a5a4baf808..471f277fb52 100644
--- a/pkgs/development/libraries/liblscp/default.nix
+++ b/pkgs/development/libraries/liblscp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "liblscp-${version}";
+  pname = "liblscp";
   version = "0.6.0";
 
   src = fetchurl {
-    url = "https://download.linuxsampler.org/packages/${name}.tar.gz";
+    url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz";
     sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k";
   };
 
diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix
index 8ff02b49e58..3786c5e77d3 100644
--- a/pkgs/development/libraries/libmatchbox/default.nix
+++ b/pkgs/development/libraries/libmatchbox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}:
 
 stdenv.mkDerivation rec {
-  name = "libmatchbox-${version}";
+  pname = "libmatchbox";
   version = "1.11";
 
   buildInputs = [ libXft libICE pango libjpeg ];
diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix
index 0f43c0d4616..7f5c8b4c4c2 100644
--- a/pkgs/development/libraries/libmatheval/default.nix
+++ b/pkgs/development/libraries/libmatheval/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.11";
-  name = "libmatheval-${version}";
+  pname = "libmatheval";
 
   nativeBuildInputs = [ pkgconfig autoconf flex ];
   buildInputs = [ guile ];
 
   src = fetchurl {
-    url = "https://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz";
+    url = "https://ftp.gnu.org/gnu/libmatheval/${pname}-${version}.tar.gz";
     sha256 = "474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab";
   };
 
diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix
index f1b15a91cca..46ed250b7b1 100644
--- a/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/pkgs/development/libraries/libmaxminddb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libmaxminddb-${version}";
+  pname = "libmaxminddb";
   version = "1.3.2";
 
   src = fetchurl {
-    url = meta.homepage + "/releases/download/${version}/${name}.tar.gz";
+    url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "1w60yq26x3yr3abxk7fwqqaggw8dc98595jdliaa3kyqdfm83y76";
   };
 
diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix
index de8baa7ad19..a38e71bb540 100644
--- a/pkgs/development/libraries/libmd/default.nix
+++ b/pkgs/development/libraries/libmd/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "libmd";
   version = "1.0.1";
 
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index bf6aa0d23fb..adf856544c4 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "19.07";
-  name = "libmediainfo-${version}";
+  pname = "libmediainfo";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
     sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss";
diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix
index e46eb9208de..7ec06b51e8c 100644
--- a/pkgs/development/libraries/libmesode/default.nix
+++ b/pkgs/development/libraries/libmesode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, expat, pkgconfig, check }:
 
 stdenv.mkDerivation rec {
-  name = "libmesode-${version}";
+  pname = "libmesode";
   version = "0.9.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix
index d3f30a75273..598f0b7f789 100644
--- a/pkgs/development/libraries/libmhash/default.nix
+++ b/pkgs/development/libraries/libmhash/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "mhash";
   version = "0.9.9.9";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn";
   };
 
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index f75d32c4313..719053e7ecf 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }:
 
 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-${version}";
+  pname = "libmicrohttpd";
   version = "0.9.64";
 
   src = fetchurl {
-    url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
+    url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz";
     sha256 = "03imzkd1hl2mkkpi84vg5xq9x6b58gwsv86ym85km0lhb7nxi4p7";
   };
 
diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix
index aa606e2a177..3eb688f9572 100644
--- a/pkgs/development/libraries/libmilter/default.nix
+++ b/pkgs/development/libraries/libmilter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, m4 }:
 
 stdenv.mkDerivation rec {
-  name = "libmilter-${version}";
+  pname = "libmilter";
   version = "8.15.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix
index 9c89d2e8d7b..8b659c46792 100644
--- a/pkgs/development/libraries/libmkv/default.nix
+++ b/pkgs/development/libraries/libmkv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "libmkv-${version}";
+  pname = "libmkv";
   version = "0.6.5.1";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix
index 512add5616a..99f04bc09de 100644
--- a/pkgs/development/libraries/libmowgli/default.nix
+++ b/pkgs/development/libraries/libmowgli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libmowgli-${version}";
+  pname = "libmowgli";
   version = "2.1.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix
index 4df38a9cc3c..e8392f88ac7 100644
--- a/pkgs/development/libraries/libmpack/default.nix
+++ b/pkgs/development/libraries/libmpack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "libmpack-${version}";
+  pname = "libmpack";
   version = "1.0.5";
   src = fetchFromGitHub {
     owner = "tarruda";
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
index dac7cf48aac..4c886078aa8 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.1";
-  name = "libmpeg2-${version}";
+  pname = "libmpeg2";
 
   src = fetchurl {
-    url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz";
+    url = "http://libmpeg2.sourceforge.net/files/${pname}-${version}.tar.gz";
     sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny";
   };
 
diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix
index 2b59adf8f92..05532df1abd 100644
--- a/pkgs/development/libraries/libmusicbrainz/5.x.nix
+++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.1.0";
-  name = "libmusicbrainz-${version}";
+  pname = "libmusicbrainz";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cmake neon libdiscid libxml2 ];
diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix
index 6653025eb05..483c5ff1ff7 100644
--- a/pkgs/development/libraries/libmx/default.nix
+++ b/pkgs/development/libraries/libmx/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libmx-${version}";
+  pname = "libmx";
   version = "1.4.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
index 2b7258031c3..166ff2ef5a0 100644
--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, boost, mysql }:
 
 stdenv.mkDerivation rec {
-  name = "libmysqlconnectorcpp-${version}";
+  pname = "libmysqlconnectorcpp";
   version = "1.1.9";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix
index b461bfb3ddf..9414ebdcc2a 100644
--- a/pkgs/development/libraries/libnabo/default.nix
+++ b/pkgs/development/libraries/libnabo/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.7";
-  name = "libnabo-${version}";
+  pname = "libnabo";
 
   src = fetchFromGitHub {
     owner = "ethz-asl";
diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix
index 17626bb23e1..695d46ba38f 100644
--- a/pkgs/development/libraries/libnatpmp/default.nix
+++ b/pkgs/development/libraries/libnatpmp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libnatpmp-${version}";
+  pname = "libnatpmp";
   version = "20150609";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
+    url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
     sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1";
   };
 
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index 222a0df055b..6019d79b00d 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libndctl-${version}";
+  pname = "libndctl";
   version = "65";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix
index 51e4deed462..6c4fc798f33 100644
--- a/pkgs/development/libraries/libndtypes/default.nix
+++ b/pkgs/development/libraries/libndtypes/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libndtypes-${version}";
+  pname = "libndtypes";
   version = "unstable-2018-11-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix
index ba116e20177..75cea004143 100644
--- a/pkgs/development/libraries/libnet/default.nix
+++ b/pkgs/development/libraries/libnet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libnet-${version}";
+  pname = "libnet";
   version = "1.2-rc3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libnet-dev/${name}.tar.gz";
+    url = "mirror://sourceforge/libnet-dev/${pname}-${version}.tar.gz";
     sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix
index 95533696ddf..328688612b6 100644
--- a/pkgs/development/libraries/libnetfilter_acct/default.nix
+++ b/pkgs/development/libraries/libnetfilter_acct/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.3";
-  name = "libnetfilter_acct-${version}";
+  pname = "libnetfilter_acct";
 
   src = fetchurl {
-    url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${name}.tar.bz2";
+    url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${pname}-${version}.tar.bz2";
     sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 41245e6539f..85fbf458ac2 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "libnetfilter_conntrack-${version}";
+  pname = "libnetfilter_conntrack";
   version = "1.0.7";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2";
     sha256 = "1dl9z50yny04xi5pymlykwmy6hcfc9p4nd7m47697zwxw98m6s1k";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
index a680e009ab6..563843cca46 100644
--- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "libnetfilter_cthelper-${version}";
+  pname = "libnetfilter_cthelper";
   version = "1.0.0";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${pname}-${version}.tar.bz2";
     sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
index d16155374ca..9f706d619c3 100644
--- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "libnetfilter_cttimeout-${version}";
+  pname = "libnetfilter_cttimeout";
   version = "1.0.0";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${pname}-${version}.tar.bz2";
     sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix
index 0d8de14513e..2b932bc0809 100644
--- a/pkgs/development/libraries/libnetfilter_log/default.nix
+++ b/pkgs/development/libraries/libnetfilter_log/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "libnetfilter_log-${version}";
+  pname = "libnetfilter_log";
   version = "1.0.1";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_log/files/${pname}-${version}.tar.bz2";
     sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix
index 94b3dc90a0b..5f84bc03f82 100644
--- a/pkgs/development/libraries/libnetfilter_queue/default.nix
+++ b/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.3";
-  name = "libnetfilter_queue-${version}";
+  pname = "libnetfilter_queue";
 
   src = fetchurl {
-    url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${name}.tar.bz2";
+    url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2";
     sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq";
   };
 
diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix
index bef977caa28..695ddadb5f3 100644
--- a/pkgs/development/libraries/libnfc/default.nix
+++ b/pkgs/development/libraries/libnfc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libusb, readline }:
 
 stdenv.mkDerivation rec {
-  name = "libnfc-${version}";
+  pname = "libnfc";
   version = "1.7.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix
index 8ed6dfa8ac0..d2848d9a1e9 100644
--- a/pkgs/development/libraries/libnfs/default.nix
+++ b/pkgs/development/libraries/libnfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libnfs-${version}";
+  pname = "libnfs";
   version = "4.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
index c6348b7b2e6..d9b2df6148a 100644
--- a/pkgs/development/libraries/libngspice/default.nix
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -3,7 +3,7 @@
 # Note that this does not provide the ngspice command-line utility. For that see
 # the ngspice derivation.
 stdenv.mkDerivation rec {
-  name = "libngspice-${version}";
+  pname = "libngspice";
   version = "30";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix
index d53b1dc0830..7c14d8102fb 100644
--- a/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libomxil-bellagio-${version}";
+  pname = "libomxil-bellagio";
   version = "0.9.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${pname}-${version}.tar.gz";
     sha256 = "0k6p6h4npn8p1qlgq6z3jbfld6n1bqswzvxzndki937gr0lhfg2r";
   };
 
diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix
index 450b9058d0b..c42cd3206b4 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/pkgs/development/libraries/libopcodes/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libopcodes-${version}";
+  pname = "libopcodes";
   inherit (binutils-unwrapped) version src;
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix
index a29f8dc4a80..4ad1e2b7735 100644
--- a/pkgs/development/libraries/libopenaptx/default.nix
+++ b/pkgs/development/libraries/libopenaptx/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "libopenaptx-${version}";
+  pname = "libopenaptx";
   version = "0.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix
index 791e4d890f9..37b3e8c93d9 100644
--- a/pkgs/development/libraries/libosmium/default.nix
+++ b/pkgs/development/libraries/libosmium/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }:
 
 stdenv.mkDerivation rec {
-  name = "libosmium-${version}";
+  pname = "libosmium";
   version = "2.15.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix
index 7797061a71a..fa0db0cd4ff 100644
--- a/pkgs/development/libraries/libow/default.nix
+++ b/pkgs/development/libraries/libow/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.2p1";
-  name = "libow-${version}";
+  pname = "libow";
 
   src = fetchFromGitHub {
     owner = "owfs";
diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index 774019de0d5..903aa66ce60 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -2,13 +2,13 @@
 , openssl }:
 
 stdenv.mkDerivation rec {
-  name = "libp11-${version}";
+  pname = "libp11";
   version = "0.4.10";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "libp11";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz";
   };
 
diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix
index b4b72e5a36d..3c37cf82495 100644
--- a/pkgs/development/libraries/libpaper/default.nix
+++ b/pkgs/development/libraries/libpaper/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.24";
-  name = "libpaper-${version}";
+  pname = "libpaper";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz";
diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index bf1d26cf90d..d0572de537e 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "4.10.1";
-  name = "libpfm-${version}";
+  pname = "libpfm";
 
   src = fetchurl {
-    url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz";
+    url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz";
     sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766";
   };
 
diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix
index bf516b33d02..63035f74ea0 100644
--- a/pkgs/development/libraries/libpinyin/default.nix
+++ b/pkgs/development/libraries/libpinyin/default.nix
@@ -12,7 +12,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "libpinyin-${version}";
+  pname = "libpinyin";
   version = "2.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index d622584c9da..19b700ca5e3 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
   pname = "libplist";
   version = "2019-04-04";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 3b050c3dc6a..09bb0e4aa3f 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -3,7 +3,7 @@
 , SystemConfiguration, CoreFoundation, JavaScriptCore }:
 
 stdenv.mkDerivation rec {
-  name = "libproxy-${version}";
+  pname = "libproxy";
   version = "0.4.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index 7d697ee10f1..60c01565e63 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python }:
 
 stdenv.mkDerivation rec {
-  name = "libpwquality-${version}";
+  pname = "libpwquality";
   version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "libpwquality";
     repo = "libpwquality";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0k564hj2q13z5ag8cj6rnkzm1na7001k4chz4f736p6aqvspv0bd";
   };
 
diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index 048ba48bb67..22245f5fa2a 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -8,7 +8,7 @@
 with lib;
 
 mkDerivation rec {
-  name = "libqtav-${version}";
+  pname = "libqtav";
   version = "1.12.0";
 
   nativeBuildInputs = [ extra-cmake-modules qttools ];
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 5eb8049437c..360b2c15a63 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lcms2, jasper, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libraw-${version}";
+  pname = "libraw";
   version = "0.19.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix
index d92b017712d..5b39940bb3f 100644
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/pkgs/development/libraries/librdf/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.0";
-  name = "liblrdf-${version}";
+  pname = "liblrdf";
 
   src = fetchurl {
     url = "https://github.com/swh/LRDF/archive/${version}.tar.gz";
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index c9debe61743..e365ec7a01a 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
   version = "0.6.0";
-  name = "libre-${version}";
+  pname = "libre";
   src = fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
     sha256 = "0cc1x6pm1nz09046bfzgvp2p3wjbgm6f53d71a9dd14grjsvr5qf";
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 392c5052e07..1ff0b2f646f 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "librealsense-${version}";
+  pname = "librealsense";
   version = "2.23.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 50c20d12ccc..aeda663342e 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, openssl, libre}:
 stdenv.mkDerivation rec {
   version = "0.6.0";
-  name = "librem-${version}";
+  pname = "librem";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";
     sha256 = "0b17wma5w9acizk02isk5k83vv47vf1cf9zkmsc1ail677d20xj1";
diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix
index 2f78222cebb..f11a7eb1fe5 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@@ -6,7 +6,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "librep-${version}";
+  pname = "librep";
   version = "0.92.7";
   sourceName = "librep_${version}";
 
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index d710c41a97c..63f6c904330 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -3,11 +3,11 @@
 let
 
   generic = { version, sha256 }: stdenv.mkDerivation rec {
-    name = "libressl-${version}";
+    pname = "libressl";
     inherit version;
 
     src = fetchurl {
-      url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
+      url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz";
       inherit sha256;
     };
 
diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix
index e4e96df86c1..79b05619ac5 100644
--- a/pkgs/development/libraries/librsync/default.nix
+++ b/pkgs/development/libraries/librsync/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }:
 
 stdenv.mkDerivation rec {
-  name = "librsync-${version}";
+  pname = "librsync";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix
index 479da52f8d9..b9ae1f829a1 100644
--- a/pkgs/development/libraries/libscrypt/default.nix
+++ b/pkgs/development/libraries/libscrypt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "libscrypt-${version}";
+  pname = "libscrypt";
   version = "1.21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index 785dac4aef2..b2a79967477 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.1.0";
-  name = "libsearpc-${version}";
+  pname = "libsearpc";
 
   src = fetchFromGitHub {
     owner = "haiwen";
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 6b38bcf2c77..8c9c6ac107c 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, getopt, makeWrapper, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "libseccomp-${version}";
+  pname = "libseccomp";
   version = "2.4.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix
index 82caacf93e6..970c4aff246 100644
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/pkgs/development/libraries/libsidplayfp/default.nix
@@ -9,10 +9,9 @@ stdenv.mkDerivation rec {
   minor = "8";
   level = "7";
   version = "${major}.${minor}.${level}";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz";
+    url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${pname}-${version}.tar.gz";
     sha256 = "14k1sbdcbhykwfcadq5lbpnm9xp2r7vs7fyi84h72g89y8pjg0da";
   };
 
diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix
index 2da5d68d117..bc34318d0a9 100644
--- a/pkgs/development/libraries/libsieve/default.nix
+++ b/pkgs/development/libraries/libsieve/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   version = "2.3.1";
-  name = "libsieve-${version}";
+  pname = "libsieve";
 
   src = fetchurl {
     url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix
index 34d959423a3..561b547a8d7 100644
--- a/pkgs/development/libraries/libsixel/default.nix
+++ b/pkgs/development/libraries/libsixel/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub}:
 stdenv.mkDerivation rec {
   version = "1.8.2";
-  name = "libsixel-${version}";
+  pname = "libsixel";
 
   src = fetchFromGitHub {
     repo = "libsixel";
diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix
index 19ebbd363e1..d0f822a23f5 100644
--- a/pkgs/development/libraries/libskk/default.nix
+++ b/pkgs/development/libraries/libskk/default.nix
@@ -4,7 +4,7 @@
   libgee, json-glib, skk-dicts, libxkbcommon }:
 
 stdenv.mkDerivation rec {
-  name = "libskk-${version}";
+  pname = "libskk";
   version = "1.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix
index 25f2a1e0846..208aa6c9d61 100644
--- a/pkgs/development/libraries/libsmi/default.nix
+++ b/pkgs/development/libraries/libsmi/default.nix
@@ -1,11 +1,11 @@
 { stdenv , fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsmi-${version}";
+  pname = "libsmi";
   version = "0.5.0";
 
   src = fetchurl {
-    url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${name}.tar.gz";
+    url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${pname}-${version}.tar.gz";
     sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj";
   };
 
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index 8ffae53be19..263623c3d37 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version  = "0.7.5";
-  name = "libsolv-${version}";
+  pname = "libsolv";
 
   src = fetchFromGitHub {
     owner  = "openSUSE";
diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index f53db7241cf..e7ec858cc7b 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
-  name = "libsoundio-${version}";
+  pname = "libsoundio";
 
   src = fetchFromGitHub {
     owner = "andrewrk";
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 52a52e7e732..5f88ba80cd6 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -3,12 +3,11 @@
 , libpsl, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "libsoup";
   version = "2.66.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx";
   };
 
diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix
index 00579600cb7..5f547a97370 100644
--- a/pkgs/development/libraries/libspiro/default.nix
+++ b/pkgs/development/libraries/libspiro/default.nix
@@ -1,10 +1,10 @@
 {stdenv, pkgconfig, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "libspiro-${version}";
+  pname = "libspiro";
   version = "0.5.20150702";
   src = fetchurl {
-    url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/fontforge/libspiro/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv";
   };
 
diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix
index 7d9ea25e9d2..f8fc6a446d1 100644
--- a/pkgs/development/libraries/libsrs2/default.nix
+++ b/pkgs/development/libraries/libsrs2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsrs2-${version}";
+  pname = "libsrs2";
   version = "1.0.18";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix
index c1e6a1f7fb8..0ef96f67505 100644
--- a/pkgs/development/libraries/libstrophe/default.nix
+++ b/pkgs/development/libraries/libstrophe/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, automake, autoconf, libtool, openssl, expat, pkgconfig, check }:
 
 stdenv.mkDerivation rec {
-  name = "libstrophe-${version}";
+  pname = "libstrophe";
   version = "0.9.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix
index 6eb8b6b1a8e..fcd010b46cc 100644
--- a/pkgs/development/libraries/libsvm/default.nix
+++ b/pkgs/development/libraries/libsvm/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "libsvm-${version}";
+  pname = "libsvm";
   version = "3.23";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix
index 29d83bcd9d7..ca0407bd0aa 100644
--- a/pkgs/development/libraries/libtap/default.nix
+++ b/pkgs/development/libraries/libtap/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
-  name = "libtap-${version}";
+  pname = "libtap";
   version = "1.12.0";
 
   src = fetchurl {
-    url = "https://web-cpan.shlomifish.org/downloads/${name}.tar.bz2";
+    url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s";
   };
 
diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix
index f2cb879b3e0..c4614103b3f 100644
--- a/pkgs/development/libraries/libtar/default.nix
+++ b/pkgs/development/libraries/libtar/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.20";
-  name = "libtar-${version}";
+  pname = "libtar";
 
   # Maintenance repo for libtar (Arch Linux uses this)
   src = fetchgit {
diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix
index 4e859c28227..7a25980a38b 100644
--- a/pkgs/development/libraries/libtcod/default.nix
+++ b/pkgs/development/libraries/libtcod/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "libtcod-${version}";
+  pname = "libtcod";
   version = "1.5.1";
 
   src = fetchFromBitbucket {
diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix
index 0bc619051c6..139de830972 100644
--- a/pkgs/development/libraries/libtelnet/default.nix
+++ b/pkgs/development/libraries/libtelnet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libtelnet-${version}";
+  pname = "libtelnet";
   version = "0.21+45f2d5c";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index 7261fb7b6b7..38a09218dd1 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchzip, libtool, pkgconfig, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "libtermkey-${version}";
+  pname = "libtermkey";
 
   version = "0.20";
 
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 55c747540f7..093d6a18544 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.0.10";
-  name = "libtiff-${version}";
+  pname = "libtiff";
 
   src = fetchurl {
     url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix
index f9e7f9684ba..6520ddd0a9e 100644
--- a/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/pkgs/development/libraries/libtomcrypt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "libtomcrypt-${version}";
+  pname = "libtomcrypt";
   version = "1.18.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix
index a90377dad34..8ce82bcf07c 100644
--- a/pkgs/development/libraries/libtommath/default.nix
+++ b/pkgs/development/libraries/libtommath/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "libtommath-${version}";
+  pname = "libtommath";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix
index 3b45d4de884..7080edcd738 100644
--- a/pkgs/development/libraries/libuecc/default.nix
+++ b/pkgs/development/libraries/libuecc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "7";
-  name = "libuecc-${version}";
+  pname = "libuecc";
 
   src = fetchgit {
     url = "git://git.universe-factory.net/libuecc";
diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix
index e21f9400848..35ec5dfed7c 100644
--- a/pkgs/development/libraries/libunarr/default.nix
+++ b/pkgs/development/libraries/libunarr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "libunarr-${version}";
+  pname = "libunarr";
   version = "1.0.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix
index 50bc0539589..7e75954fb45 100644
--- a/pkgs/development/libraries/libunibreak/default.nix
+++ b/pkgs/development/libraries/libunibreak/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libunibreak-${version}";
+  pname = "libunibreak";
   version = "1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${pname}-${version}.tar.gz";
     sha256 = "02657l426bk5d8h42b9ixxy1clc50mx4bzwg02nkdhs09wqw32wn";
   };
 
diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix
index b302e1d0ba0..b315d0f16b0 100644
--- a/pkgs/development/libraries/libunique/3.x.nix
+++ b/pkgs/development/libraries/libunique/3.x.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   majorVer = "3.0";
   minorVer = "2";
   version = "${majorVer}.${minorVer}";
-  name = "libunique3-${version}";
+  pname = "libunique3";
   srcName = "libunique-${version}";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index e066c072367..e02e5228aa4 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "libunistring-${version}";
+  pname = "libunistring";
   version = "0.9.10";
 
   src = fetchurl {
-    url = "mirror://gnu/libunistring/${name}.tar.gz";
+    url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz";
     sha256 = "02v17za10mxnj095x4pvm80jxyqwk93kailfc2j8xa1r6crmnbm8";
   };
 
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 9bea14bd8e8..70e6b698ec5 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, xz }:
 
 stdenv.mkDerivation rec {
-  name = "libunwind-${version}";
+  pname = "libunwind";
   version = "1.3.1";
 
   src = fetchurl {
-    url = "mirror://savannah/libunwind/${name}.tar.gz";
+    url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz";
     sha256 = "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3";
   };
 
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index 90be7740114..3ed45e788c4 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.11.1";
-  name = "liburcu-${version}";
+  pname = "liburcu";
 
   src = fetchurl {
     url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix
index ff88bdcaafd..5eeb50468de 100644
--- a/pkgs/development/libraries/liburing/default.nix
+++ b/pkgs/development/libraries/liburing/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "liburing-${version}";
+  pname = "liburing";
   version = "1.0.0pre156_${builtins.substring 0 7 src.rev}";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
index d9e008af977..debccb9087d 100644
--- a/pkgs/development/libraries/libusbmuxd/default.nix
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
   pname = "libusbmuxd";
   version = "2019-03-23";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix
index f9703e3c593..ff2044242b9 100644
--- a/pkgs/development/libraries/libutempter/default.nix
+++ b/pkgs/development/libraries/libutempter/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "libutempter-${version}";
+  pname = "libutempter";
   version = "1.1.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix
index 9883de59feb..c604ce71cb7 100644
--- a/pkgs/development/libraries/libva-utils/default.nix
+++ b/pkgs/development/libraries/libva-utils/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-utils-${version}";
+  pname = "libva-utils";
   inherit (libva) version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix
index 6a067244543..9b12f83bcb8 100644
--- a/pkgs/development/libraries/libva/1.0.0.nix
+++ b/pkgs/development/libraries/libva/1.0.0.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-${version}";
+  pname = "libva";
   version = "1.7.3";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
+    url = "https://www.freedesktop.org/software/vaapi/releases/libva/${pname}-${version}.tar.bz2";
     sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12";
   };
 
diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix
index 50b995a0356..039e3308f88 100644
--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -2,7 +2,7 @@
 , libXext, libvdpau, glib, libva, ffmpeg, libGLU }:
 
 stdenv.mkDerivation rec {
-  name = "libvdpau-va-gl-${version}";
+  pname = "libvdpau-va-gl";
   version = "0.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index d6842226014..792a31bcf9f 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, xorg, mesa }:
 
 stdenv.mkDerivation rec {
-  name = "libvdpau-${version}";
+  pname = "libvdpau";
   version = "1.2";
 
   src = fetchurl {
-    url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${name}.tar.bz2";
+    url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${pname}-${version}.tar.bz2";
     sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06";
   };
 
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index c559d3f8407..d5f4ae0ce02 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -16,13 +16,13 @@ with stdenv.lib;
 let
   buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
-  name = "libvirt-${version}";
+  pname = "libvirt";
   version = "5.4.0";
 
   src =
     if buildFromTarball then
       fetchurl {
-        url = "http://libvirt.org/sources/${name}.tar.xz";
+        url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
         sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw";
       }
     else
diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix
index a09e2cf2f72..a272d355c84 100644
--- a/pkgs/development/libraries/libvisio/default.nix
+++ b/pkgs/development/libraries/libvisio/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libvisio-${version}";
+  pname = "libvisio";
   version = "0.1.6";
 
   outputs = [ "out" "bin" "dev" "doc" ];
 
   src = fetchurl {
-    url = "https://dev-www.libreoffice.org/src/libvisio/${name}.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libvisio/${pname}-${version}.tar.xz";
     sha256 = "1yahpfl13qk6178irv8jn5ppxdn7isafqisyqsdw0lqxcz9h447y";
   };
 
diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix
index 44b2a81b2d3..e49ab9b38a0 100644
--- a/pkgs/development/libraries/libvmi/default.nix
+++ b/pkgs/development/libraries/libvmi/default.nix
@@ -13,7 +13,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libvmi-${version}";
+  pname = "libvmi";
   version = "0.12.0";
   libVersion = "0.0.12";
 
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index cd0cc9798fa..ee36365c03f 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -55,7 +55,7 @@ assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport);
 assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
 
 stdenv.mkDerivation rec {
-  name = "libvpx-${version}";
+  pname = "libvpx";
   version = "1.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index a1e10b6d003..a4f0a44e60b 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, glib, pkgconfig, udev, libgudev }:
 
 stdenv.mkDerivation rec {
-  name = "libwacom-${version}";
+  pname = "libwacom";
   version = "0.33";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index c11f70290a4..fc9932567cf 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -26,11 +26,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libwebp-${version}";
+  pname = "libwebp";
   version = "1.0.3";
 
   src = fetchurl {
-    url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
+    url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz";
     sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2";
   };
 
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 7c1d58d2980..6bec6166246 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }:
 
 stdenv.mkDerivation rec {
-  name = "libwebsockets-${version}";
+  pname = "libwebsockets";
   version = "3.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix
index 2af550c7d99..18f6d37768a 100644
--- a/pkgs/development/libraries/libwhereami/default.nix
+++ b/pkgs/development/libraries/libwhereami/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
 
 stdenv.mkDerivation rec {
-  name = "libwhereami-${version}";
+  pname = "libwhereami";
   version = "0.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix
index 76ac946d618..e8f39754885 100644
--- a/pkgs/development/libraries/libwps/default.nix
+++ b/pkgs/development/libraries/libwps/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libwps-${version}";
+  pname = "libwps";
   version = "0.4.10";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libwps/${name}.tar.bz2";
+    url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2";
     sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4";
   };
 
diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix
index d56c20cb75a..271823ace28 100644
--- a/pkgs/development/libraries/libx86/default.nix
+++ b/pkgs/development/libraries/libx86/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libx86-${version}";
+  pname = "libx86";
   version = "1.1";
   src = fetchurl {
-    url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz";
+    url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${pname}-${version}.tar.gz";
     sha256 = "0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav";
   };
   patches = [./constants.patch ./non-x86.patch ];
diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index 2e00b5b5ab9..f361b3e1b1f 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libx86emu-${version}";
+  pname = "libx86emu";
   version = "2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index b4ad501c2ef..fb1f4b29423 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libxcomp-${version}";
+  pname = "libxcomp";
   version = "3.5.99.16";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix
index a2a576edc0f..12658996646 100644
--- a/pkgs/development/libraries/libxls/default.nix
+++ b/pkgs/development/libraries/libxls/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "libxls-${version}";
+  pname = "libxls";
   version = "1.5.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 33f818f7d62..04954f3e1f5 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -10,11 +10,11 @@ let
   python = python2;
 
 in stdenv.mkDerivation rec {
-  name = "libxml2-${version}";
+  pname = "libxml2";
   version = "2.9.9";
 
   src = fetchurl {
-    url = "http://xmlsoft.org/sources/${name}.tar.gz";
+    url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
     sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl";
   };
 
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix
index 9edb9b475e8..209a7328d12 100644
--- a/pkgs/development/libraries/libxmlb/default.nix
+++ b/pkgs/development/libraries/libxmlb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, libuuid, gobject-introspection, gtk-doc, shared-mime-info, python3, docbook_xsl, docbook_xml_dtd_43 }:
 
 stdenv.mkDerivation rec {
-  name = "libxmlb-${version}";
+  pname = "libxmlb";
   version = "0.1.10";
 
   outputs = [ "out" "lib" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix
index cb93ec63e67..9eb891544b5 100644
--- a/pkgs/development/libraries/libxnd/default.nix
+++ b/pkgs/development/libraries/libxnd/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libxnd-${version}";
+  pname = "libxnd";
   version = "unstable-2018-11-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 2dde7fe32ef..1a3efee176a 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -11,10 +11,9 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libxslt";
   version = "1.1.33";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "http://xmlsoft.org/sources/${name}.tar.gz";
+    url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
     sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf";
   };
 
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index af665c6d9a4..75b377ff8d4 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "libyaml-cpp-${version}";
+  pname = "libyaml-cpp";
   version = "0.6.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix
index 710e7a3f072..e46064ae56e 100644
--- a/pkgs/development/libraries/libytnef/default.nix
+++ b/pkgs/development/libraries/libytnef/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "libytnef-${version}";
+  pname = "libytnef";
   version = "1.9.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix
index f3cbddf1ec4..b16d897fb5f 100644
--- a/pkgs/development/libraries/libzdb/default.nix
+++ b/pkgs/development/libraries/libzdb/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec
 {
   version = "3.1";
-  name = "libzdb-${version}";
+  pname = "libzdb";
 
   src = fetchurl
   {
diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix
index afa7696aca9..fbbfb5364b0 100644
--- a/pkgs/development/libraries/libzen/default.nix
+++ b/pkgs/development/libraries/libzen/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.37";
-  name = "libzen-${version}";
+  pname = "libzen";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
     sha256 = "1hcsrmn85b0xp0mp33aazk7g071q1v3f163nnhv8b0mv9c4bgsfn";
diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 50ed00711df..43a5f7dc841 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libzip-${version}";
+  pname = "libzip";
   version = "1.3.0";
 
   src = fetchurl {
-    url = "https://www.nih.at/libzip/${name}.tar.gz";
+    url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz";
     sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9";
   };
 
diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix
index 1413da4a18d..85b9308237f 100644
--- a/pkgs/development/libraries/libzmf/default.nix
+++ b/pkgs/development/libraries/libzmf/default.nix
@@ -1,12 +1,11 @@
 {stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "libzmf";
   version = "0.0.2";
 
   src = fetchurl {
-    url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libzmf/${pname}-${version}.tar.xz";
     sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197";
   };
 
diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 3f963c7ca19..8a5026e307f 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "lightning-${version}";
+  pname = "lightning";
   version = "2.1.2";
 
   src = fetchurl {
-    url = "mirror://gnu/lightning/${name}.tar.gz";
+    url = "mirror://gnu/lightning/${pname}-${version}.tar.gz";
     sha256 = "0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v";
   };
 
diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index ab0e51bae26..7f82d49462c 100644
--- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -15,7 +15,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "lightstep-tracer-cpp-${version}";
+  pname = "lightstep-tracer-cpp";
   version = "0.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 9af0c20d701..f5cb197dfe5 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -9,7 +9,6 @@
 , withSage ? false # sage support
 }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "linbox";
   version = "1.6.3";
 
diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix
index 5fa1035868d..b105aa64bff 100644
--- a/pkgs/development/libraries/linenoise-ng/default.nix
+++ b/pkgs/development/libraries/linenoise-ng/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "linenoise-ng-${version}";
+  pname = "linenoise-ng";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix
index 6bbcc725f22..857f5247cd5 100644
--- a/pkgs/development/libraries/linenoise/default.nix
+++ b/pkgs/development/libraries/linenoise/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "linenoise-${version}";
+  pname = "linenoise";
   version = "1.0.10";  # Its version 1.0 plus 10 commits
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix
index 99ea6343d70..8b0aecdab16 100644
--- a/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/pkgs/development/libraries/liquid-dsp/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "liquid-dsp-${version}";
+  pname = "liquid-dsp";
   version = "20170307";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index 268476e079d..a5eec1805e1 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -2,7 +2,7 @@
 
 # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
 stdenv.mkDerivation rec {
-  name = "live555-${version}";
+  pname = "live555";
   version = "2019.06.28";
 
   src = fetchurl { # the upstream doesn't provide a stable URL
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 690a42cfb30..830ec7bdaee 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "lmdb-${version}";
+  pname = "lmdb";
   version = "0.9.24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix
index 232a67c23f3..f4ecba7ad1e 100644
--- a/pkgs/development/libraries/lmdbxx/default.nix
+++ b/pkgs/development/libraries/lmdbxx/default.nix
@@ -3,7 +3,7 @@
 , lmdb }:
 
 stdenv.mkDerivation rec {
-  name = "lmdbxx-${version}";
+  pname = "lmdbxx";
   version = "0.9.14.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/loadcaffe/default.nix b/pkgs/development/libraries/loadcaffe/default.nix
index f0904726eed..c4e55b14407 100644
--- a/pkgs/development/libraries/loadcaffe/default.nix
+++ b/pkgs/development/libraries/loadcaffe/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, cmake, torch, protobuf, protobufc}:
 stdenv.mkDerivation rec {
-  name = "loadcaffe-${version}";
+  pname = "loadcaffe";
   version = "0.0pre2016.08.01";
   buildInputs = [cmake torch protobuf protobufc];
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index 8e854156424..04b91e5d80f 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "log4cxx-${version}";
+  pname = "log4cxx";
   version = "0.10.0";
 
   src = fetchurl {
-    url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${name}.tar.gz";
+    url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz";
     sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d";
   };
 
diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix
index b2fba7df509..ab8c2c9385f 100644
--- a/pkgs/development/libraries/log4shib/default.nix
+++ b/pkgs/development/libraries/log4shib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "log4shib-${version}";
+  pname = "log4shib";
   version = "1.0.9";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix
index 2ff927048ad..631233f0ecb 100644
--- a/pkgs/development/libraries/loki/default.nix
+++ b/pkgs/development/libraries/loki/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "loki-${version}";
+  pname = "loki";
   version = "0.1.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index cad5d0d7eca..e00fc07480e 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.5.3";
-  name = "loudmouth-${version}";
+  pname = "loudmouth";
 
   src = fetchurl {
-    url = "https://mcabber.com/files/loudmouth/${name}.tar.bz2";
+    url = "https://mcabber.com/files/loudmouth/${pname}-${version}.tar.bz2";
     sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl";
   };
 
diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix
index c45fa6bc61a..32eec84e69e 100644
--- a/pkgs/development/libraries/lucene++/default.nix
+++ b/pkgs/development/libraries/lucene++/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, boost, gtest }:
 
 stdenv.mkDerivation rec {
-  name = "lucene++-${version}";
+  pname = "lucene++";
   version = "3.0.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix
index 8a8a004a5e6..7355248b5c5 100644
--- a/pkgs/development/libraries/mac/default.nix
+++ b/pkgs/development/libraries/mac/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, yasm }:
 
 stdenv.mkDerivation rec {
-  name = "mac-${version}";
+  pname = "mac";
   version = "4.11-u4-b5-s7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index c7794b1a8bf..04f2208a35d 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mailcore2-${version}";
+  pname = "mailcore2";
 
   version = "0.6.3";
 
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 3a90a4cdf33..1feea915c02 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mapnik-${version}";
+  pname = "mapnik";
   version = "3.0.22";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 064f04f220c..cec9e5adc29 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/pkgs/development/libraries/martyr/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, ant, jdk}:
 
 stdenv.mkDerivation rec {
-	name = "martyr-${version}";
+	pname = "martyr";
   version = "0.3.9";
 	src = fetchurl {
-		url = "mirror://sourceforge/martyr/${name}.tar.gz";
+		url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz";
 		sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
 	};
 
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index a72d5a825c6..a06d082b226 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -10,13 +10,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-${version}";
+  pname = "mbedtls";
   version = "2.17.0";
 
   src = fetchFromGitHub {
     owner = "ARMmbed";
     repo = "mbedtls";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1mk3xv61wvqqrzd6jnrz8csyfnwwwwpjzywj3fsfy99p51d7wqgw";
   };
 
diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix
index 8f0a6317a25..04ebfced52e 100644
--- a/pkgs/development/libraries/medfile/default.nix
+++ b/pkgs/development/libraries/medfile/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, hdf5 }:
 
 stdenv.mkDerivation rec {
-  name = "medfile-${version}";
+  pname = "medfile";
   version = "4.0.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
index b8a8c64011c..ebd68134ba5 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mediastreamer-openh264-${version}";
+  pname = "mediastreamer-openh264";
   version = "0.0pre20160801";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix
index 94622b8a8f9..902fd920568 100644
--- a/pkgs/development/libraries/mesa-glu/default.nix
+++ b/pkgs/development/libraries/mesa-glu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }:
 
 stdenv.mkDerivation rec {
-  name = "glu-${version}";
+  pname = "glu";
   version = "9.0.0";
 
   src = fetchurl {
-    url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${name}.tar.bz2";
+    url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${pname}-${version}.tar.bz2";
     sha256 = "04nzlil3a6fifcmb95iix3yl8mbxdl66b99s62yzq8m7g79x0yhz";
   };
   postPatch = ''
diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix
index 788d2c5d618..0919ee6cd28 100644
--- a/pkgs/development/libraries/microsoft_gsl/default.nix
+++ b/pkgs/development/libraries/microsoft_gsl/default.nix
@@ -5,7 +5,7 @@ let
   nativeBuild = stdenv.hostPlatform == stdenv.buildPlatform;
 in
 stdenv.mkDerivation rec {
-  name = "microsoft_gsl-${version}";
+  pname = "microsoft_gsl";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix
index 7a06f9277c9..5f4dc5eedde 100644
--- a/pkgs/development/libraries/mimetic/default.nix
+++ b/pkgs/development/libraries/mimetic/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "mimetic";
   version = "0.9.8";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url    = "http://www.codesink.org/download/${pname}-${version}.tar.gz";
diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix
index 791cc9f3f91..3493bc5d967 100644
--- a/pkgs/development/libraries/miniball/default.nix
+++ b/pkgs/development/libraries/miniball/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "miniball-${version}";
+  pname = "miniball";
   version = "3.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index 972cc3e738c..5bdacbba11d 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "mxml-${version}";
+  pname = "mxml";
   version = "3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index a56deff66e4..5099991c117 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mlt-${version}";
+  pname = "mlt";
   version = "6.16.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index f46ec57197f..f017e4452a6 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -6,7 +6,7 @@
 let inherit (stdenv.lib) getDev; in
 
 stdenv.mkDerivation rec {
-  name = "mlt-${version}";
+  pname = "mlt";
   version = "6.16.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 2a933ef7840..49116c349a8 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mongoc-${version}";
+  pname = "mongoc";
   version = "1.8.0";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index 58905cce82a..2bba61975f9 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }:
 
 stdenv.mkDerivation rec {
-  name = "mono-addins-${version}";
+  pname = "mono-addins";
   version = "1.3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix
index ba9e2a741e4..89db7344f99 100644
--- a/pkgs/development/libraries/mono-zeroconf/default.nix
+++ b/pkgs/development/libraries/mono-zeroconf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, which, pkgconfig, mono }:
 
 stdenv.mkDerivation rec {
-  name = "mono-zeroconf-${version}";
+  pname = "mono-zeroconf";
   version = "0.9.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix
index 51591c9d8e8..ba61cb8414a 100644
--- a/pkgs/development/libraries/motif/default.nix
+++ b/pkgs/development/libraries/motif/default.nix
@@ -8,11 +8,11 @@
 # refer to the gentoo package
 
 stdenv.mkDerivation rec {
-  name = "motif-${version}";
+  pname = "motif";
   version = "2.3.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/motif/${name}.tar.gz";
+    url = "mirror://sourceforge/motif/${pname}-${version}.tar.gz";
     sha256 = "1ksqbp0bzdw6wcrx8s4hj4ivvxmw54hz85l2xfigb87cxmmhx0gs";
   };
 
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index 96444ea4a23..8162d3bb911 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "movit-${version}";
+  pname = "movit";
   version = "1.6.3";
 
   src = fetchurl {
-    url = "https://movit.sesse.net/${name}.tar.gz";
+    url = "https://movit.sesse.net/${pname}-${version}.tar.gz";
     sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb";
   };
 
diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix
index 6b607e94bd4..baefab487e5 100644
--- a/pkgs/development/libraries/mpfi/default.nix
+++ b/pkgs/development/libraries/mpfi/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, mpfr}:
 stdenv.mkDerivation rec {
-  name = "mpfi-${version}";
+  pname = "mpfi";
   version = "1.5.3";
   file_nr = "37331";
   src = fetchurl {
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index e32c83af8a7..a91d220be33 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   version = "4.0.2";
-  name = "mpfr-${version}";
+  pname = "mpfr";
 
   src = fetchurl {
     urls = [
       #"https://www.mpfr.org/${name}/${name}.tar.xz"
-      "mirror://gnu/mpfr/${name}.tar.xz"
+      "mirror://gnu/mpfr/${pname}-${version}.tar.xz"
     ];
     sha256 = "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx";
   };
diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index 1c6b8df1511..2232bfb9a38 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -3,7 +3,7 @@
 } :
 
 stdenv.mkDerivation  rec {
-  name = "mpich-${version}";
+  pname = "mpich";
   version = "3.3.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index fe9cd6f492e..3b40f02c01c 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, m4, which, yasm }:
 
 stdenv.mkDerivation rec {
-  name = "mpir-${version}";
+  pname = "mpir";
   version = "3.0.0";
 
   nativeBuildInputs = [ m4 which yasm ];
diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix
index 1430a3dfca1..3767b22ba0d 100644
--- a/pkgs/development/libraries/mps/default.nix
+++ b/pkgs/development/libraries/mps/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "mps-${version}";
+  pname = "mps";
   version = "1.117.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix
index e177694e894..b200a12ef95 100644
--- a/pkgs/development/libraries/msgpuck/default.nix
+++ b/pkgs/development/libraries/msgpuck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "msgpuck-${version}";
+  pname = "msgpuck";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
index ef8525cf54d..da41aceeef5 100644
--- a/pkgs/development/libraries/mtxclient/default.nix
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -2,7 +2,7 @@
 , boost, openssl, zlib, libsodium, olm, nlohmann_json }:
 
 stdenv.mkDerivation rec {
-  name = "mtxclient-${version}";
+  pname = "mtxclient";
   version = "0.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix
index 53f348f93f8..d058322660c 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/pkgs/development/libraries/muparser/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "muparser-${version}";
+  pname = "muparser";
   version = "2.2.3";
   url-version = stdenv.lib.replaceChars ["."] ["_"] version;
 
diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix
index f4a869255f8..0907f0174c9 100644
--- a/pkgs/development/libraries/mygui/default.nix
+++ b/pkgs/development/libraries/mygui/default.nix
@@ -4,7 +4,7 @@
 let
   renderSystem = if withOgre then "3" else "4";
 in stdenv.mkDerivation rec {
-  name = "mygui-${version}";
+  pname = "mygui";
   version = "3.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix
index f29fb9564f3..5c0238fe41e 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/pkgs/development/libraries/nanoflann/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.0";
-  name = "nanoflann-${version}";
+  pname = "nanoflann";
   
   src = fetchFromGitHub {
     owner = "jlblancoc";
diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index 8f72b333aa4..94bc8186f30 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.5";
-  name = "nanomsg-${version}";
+  pname = "nanomsg";
 
   src = fetchFromGitHub {
     owner = "nanomsg";
diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix
index 55e9f44eae3..c842eac4311 100644
--- a/pkgs/development/libraries/nco/default.nix
+++ b/pkgs/development/libraries/nco/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.8.1";
-  name = "nco-${version}";
+  pname = "nco";
 
   buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr which curl flex ];
 
diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix
index 87f9b5effac..fbffb138e96 100644
--- a/pkgs/development/libraries/neon/0.29.nix
+++ b/pkgs/development/libraries/neon/0.29.nix
@@ -15,10 +15,10 @@ in
 
 stdenv.mkDerivation rec {
   version = "0.29.6";
-  name = "neon-${version}";
+  pname = "neon";
 
   src = fetchurl {
-    url = "http://www.webdav.org/neon/${name}.tar.gz";
+    url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz";
     sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w";
   };
 
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index 61a40753a56..ffefc8e51c4 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -15,10 +15,10 @@ in
 
 stdenv.mkDerivation rec {
   version = "0.30.2";
-  name = "neon-${version}";
+  pname = "neon";
 
   src = fetchurl {
-    url = "http://www.webdav.org/neon/${name}.tar.gz";
+    url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz";
     sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv";
   };
 
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index a57884912ba..665145a92ac 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, netcdf, hdf5, curl }:
 stdenv.mkDerivation rec {
-  name = "netcdf-cxx4-${version}";
+  pname = "netcdf-cxx4";
   version = "4.3.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index bb621a3eda6..c9c52636a5b 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:
 stdenv.mkDerivation rec {
-  name = "netcdf-fortran-${version}";
+  pname = "netcdf-fortran";
   version = "4.4.5";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix
index 3c5ae8537a4..4609fd1a376 100644
--- a/pkgs/development/libraries/notify-sharp/default.nix
+++ b/pkgs/development/libraries/notify-sharp/default.nix
@@ -2,7 +2,7 @@
 , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }:
 
 stdenv.mkDerivation rec {
-  name = "notify-sharp-${version}";
+  pname = "notify-sharp";
   version = "3.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix
index 43732406064..2cbf88633e7 100644
--- a/pkgs/development/libraries/npapi-sdk/default.nix
+++ b/pkgs/development/libraries/npapi-sdk/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "npapi-sdk-${version}";
+  pname = "npapi-sdk";
 
   version = "0.27.2";
 
   src = fetchurl {
-    url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${name}.tar.bz2";
+    url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${pname}-${version}.tar.bz2";
 
     sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1";
   };
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index b410686865f..b7b4ea45d8b 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,11 +9,11 @@ let
   underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 
 in stdenv.mkDerivation rec {
-  name = "nss-${version}";
+  pname = "nss";
   inherit version;
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz";
+    url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
     sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w";
   };
 
diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix
index dac65e1c2f9..5ea43097b8c 100644
--- a/pkgs/development/libraries/ntbtls/default.nix
+++ b/pkgs/development/libraries/ntbtls/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "ntbtls-${version}";
+  pname = "ntbtls";
   version = "0.1.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index 12d3c9ad942..e83fe2e7e7b 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -13,7 +13,7 @@
 assert withGf2x -> gf2x != null;
 
 stdenv.mkDerivation rec {
-  name = "ntl-${version}";
+  pname = "ntl";
   version = "11.3.2";
 
   src = fetchurl {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     perl # needed for ./configure
   ];
 
-  sourceRoot = "${name}/src";
+  sourceRoot = "${pname}-${version}/src";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index 91318c802d8..db542ec93a9 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }:
 
 stdenv.mkDerivation rec {
-  name = "nuspell-${version}";
+  pname = "nuspell";
   version = "2.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix
index 77167361ff2..73b5e3fe772 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "nvidia-texture-tools-${version}";
+  pname = "nvidia-texture-tools";
   version = "2.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix
index abdc7502052..6cab843a22b 100644
--- a/pkgs/development/libraries/ocl-icd/default.nix
+++ b/pkgs/development/libraries/ocl-icd/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
-  name = "ocl-icd-${version}";
+  pname = "ocl-icd";
   version = "2.2.10";
 
   src = fetchurl {
-    url = "https://forge.imag.fr/frs/download.php/810/${name}.tar.gz";
+    url = "https://forge.imag.fr/frs/download.php/810/${pname}-${version}.tar.gz";
     sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2";
   };
 
diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index aa188650860..a540d89ed3b 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ode-${version}";
+  pname = "ode";
   version = "0.12";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
index 931ecc186be..34af3b0b9e0 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fixDarwinDylibNames, oracle-instantclient, libaio }:
 
 stdenv.mkDerivation rec {
-  name = "odpic-${version}";
+  pname = "odpic";
   version = "3.1.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix
index 42babc32ecd..2855d1139c3 100644
--- a/pkgs/development/libraries/ogre/1.9.x.nix
+++ b/pkgs/development/libraries/ogre/1.9.x.nix
@@ -11,7 +11,6 @@
 stdenv.mkDerivation rec {
   pname = "ogre";
   version = "1.9.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "OGRECave";
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index f1b6060e166..dc3bf8cf009 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -10,7 +10,7 @@
 , withSamples ? false }:
 
 stdenv.mkDerivation rec {
-  name = "ogre-${version}";
+  pname = "ogre";
   version = "1.12.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix
index e4045bcd5dc..0844c44c8a8 100644
--- a/pkgs/development/libraries/ogrepaged/default.nix
+++ b/pkgs/development/libraries/ogrepaged/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }:
 
 stdenv.mkDerivation rec {
-  name = "ogre-paged-${version}";
+  pname = "ogre-paged";
   version = "1.2.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix
index 253d185fa0c..15e83cf9d76 100644
--- a/pkgs/development/libraries/ois/default.nix
+++ b/pkgs/development/libraries/ois/default.nix
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ois-${version}";
+  pname = "ois";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index 49daff30e7b..dd3f83a0130 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "olm-${version}";
+  pname = "olm";
   version = "3.0.0";
 
   meta = {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz";
+    url = "https://matrix.org/git/olm/snapshot/${pname}-${version}.tar.gz";
     sha256 = "1iivxjk458v9lhqgzp0c4k5azligsh9k3rk6irf9ssj29wzgjm2c";
   };
 
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index b54f34fbb2c..8582580579d 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "onig-${version}";
+  pname = "onig";
   version = "6.9.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix
index b60a53e55ca..32b13115957 100644
--- a/pkgs/development/libraries/opae/default.nix
+++ b/pkgs/development/libraries/opae/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "opae-${version}";
+  pname = "opae";
   version = "1.0.0";
 
   # the tag has a silly name for some reason. drop this in the future if
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index 3c082926e06..89ac85b752b 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -11,12 +11,12 @@ assert pulseSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   version = "1.19.1";
-  name = "openal-soft-${version}";
+  pname = "openal-soft";
 
   src = fetchFromGitHub {
     owner = "kcat";
     repo = "openal-soft";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi";
   };
 
diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index 81754ffad4d..26bcf3d20ff 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "openbabel-${version}";
+  pname = "openbabel";
   version = "2.4.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix
index 4d3e9e9a04e..5aeb07de923 100644
--- a/pkgs/development/libraries/openbr/default.nix
+++ b/pkgs/development/libraries/openbr/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
 
   version = "0.5";
-  name = "openbr-${version}";
+  pname = "openbr";
 
   src = fetchFromGitHub {
     owner = "biometrics";
diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix
index 2b2fc3ff4d5..292b824709b 100644
--- a/pkgs/development/libraries/openbsm/default.nix
+++ b/pkgs/development/libraries/openbsm/default.nix
@@ -2,13 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "openbsm";
-  name = "${pname}-${version}";
   version = "1.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] name)}";
+    rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] "${pname}-${version}")}";
     sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1";
   };
 
diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix
index 613aeddd77b..5ed2dd5e23d 100644
--- a/pkgs/development/libraries/opencl-clhpp/default.nix
+++ b/pkgs/development/libraries/opencl-clhpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python, opencl-headers }:
 
 stdenv.mkDerivation rec {
-  name = "opencl-clhpp-${version}";
+  pname = "opencl-clhpp";
   version = "2.0.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index cd3da4a7960..9bd25bfb93a 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -2,7 +2,7 @@
 , darwin}:
 
 stdenv.mkDerivation rec {
-  name = "opencollada-${version}";
+  pname = "opencollada";
 
   version = "1.6.68";
 
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 3081c6c839c..cbd05848173 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "opencolorio-${version}";
+  pname = "opencolorio";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index 11c66f0d497..1fdddf930cf 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/pkgs/development/libraries/opencsg/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.2";
-  name = "opencsg-${version}";
+  pname = "opencsg";
   src = fetchurl {
     url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
     sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr";
diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix
index 5ad7eecace1..5f1c2b5c6f6 100644
--- a/pkgs/development/libraries/openct/default.nix
+++ b/pkgs/development/libraries/openct/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "openct-${version}";
+  pname = "openct";
   version = "0.6.20";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "openct";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "09wxq0jxdxhci3zr7jd3zcxjkl3j0r1v00k3q8gqrg9gighh8nk2";
   };
 
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index d5dc716c4a8..e35f5375fd9 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -140,7 +140,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "opencv-${version}";
+  pname = "opencv";
   inherit version src;
 
   postUnpack = lib.optionalString buildContrib ''
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 85bb2f1effd..ab24dcb1944 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -153,7 +153,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "opencv-${version}";
+  pname = "opencv";
   inherit version src;
 
   postUnpack = lib.optionalString buildContrib ''
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 784071c6e4d..b91a1489eb6 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -19,7 +19,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "opencv-${version}";
+  pname = "opencv";
   version = "2.4.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index 17e2c9098a1..77569590142 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opendht-${version}";
+  pname = "opendht";
   version = "1.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index 3d110910b15..fd8dadb5398 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -2,11 +2,11 @@
 , perl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "opendkim-${version}";
+  pname = "opendkim";
   version = "2.10.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/opendkim/files/${name}.tar.gz";
+    url = "mirror://sourceforge/opendkim/files/${pname}-${version}.tar.gz";
     sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823";
   };
 
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 072848d7bbc..9eef138c532 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -6,11 +6,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openexr-${version}";
+  pname = "openexr";
   version = lib.getVersion ilmbase;
 
   src = fetchurl {
-    url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x";
   };
 
diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix
index 099bd8d1e97..5d26063adb6 100644
--- a/pkgs/development/libraries/openexrid-unstable/default.nix
+++ b/pkgs/development/libraries/openexrid-unstable/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec
 {
-  name = "openexrid-unstable-${version}";
+  pname = "openexrid-unstable";
   version = "2017-09-17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix
index cd3210dd08b..6554d025311 100644
--- a/pkgs/development/libraries/openfst/default.nix
+++ b/pkgs/development/libraries/openfst/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "openfst";
   version = "1.7.2";
 
   src = fetchurl {
-    url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz";
+    url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz";
     sha256 = "0fqgk8195kz21is09gwzwnrg7fr9526bi9mh4apyskapz27pbhr1";
   };
   meta = {
diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix
index 42edb1958ce..abc60f026e5 100644
--- a/pkgs/development/libraries/openfx/default.nix
+++ b/pkgs/development/libraries/openfx/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec
 {
-  name = "openfx-${version}";
+  pname = "openfx";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index c8208ce27ba..cd91a132597 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, nasm }:
 
 stdenv.mkDerivation rec {
-  name = "openh264-${version}";
+  pname = "openh264";
   version = "1.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix
index ed646b9e221..6d53d23ae0e 100644
--- a/pkgs/development/libraries/openpa/default.nix
+++ b/pkgs/development/libraries/openpa/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "openpa";
   version = "1.0.4";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${name}.tar.gz";
+    url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${pname}-${version}.tar.gz";
     sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy";
   };
 
diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix
index 339f6064999..b217527269d 100644
--- a/pkgs/development/libraries/openpam/default.nix
+++ b/pkgs/development/libraries/openpam/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lib }:
 
 stdenv.mkDerivation rec {
-  name = "openpam-${version}";
+  pname = "openpam";
   version = "20170430";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openpam/openpam/Resedacea/${name}.tar.gz";
+    url = "mirror://sourceforge/openpam/openpam/Resedacea/${pname}-${version}.tar.gz";
     sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2";
   };
 
diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix
index 659c4fb7cff..1c753008022 100644
--- a/pkgs/development/libraries/opensaml-cpp/default.nix
+++ b/pkgs/development/libraries/opensaml-cpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "opensaml-cpp-${version}";
+  pname = "opensaml-cpp";
   version = "2.6.1";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
index f07ebad9e81..46028d3a7ea 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssl-chacha-${version}";
+  pname = "openssl-chacha";
   version = "2016-08-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 72e532ae782..81ef6a3bf5d 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensubdiv-${version}";
+  pname = "opensubdiv";
   version = "3.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix
index 00f4f45df96..f29972a64bd 100644
--- a/pkgs/development/libraries/opentracing-cpp/default.nix
+++ b/pkgs/development/libraries/opentracing-cpp/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
-  name = "opentracing-cpp-${version}";
+  pname = "opentracing-cpp";
   version = "1.5.1";
   src = fetchFromGitHub {
     owner = "opentracing";
diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
index af88172c57a..800acebac34 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/pkgs/development/libraries/openvdb/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec
 {
-  name = "openvdb-${version}";
+  pname = "openvdb";
   version = "6.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix
index a986b71bc1d..134ec74d530 100644
--- a/pkgs/development/libraries/openwsman/default.nix
+++ b/pkgs/development/libraries/openwsman/default.nix
@@ -2,7 +2,7 @@
 , curl, libxml2, pam, sblim-sfcc }:
 
 stdenv.mkDerivation rec {
-  name = "openwsman-${version}";
+  pname = "openwsman";
   version = "2.6.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index fe260e0c2ad..2e90d867b5a 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -37,7 +37,7 @@ let
   extLib = stdenv.hostPlatform.extensions.sharedLibrary;
 in stdenv.mkDerivation rec {
   inherit version srcs;
-  name = "oracle-instantclient-${version}";
+  pname = "oracle-instantclient";
 
   buildInputs = [ stdenv.cc.cc.lib ]
     ++ optionals (stdenv.isLinux) [ libaio ]
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
   unpackCmd = "unzip $curSrc";
 
   installPhase = ''
-    mkdir -p "$out/"{bin,include,lib,"share/java","share/${name}/demo/"}
+    mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"}
     install -Dm755 {sqlplus,adrci,genezi} $out/bin
     ${optionalString stdenv.isDarwin ''
       for exe in "$out/bin/"* ; do
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
     install -Dm644 *${extLib}* $out/lib
     install -Dm644 *.jar $out/share/java
     install -Dm644 sdk/include/* $out/include
-    install -Dm644 sdk/demo/* $out/share/${name}/demo
+    install -Dm644 sdk/demo/* $out/share/${pname}-${version}/demo
 
     # PECL::oci8 will not build without this
     # this symlink only exists in dist zipfiles for some platforms
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index ce917ccbe7f..a243b5c0b51 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
     url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
     sha256 = "0igic785fh458ck33kxb6i34l7bzdp9zpfjy5dxrcvv5gacklms0";
   };
-  name = "libosip2-${version}";
+  pname = "libosip2";
 
   meta = {
     license = stdenv.lib.licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix
index a1e7215fd9a..551c70cebcc 100644
--- a/pkgs/development/libraries/osm-gps-map/default.nix
+++ b/pkgs/development/libraries/osm-gps-map/default.nix
@@ -1,7 +1,7 @@
 { cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "osm-gps-map-${version}";
+  pname = "osm-gps-map";
   version = "1.1.0";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix
index 47c6a27639d..67c4e75c1e1 100644
--- a/pkgs/development/libraries/pagmo2/default.nix
+++ b/pkgs/development/libraries/pagmo2/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pagmo2-${version}";
+  pname = "pagmo2";
   version = "2.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix
index 6fb123f5094..44293d52da4 100644
--- a/pkgs/development/libraries/pangolin/default.nix
+++ b/pkgs/development/libraries/pangolin/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pangolin-${version}";
+  pname = "pangolin";
 
   version = "2017-08-02";
 
diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix
index b45ed296691..d90a27ed545 100644
--- a/pkgs/development/libraries/partio/default.nix
+++ b/pkgs/development/libraries/partio/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec
 {
-  name = "partio-${version}";
+  pname = "partio";
   version = "2018-03-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix
index 2050e5cdfe7..32fc27f9ab4 100644
--- a/pkgs/development/libraries/pcaudiolib/default.nix
+++ b/pkgs/development/libraries/pcaudiolib/default.nix
@@ -4,7 +4,7 @@
 , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-  name = "pcaudiolib-${version}";
+  pname = "pcaudiolib";
   version = "2016-07-19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix
index 654698c1b32..58fbb26532e 100644
--- a/pkgs/development/libraries/pcg-c/default.nix
+++ b/pkgs/development/libraries/pcg-c/default.nix
@@ -4,10 +4,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.94";
-  name = "pcg-c-${version}";
+  pname = "pcg-c";
 
   src = fetchzip {
-    url = "http://www.pcg-random.org/downloads/${name}.zip";
+    url = "http://www.pcg-random.org/downloads/${pname}-${version}.zip";
     sha256 = "0smm811xbvs03a5nc2668zd0178wnyri2h023pqffy767bpy1vlv";
   };
 
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index f080de82ddc..e27c71314d9 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pcre2-${version}";
+  pname = "pcre2";
   version = "10.33";
   src = fetchurl {
-    url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2";
+    url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2";
     sha256 = "1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m";
   };
 
diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix
index 4cc607345e8..473fb3bfd48 100644
--- a/pkgs/development/libraries/phash/default.nix
+++ b/pkgs/development/libraries/phash/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "pHash";
   version = "0.9.4";
 
diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix
index d542c6cf1d7..5302ad21258 100644
--- a/pkgs/development/libraries/physics/apfel/default.nix
+++ b/pkgs/development/libraries/physics/apfel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gfortran, lhapdf, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "apfel-${version}";
+  pname = "apfel";
   version = "3.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix
index 983523e1f2f..2ba87024bc5 100644
--- a/pkgs/development/libraries/physics/apfelgrid/default.nix
+++ b/pkgs/development/libraries/physics/apfelgrid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }:
 
 stdenv.mkDerivation rec {
-  name = "apfelgrid-${version}";
+  pname = "apfelgrid";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix
index 1ad5dcb8b25..edda5148068 100644
--- a/pkgs/development/libraries/physics/applgrid/default.nix
+++ b/pkgs/development/libraries/physics/applgrid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }:
 
 stdenv.mkDerivation rec {
-  name = "applgrid-${version}";
+  pname = "applgrid";
   version = "1.4.70";
 
   src = fetchurl {
-    url = "https://www.hepforge.org/archive/applgrid/${name}.tgz";
+    url = "https://www.hepforge.org/archive/applgrid/${pname}-${version}.tgz";
     sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
   };
 
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index f01fab74635..2a1846e40a6 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2006";
-  name = "cernlib-${version}";
+  pname = "cernlib";
 
   src = fetchurl {
     url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz";
diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
index 3828cfda2af..826362cc586 100644
--- a/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "fastjet-${version}";
+  pname = "fastjet";
   version = "3.3.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
index e3291907d31..5ef446319a8 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "fastnlo_toolkit-${version}";
+  pname = "fastnlo_toolkit";
   version = "2.3.1pre-2402";
 
   src = fetchurl {
-    url = "https://fastnlo.hepforge.org/code/v23/${name}.tar.gz";
+    url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz";
     sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl";
   };
 
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 5f51c6a194c..fb108dd7c25 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -37,7 +37,7 @@
 
 stdenv.mkDerivation rec {
   version = "10.4.1";
-  name = "geant4-${version}";
+  pname = "geant4";
 
   src = fetchurl{
     url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index 0b1f3f0490d..dd39fbbc84b 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -16,7 +16,7 @@ in
 
 stdenv.mkDerivation rec {
   inherit (geant4_nomt) version src;
-  name = "g4py-${version}";
+  pname = "g4py";
 
   sourceRoot = "geant4.10.04.p01/environments/g4py";
 
diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix
index d61a68ebe34..665cd417dc0 100644
--- a/pkgs/development/libraries/physics/hepmc2/default.nix
+++ b/pkgs/development/libraries/physics/hepmc2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "hepmc-${version}";
+  pname = "hepmc";
   version = "2.06.10";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix
index c4717800f70..3116c4d36bb 100644
--- a/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/pkgs/development/libraries/physics/hepmc3/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, coreutils, root }:
 
 stdenv.mkDerivation rec {
-  name = "hepmc3-${version}";
+  pname = "hepmc3";
   version = "3.1.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index 7a146bb7309..d252e62286b 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "herwig-${version}";
+  pname = "herwig";
   version = "7.1.5";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix
index 9c379f6a347..9e68fbd3fc4 100644
--- a/pkgs/development/libraries/physics/hoppet/default.nix
+++ b/pkgs/development/libraries/physics/hoppet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gfortran, perl }:
 
 stdenv.mkDerivation rec {
-  name = "hoppet-${version}";
+  pname = "hoppet";
   version = "1.2.0";
 
   src = fetchurl {
-    url = "https://hoppet.hepforge.org/downloads/${name}.tgz";
+    url = "https://hoppet.hepforge.org/downloads/${pname}-${version}.tgz";
     sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz";
   };
 
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 3ad0b3dc4cc..dff9fb1c1dd 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "lhapdf-${version}";
+  pname = "lhapdf";
   version = "6.2.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix
index b287e52b243..74b4ba4224e 100644
--- a/pkgs/development/libraries/physics/mcgrid/default.nix
+++ b/pkgs/development/libraries/physics/mcgrid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fastnlo, rivet, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "mcgrid-${version}";
+  pname = "mcgrid";
   version = "2.0.2";
 
   src = fetchurl {
-    url = "https://www.hepforge.org/archive/mcgrid/${name}.tar.gz";
+    url = "https://www.hepforge.org/archive/mcgrid/${pname}-${version}.tar.gz";
     sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy";
   };
 
diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix
index a608a7f6b0f..1518c23718a 100644
--- a/pkgs/development/libraries/physics/mela/default.nix
+++ b/pkgs/development/libraries/physics/mela/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gfortran }:
 
 stdenv.mkDerivation rec {
-  name = "mela-${version}";
+  pname = "mela";
   version = "2.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix
index 2f79a2b76ab..20df49d9ae7 100644
--- a/pkgs/development/libraries/physics/nlojet/default.nix
+++ b/pkgs/development/libraries/physics/nlojet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nlojet++-${version}";
+  pname = "nlojet++";
   version = "4.1.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix
index e6b351c206d..0398175a9a2 100644
--- a/pkgs/development/libraries/physics/pythia/default.nix
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "pythia-${version}";
+  pname = "pythia";
   version = "8.243";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix
index 620f227250d..ad5f994620f 100644
--- a/pkgs/development/libraries/physics/qcdnum/default.nix
+++ b/pkgs/development/libraries/physics/qcdnum/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation rec {
-  name = "QCDNUM-${version}";
+  pname = "QCDNUM";
   version = "17-01-13";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index c068424e416..914eee5c286 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "rivet-${version}";
+  pname = "rivet";
   version = "2.7.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index 272761977ba..fa293eab350 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "thepeg-${version}";
+  pname = "thepeg";
   version = "2.1.5";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index 08afe6d6452..c6c6f742d0b 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }:
 
 stdenv.mkDerivation rec {
-  name = "yoda-${version}";
+  pname = "yoda";
   version = "1.7.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index d3bbb867974..1f9996ec213 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
-  name = "pixman-${version}";
+  pname = "pixman";
   version = "0.38.4";
 
   src = fetchurl {
-    url = "mirror://xorg/individual/lib/${name}.tar.bz2";
+    url = "mirror://xorg/individual/lib/${pname}-${version}.tar.bz2";
     sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4";
   };
 
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index 5cf5d34b9af..ce511544a42 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "pkcs11-helper-${version}";
+  pname = "pkcs11-helper";
   version = "1.25.1";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "pkcs11-helper";
-    rev = "${name}";
+    rev = "${pname}-${version}";
     sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns";
   };
 
diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix
index ceb49fc0153..e945154c003 100644
--- a/pkgs/development/libraries/pmdk/default.nix
+++ b/pkgs/development/libraries/pmdk/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pmdk-${version}";
+  pname = "pmdk";
   version = "1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix
index 3f6a609121a..8509468f59a 100644
--- a/pkgs/development/libraries/png++/default.nix
+++ b/pkgs/development/libraries/png++/default.nix
@@ -4,7 +4,7 @@
 assert docSupport -> doxygen != null;
 
 stdenv.mkDerivation rec {
-  name = "pngpp-${version}";
+  pname = "pngpp";
   version = "0.2.10";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index 68ddf5c91d1..993e53f2133 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }:
 
 stdenv.mkDerivation rec {
-  name = "poco-${version}";
+  pname = "poco";
 
   version = "1.9.2";
 
   src = fetchurl {
-    url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz";
+    url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz";
     sha256 = "0jkbxw6z8l7zpr7bh2xcyzk8a5apzyz4ranhl66gxna1ay0gpzvd";
   };
 
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 722c1cae872..809159b8c2f 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.6";
-  name = "podofo-${version}";
+  pname = "podofo";
 
   src = fetchurl {
-    url = "mirror://sourceforge/podofo/${name}.tar.gz";
+    url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz";
     sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9";
   };
 
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix
index f790c62f5af..ffe7f46b77d 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/pkgs/development/libraries/portmidi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "portmidi-${version}";
+  pname = "portmidi";
   version = "217";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix
index a18d768c288..8704356a537 100644
--- a/pkgs/development/libraries/protozero/default.nix
+++ b/pkgs/development/libraries/protozero/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "protozero-${version}";
+  pname = "protozero";
   version = "1.6.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index 74c6e8ef1b3..d1825171596 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }:
 
 stdenv.mkDerivation rec {
-  name = "pugixml-${version}";
+  pname = "pugixml";
   version = "1.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index b5a01698e5e..66a395801b2 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libupnp-${version}";
+  pname = "libupnp";
   version = "1.8.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix
index aa1f8d10ba9..7dfbdc4d64a 100644
--- a/pkgs/development/libraries/pybind11/default.nix
+++ b/pkgs/development/libraries/pybind11/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }:
 
 stdenv.mkDerivation rec {
-  name = "pybind-${version}";
+  pname = "pybind";
   version = "2.2.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix
index 4b5b7ace074..2b630de14b2 100644
--- a/pkgs/development/libraries/python-qt/default.nix
+++ b/pkgs/development/libraries/python-qt/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.2";
-  name = "python-qt-${version}";
+  pname = "python-qt";
 
   src = fetchurl {
     url="mirror://sourceforge/pythonqt/PythonQt${version}.zip";
diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix
index ec32c44a91f..33505f9b07f 100644
--- a/pkgs/development/libraries/qca2/default.nix
+++ b/pkgs/development/libraries/qca2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, pkgconfig, qt, darwin }:
 
 stdenv.mkDerivation rec {
-  name = "qca-${version}";
+  pname = "qca";
   version = "2.1.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index a7077c69dd8..2156c0e5350 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.0";
-  name = "qjson-${version}";
+  pname = "qjson";
 
   src = fetchFromGitHub {
     owner = "flavio";
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index ba62324d586..d3f4a8e88e2 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2018-11-24";
-  name = "qmltermwidget-unstable-${version}";
+  pname = "qmltermwidget-unstable";
 
   src = fetchFromGitHub {
     repo = "qmltermwidget";
diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix
index ae99035d226..b7857372d1c 100644
--- a/pkgs/development/libraries/qt-mobility/default.nix
+++ b/pkgs/development/libraries/qt-mobility/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
-  name = "qt-mobility-${version}";
+  pname = "qt-mobility";
   src = fetchFromGitHub {
     owner = "qtproject";
     repo = "qt-mobility";
diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix
index 1578593b8ae..3c4c192bd4b 100644
--- a/pkgs/development/libraries/qtinstaller/default.nix
+++ b/pkgs/development/libraries/qtinstaller/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "qtinstaller-${version}";
+  pname = "qtinstaller";
 
   propagatedBuildInputs = [ qtdeclarative qttools ];
   nativeBuildInputs = [ qmake ];
diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix
index 84be9876c1c..2e47a213565 100644
--- a/pkgs/development/libraries/quesoglc/default.nix
+++ b/pkgs/development/libraries/quesoglc/default.nix
@@ -2,9 +2,8 @@
 stdenv.mkDerivation rec {
   pname = "quesoglc";
   version = "0.7.2";
-  name = "${pname}-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl";
   };
   buildInputs = [ libGLU_combined glew freetype fontconfig fribidi libX11 ];
diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix
index 35d16ee5e19..14bfd40a593 100644
--- a/pkgs/development/libraries/quickder/default.nix
+++ b/pkgs/development/libraries/quickder/default.nix
@@ -3,7 +3,6 @@
 
 stdenv.mkDerivation rec {
   pname = "quickder";
-  name = "${pname}-${version}";
   version = "1.2-6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix
index 5ed05ec6b32..79d4d652424 100644
--- a/pkgs/development/libraries/qxt/default.nix
+++ b/pkgs/development/libraries/qxt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, which, coreutils, fetchzip, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "qxt-${version}";
+  pname = "qxt";
   version = "0.6.2";
   
   src = fetchzip {
diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix
index 286c5c868df..fe48d99b383 100644
--- a/pkgs/development/libraries/rabbitmq-c/default.nix
+++ b/pkgs/development/libraries/rabbitmq-c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }:
 
 stdenv.mkDerivation rec {
-  name = "rabbitmq-c-${version}";
+  pname = "rabbitmq-c";
   version = "0.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index 256b756ed45..e02b22af756 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "range-v3-${version}";
+  pname = "range-v3";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix
index 9d8ce8cef20..92c42d19af6 100644
--- a/pkgs/development/libraries/rapidcheck/default.nix
+++ b/pkgs/development/libraries/rapidcheck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec{
-  name = "rapidcheck-${version}";
+  pname = "rapidcheck";
   version = "unstable-2018-09-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix
index a1671aa3e0f..ea91c1507dc 100644
--- a/pkgs/development/libraries/rapidjson/default.nix
+++ b/pkgs/development/libraries/rapidjson/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, pkgconfig, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "rapidjson-${version}";
+  pname = "rapidjson";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix
index 99f88091690..ca072f2ca4b 100644
--- a/pkgs/development/libraries/rapidxml/default.nix
+++ b/pkgs/development/libraries/rapidxml/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "rapidxml";
   version = "1.13";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.zip";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.zip";
     sha256 = "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63";
   };
 
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 9f4fe54e805..165e9716a97 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "rdkafka-${version}";
+  pname = "rdkafka";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index a6a5fbed4fc..e36b6f9488a 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "re2-${version}";
+  pname = "re2";
   version = "20190401";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index e96b4f1ebe2..11d5c378015 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "readline-${version}";
+  pname = "readline";
   version = "7.0p${toString (builtins.length upstreamPatches)}";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix
index eefef972766..cdc36617c52 100644
--- a/pkgs/development/libraries/readline/8.0.nix
+++ b/pkgs/development/libraries/readline/8.0.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "readline-${version}";
+  pname = "readline";
   version = "8.0p${toString (builtins.length upstreamPatches)}";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix
index 681fc3a012f..a43700ce439 100644
--- a/pkgs/development/libraries/rep-gtk/default.nix
+++ b/pkgs/development/libraries/rep-gtk/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "rep-gtk-${version}";
+  pname = "rep-gtk";
   version = "0.90.8.3";
   sourceName = "rep-gtk_${version}";
 
diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix
index 195db9a1685..82a2998be1e 100644
--- a/pkgs/development/libraries/rote/default.nix
+++ b/pkgs/development/libraries/rote/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "rote-${version}";
+  pname = "rote";
   version = "0.2.8";
 
   src = fetchurl {
     sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky";
-    url = "mirror://sourceforge/rote/${name}.tar.gz";
+    url = "mirror://sourceforge/rote/${pname}-${version}.tar.gz";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix
index daa499061c5..b69cd56d35d 100644
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl, path, runtimeShell }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "safefile";
   version = "1.0.5";
 
   src = fetchurl {
-    url = "http://research.cs.wisc.edu/mist/${pname}/releases/${name}.tar.gz";
+    url = "http://research.cs.wisc.edu/mist/${pname}/releases/${pname}-${version}.tar.gz";
     sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78";
   };
 
diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix
index ba0b8f4e996..9ffa2efc376 100644
--- a/pkgs/development/libraries/sblim-sfcc/default.nix
+++ b/pkgs/development/libraries/sblim-sfcc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, curl }:
 
 stdenv.mkDerivation rec {
-  name = "sblim-sfcc-${version}";
+  pname = "sblim-sfcc";
   version = "2.2.9"; # this is technically 2.2.9-preview
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix
index f727728943b..75beddcd22c 100644
--- a/pkgs/development/libraries/science/benchmark/papi/default.nix
+++ b/pkgs/development/libraries/science/benchmark/papi/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.6.0";
-  name = "papi-${version}";
+  pname = "papi";
 
   src = fetchurl {
     url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz";
diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 2ee9144b316..367fc635c8b 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "htslib";
   version = "1.9";
 
   src = fetchurl {
-    url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2";
+    url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2";
     sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0";
   };
 
diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix
index 22bcc56c82a..e6c58b96e5c 100644
--- a/pkgs/development/libraries/science/biology/mirtk/default.nix
+++ b/pkgs/development/libraries/science/biology/mirtk/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
-  name = "mirtk-${version}";
+  pname = "mirtk";
 
   src = fetchFromGitHub {
     owner = "BioMedIA";
diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
index 4668839ebb9..d4333146406 100644
--- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix
+++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "QuadProgpp-${version}";
+  pname = "QuadProgpp";
   version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index 286be260052..9c412f93d13 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation rec {
-  name = "blas-${version}";
+  pname = "blas";
   version = "3.8.0";
 
   src = fetchurl {
-    url = "http://www.netlib.org/blas/${name}.tgz";
+    url = "http://www.netlib.org/blas/${pname}-${version}.tgz";
     sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm";
   };
 
diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
index 16850fb1665..bc276b9923c 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.5";
-  name = "brial-${version}";
+  pname = "brial";
 
   src = fetchFromGitHub {
     owner = "BRiAl";
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index 4746f77a216..d22858d64d0 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -61,7 +61,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "caffe2-${version}";
+  pname = "caffe2";
   version = "0.8.1";
   src = fetchFromGitHub {
     owner = "caffe2";
diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix
index 537fcb93a87..52c775c9a0d 100644
--- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix
+++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix
@@ -5,8 +5,6 @@ in let
   # SuiteSparse must use the same openblas
   suitesparse = suitesparse_.override { inherit openblas; };
 in stdenv.mkDerivation rec {
-
-  name = "${pname}-${version}";
   pname = "cholmod-extra";
   version = "1.2.0";
 
diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix
index 40dbfc53e2c..8a474e06e55 100644
--- a/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "clblas-${version}";
+  pname = "clblas";
   version = "2.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix
index 2441aff9fa3..5193c2db5c5 100644
--- a/pkgs/development/libraries/science/math/cliquer/default.nix
+++ b/pkgs/development/libraries/science/math/cliquer/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.21";
-  name = "cliquer-${version}";
+  pname = "cliquer";
 
   # autotoolized version of the original cliquer
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix
index 645a865eb95..77973a95449 100644
--- a/pkgs/development/libraries/science/math/ecos/default.nix
+++ b/pkgs/development/libraries/science/math/ecos/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "ecos-${version}";
+  pname = "ecos";
   version = "2.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix
index 2891429c857..6fd16535459 100644
--- a/pkgs/development/libraries/science/math/flintqs/default.nix
+++ b/pkgs/development/libraries/science/math/flintqs/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   version = "1.0";
   pname = "flintqs";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "sagemath";
diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 30453086d45..1995fb9c85d 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, openblas, gfortran }:
 
 stdenv.mkDerivation rec {
-  name = "ipopt-${version}";
+  pname = "ipopt";
   version = "3.12.13";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix
index 51fbd9f14cb..0f23f08145e 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   version = "1.23";
   pname = "lcalc";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available
diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix
index be650f3c3ce..c8f1138d69f 100644
--- a/pkgs/development/libraries/science/math/libbraiding/default.nix
+++ b/pkgs/development/libraries/science/math/libbraiding/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "libbraiding-${version}";
+  pname = "libbraiding";
 
   src = fetchFromGitHub {
     owner = "miguelmarco";
diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix
index e96ee475d7d..a2c0dd4fa17 100644
--- a/pkgs/development/libraries/science/math/libhomfly/default.nix
+++ b/pkgs/development/libraries/science/math/libhomfly/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.02r5";
-  name = "llibhomfly-${version}";
+  pname = "llibhomfly";
 
   src = fetchFromGitHub {
     owner = "miguelmarco";
diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix
index 3cf5c3619a9..b0cfbca5aa3 100644
--- a/pkgs/development/libraries/science/math/lrs/default.nix
+++ b/pkgs/development/libraries/science/math/lrs/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchurl, gmp}:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "lrs";
   version = "7.0";
 
diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix
index b9ee1e2a10d..b8c4fa67148 100644
--- a/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/pkgs/development/libraries/science/math/m4ri/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "20140914";
-  name = "m4ri-${version}";
+  pname = "m4ri";
 
   src = fetchFromBitbucket {
     owner = "malb";
diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix
index 23fc03655cf..6a664b1dfff 100644
--- a/pkgs/development/libraries/science/math/m4rie/default.nix
+++ b/pkgs/development/libraries/science/math/m4rie/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "20150908";
-  name = "m4rie-${version}";
+  pname = "m4rie";
 
   src = fetchFromBitbucket {
     owner = "malb";
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index d967bbf8c3e..d5ba7053de8 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -86,7 +86,7 @@ let
   mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");
 in
 stdenv.mkDerivation rec {
-  name = "openblas-${version}";
+  pname = "openblas";
   version = "0.3.6";
   src = fetchFromGitHub {
     owner = "xianyi";
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 01b0faf89f9..6fc96623a33 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "openlibm-${version}";
+  pname = "openlibm";
   version = "0.6.0";
   src = fetchurl {
     url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 2dd63ebfc85..c6e065320a2 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -4,7 +4,7 @@
 , pythonProtobuf }:
 
 stdenv.mkDerivation rec {
-  name = "or-tools-${version}";
+  pname = "or-tools";
   version = "v7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix
index ca35ce2f413..3a9ef770459 100644
--- a/pkgs/development/libraries/science/math/parmetis/default.nix
+++ b/pkgs/development/libraries/science/math/parmetis/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "parmetis-${version}";
+  pname = "parmetis";
   version = "4.0.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix
index ac8129c9032..c2eda9dac48 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/pkgs/development/libraries/science/math/petsc/default.nix
@@ -6,7 +6,7 @@
 , python }:
 
 stdenv.mkDerivation rec {
-  name = "petsc-${version}";
+  pname = "petsc";
   version = "3.8.4";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix
index 7394fb9e1b4..e7dfaecf1de 100644
--- a/pkgs/development/libraries/science/math/planarity/default.nix
+++ b/pkgs/development/libraries/science/math/planarity/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   pname = "planarity";
   version = "3.0.0.5";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "graph-algorithms";
diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix
index 3eee63dbf4f..faa219044bd 100644
--- a/pkgs/development/libraries/science/math/primesieve/default.nix
+++ b/pkgs/development/libraries/science/math/primesieve/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "primesieve-${version}";
+  pname = "primesieve";
   version = "7.4";
 
   nativeBuildInputs = [cmake];
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
index fda54fe44ab..66c573245db 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   pname = "rankwidth";
   version = "0.7";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/rw/rw-${version}.tar.gz";
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index 624885c501a..207406388e0 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   pname = "rubiks";
   version = "20070912";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index b4c6574d13a..14277c8c631 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -4,7 +4,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "scalapack-${version}";
+  pname = "scalapack";
   version = "2.0.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix
index f9d1a84b1f0..51a72585c0c 100644
--- a/pkgs/development/libraries/science/math/scs/default.nix
+++ b/pkgs/development/libraries/science/math/scs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  name = "scs-${version}";
+  pname = "scs";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index 7e71eafef69..48de128edc5 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
@@ -5,7 +5,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "4.2.1";
-  name = "suitesparse-${version}";
+  pname = "suitesparse";
   src = fetchurl {
     url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ;
     sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8";
diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix
index 9938a3096a0..570c9814485 100644
--- a/pkgs/development/libraries/science/math/superlu/default.nix
+++ b/pkgs/development/libraries/science/math/superlu/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.2.1";
-  name = "superlu-${version}";
+  pname = "superlu";
 
   src = fetchurl {
     url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_${version}.tar.gz";
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index fd9285ebf79..15dd898c455 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.023.4";
-  name = "sympow-${version}";
+  pname = "sympow";
 
   src = fetchFromGitLab {
     group = "rezozer";
diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix
index ad4d4c01737..4ee6f6cb992 100644
--- a/pkgs/development/libraries/science/math/zn_poly/default.nix
+++ b/pkgs/development/libraries/science/math/zn_poly/default.nix
@@ -10,7 +10,6 @@
 stdenv.mkDerivation rec {
   version = "0.9.1";
   pname = "zn_poly";
-  name = "${pname}-${version}";
 
   # sage has picked up the maintenance (bug fixes and building, not development)
   # from the original, now unmaintained project which can be found at
diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix
index 5f2263d821d..640eefbd733 100644
--- a/pkgs/development/libraries/science/robotics/ispike/default.nix
+++ b/pkgs/development/libraries/science/robotics/ispike/default.nix
@@ -2,11 +2,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ispike-${version}";
+  pname = "ispike";
   version = "2.1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ispike/${name}.tar.gz";
+    url = "mirror://sourceforge/ispike/${pname}-${version}.tar.gz";
     sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp";
   };
 
diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix
index ba291dc97ff..eb8d17c6457 100644
--- a/pkgs/development/libraries/scriptaculous/default.nix
+++ b/pkgs/development/libraries/scriptaculous/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec {
-  name = "scriptaculous-${version}";
+  pname = "scriptaculous";
   version = "1.9.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index 533fefa9f19..63b6ae94a38 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "serd-${version}";
+  pname = "serd";
   version = "0.30.0";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf";
   };
 
diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix
index 1e9a8ba6a58..261658b0547 100644
--- a/pkgs/development/libraries/sfsexp/default.nix
+++ b/pkgs/development/libraries/sfsexp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "sfsexp-${version}";
+  pname = "sfsexp";
   version = "1.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix
index 74f861297d1..da417c35a6c 100644
--- a/pkgs/development/libraries/shibboleth-sp/default.nix
+++ b/pkgs/development/libraries/shibboleth-sp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }:
 
 stdenv.mkDerivation rec {
-  name = "shibboleth-sp-${version}";
+  pname = "shibboleth-sp";
   version = "2.6.1";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index f795dfef9e4..14af55c2afc 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.6";
-  name = "graphite2-${version}";
+  pname = "graphite2";
 
   src = fetchurl {
     url = "https://github.com/silnrsi/graphite/releases/download/"
diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
index 90dfe8ebfab..e35be7eda42 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname    = "simpleitk";
   version = "1.2.0";
-  name  = "${pname}-${version}";
 
   src = fetchurl {
     url    = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz";
diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix
index 941e75b8ba9..14cefdea77b 100644
--- a/pkgs/development/libraries/smarty3-i18n/default.nix
+++ b/pkgs/development/libraries/smarty3-i18n/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
-  name = "smarty-i18n-${version}";
+  pname = "smarty-i18n";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix
index 66bfd601a62..4876c39ce83 100644
--- a/pkgs/development/libraries/smarty3/default.nix
+++ b/pkgs/development/libraries/smarty3/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
-  name = "smarty3-${version}";
+  pname = "smarty3";
   version = "3.1.33";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index 36077d71126..73cc88882d0 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "snappy-${version}";
+  pname = "snappy";
   version = "1.1.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix
index 48ee1af0e30..edcb3549c31 100644
--- a/pkgs/development/libraries/sonic/default.nix
+++ b/pkgs/development/libraries/sonic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "sonic-${version}";
+  pname = "sonic";
   version = "2016-03-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 10258e791ba..c1c22cb910d 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "sord-${version}";
+  pname = "sord";
   version = "0.16.2";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89";
   };
 
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index be2fc503e39..c2dc20cc392 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, audiofile, libtiff}:
 stdenv.mkDerivation rec {
   version = "0.0.6";
-  name = "spandsp-${version}";
+  pname = "spandsp";
   src=fetchurl {
     url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
     sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix
index cab0e69ad1a..a18edc0a6df 100644
--- a/pkgs/development/libraries/spdk/default.nix
+++ b/pkgs/development/libraries/spdk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libuuid, numactl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "spdk-${version}";
+  pname = "spdk";
   version = "19.04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index b27fd0843bc..43360d781cd 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -27,11 +27,11 @@ let
     else
       throw "You need to enable at least one output module.";
 in stdenv.mkDerivation rec {
-  name = "speech-dispatcher-${version}";
+  pname = "speech-dispatcher";
   version = "0.8.8";
 
   src = fetchurl {
-    url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz";
+    url = "http://www.freebsoft.org/pub/projects/speechd/${pname}-${version}.tar.gz";
     sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw";
   };
 
diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix
index 40d272fd07d..98c8ced5b47 100644
--- a/pkgs/development/libraries/spirv-headers/default.nix
+++ b/pkgs/development/libraries/spirv-headers/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
-  name = "spirv-headers-${version}";
+  pname = "spirv-headers";
   version = "2019.1"; # spirv-tools version whose DEPS file calls for this commit
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index 6cf8d97cb67..9365ee006d1 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -3,7 +3,7 @@
 assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation rec {
-  name = "sqlcipher-${version}";
+  pname = "sqlcipher";
   version = "4.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index f0390486b10..3c5761b767e 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -5,7 +5,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "sqlite-analyzer-${version}";
+  pname = "sqlite-analyzer";
   version = "3.28.0";
 
   src = assert version == sqlite.version; fetchurl {
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index ea1c38ea476..9ba5da0c910 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "sqlite-${version}";
+  pname = "sqlite";
   version = "3.28.0";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix
index e5d322330e8..e4c1f8eb5f6 100644
--- a/pkgs/development/libraries/sqlite/sqlar.nix
+++ b/pkgs/development/libraries/sqlite/sqlar.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fuse, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sqlar-${version}";
+  pname = "sqlar";
   version = "2018-01-07";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index c9073fc0b7e..3940faf1d6d 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libsrtp-${version}";
+  pname = "libsrtp";
   version = "2.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix
index 4f36ac2ba1c..440f0c22ea6 100644
--- a/pkgs/development/libraries/stb/default.nix
+++ b/pkgs/development/libraries/stb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "stb-${version}";
+  pname = "stb";
   version = "20180211";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index 36768acd991..8121b7a501f 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "strigi-${version}";
+  pname = "strigi";
   version = "0.7.8";
 
   src = fetchurl {
-    url = "https://www.vandenoever.info/software/strigi/${name}.tar.bz2";
+    url = "https://www.vandenoever.info/software/strigi/${pname}-${version}.tar.bz2";
     sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23";
   };
 
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index 2244803f4d3..5589a5560eb 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "stxxl-${version}";
+  pname = "stxxl";
   version = "1.4.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix
index 35bacff0525..9a5f4db2deb 100644
--- a/pkgs/development/libraries/subunit/default.nix
+++ b/pkgs/development/libraries/subunit/default.nix
@@ -3,11 +3,11 @@
 # NOTE: for subunit python library see pkgs/top-level/python-packages.nix
 
 stdenv.mkDerivation rec {
-  name = "subunit-${version}";
+  pname = "subunit";
   version = "1.1.0";
 
   src = fetchurl {
-    url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8";
   };
 
diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix
index 2e6e2d3fbbf..628ab7e28ef 100644
--- a/pkgs/development/libraries/svrcore/default.nix
+++ b/pkgs/development/libraries/svrcore/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, nss, nspr }:
 
 stdenv.mkDerivation rec {
-  name = "svrcore-${version}";
+  pname = "svrcore";
   version = "4.0.4";
 
   src = fetchurl {
-    url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${name}.tar.bz2";
+    url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${pname}-${version}.tar.bz2";
     sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7";
   };
 
diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index e30da732a46..c8c60c1f8ea 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -1,6 +1,6 @@
 { stdenv, python, fetchurl, openssl, boost, scons }:
 stdenv.mkDerivation rec {
-  name    = "swiften-${version}";
+  pname = "swiften";
   version = "4.0.2";
 
   nativeBuildInputs = [ scons];
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index a8a110cf9b1..3d146a5a227 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "sword-${version}";
+  pname = "sword";
   version = "1.7.4";
 
   src = fetchurl {
-    url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
+    url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${pname}-${version}.tar.gz";
     sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr";
   };
 
diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix
index 424dc116c7e..47b93ab373a 100644
--- a/pkgs/development/libraries/symengine/default.nix
+++ b/pkgs/development/libraries/symengine/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "symengine-${version}";
+  pname = "symengine";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index 6577ebeae28..6fd1d1ca941 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
     
 stdenv.mkDerivation rec {
-  name = "szip-${version}";
+  pname = "szip";
   version = "2.1.1";
   src = fetchurl {
     url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz";
diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index 27ac0fdd5ff..227d3c4c547 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -12,10 +12,10 @@ assert withPngSupport -> libpng != null;
 assert stdenv.isDarwin -> Carbon != null;
 
 stdenv.mkDerivation rec {
-  name = "tachyon-${version}";
+  pname = "tachyon";
   version = "0.99b2";
   src = fetchurl {
-    url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz";
+    url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz";
     sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v";
   };
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix
index 86006806baa..28ce5c60481 100644
--- a/pkgs/development/libraries/taglib-sharp/default.nix
+++ b/pkgs/development/libraries/taglib-sharp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }:
 
 stdenv.mkDerivation rec {
-  name = "taglib-sharp-${version}";
+  pname = "taglib-sharp";
   version = "2.1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 89b163a0917..6fe4e45521e 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
 
 with stdenv.lib; stdenv.mkDerivation rec {
-  name = "tbb-${version}";
+  pname = "tbb";
   version = "2019_U8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix
index 24b1d477b8a..40e137204e2 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/pkgs/development/libraries/tcllib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, tcl }:
 
 stdenv.mkDerivation rec {
-  name = "tcllib-${version}";
+  pname = "tcllib";
   version = "1.19";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix
index 4e1f0bcab03..f1fd6760c61 100644
--- a/pkgs/development/libraries/tcltls/default.nix
+++ b/pkgs/development/libraries/tcltls/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, tcl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tcltls-${version}";
+  pname = "tcltls";
   version = "1.6.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix
index eefc976a62b..8ebf0156be8 100644
--- a/pkgs/development/libraries/termbox/default.nix
+++ b/pkgs/development/libraries/termbox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "termbox-${version}";
+  pname = "termbox";
   version = "1.1.2";
   src = fetchFromGitHub {
     owner = "nsf";
diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix
index 8d72d9a7d8e..646cc60406a 100644
--- a/pkgs/development/libraries/theft/default.nix
+++ b/pkgs/development/libraries/theft/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.5";
-  name = "theft-${version}";
+  pname = "theft";
 
   src = fetchFromGitHub {
     owner  = "silentbicycle";
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index 92cc76273ba..0fce957df22 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "thrift-${version}";
+  pname = "thrift";
   version = "0.12.0";
 
   src = fetchurl {
-    url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz";
+    url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
     sha256 = "0a04v7dgm1qzgii7v0sisnljhxc9xpq2vxkka60scrdp6aahjdn3";
   };
 
diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix
index 7f1b3ebcbf5..4fc1da1fe0a 100644
--- a/pkgs/development/libraries/tinyxml-2/default.nix
+++ b/pkgs/development/libraries/tinyxml-2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "tinyxml-2-${version}";
+  pname = "tinyxml-2";
   version = "6.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix
index 232c95e6257..61d9c710801 100644
--- a/pkgs/development/libraries/tix/default.nix
+++ b/pkgs/development/libraries/tix/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "8.4.3";
-  name = "tix-${version}";
+  pname = "tix";
   src = fetchurl {
      url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz";
      sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn";
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index 229e4cfaa6c..d7162067deb 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/pkgs/development/libraries/tnt/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "tnt-${version}";
+  pname = "tnt";
   version = "3.0.12";
   
   src = fetchurl {
diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix
index 9edfcc88f16..13b4e6b97a9 100644
--- a/pkgs/development/libraries/tntdb/default.nix
+++ b/pkgs/development/libraries/tntdb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tntdb-${version}";
+  pname = "tntdb";
   version = "1.3";
 
   src = fetchurl {
-    url = "http://www.tntnet.org/download/${name}.tar.gz";
+    url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
     sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
   };
 
diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix
index aaff759525b..86b0080a824 100644
--- a/pkgs/development/libraries/tntnet/default.nix
+++ b/pkgs/development/libraries/tntnet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cxxtools, zlib, openssl, zip }:
 
 stdenv.mkDerivation rec {
-  name = "tntnet-${version}";
+  pname = "tntnet";
   version = "2.2.1";
 
   src = fetchurl {
-    url = "http://www.tntnet.org/download/${name}.tar.gz";
+    url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
     sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8";
   };
 
diff --git a/pkgs/development/libraries/torch-hdf5/default.nix b/pkgs/development/libraries/torch-hdf5/default.nix
index e5803d644f3..6dd51944111 100644
--- a/pkgs/development/libraries/torch-hdf5/default.nix
+++ b/pkgs/development/libraries/torch-hdf5/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, torch, cmake, hdf5}:
 stdenv.mkDerivation rec {
-  name = "torch-hdf5-${version}";
+  pname = "torch-hdf5";
   version = "0.0pre2016-07-01";
   buildInputs = [cmake torch hdf5];
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix
index d4c61890afb..ff8c26062d3 100644
--- a/pkgs/development/libraries/torch/default.nix
+++ b/pkgs/development/libraries/torch/default.nix
@@ -4,7 +4,7 @@
   }:
 stdenv.mkDerivation rec{
   version = "0.0pre20160820";
-  name = "torch-${version}";
+  pname = "torch";
   buildInputs = [
     luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4
     libjpeg zeromq3 ncurses openssl libpng readline pkgconfig
diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix
index 552bd4c1c51..af2fc6c879a 100644
--- a/pkgs/development/libraries/trompeloeil/default.nix
+++ b/pkgs/development/libraries/trompeloeil/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "trompeloeil-${version}";
+  pname = "trompeloeil";
   version = "34";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix
index bcc91d058f0..d5af39d3f2a 100644
--- a/pkgs/development/libraries/tsocks/default.nix
+++ b/pkgs/development/libraries/tsocks/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tsocks-${version}";
+  pname = "tsocks";
   version = "1.8beta5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tsocks/${name}.tar.gz";
+    url = "mirror://sourceforge/tsocks/${pname}-${version}.tar.gz";
     sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4";
   };
 
diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix
index a752da8cb57..46b65a08eaa 100644
--- a/pkgs/development/libraries/twolame/default.nix
+++ b/pkgs/development/libraries/twolame/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "twolame-${version}";
+  pname = "twolame";
   version = "2017-09-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix
index 9c899eb21ba..18f270e70db 100644
--- a/pkgs/development/libraries/udns/default.nix
+++ b/pkgs/development/libraries/udns/default.nix
@@ -4,7 +4,7 @@
 # https://tracker.debian.org/media/packages/u/udns/rules-0.4-1
 
 stdenv.mkDerivation rec {
-  name = "udns-${version}";
+  pname = "udns";
   version = "0.4";
 
   configurePhase = "./configure --enable-ipv6";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildPhase = "make staticlib sharedlib rblcheck_s dnsget_s";
 
   src = fetchurl {
-    url = "http://www.corpit.ru/mjt/udns/${name}.tar.gz";
+    url = "http://www.corpit.ru/mjt/udns/${pname}-${version}.tar.gz";
     sha256 = "0447fv1hmb44nnchdn6p5pd9b44x8p5jn0ahw6crwbqsg7f0hl8i";
   };
 
diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index 664bc29a72d..faee73fd393 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "udunits-${version}";
+  pname = "udunits";
   version = "2.2.27.6";
   
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix
index 6eef95309aa..1b5fbe6c2ca 100644
--- a/pkgs/development/libraries/uhttpmock/default.nix
+++ b/pkgs/development/libraries/uhttpmock/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version="0.5.0";
-  name = "uhttpmock-${version}";
+  pname = "uhttpmock";
 
   src = fetchFromGitLab {
     repo = "uhttpmock";
diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index 07892e97087..347efb4d3bd 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, glib, systemd, libgudev, vala }:
 
 stdenv.mkDerivation rec {
-  name = "umockdev-${version}";
+  pname = "umockdev";
   version = "0.12.1";
 
   outputs = [ "bin" "out" "dev" "doc" ];
diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
index 717edda18a2..73ca55cffd0 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "unibilium-${version}";
+  pname = "unibilium";
 
   version = "2.0.0";
 
diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix
index a902b6f8451..7fa8fe81c11 100644
--- a/pkgs/development/libraries/unicap/default.nix
+++ b/pkgs/development/libraries/unicap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }:
 
 stdenv.mkDerivation rec {
-  name = "libunicap-${version}";
+  pname = "libunicap";
   version="0.9.12";
 
   src = fetchurl {
-    url = "https://www.unicap-imaging.org/downloads/${name}.tar.gz";
+    url = "https://www.unicap-imaging.org/downloads/${pname}-${version}.tar.gz";
     sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
   };
 
diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix
index aa4a7890b23..96f318ff0ef 100644
--- a/pkgs/development/libraries/unicorn-emu/default.nix
+++ b/pkgs/development/libraries/unicorn-emu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name    = "unicorn-emulator-${version}";
+  pname = "unicorn-emulator";
   version = "1.0.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix
index 90a28df6a15..0e5971945f3 100644
--- a/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/pkgs/development/libraries/unittest-cpp/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "unittest-cpp-${version}";
+  pname = "unittest-cpp";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix
index 1275df69f59..3a51e2c986a 100644
--- a/pkgs/development/libraries/unixODBC/default.nix
+++ b/pkgs/development/libraries/unixODBC/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "unixODBC-${version}";
+  pname = "unixODBC";
   version = "2.3.7";
 
   src = fetchurl {
-    url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz";
+    url = "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz";
     sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5";
   };
 
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 7b72e12a66b..14f44aaebee 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -4,11 +4,11 @@
 
 {
   psql = stdenv.mkDerivation rec {
-    name = "psqlodbc-${version}";
+    pname = "psqlodbc";
     version = "10.01.0000";
 
     src = fetchurl {
-      url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
+      url = "http://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz";
       sha256 = "1cyams7157f3gry86x64xrplqi2vyqrq3rqka59gv4lb4rpl7jl7";
     };
 
@@ -28,11 +28,11 @@
   };
 
   mariadb = stdenv.mkDerivation rec {
-    name = "mariadb-connector-odbc-${version}";
+    pname = "mariadb-connector-odbc";
     version = "2.0.10";
 
     src = fetchurl {
-      url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${name}-ga-src.tar.gz";
+      url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz";
       sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz";
     };
 
@@ -57,12 +57,12 @@
   };
 
   mysql = stdenv.mkDerivation rec {
-    name = "mysql-connector-odbc-${version}";
+    pname = "mysql-connector-odbc";
     majorVersion = "5.3";
     version = "${majorVersion}.6";
 
     src = fetchurl {
-      url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${name}-src.tar.gz";
+      url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${pname}-${version}-src.tar.gz";
       sha256 = "1smi4z49i4zm7cmykjkwlxxzqvn7myngsw5bc35z6gqxmi8c55xr";
     };
 
@@ -86,7 +86,7 @@
   };
 
   sqlite = stdenv.mkDerivation rec {
-    name = "sqlite-connector-odbc-${version}";
+    pname = "sqlite-connector-odbc";
     version = "0.9993";
  
     src = fetchurl {
@@ -121,7 +121,7 @@
   };
 
   msodbcsql17 = stdenv.mkDerivation rec {
-    name = "msodbcsql17-${version}";
+    pname = "msodbcsql17";
     version = "${versionMajor}.${versionMinor}.${versionAdditional}-1";
 
     versionMajor = "17";
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index 89efdc006a5..9c48488bff8 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }:
 
 stdenv.mkDerivation rec {
-  name = "uriparser-${version}";
+  pname = "uriparser";
   version = "0.9.1";
 
   # Release tarball differs from source tarball
   src = fetchurl {
-    url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2";
+    url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2";
     sha256 = "1gisi7h8hd6mswbiaaa3s25bnb77xf37pzrmjy63rcdpwcyqy93m";
   };
 
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix
index 3d09545c931..2eee80a7696 100644
--- a/pkgs/development/libraries/usbredir/default.nix
+++ b/pkgs/development/libraries/usbredir/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb }:
 
 stdenv.mkDerivation rec {
-  name = "usbredir-${version}";
+  pname = "usbredir";
   version = "0.8.0";
 
   src = fetchurl {
-    url = "https://spice-space.org/download/usbredir/${name}.tar.bz2";
+    url = "https://spice-space.org/download/usbredir/${pname}-${version}.tar.bz2";
     sha256 = "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47";
   };
 
diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix
index c15259c585a..18eae87e11c 100644
--- a/pkgs/development/libraries/ustr/default.nix
+++ b/pkgs/development/libraries/ustr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ustr-${version}";
+  pname = "ustr";
   version = "1.0.4";
 
   src = fetchurl {
-    url = "http://www.and.org/ustr/${version}/${name}.tar.bz2";
+    url = "http://www.and.org/ustr/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx";
   };
 
diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix
index 827274251ed..7f9e8508a65 100644
--- a/pkgs/development/libraries/v8/3.14.nix
+++ b/pkgs/development/libraries/v8/3.14.nix
@@ -12,7 +12,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "v8-${version}";
+  pname = "v8";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
index a7dddd14124..e134c9ea60f 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -10,12 +10,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "v8-${version}";
+  pname = "v8";
   version = "3.16.14.11";
 
   src = fetchurl {
     url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
-        + "${name}.tar.bz2";
+        + "${pname}-${version}.tar.bz2";
     sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj";
   };
 
diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix
index 2b9fa5cc04c..cb53765e394 100644
--- a/pkgs/development/libraries/v8/5_x.nix
+++ b/pkgs/development/libraries/v8/5_x.nix
@@ -102,7 +102,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "v8-${version}";
+  pname = "v8";
   version = "5.4.232";
 
   inherit doCheck;
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index f7c4f34e8e6..2d9c5d4b92a 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -44,7 +44,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "v8-${version}";
+  pname = "v8";
   version = "7.4.255";
 
   doCheck = true;
diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix
index 8d2276def70..bda3f07f0a4 100644
--- a/pkgs/development/libraries/v8/plv8_6_x.nix
+++ b/pkgs/development/libraries/v8/plv8_6_x.nix
@@ -109,7 +109,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "v8-${version}";
+  pname = "v8";
   version = "6.4.388.40";
 
   inherit doCheck;
diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
index 56ded2c5644..678d7dd265c 100644
--- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
+++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }:
 
 stdenv.mkDerivation rec {
-  name = "intel-hybrid-driver-${version}";
+  pname = "intel-hybrid-driver";
   version = "1.0.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 640f50eb45b..722079ff347 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "intel-vaapi-driver-${version}";
+  pname = "intel-vaapi-driver";
   # TODO: go back to stable releases with the next stable release after 2.3.0.
   #       see: https://github.com/NixOS/nixpkgs/issues/55975 (and the libva comment v)
   rev = "329975c63123610fc750241654a3bd18add75beb"; # generally try to match libva version, but not required
diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index abdf9fbeed3..8a2e3af4791 100644
--- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix
+++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vapoursynth-mvtools-${version}";
+  pname = "vapoursynth-mvtools";
   version = "21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix
index 1af70056d2e..18b2659cc5d 100644
--- a/pkgs/development/libraries/vc/0.7.nix
+++ b/pkgs/development/libraries/vc/0.7.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "Vc-${version}";
+  pname = "Vc";
   version = "0.7.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index 66c8e4fbc53..2194c7be38b 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "Vc-${version}";
+  pname = "Vc";
   version = "1.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix
index b7249c8ee82..eb37d14b532 100644
--- a/pkgs/development/libraries/vcg/default.nix
+++ b/pkgs/development/libraries/vcg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, eigen }:
 
 stdenv.mkDerivation rec {
-  name = "vcg-${version}";
+  pname = "vcg";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix
index e516c94866a..eb88b36a142 100644
--- a/pkgs/development/libraries/vid-stab/default.nix
+++ b/pkgs/development/libraries/vid-stab/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "vid-stab-${version}";
+  pname = "vid-stab";
   version = "0.98b";
   
   src = fetchurl {
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index fb69d4bf63e..625ec2cee38 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -5,7 +5,7 @@ let
   inherit (python2Packages) python numpy;
   # Might want to use `python2.withPackages(ps: [ps.numpy]);` here...
 in stdenv.mkDerivation rec {
-  name = "vigra-${version}";
+  pname = "vigra";
   version = "1.11.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix
index 72803e09f07..71bd608e93a 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/pkgs/development/libraries/virglrenderer/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "virglrenderer-${version}";
+  pname = "virglrenderer";
   version = "0.7.0";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/virgl/${name}.tar.bz2";
+    url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2";
     sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m";
   };
 
diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix
index e0398487abc..a68880c2f95 100644
--- a/pkgs/development/libraries/vmime/default.nix
+++ b/pkgs/development/libraries/vmime/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vmime-${version}";
+  pname = "vmime";
   version = "0.9.2";
   src = fetchFromGitHub {
     owner = "kisli";
diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix
index 18b9278539f..b9eb29422c5 100644
--- a/pkgs/development/libraries/vmmlib/default.nix
+++ b/pkgs/development/libraries/vmmlib/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.2";
-  name = "vmmlib-${version}";
+  pname = "vmmlib";
 
   src = fetchFromGitHub {
     owner = "VMML";
diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix
index 4f72cc138ac..efd60fe66fb 100644
--- a/pkgs/development/libraries/vrb/default.nix
+++ b/pkgs/development/libraries/vrb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "vrb-${version}";
+  pname = "vrb";
   version = "0.5.1";
 
   src = fetchurl {
-    url = "http://vrb.sourceforge.net/download/${name}.tar.bz2";
+    url = "http://vrb.sourceforge.net/download/${pname}-${version}.tar.bz2";
     sha256 = "d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f";
   };
 
diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix
index e706c730ddd..fd0e90941b8 100644
--- a/pkgs/development/libraries/vsqlite/default.nix
+++ b/pkgs/development/libraries/vsqlite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "vsqlite-${version}";
+  pname = "vsqlite";
   version = "0.3.13";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index f7c1bf9a65b..de233b49f3a 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
-  name = "vulkan-headers-${version}";
+  pname = "vulkan-headers";
   version = "1.1.106";
 
   buildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index a44e91e1bf5..d8b94c40c7e 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -7,7 +7,7 @@ in
 
 assert version == vulkan-headers.version;
 stdenv.mkDerivation rec {
-  name = "vulkan-loader-${version}";
+  pname = "vulkan-loader";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 8af33c10319..f3f87b3ba60 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libiconv, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "wavpack-${version}";
+  pname = "wavpack";
   version = "5.1.0";
 
   enableParallelBuilding = true;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
 
   src = fetchurl {
-    url = "http://www.wavpack.com/${name}.tar.bz2";
+    url = "http://www.wavpack.com/${pname}-${version}.tar.bz2";
     sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r";
   };
 
diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix
index 3fda417d8e1..7572051b1de 100644
--- a/pkgs/development/libraries/wayland/1.9.nix
+++ b/pkgs/development/libraries/wayland/1.9.nix
@@ -7,11 +7,11 @@
 assert expat != null;
 
 stdenv.mkDerivation rec {
-  name = "wayland-${version}";
+  pname = "wayland";
   version = "1.9.0";
 
   src = fetchurl {
-    url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
     sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww";
   };
 
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index b14dc03385c..d2af8b084e6 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "wayland-protocols-${version}";
+  pname = "wayland-protocols";
   version = "1.17";
 
   src = fetchurl {
-    url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
     sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz";
   };
 
diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 44e6370e640..fbf0162eab3 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   version = "6.3";
-  name = "wcslib-${version}";
+  pname = "wcslib";
 
   buildInputs = [ flex ];
 
   src = fetchurl {
-    url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
+    url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2";
     sha256 ="1si272bms58yv1zmymx9ypx1ycka8bfqy8wk03rvl6nmciyz0dsc";
   };
 
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 04758ace7fa..25868cdb886 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -14,7 +14,7 @@ assert stdenv.isDarwin -> !enableCredentialStorage;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "webkitgtk-${version}";
+  pname = "webkitgtk";
   version = "2.4.11";
 
   meta = with stdenv.lib; {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "https://webkitgtk.org/releases/${name}.tar.xz";
+    url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
     sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq";
   };
 
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 927301589b4..71b30960bac 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -14,7 +14,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "webkitgtk-${version}";
+  pname = "webkitgtk";
   version = "2.24.3";
 
   meta = {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "https://webkitgtk.org/releases/${name}.tar.xz";
+    url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
     sha256 = "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl";
   };
 
diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix
index d84f30aad55..84fbda503ea 100644
--- a/pkgs/development/libraries/websocket++/default.nix
+++ b/pkgs/development/libraries/websocket++/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "websocket++-${version}";
+  pname = "websocket++";
   version = "0.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index c45f521dcbb..e54e0d4b306 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -25,7 +25,7 @@ let
   optLeveldb = shouldUsePkg leveldb;
 in
 stdenv.mkDerivation rec {
-  name = "wiredtiger-${version}";
+  pname = "wiredtiger";
   version = "2.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 549e492e944..780d7df47cb 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "wolfssl-${version}";
+  pname = "wolfssl";
   version = "4.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
index 2aa28a2ccf4..bd893892d98 100644
--- a/pkgs/development/libraries/wxSVG/default.nix
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "wxSVG-${version}";
+  pname = "wxSVG";
   srcName = "wxsvg-${version}";
   version = "1.5.19";
 
diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix
index 49f12842533..a528166f68a 100644
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/pkgs/development/libraries/wxsqlite3/default.nix
@@ -2,7 +2,7 @@
 , darwin }:
 
 stdenv.mkDerivation rec {
-  name = "wxsqlite3-${version}";
+  pname = "wxsqlite3";
   version = "3.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix
index 998f6a9e5f6..9ca15d4977b 100644
--- a/pkgs/development/libraries/wxsqliteplus/default.nix
+++ b/pkgs/development/libraries/wxsqliteplus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "wxsqliteplus-${version}";
+  pname = "wxsqliteplus";
   version = "0.3.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index b952e8b1267..38ee4376ac2 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -12,7 +12,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "2.8.12.1";
-  name = "wxGTK-${version}";
+  pname = "wxGTK";
 
   src = fetchurl {
     url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index b33b0b15331..a12447562b8 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -18,7 +18,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "3.0.4";
-  name = "wxwidgets-${version}";
+  pname = "wxwidgets";
 
   src = fetchFromGitHub {
     owner = "wxWidgets";
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index cbe8bd8ac5e..5236996199d 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.4";
-  name = "wxmac-${version}";
+  pname = "wxmac";
 
   src = fetchzip {
     url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix
index cee967ef2aa..8fe75153de6 100644
--- a/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "3.1.2";
-  name = "wxwidgets-${version}";
+  pname = "wxwidgets";
 
   src = fetchFromGitHub {
     owner = "wxWidgets";
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index f2189cb014e..634847941d0 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -16,7 +16,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "x265-${version}";
+  pname = "x265";
   version = "3.1.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix
index aeb741dbae7..92a932a01a4 100644
--- a/pkgs/development/libraries/xalanc/default.nix
+++ b/pkgs/development/libraries/xalanc/default.nix
@@ -5,7 +5,7 @@ let
              if stdenv.isDarwin then "macosx" else
              throw "Unsupported platform";
 in stdenv.mkDerivation rec {
-  name = "xalan-c-${version}";
+  pname = "xalan-c";
   version = "1.11";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index 1203f19d6c8..6c8eda6358b 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }:
 
 stdenv.mkDerivation rec {
-  name = "xapian-omega-${version}";
+  pname = "xapian-omega";
   inherit (xapian) version;
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix
index 31c31164e01..d7ec3ae9c1e 100644
--- a/pkgs/development/libraries/xavs/default.nix
+++ b/pkgs/development/libraries/xavs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn }:
 
 stdenv.mkDerivation rec {
-  name = "xavs-${version}";
+  pname = "xavs";
   version = "55";
 
   src = fetchsvn {
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index e343c301127..705bd6b87fc 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -2,7 +2,7 @@
 , xorg, gnum4, libxcb, gperf }:
 
 stdenv.mkDerivation rec {
-  name = "xcb-util-cursor-0.1.1-3-unstable-${version}";
+  pname = "xcb-util-cursor-0.1.1-3-unstable";
   version = "2017-04-05";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix
index 8ad4e6d6a8a..704884c23f3 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/pkgs/development/libraries/xercesc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "xerces-c-${version}";
+  pname = "xerces-c";
   version = "3.2.2";
 
   src = fetchurl {
-    url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz";
+    url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz";
     sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx";
   };
 
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 74d263a9417..f4687bd46f8 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -7,7 +7,7 @@
 assert ncclSupport -> cudaSupport;
 
 stdenv.mkDerivation rec {
-  name = "xgboost-${version}";
+  pname = "xgboost";
   version = "0.90";
 
   # needs submodules
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix
index 718554b20a4..3d1b4ea74db 100644
--- a/pkgs/development/libraries/xlslib/default.nix
+++ b/pkgs/development/libraries/xlslib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "xlslib-${version}";
+  pname = "xlslib";
   version = "2.5.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index fec4bbe8efe..5d9e5c29f3c 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "xml-security-c-${version}";
+  pname = "xml-security-c";
   version = "1.7.3";
 
   src = fetchurl {
-    url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz";
+    url = "https://www.apache.org/dist/santuario/c-library/${pname}-${version}.tar.gz";
     sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583";
   };
 
diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix
index 8e1d71fab3f..a1d9b60418c 100644
--- a/pkgs/development/libraries/xml-tooling-c/default.nix
+++ b/pkgs/development/libraries/xml-tooling-c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, boost, curl, openssl, log4shib, xercesc, xml-security-c }:
 
 stdenv.mkDerivation rec {
-  name = "xml-tooling-c-${version}";
+  pname = "xml-tooling-c";
   version = "1.6.3";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix
index 051a194af98..5a267bbfe76 100644
--- a/pkgs/development/libraries/xsd/default.nix
+++ b/pkgs/development/libraries/xsd/default.nix
@@ -4,7 +4,7 @@ let
   fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"'';
 in
 stdenv.mkDerivation rec {
-  name = "xsd-${version}";
+  pname = "xsd";
   version = "4.0.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index 17d7320cb64..5ec96157a79 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -2,11 +2,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "xvidcore-${version}";
+  pname = "xvidcore";
   version = "1.3.5";
 
   src = fetchurl {
-    url = "http://downloads.xvid.org/downloads/${name}.tar.bz2";
+    url = "http://downloads.xvid.org/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1d0hy1w9sn6491a3vhyf3vmhq4xkn6yd4ralx1191s6qz5wz483w";
   };
 
diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix
index 9f2b83d7597..39e9fc49382 100644
--- a/pkgs/development/libraries/xxHash/default.nix
+++ b/pkgs/development/libraries/xxHash/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "xxHash-${version}";
+  pname = "xxHash";
   version = "0.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix
index c9c84f4e1d8..155e46c8f8c 100644
--- a/pkgs/development/libraries/xylib/default.nix
+++ b/pkgs/development/libraries/xylib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }:
 
 stdenv.mkDerivation rec {
-  name = "xylib-${version}";
+  pname = "xylib";
   version = "1.5";
 
   src = fetchurl {
-    url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${name}.tar.bz2";
+    url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${pname}-${version}.tar.bz2";
     sha256 = "1r2kx80zhdvz39k6h2fsncm2742xxvxl3z8a3fnr13jl9sl7mnnd";
   };
 
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
index 82b53402fc7..a2e60eacf98 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "zeroc-ice-${version}";
+  pname = "zeroc-ice";
   version = "3.6.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 8a89d2ae1c7..db5d90e2f02 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }:
 
 stdenv.mkDerivation rec {
-  name = "zeromq-${version}";
+  pname = "zeromq";
   version = "4.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix
index 9b7a9026628..1b74b8c5388 100644
--- a/pkgs/development/libraries/zimlib/default.nix
+++ b/pkgs/development/libraries/zimlib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lzma }:
 
 stdenv.mkDerivation rec {
-  name = "zimlib-${version}";
+  pname = "zimlib";
   version = "1.4";
 
   src = fetchurl {
-    url = "http://www.openzim.org/download/${name}.tar.gz";
+    url = "http://www.openzim.org/download/${pname}-${version}.tar.gz";
     sha256 = "14ra3iq42x53k1nqxb5lsg4gadlkpkgv6cbjjl6305ajmbrghcdq";
   };
 
diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix
index 330b91e995d..5c601575742 100644
--- a/pkgs/development/libraries/zlog/default.nix
+++ b/pkgs/development/libraries/zlog/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.14";
-  name = "zlog-${version}";
+  pname = "zlog";
 
   src = fetchzip {
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz";
     sha256 = "1qcrfmh2vbarkx7ij3gwk174qmgmhm2j336bfaakln1ixd9lkxa5";
   };
diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix
index f7e849f6a33..98211e6e3eb 100644
--- a/pkgs/development/libraries/zmqpp/default.nix
+++ b/pkgs/development/libraries/zmqpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }:
 
 stdenv.mkDerivation rec {
-  name = "zmqpp-${version}";
+  pname = "zmqpp";
   version = "4.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix
index 65509d766b9..78983f09543 100644
--- a/pkgs/development/libraries/zxcvbn-c/default.nix
+++ b/pkgs/development/libraries/zxcvbn-c/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "zxcvbn-c-${version}";
+  pname = "zxcvbn-c";
   version = "2.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 010c73336b9..8b199d3e89a 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -1,7 +1,7 @@
 { docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "zziplib-${version}";
+  pname = "zziplib";
   version = "0.13.69";
 
   src = fetchurl {
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index b0e97038b7b..e176fc31909 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -37,7 +37,7 @@ let lispPackages = rec {
   };
 
   quicklisp-to-nix-system-info = stdenv.mkDerivation rec {
-    name = "quicklisp-to-nix-system-info-${version}";
+    pname = "quicklisp-to-nix-system-info";
     version = "1.0.0";
     src = ./quicklisp-to-nix;
     nativeBuildInputs = [sbcl];
@@ -58,7 +58,7 @@ let lispPackages = rec {
   };
 
   quicklisp-to-nix = stdenv.mkDerivation rec {
-    name = "quicklisp-to-nix-${version}";
+    pname = "quicklisp-to-nix";
     version = "1.0.0";
     src = ./quicklisp-to-nix;
     buildDependencies = [sbcl quicklisp-to-nix-system-info];
diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix
index 5ef83ed77b3..d16f63152b8 100644
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.0";
-  name = "amdadl-sdk-${version}";
+  pname = "amdadl-sdk";
 
   src = requireFile {
     name = "ADL_SDK_6.0.zip";
diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix
index b6d35051733..8578e51e939 100644
--- a/pkgs/development/mobile/adb-sync/default.nix
+++ b/pkgs/development/mobile/adb-sync/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, python3, platform-tools, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "adb-sync-${version}";
+  pname = "adb-sync";
   version = "2016-08-31";
 
   src = fetchgit {
diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix
index fffe2fbbcbe..2033fa78ae5 100644
--- a/pkgs/development/mobile/adbfs-rootless/default.nix
+++ b/pkgs/development/mobile/adbfs-rootless/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }:
 
 stdenv.mkDerivation rec {
-  name = "adbfs-rootless-${version}";
+  pname = "adbfs-rootless";
   version = "2016-10-02";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix
index 9cee1c9e5de..706fa2c6599 100644
--- a/pkgs/development/mobile/imgpatchtools/default.nix
+++ b/pkgs/development/mobile/imgpatchtools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, bzip2, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "imgpatchtools-${version}";
+  pname = "imgpatchtools";
   version = "0.3";
 
   src = fetchzip {
diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix
index f149cb622e1..cd58ea4e20c 100644
--- a/pkgs/development/mobile/webos/cmake-modules.nix
+++ b/pkgs/development/mobile/webos/cmake-modules.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "cmake-modules-webos-${version}";
+  pname = "cmake-modules-webos";
   version = "19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix
index 52b50635e33..e7afdb32137 100644
--- a/pkgs/development/mobile/webos/novacom.nix
+++ b/pkgs/development/mobile/webos/novacom.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, webos, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "novacom-${version}";
+  pname = "novacom";
   version = "18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix
index f82009b0c39..4d62dd305d3 100644
--- a/pkgs/development/mobile/webos/novacomd.nix
+++ b/pkgs/development/mobile/webos/novacomd.nix
@@ -4,7 +4,7 @@ webos, cmake, pkgconfig,
 libusb }:
 
 stdenv.mkDerivation rec {
-  name = "novacomd-${version}";
+  pname = "novacomd";
   version = "127";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
index a7e591e049e..21897e3bf10 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
@@ -5,7 +5,7 @@ then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-  name = "camomile-${version}";
+  pname = "camomile";
   version = "0.8.2";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
index 48517036dc6..a30b574f19b 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}:
 
 stdenv.mkDerivation rec {
-  name = "camomile-${version}";
+  pname = "camomile";
   version = "0.8.5";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix
index 4832f5c39af..2a4d7004faa 100644
--- a/pkgs/development/ocaml-modules/cow/default.nix
+++ b/pkgs/development/ocaml-modules/cow/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.2.0";
-  name = "ocaml-cow-${version}";
+  pname = "ocaml-cow";
 
   src = fetchFromGitHub {
     owner  = "mirage";
diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix
index 7720650ddfc..17da11708c6 100644
--- a/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -5,7 +5,7 @@ then throw "cryptgps is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-  name = "ocaml-cryptgps-${version}";
+  pname = "ocaml-cryptgps";
   version = "0.2.1";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 41214624427..1811e21cf58 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -18,7 +18,7 @@ let param =
 in
 
 stdenv.mkDerivation rec {
-  name = "cryptokit-${version}";
+  pname = "cryptokit";
   inherit (param) version;
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix
index d08259af247..dc6b1751283 100644
--- a/pkgs/development/ocaml-modules/curses/default.nix
+++ b/pkgs/development/ocaml-modules/curses/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml, findlib, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-curses-${version}";
+  pname = "ocaml-curses";
   version = "1.0.4";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 010df7d8df9..25e75ceeba3 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec
 {
   pname = "eliom";
   version = "6.7.0";
-  name = "${pname}-${version}";
 
   src = fetchzip {
     url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix
index e8d9267aa85..93e2b3b8429 100644
--- a/pkgs/development/ocaml-modules/higlo/default.nix
+++ b/pkgs/development/ocaml-modules/higlo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }:
 
 stdenv.mkDerivation rec {
-  name = "higlo-${version}";
+  pname = "higlo";
   version = "0.6";
   src = fetchFromGitHub {
     owner = "zoggy";
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index 6b01929db76..e78dd91f00a 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -14,7 +14,7 @@ let param =
 in
 
 stdenv.mkDerivation rec {
-  name = "lablgtk-${version}";
+  pname = "lablgtk";
   inherit (param) version;
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix
index c0532ff0325..d0a539ce8a1 100644
--- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.6";
-  name = "lambda-term-${version}";
+  pname = "lambda-term";
 
   src = fetchurl {
     url = https://github.com/diml/lambda-term/archive/1.6.tar.gz;
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index b789b133aaf..11405c0ebe5 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-libvirt-${version}";
+  pname = "ocaml-libvirt";
   rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897";
   version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4
 
diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix
index 10d8484e3ef..e210ffa1152 100644
--- a/pkgs/development/ocaml-modules/ocaml-text/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-text-${version}";
+  pname = "ocaml-text";
   version = "0.8";
 
   src = fetchzip {
diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index 20b63e3a8ee..27442075064 100644
--- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }:
 
 stdenv.mkDerivation rec {
-  name = "ocamlfuse-${version}";
+  pname = "ocamlfuse";
   version = "2.7.1_cvs5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index e005024d222..887dce58689 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, ocaml, findlib, lablgtk}:
 
 stdenv.mkDerivation rec {
-  name = "ocamlgraph-${version}";
+  pname = "ocamlgraph";
   version = "1.8.8";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix
index 9c4c2e21edd..468e387f8f1 100644
--- a/pkgs/development/ocaml-modules/ocamlnat/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix
@@ -4,11 +4,11 @@
 assert lib.versionOlder ocaml.version "4";
 
 stdenv.mkDerivation rec {
-  name = "ocamlnat-${version}";
+  pname = "ocamlnat";
   version = "0.1.1";
 
   src = fetchurl {
-    url = "http://benediktmeurer.de/files/source/${name}.tar.bz2";
+    url = "http://benediktmeurer.de/files/source/${pname}-${version}.tar.bz2";
     sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix
index 6117d30665f..0452b1b7dfe 100644
--- a/pkgs/development/ocaml-modules/ocf/default.nix
+++ b/pkgs/development/ocaml-modules/ocf/default.nix
@@ -4,7 +4,7 @@ if stdenv.lib.versionOlder ocaml.version "4.03"
 then throw "ocf not supported for ocaml ${ocaml.version}"
 else
 stdenv.mkDerivation rec {
-  name = "ocf-${version}";
+  pname = "ocf";
   version = "0.5.0";
   src = fetchFromGitHub {
     owner = "zoggy";
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 147b4200cf6..9499bff84a1 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -14,7 +14,7 @@ in
 
 stdenv.mkDerivation rec {
   version = "2.11.0";
-  name = "ocsigenserver-${version}";
+  pname = "ocsigenserver";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index bbe38ac8994..83d47fbb3af 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.5";
-  name    = "piqi-ocaml-${version}";
+  pname = "piqi-ocaml";
 
   src = fetchurl {
     url = "https://github.com/alavrik/piqi-ocaml/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index 6be1595f7c5..fb06820f196 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.14";
-  name    = "piqi-${version}";
+  pname = "piqi";
  
   src = fetchurl {
     url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix
index 38e1b3c7467..0b3f13bc54f 100644
--- a/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, sqlite, ocaml, findlib, ocamlbuild, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-sqlite3-${version}";
+  pname = "ocaml-sqlite3";
   version = "2.0.9";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix
index 125b117bcd8..15d79c43aa3 100644
--- a/pkgs/development/ocaml-modules/uuidm/default.nix
+++ b/pkgs/development/ocaml-modules/uuidm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.6";
-  name = "uuidm-${version}";
+  pname = "uuidm";
   src = fetchurl {
     url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
     sha256 = "0hz4fdx0x16k0pw9995vkz5d1hmzz6b16wck9li399rcbfnv5jlc";
diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index 8282c38a1e7..2f633eed7a3 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2017.02.28";
-  name = "pharo-launcher-${version}";
+  pname = "pharo-launcher";
   src = fetchurl {
     url = "http://files.pharo.org/platform/launcher/PharoLauncher-user-stable-${version}.zip";
     sha256 = "1hfwjyx0c47s6ivc1zr2sf5mk1xw2zspsv0ns8mj3kcaglzqwiq0";
diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix
index 3bd72434eb3..ec4168508a7 100644
--- a/pkgs/development/pharo/vm/share.nix
+++ b/pkgs/development/pharo/vm/share.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "pharo-share-${version}";
+  pname = "pharo-share";
 
   dontUnpack = true;
 
diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix
index de041c0f4c8..12a3529f864 100644
--- a/pkgs/development/python-modules/augeas/default.nix
+++ b/pkgs/development/python-modules/augeas/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
     pname = "augeas";
     version = "1.0.3";
-    name = pname + "-" + version;
 
     src = fetchFromGitHub {
       owner = "hercules-team";
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index 9bd7e586820..bd19b8eb33e 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -16,7 +16,7 @@
 let visualizationSupport = (pyqtgraph != null);
 in
 buildPythonPackage rec {
-  name = "binwalk-${version}";
+  pname = "binwalk";
   version = "2.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix
index fde330d706f..7b67997fa08 100644
--- a/pkgs/development/python-modules/blockdiag/default.nix
+++ b/pkgs/development/python-modules/blockdiag/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "blockdiag";
   version = "1.5.3";
-  name = pname + "-" + version;
 
   src = fetchurl {
     url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index c4db013ea34..21492dc152c 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "Bottleneck";
   version = "1.2.1";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix
index 6e2e703dd56..069358a4d6d 100644
--- a/pkgs/development/python-modules/btchip/default.nix
+++ b/pkgs/development/python-modules/btchip/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "btchip-python";
   version = "0.1.28";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix
index 2c97cbd4a33..7496e7e1fcc 100644
--- a/pkgs/development/python-modules/cgroup-utils/default.nix
+++ b/pkgs/development/python-modules/cgroup-utils/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   version = "0.6";
   pname = "cgroup-utils";
-  name = pname + "-" + version;
 
   buildInputs = [ pep8 nose ];
   # Pep8 tests fail...
diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix
index 67120bf0f3d..234bb46f97b 100644
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/pkgs/development/python-modules/cx_freeze/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "cx_Freeze";
   version = "5.1.1";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix
index 6862d6447e5..b3d4a40bf66 100644
--- a/pkgs/development/python-modules/cymem/default.nix
+++ b/pkgs/development/python-modules/cymem/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "cymem";
   version = "2.0.2";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "explosion";
diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix
index a459e3c0e10..9baafed4b75 100644
--- a/pkgs/development/python-modules/django/1_8.nix
+++ b/pkgs/development/python-modules/django/1_8.nix
@@ -4,11 +4,11 @@
 }:
 
 buildPythonPackage rec {
-  name = "Django-${version}";
+  pname = "Django";
   version = "1.8.19";
 
   src = fetchurl {
-    url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
+    url = "http://www.djangoproject.com/m/releases/1.8/${pname}-${version}.tar.gz";
     sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k";
   };
 
diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix
index 5c0e57cddc0..6e03a33f29b 100644
--- a/pkgs/development/python-modules/dyn/default.nix
+++ b/pkgs/development/python-modules/dyn/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "dyn";
   version = "1.8.1";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
index b09bef9fec4..1ad5ea1ab3b 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "edward";
   version = "1.3.5";
-  name  = "${pname}-${version}";
 
   disabled = !(isPy27 || pythonAtLeast "3.4");
 
diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix
index 3b91fb717bc..de7342d67ca 100644
--- a/pkgs/development/python-modules/first/default.nix
+++ b/pkgs/development/python-modules/first/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "first";
   version = "2.0.2";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index a9ac85e6248..de313dc1c7d 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "geopandas";
   version = "0.5.1";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "geopandas";
diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix
index dd5d90bb968..82553f3e956 100644
--- a/pkgs/development/python-modules/glances/default.nix
+++ b/pkgs/development/python-modules/glances/default.nix
@@ -8,7 +8,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "glances-${version}";
+  pname = "glances";
   version = "3.1.1";
   disabled = isPyPy;
 
diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
index 8bbcaed377a..2a65df18fa5 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "GPy";
   version = "1.9.8";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix
index cfaaa563611..51d42e5c8b7 100644
--- a/pkgs/development/python-modules/hcs_utils/default.nix
+++ b/pkgs/development/python-modules/hcs_utils/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "hcs_utils";
   version = "2.0";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix
index 9938d405387..32c79b17136 100644
--- a/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/pkgs/development/python-modules/hmmlearn/default.nix
@@ -3,10 +3,9 @@
 buildPythonPackage rec {
   pname = "hmmlearn";
   version = "0.2.2";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
+    url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz";
     sha256 = "081c53xs5wn5vikwslallwdv0am09w9cbbggl5dbkqpnic9zx4h4";
   };
 
diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix
index c4afe809cfb..59528723d80 100644
--- a/pkgs/development/python-modules/hoomd-blue/default.nix
+++ b/pkgs/development/python-modules/hoomd-blue/default.nix
@@ -16,7 +16,7 @@ let components = {
 in
 stdenv.mkDerivation rec {
   version = "2.3.4";
-  name = "hoomd-blue-${version}";
+  pname = "hoomd-blue";
 
   src = fetchgit {
     url = "https://bitbucket.org/glotzer/hoomd-blue";
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index 81301f337e6..e22ab22d5a7 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -2,7 +2,7 @@
 , pbr, ldap, prettytable, fixtures, testresources, testtools }:
 
 buildPythonPackage rec {
-  name = "ldappool-${version}";
+  pname = "ldappool";
   version = "2.4.1";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index 6babc6ae014..40a4f6f7429 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -18,7 +18,6 @@ assert cudaSupport -> nvidia_x11 != null
 buildPythonPackage rec {
   pname = "libgpuarray";
   version = "0.7.5";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "Theano";
diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix
index 745f83fe508..c456d67ac49 100644
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@@ -8,7 +8,6 @@
 }:
 
 buildPythonPackage rec {
-  name    = "${pname}-${version}";
   pname   = "libsoundtouch";
   version = "0.4.0";
 
diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index 7f9aa3fa2e4..6a497358404 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -5,10 +5,9 @@
 buildPythonPackage rec {
   pname = "llfuse";
   version = "1.3.6";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
+    url = "mirror://pypi/l/llfuse/${pname}-${version}.tar.bz2";
     sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii";
   };
 
diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/pkgs/development/python-modules/mps-youtube/default.nix
index 4a3ff00f835..4610b052ff8 100644
--- a/pkgs/development/python-modules/mps-youtube/default.nix
+++ b/pkgs/development/python-modules/mps-youtube/default.nix
@@ -6,7 +6,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "mps-youtube-${version}";
+  pname = "mps-youtube";
   version = "0.2.7.1";
   disabled = (!isPy3k);
 
diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index e45a0033c82..2da580abd92 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "nilearn";
   version = "0.5.2";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix
index 5dd95380891..6aadd7f4533 100644
--- a/pkgs/development/python-modules/notify/default.nix
+++ b/pkgs/development/python-modules/notify/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "python-notify-${version}";
+  pname = "python-notify";
   version = "0.1.1";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix
index 7fb1de53dbd..7e34f3897bc 100644
--- a/pkgs/development/python-modules/nwdiag/default.nix
+++ b/pkgs/development/python-modules/nwdiag/default.nix
@@ -5,10 +5,9 @@
 buildPythonPackage rec {
   pname = "nwdiag";
   version = "1.0.4";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/n/nwdiag/${name}.tar.gz";
+    url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz";
     sha256 = "002565875559789a2dfc5f578c07abdf44269c3f7cdf78d4809bdc4bdc2213fa";
   };
 
diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix
index 73230b2e8fb..4c0d4346ee7 100644
--- a/pkgs/development/python-modules/ovito/default.nix
+++ b/pkgs/development/python-modules/ovito/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40
   # This is not the "released" 3.0.0 just a commit
   version = "3.0.0";
-  name = "ovito-${version}";
+  pname = "ovito";
 
   src = fetchgit {
     url = "https://gitlab.com/stuko/ovito";
diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index 0183379ac00..029ce4a1712 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "paramz";
   version = "0.9.5";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index 24539c7bbce..6f82c446a1f 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "passlib";
   version = "1.7.1";
-  name    = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix
index 39a2789a360..8fb6259c574 100644
--- a/pkgs/development/python-modules/pathspec/default.nix
+++ b/pkgs/development/python-modules/pathspec/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
   pname   = "pathspec";
   version = "0.5.9";
-  name    = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
index b35c9de19dc..f8db636520f 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -11,11 +11,10 @@
 buildPythonPackage rec {
   version  = "2.7";
   pname = "powerline";
-  name = pname + "-" + version;
 
   src = fetchurl {
     url    = "https://github.com/powerline/powerline/archive/${version}.tar.gz";
-    name   = "${name}.tar.gz";
+    name   = "${pname}-${version}.tar.gz";
     sha256 = "1h1j2rfphvfdq6mmfyn5bql45hzrwxkhpc2jcwf0vrl3slzkl5s5";
   };
 
diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix
index be409e348ea..5ffe46e5b6f 100644
--- a/pkgs/development/python-modules/pyGithub/default.nix
+++ b/pkgs/development/python-modules/pyGithub/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "PyGithub";
   version = "1.36";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "PyGithub";
diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix
index eb6de23e0ea..1cd95c83fa2 100644
--- a/pkgs/development/python-modules/pyblock/default.nix
+++ b/pkgs/development/python-modules/pyblock/default.nix
@@ -5,13 +5,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pyblock-${version}";
+  pname = "pyblock";
   version = "0.53";
   md5_path = "f6d33a8362dee358517d0a9e2ebdd044";
 
   src = pkgs.fetchurl rec {
     url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/"
-        + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2";
+        + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2";
     sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
   };
 
diff --git a/pkgs/development/python-modules/pycuda/compyte.nix b/pkgs/development/python-modules/pycuda/compyte.nix
index 192d60cec46..c441cea5f45 100644
--- a/pkgs/development/python-modules/pycuda/compyte.nix
+++ b/pkgs/development/python-modules/pycuda/compyte.nix
@@ -5,7 +5,6 @@
 mkDerivation rec {
   pname = "compyte";
   version = "git-20150817";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "inducer";
diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix
index e393265ae37..b5ca0c7ef6c 100644
--- a/pkgs/development/python-modules/pyev/default.nix
+++ b/pkgs/development/python-modules/pyev/default.nix
@@ -3,10 +3,9 @@
 buildPythonPackage rec {
   pname = "pyev";
   version = "0.9.0";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/p/pyev/${name}.tar.gz";
+    url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz";
     sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx";
   };
 
diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix
index 2b20ba95600..bf92f7360dd 100644
--- a/pkgs/development/python-modules/pyftgl/default.nix
+++ b/pkgs/development/python-modules/pyftgl/default.nix
@@ -12,11 +12,10 @@ in
 buildPythonPackage rec {
   pname = "pyftgl";
   version = "0.4b";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "umlaeute";
-    repo = name;
+    repo = "${pname}-${version}";
     rev = version;
     sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
   };
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 4826db3a8c0..d685e3541f9 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
   pname = "pygobject";
   version = "2.28.6";
   format = "other";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz";
+    url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz";
     sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
   };
 
@@ -31,7 +30,7 @@ buildPythonPackage rec {
   # used to select a specific version, in our setup it should have no
   # effect, but we leave it in case somebody expects and calls it.
   postInstall = ''
-    mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth}
+    mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth}
 
     # Prevent wrapping of codegen files as these are meant to be
     # executed by the python program
diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix
index a03be0ac04d..947b5733a7e 100644
--- a/pkgs/development/python-modules/pygtksourceview/default.nix
+++ b/pkgs/development/python-modules/pygtksourceview/default.nix
@@ -4,7 +4,6 @@ buildPythonPackage rec {
   pname = "pygtksourceview";
   format = "other";
   version = "2.10.1";
-  name = pname + "-" + version;
 
   src = fetchurl {
     url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2";
diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix
index 0770520ceee..272774a23ff 100644
--- a/pkgs/development/python-modules/pykde4/default.nix
+++ b/pkgs/development/python-modules/pykde4/default.nix
@@ -14,10 +14,10 @@ let
   });
 in stdenv.mkDerivation rec {
   version = "4.14.3";
-  name = "pykde4-${version}";
+  pname = "pykde4";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${version}/src/${name}-${version}.tar.xz";
+    url = "mirror://kde/stable/${version}/src/${pname}-${version}-${version}.tar.xz";
     sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";
   };
 
diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix
index c5e148d1500..5d1db9efc01 100644
--- a/pkgs/development/python-modules/pykde4/kdelibs.nix
+++ b/pkgs/development/python-modules/pykde4/kdelibs.nix
@@ -7,9 +7,9 @@
 
 stdenv.mkDerivation rec {
   version = "4.14.38";
-  name = "kdelibs-${version}";
+  pname = "kdelibs";
   src = fetchurl {
-    url = "mirror://kde/stable/applications/17.08.3/src/${name}.tar.xz";
+    url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz";
     sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
   };
 
diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix
index 97fbe28e50d..f366f6e57f6 100644
--- a/pkgs/development/python-modules/pylibacl/default.nix
+++ b/pkgs/development/python-modules/pylibacl/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "pylibacl";
   version = "0.5.3";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix
index 47a73c9c80a..ca606767f4d 100644
--- a/pkgs/development/python-modules/pyocr/default.nix
+++ b/pkgs/development/python-modules/pyocr/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "pyocr";
   version = "0.5.3";
-  name = pname + "-" + version;
   disabled = !isPy3k;
 
   # Don't fetch from PYPI because it doesn't contain tests.
diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix
index 1a477ab2328..3defe979d37 100644
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/pkgs/development/python-modules/pyparted/default.nix
@@ -6,7 +6,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "pyparted-${version}";
+  pname = "pyparted";
   version = "3.10.7";
   disabled = isPyPy;
 
diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix
index 76503122a1b..0313632e6fd 100644
--- a/pkgs/development/python-modules/pypillowfight/default.nix
+++ b/pkgs/development/python-modules/pypillowfight/default.nix
@@ -2,7 +2,7 @@
 , isPy3k, isPyPy
 }:
 buildPythonPackage rec {
-  name = "pypillowfight-${version}";
+  pname = "pypillowfight";
   version = "0.2.4";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix
index 65ff765a584..8851b046414 100644
--- a/pkgs/development/python-modules/pyro4/default.nix
+++ b/pkgs/development/python-modules/pyro4/default.nix
@@ -13,8 +13,6 @@
 }:
 
 buildPythonPackage rec {
-
-  name = "${pname}-${version}";
   pname = "Pyro4";
   version = "4.75";
 
diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix
index 47e269c2ff5..beb57ac491a 100644
--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/pkgs/development/python-modules/python-efl/default.nix
@@ -3,11 +3,11 @@
 # Should be bumped along with EFL!
 
 buildPythonPackage rec {
-  name = "python-efl-${version}";
+  pname = "python-efl";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
+    url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz";
     sha256 = "1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63";
   };
 
diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix
index 1ff1f651264..24f56ae53b2 100644
--- a/pkgs/development/python-modules/python_fedora/default.nix
+++ b/pkgs/development/python-modules/python_fedora/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "python-fedora";
   version = "0.10.0";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix
index f667e09892c..7a137f5204c 100644
--- a/pkgs/development/python-modules/pyxattr/default.nix
+++ b/pkgs/development/python-modules/pyxattr/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
     pname = "pyxattr";
     version = "0.6.1";
-    name = pname + "-" + version;
 
     src = fetchPypi {
       inherit pname version;
diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix
index 91c2009744f..06010b40ed9 100644
--- a/pkgs/development/python-modules/qscintilla/default.nix
+++ b/pkgs/development/python-modules/qscintilla/default.nix
@@ -11,7 +11,7 @@
 disabledIf (isPy3k || isPyPy)
   (buildPythonPackage rec {
     # TODO: Qt5 support
-    name = "qscintilla-${version}";
+    pname = "qscintilla";
     version = pkgs.qscintilla.version;
     format = "other";
 
diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix
index aaa095c5398..9644055b007 100644
--- a/pkgs/development/python-modules/recursive-pth-loader/default.nix
+++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "python-recursive-pth-loader";
   version = "1.0";
-  name = pname + "-" + version;
 
   dontUnpack = true;
 
diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix
index 8bac32ba911..4db1db04acc 100644
--- a/pkgs/development/python-modules/robotframework-ride/default.nix
+++ b/pkgs/development/python-modules/robotframework-ride/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
   version = "1.2.3";
   pname = "robotframework-ride";
   disabled = isPy3k;
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz";
+    url = "https://robotframework-ride.googlecode.com/files/${pname}-${version}.tar.gz";
     sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j";
   };
 
diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix
index 3164be5aa86..bbe20fd1e82 100644
--- a/pkgs/development/python-modules/rpkg/default.nix
+++ b/pkgs/development/python-modules/rpkg/default.nix
@@ -4,12 +4,11 @@
 buildPythonPackage rec {
   pname = "rpkg";
   version = "1.50";
-  name  = "${pname}-${version}";
 
   disabled = isPy3k;
 
   src = fetchurl {
-    url = "https://releases.pagure.org/rpkg/${name}.tar.gz";
+    url = "https://releases.pagure.org/rpkg/${pname}-${version}.tar.gz";
     sha256 = "0j83bnm9snr3m1mabw2cvd2r7d6kcnkzyz7b9p65fhcc3c7s3rvv";
   };
 
diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix
index 079e88378c0..7bb66be3096 100644
--- a/pkgs/development/python-modules/selectors34/default.nix
+++ b/pkgs/development/python-modules/selectors34/default.nix
@@ -6,8 +6,6 @@
 }:
 
 buildPythonPackage rec {
-
-  name = "${pname}-${version}";
   pname = "selectors34";
   version = "1.2";
 
diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix
index 158d9a054df..1f6307f2cbb 100644
--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -5,10 +5,9 @@
 buildPythonPackage rec {
   pname = "seqdiag";
   version = "0.9.6";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/s/seqdiag/${name}.tar.gz";
+    url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz";
     sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf";
   };
 
diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix
index 5ea59eb6a2a..887d0c54424 100644
--- a/pkgs/development/python-modules/serpent/default.nix
+++ b/pkgs/development/python-modules/serpent/default.nix
@@ -9,8 +9,6 @@
 }:
 
 buildPythonPackage rec {
-
-  name = "${pname}-${version}";
   pname = "serpent";
   version = "1.27";
 
diff --git a/pkgs/development/python-modules/smugline/default.nix b/pkgs/development/python-modules/smugline/default.nix
index ac625cf1fa0..514a3005725 100644
--- a/pkgs/development/python-modules/smugline/default.nix
+++ b/pkgs/development/python-modules/smugline/default.nix
@@ -8,7 +8,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname   = "smugline";
   version = "20160106";
 
diff --git a/pkgs/development/python-modules/smugpy/default.nix b/pkgs/development/python-modules/smugpy/default.nix
index 5eb8d77a244..c2028228c31 100644
--- a/pkgs/development/python-modules/smugpy/default.nix
+++ b/pkgs/development/python-modules/smugpy/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
-  name    = pname + "-" + version;
   pname   = "smugpy";
   version = "20131218";
 
diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix
index 3309f1e9978..f1455f945a9 100644
--- a/pkgs/development/python-modules/sphfile/default.nix
+++ b/pkgs/development/python-modules/sphfile/default.nix
@@ -3,10 +3,9 @@
 buildPythonPackage rec {
   pname = "sphfile";
   version = "1.0.1";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/s/sphfile/${name}.tar.gz";
+    url = "mirror://pypi/s/sphfile/${pname}-${version}.tar.gz";
     sha256 = "422b0704107b02ef3ca10e55ccdc80b0bb5ad8e2613b6442f8e2ea372c7cf5d8";
   };
 
diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix
index 9a414e31360..70471aedbd7 100644
--- a/pkgs/development/python-modules/spotipy/default.nix
+++ b/pkgs/development/python-modules/spotipy/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "spotipy";
   version = "2.4.4";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix
index 51c80e0fa91..7821c7b3d74 100644
--- a/pkgs/development/python-modules/sybase/default.nix
+++ b/pkgs/development/python-modules/sybase/default.nix
@@ -8,11 +8,10 @@
 buildPythonPackage rec {
   pname = "python-sybase";
   version = "0.40pre2";
-  name = pname + "-" + version;
   disabled = isPy3k;
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${name}/${name}.tar.gz";
+    url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "0pm88hyn18dy7ljam4mdx9qqgmgraf2zy2wl02g5vsjl4ncvq90j";
   };
 
diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix
index ec5b3b325dd..cbe2a213191 100644
--- a/pkgs/development/python-modules/systemd/default.nix
+++ b/pkgs/development/python-modules/systemd/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "systemd";
   version = "234";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "systemd";
diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix
index 318c47d2160..4eff644a161 100644
--- a/pkgs/development/python-modules/tempita/default.nix
+++ b/pkgs/development/python-modules/tempita/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   version = "0.5.3-2016-09-28";
-  name = "tempita-${version}";
+  pname = "tempita";
 
   src = fetchFromGitHub {
     owner = "gjhiggins";
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 0915bc300c5..0413fd33f6f 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -10,7 +10,6 @@
 buildPythonPackage rec {
   version = "0.2.1";
   pname   = "torchvision";
-  name    = "${pname}-${version}";
 
   format = "wheel";
 
diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix
index 416c857bdc6..95c0d628697 100644
--- a/pkgs/development/python-modules/umemcache/default.nix
+++ b/pkgs/development/python-modules/umemcache/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
   pname = "umemcache";
   version = "1.6.3";
   disabled = isPy3k;
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/u/umemcache/${name}.zip";
+    url = "mirror://pypi/u/umemcache/${pname}-${version}.zip";
     sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918";
   };
 
diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix
index 35afe10f8d2..dcb8eca187e 100644
--- a/pkgs/development/python-modules/unicorn/default.nix
+++ b/pkgs/development/python-modules/unicorn/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPackages, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  name  = "${pname}-${version}";
   pname = "unicorn";
   version = "1.0.1";
 
diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix
index 6835f8c48e0..cf3d36c3e5d 100644
--- a/pkgs/development/python-modules/uritools/default.nix
+++ b/pkgs/development/python-modules/uritools/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "uritools";
   version = "2.2.0";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix
index 528846d7238..940f6234187 100644
--- a/pkgs/development/python-modules/urlgrabber/default.nix
+++ b/pkgs/development/python-modules/urlgrabber/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "urlgrabber";
   version = "3.10.2";
-  name  = "${pname}-${version}";
 
   disabled = isPy3k;
 
diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix
index bcbaa0b728c..8b397d3c42c 100644
--- a/pkgs/development/python-modules/usbtmc/default.nix
+++ b/pkgs/development/python-modules/usbtmc/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "usbtmc";
   version = "0.8";
-  name = pname + "-" + version;
 
   src = fetchurl {
     url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz";
diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix
index 584200ff2b0..8b30cc6be87 100644
--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/pkgs/development/python-modules/wxPython/3.0.nix
@@ -21,7 +21,6 @@ assert wxGTK.unicode;
 buildPythonPackage rec {
   pname = "wxPython";
   version = "3.0.2.0";
-  name = pname + "-" + version;
 
   disabled = isPy3k || isPyPy;
   doCheck = false;
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 4bd95a8d745..8b44203a7d2 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "ammonite-${version}";
+  pname = "ammonite";
   version = "1.6.9";
   scalaVersion = "2.12";
 
diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix
index a8b8a965256..16b4be47d8b 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/pkgs/development/tools/analysis/autoflake/default.nix
@@ -4,7 +4,6 @@ with python3Packages;
 buildPythonApplication rec {
   pname = "autoflake";
   version = "1.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 95f5a418a61..ac2c6795a42 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "8.23";
-  name = "checkstyle-${version}";
+  pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix
index 2e01e4d8f28..6b0c1b401f6 100644
--- a/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name    = "clang-analyzer-${version}";
+  pname = "clang-analyzer";
   version = "3.4";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix
index 2b4a87ffcb8..951c46e2166 100644
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "6.0.1";
-  name = "coan-${version}";
+  pname = "coan";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/coan2/v${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/coan2/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
   };
 
diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix
index bd0a4ee5e40..bd8c5c37c86 100644
--- a/pkgs/development/tools/analysis/cov-build/default.nix
+++ b/pkgs/development/tools/analysis/cov-build/default.nix
@@ -7,7 +7,7 @@ let
   '';
 in
 stdenv.mkDerivation rec {
-  name    = "cov-build-${version}";
+  pname = "cov-build";
   version = "7.0.2";
 
   src =
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 09901afdd20..8b6eb71f90f 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "cppcheck";
   version = "1.88";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "1jiqv9pzzy2gxkdhxv3gqjarwgbvc7kxyc66dm3i6xwp94bl89dv";
   };
 
diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix
index 00c020e3f40..ed338a6e0d9 100644
--- a/pkgs/development/tools/analysis/eresi/default.nix
+++ b/pkgs/development/tools/analysis/eresi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, which, openssl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "eresi-${version}";
+  pname = "eresi";
   version = "0.83-a3-phoenix";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix
index 77bfa548068..36fa7bb1f16 100644
--- a/pkgs/development/tools/analysis/evmdis/default.nix
+++ b/pkgs/development/tools/analysis/evmdis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "evmdis-unstable-${version}";
+  pname = "evmdis-unstable";
   version = "2018-03-23";
   goPackagePath = "github.com/Arachnid/evmdis";
 
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 5f6b894f984..8f170993370 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -22,7 +22,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name    = "frama-c-${version}";
+  pname = "frama-c";
   version = "19.0";
   slang   = "Potassium";
 
diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 4222f72248a..fabd4dc03e5 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake, llvmPackages, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "include-what-you-use-${version}";
+  pname = "include-what-you-use";
   # Also bump llvmPackages in all-packages.nix to the supported version!
   version = "0.10";
 
   src = fetchurl {
     sha256 = "16alan9rwbhpyfxmlpc7gbfnbqd877wdqrkvgqrjb1jlqkzpg55s";
-    url = "${meta.homepage}/downloads/${name}.src.tar.gz";
+    url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz";
   };
 
   buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ];
diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index 939ae10c089..455ff7722fa 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ant, jdk, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "jdepend-${version}";
+  pname = "jdepend";
   version = "2.9.1";
 
   src = fetchFromGitHub {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin $out/share
-    install dist/${name}.jar $out/share
+    install dist/${pname}-${version}.jar $out/share
 
     cat > "$out/bin/jdepend" <<EOF
     #!${runtimeShell}
diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix
index af20165d155..b5bc31ad5e9 100644
--- a/pkgs/development/tools/analysis/kcov/default.nix
+++ b/pkgs/development/tools/analysis/kcov/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}:
 
 stdenv.mkDerivation rec {
-  name = "kcov-${version}";
+  pname = "kcov";
   version = "36";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix
index a9793e04883..c2f0236ed0b 100644
--- a/pkgs/development/tools/analysis/massif-visualizer/default.nix
+++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix
@@ -6,11 +6,11 @@
 }:
 
 mkDerivation rec {
-  name = "massif-visualizer-${version}";
+  pname = "massif-visualizer";
   version = "0.7.0";
 
   src = fetchurl {
-    url = "mirror://kde/stable/massif-visualizer/${version}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/massif-visualizer/${version}/src/${pname}-${version}.tar.xz";
     sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q";
   };
 
diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix
index 4fc85c30166..e8e3168e937 100644
--- a/pkgs/development/tools/analysis/randoop/default.nix
+++ b/pkgs/development/tools/analysis/randoop/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.1.5";
-  name = "randoop-${version}";
+  pname = "randoop";
 
   src = fetchurl {
-    url = "https://github.com/randoop/randoop/releases/download/v${version}/${name}.zip";
+    url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip";
     sha256 = "13zspyi9fgnqc90qfqqnj0hb7869l0aixv0vwgj8m4m1hggpadlx";
   };
 
diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix
index fec127178f9..475d1950bb2 100644
--- a/pkgs/development/tools/analysis/retdec/default.nix
+++ b/pkgs/development/tools/analysis/retdec/default.nix
@@ -124,7 +124,7 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  name = "retdec-${version}";
+  pname = "retdec";
 
   # If you update this you will also need to adjust the versions of the updated dependencies. You can do this by first just updating retdec
   # itself and trying to build it. The build should fail and tell you which dependencies you have to upgrade to which versions.
diff --git a/pkgs/development/tools/analysis/retdec/yaracpp.nix b/pkgs/development/tools/analysis/retdec/yaracpp.nix
index cc857b86145..c8bc4ed747b 100644
--- a/pkgs/development/tools/analysis/retdec/yaracpp.nix
+++ b/pkgs/development/tools/analysis/retdec/yaracpp.nix
@@ -13,7 +13,7 @@ let
 in stdenv.mkDerivation rec {
   # only fetches the yaracpp source patched to work with a local yara clone,
   # does not build anything
-  name = "yaracpp-src-${version}";
+  pname = "yaracpp-src";
   version = "2018-10-09";
   rev = "b92bde0e59e3b75bc445227e04b71105771dee8b"; # as specified in retdec/deps/yaracpp/CMakeLists.txt
 
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index cd2fb21209c..844fd38d9be 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.2.0";
-  name = "rr-${version}";
+  pname = "rr";
 
   src = fetchFromGitHub {
     owner = "mozilla";
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index e965acc746c..f8f2f55c5aa 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "snowman-${version}";
+  pname = "snowman";
   version = "0.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index fbb7eca0ef5..26598bb36cd 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -6,7 +6,7 @@ let
   ibinPath = stdenv.lib.makeBinPath [ gcc tk swarm graphviz tk ];
 
 in stdenv.mkDerivation rec {
-  name = "spin-${version}";
+  pname = "spin";
   version = "6.4.9";
   url-version = stdenv.lib.replaceChars ["."] [""] version;
 
diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index d9d70f64d73..56f9f98856c 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre, build-tools }:
 
 stdenv.mkDerivation rec {
-  name = "apktool-${version}";
+  pname = "apktool";
   version = "2.4.0";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix
index d2cb7e807b5..04cb6f808df 100644
--- a/pkgs/development/tools/asmfmt/default.nix
+++ b/pkgs/development/tools/asmfmt/default.nix
@@ -5,7 +5,7 @@
 }:
 
 buildGoPackage rec {
-  name = "asmfmt-${version}";
+  pname = "asmfmt";
   version = "1.1";
 
   goPackagePath = "github.com/klauspost/asmfmt";
diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix
index ee2367d28bb..a81c606dc60 100644
--- a/pkgs/development/tools/avro-tools/default.nix
+++ b/pkgs/development/tools/avro-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   version = "1.9.0";
-  name = "avro-tools-${version}";
+  pname = "avro-tools";
 
   src = fetchurl {
     url =
-    "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${name}.jar";
+    "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
     sha256 = "164mcz7ljd2ikwsq9ba98galcjar4g4n6ag7kkh466nwrpbmd2zi";
   };
 
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     mkdir -p $out/libexec/avro-tools
-    mv $src ${name}.jar
-    cp ${name}.jar $out/libexec/avro-tools
+    mv $src ${pname}-${version}.jar
+    cp ${pname}-${version}.jar $out/libexec/avro-tools
 
     makeWrapper ${jre}/bin/java $out/bin/avro-tools \
-    --add-flags "-jar $out/libexec/avro-tools/${name}.jar"
+    --add-flags "-jar $out/libexec/avro-tools/${pname}-${version}.jar"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 2089142a1de..403d0ab745a 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "azure-storage-azcopy-${version}";
+  pname = "azure-storage-azcopy";
   version = "10.0.1-pre";
   revision = "10.0.1";
   goPackagePath = "github.com/Azure/azure-storage-azcopy";
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index f66c8414264..9a12a7afc62 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "bloaty-${version}";
+  pname = "bloaty";
 
   src = fetchFromGitHub {
     owner = "google";
diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index 7b539172542..2623787993c 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "boomerang-${version}";
+  pname = "boomerang";
   version = "0.4.0-alpha-2018-07-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
index 89c1b560eac..f392475f618 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "boost-build-${version}";
+  pname = "boost-build";
   version = "2016.03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix
index 0aec7491e4a..16eb5e3ec74 100644
--- a/pkgs/development/tools/build-managers/arpa2cm/default.nix
+++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "arpa2cm";
   version = "0.5";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     sha256 = "093h7njj8d8iiwnw5byfxkkzlbny60fwv1w57j8f1lsd4yn6rih4";
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix
index 62482161346..969cd987974 100644
--- a/pkgs/development/tools/build-managers/bam/default.nix
+++ b/pkgs/development/tools/build-managers/bam/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lua5_3, python }:
 
 stdenv.mkDerivation rec {
-  name = "bam-${version}";
+  pname = "bam";
   version = "0.5.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix
index 1018abd6ee9..334d0962253 100644
--- a/pkgs/development/tools/build-managers/bazel/0.4.nix
+++ b/pkgs/development/tools/build-managers/bazel/0.4.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     broken = true; # 2018-08-07
   };
 
-  name = "bazel-${version}";
+  pname = "bazel";
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index f7b0184f836..b606e547036 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
-  name = "bazel-buildtools-${version}";
+  pname = "bazel-buildtools";
   version = "0.28.0";
   rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052";
 
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index ea8ee1f8496..c095f8c695c 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python }:
 
 stdenv.mkDerivation rec {
-  name = "bear-${version}";
+  pname = "bear";
   version = "2.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix
index f71b877c8c5..d895261c4b5 100644
--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/pkgs/development/tools/build-managers/bmake/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "bmake-${version}";
+  pname = "bmake";
   version = "20181221";
 
   src = fetchurl {
-    url    = "http://www.crufty.net/ftp/pub/sjg/${name}.tar.gz";
+    url    = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
     sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw";
   };
 
diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
index 380ba4803bd..3f086c912c1 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.7.2";
-  name = "boot-${version}";
+  pname = "boot";
 
   src = fetchurl {
     url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh";
diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix
index 9f4cb366e23..60a011a49d0 100644
--- a/pkgs/development/tools/build-managers/colormake/default.nix
+++ b/pkgs/development/tools/build-managers/colormake/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchgit, perl}:
 
 stdenv.mkDerivation rec {
-  name = "colormake-${version}";
+  pname = "colormake";
   version = "2.1.0";
 
   buildInputs = [perl];
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 7b882926e1f..ef2b155482f 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
 
 stdenv.mkDerivation rec {
-  name = "dub-${version}";
+  pname = "dub";
   version = "1.14.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index 34d19b61694..24df6fa6ff3 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -17,7 +17,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "gn-${version}";
+  pname = "gn";
   version = "20190403";
 
   src = fetchgit {
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index baa658b522a..30c4d4ec4de 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     rev = "version-0.7.0";
     sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv";
   };
-  name = "gup-${version}";
+  pname = "gup";
   buildInputs = lib.remove null [ python which pychecker ];
   SKIP_PYCHECKER = pychecker == null;
   buildPhase = "make python";
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index c5ab3fafc5e..1d1bee9c04f 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "icmake-${version}";
+  pname = "icmake";
   version = "9.02.08";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix
index 8a72847be77..03cc0518ab5 100644
--- a/pkgs/development/tools/build-managers/kati/default.nix
+++ b/pkgs/development/tools/build-managers/kati/default.nix
@@ -1,7 +1,7 @@
 { fetchgit, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "kati-unstable-${version}";
+  pname = "kati-unstable";
   version = "2017-05-23";
   rev = "2dde61e46ab789f18956ff3b7c257dd8eb97993f";
 
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index d73683287a1..9538171474d 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -4,7 +4,6 @@
 stdenv.mkDerivation rec {
   pname = "leiningen";
   version = "2.9.1";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
@@ -13,11 +12,11 @@ stdenv.mkDerivation rec {
 
   jarsrc = fetchurl {
     # NOTE: This is actually a .jar, Github has issues
-    url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
+    url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip";
     sha256 = "1y2mva5s2w2szzn1b9rhz0dvkffls4ravii677ybcf2w9wd86z7a";
   };
 
-  JARNAME = "${name}-standalone.jar";
+  JARNAME = "${pname}-${version}-standalone.jar";
 
   dontUnpack = true;
 
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index f929d310585..b7e6e08cb04 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "mill-${version}";
+  pname = "mill";
   version = "0.5.0";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index 796747bf6e9..1c90bcc3a9f 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "ninja-${version}";
+  pname = "ninja";
   version = "1.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index 266dff8cf6c..3d2759f025c 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "qbs-${version}";
+  pname = "qbs";
 
   version = "1.13.1";
 
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index 767cd70abcd..28697f4c69c 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, python2, which}:
 stdenv.mkDerivation rec {
-  name = "redo-apenwarr-${version}";
+  pname = "redo-apenwarr";
 
   version = "unstable-2019-06-21";
 
diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix
index 3036ef23584..612dd5c7810 100644
--- a/pkgs/development/tools/build-managers/redo-sh/default.nix
+++ b/pkgs/development/tools/build-managers/redo-sh/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.3";
-  name = "redo-sh-${version}";
+  pname = "redo-sh";
 
   src = fetchurl {
     url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz";
diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix
index 3eca6f02e45..4d43812ebe6 100644
--- a/pkgs/development/tools/build-managers/remake/default.nix
+++ b/pkgs/development/tools/build-managers/remake/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "remake-${version}";
+  pname = "remake";
   remakeVersion = "4.1";
   dbgVersion = "1.1";
   version = "${remakeVersion}+dbg-${dbgVersion}";
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 8110027b6cf..813be519822 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "sbt-${version}";
+  pname = "sbt";
   version = "1.2.8";
 
   src = fetchurl {
     urls = [
-      "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"
+      "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${pname}-${version}.tgz"
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
       "https://cocl.us/sbt-${version}.tgz"
     ];
diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 00345179131..7f0cc8100ac 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }:
 
 stdenv.mkDerivation rec {
-  name = "shards-${version}";
+  pname = "shards";
   version = "0.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix
index 19256e39c33..9b44b30d777 100644
--- a/pkgs/development/tools/build-managers/tup/default.nix
+++ b/pkgs/development/tools/build-managers/tup/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "tup-${version}";
+  pname = "tup";
   version = "0.7.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index c3346ad7e99..6f50907665f 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -7,13 +7,13 @@ let
     optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\"";
 in
 stdenv.mkDerivation rec {
-  name = "waf-${version}";
+  pname = "waf";
   version = "2.0.15";
 
   src = fetchFromGitLab {
     owner = "ita1024";
     repo = "waf";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0i86dbn6l01n4h4rzyl4mvizqabbqn5w7fywh83z7fxpha13c3bz";
   };
 
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index e33761a67e0..b245084fe93 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python, emacsPackagesNg }:
 
 stdenv.mkDerivation rec {
-  name = "cask-${version}";
+  pname = "cask";
   version = "0.8.4";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix
index dfa164e6755..9ae1026c858 100644
--- a/pkgs/development/tools/check/default.nix
+++ b/pkgs/development/tools/check/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "check-unstable-${version}";
+  pname = "check-unstable";
   version = "2018-09-12";
   rev = "88db195993f8e991ad402754accd0635490769f9";
 
diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix
index f17399747f9..891e838fb4f 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "cloudfoundry-cli-${version}";
+  pname = "cloudfoundry-cli";
   version = "6.45.0";
 
   goPackagePath = "code.cloudfoundry.org/cli";
diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix
index db7df2af700..24aca0dada7 100644
--- a/pkgs/development/tools/compile-daemon/default.nix
+++ b/pkgs/development/tools/compile-daemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "compile-daemon-unstable-${version}";
+  pname = "compile-daemon-unstable";
   version = "2017-03-08";
   rev = "d447e567232bcb84cedd3b2be012c7127f31f469";
 
diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix
index b2b903b095c..9aaf886ef06 100644
--- a/pkgs/development/tools/container-linux-config-transpiler/default.nix
+++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "ct-${version}";
+  pname = "ct";
   version = "0.7.0";
 
   goPackagePath = "github.com/coreos/container-linux-config-transpiler";
diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix
index fe83a9aa170..75f175aae9c 100644
--- a/pkgs/development/tools/continuous-integration/cide/default.nix
+++ b/pkgs/development/tools/continuous-integration/cide/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, docker, git, gnutar, gzip }:
 
 stdenv.mkDerivation rec {
-  name = "cide-${version}";
+  pname = "cide";
   version = "0.9.0";
 
   env = bundlerEnv {
-    name = "${name}-gems";
+    name = "${pname}-${version}-gems";
 
     gemdir = ./.;
   };
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index 4a4708df32d..b20d5cfbeee 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -2,7 +2,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "drone-cli-${version}";
+  pname = "drone-cli";
   version = "0.8.6";
   revision = "v${version}";
   goPackagePath = "github.com/drone/drone-cli";
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 81dbc54cece..53ad6f4c2f6 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage, go-bindata, go-bindata-assetfs }:
 
 buildGoPackage rec {
-  name = "drone.io-${version}";
+  pname = "drone.io";
   version = "0.8.6-20180727-${stdenv.lib.strings.substring 0 7 revision}";
   revision = "c48150767c2700d35dcc29b110a81c8b5969175e";
   goPackagePath = "github.com/drone/drone";
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 1aa13a34d12..18c0310e6e3 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -15,7 +15,7 @@ let
 in
 buildGoPackage rec {
   inherit version;
-  name = "gitlab-runner-${version}";
+  pname = "gitlab-runner";
   goPackagePath = "gitlab.com/gitlab-org/gitlab-runner";
   commonPackagePath = "${goPackagePath}/common";
   buildFlagsArray = ''
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 04352660a76..da237a15a5d 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "jenkins-${version}";
+  pname = "jenkins";
   version = "2.176.2";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 299e7d9d499..5443cbf9fb5 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "coursier-${version}";
+  pname = "coursier";
   version = "1.1.0-M14-6";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix
index 99f8d55bd87..a398fc98f1f 100644
--- a/pkgs/development/tools/cppclean/default.nix
+++ b/pkgs/development/tools/cppclean/default.nix
@@ -3,7 +3,7 @@
 with python3Packages;
 
 buildPythonApplication rec {
-  name = "cppclean-unstable-${version}";
+  pname = "cppclean-unstable";
   version = "2018-05-12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index 7eb34aa29ba..11b84648632 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "dbmate-${version}";
+  pname = "dbmate";
   version = "1.4.1";
 
   goPackagePath = "github.com/amacneil/dbmate";
diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix
index e136b180d78..8feca8c62ca 100644
--- a/pkgs/development/tools/database/ephemeralpg/default.nix
+++ b/pkgs/development/tools/database/ephemeralpg/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, postgresql, getopt, makeWrapper }:
 stdenv.mkDerivation rec {
-  name = "ephemeralpg-${version}";
+  pname = "ephemeralpg";
   version = "2.5";
   src = fetchurl {
-    url = "http://ephemeralpg.org/code/${name}.tar.gz";
+    url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz";
     sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk";
   };
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 4589e6ff4e5..637519bcf3f 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -21,12 +21,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "liquibase";
   version = "3.6.2";
 
   src = fetchurl {
-    url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz";
+    url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${pname}-${version}-bin.tar.gz";
     sha256 = "199ybjk0xxsg04v5x5l4arljmzj96hxva6ym6bp7av7dny0nqvfx";
   };
 
@@ -48,10 +47,10 @@ stdenv.mkDerivation rec {
       cp ${logback-core} ${logback-classic} ${slf4j} $out/lib
 
       # Clean up documentation.
-      mkdir -p $out/share/doc/${name}
+      mkdir -p $out/share/doc/${pname}-${version}
       mv $out/LICENSE.txt \
          $out/README.txt \
-         $out/share/doc/${name}
+         $out/share/doc/${pname}-${version}
 
       # Remove silly files.
       rm $out/liquibase.bat $out/liquibase.spec
diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix
index 128921a67d7..d4e57adc140 100644
--- a/pkgs/development/tools/database/schemaspy/default.nix
+++ b/pkgs/development/tools/database/schemaspy/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "6.0.0-rc2";
-  name = "schemaspy-${version}";
+  pname = "schemaspy";
 
   src = fetchurl {
-    url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${name}.jar";
+    url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${pname}-${version}.jar";
     sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn";
   };
 
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
   ];
 
   installPhase = ''
-    install -D ${src} "$out/share/java/${name}.jar"
+    install -D ${src} "$out/share/java/${pname}-${version}.jar"
 
     makeWrapper ${jre}/bin/java $out/bin/schemaspy \
-      --add-flags "-jar $out/share/java/${name}.jar" \
+      --add-flags "-jar $out/share/java/${pname}-${version}.jar" \
       --prefix PATH : "$wrappedPath"
   '';
 
diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix
index f6534788938..2ba38905af9 100644
--- a/pkgs/development/tools/database/shmig/default.nix
+++ b/pkgs/development/tools/database/shmig/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "shmig-${version}";
+  pname = "shmig";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix
index 867aa0b98ec..33b2abce277 100644
--- a/pkgs/development/tools/database/sqlcheck/default.nix
+++ b/pkgs/development/tools/database/sqlcheck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "sqlcheck-${version}";
+  pname = "sqlcheck";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/pkgs/development/tools/database/sqldeveloper/18.2.nix
index adb22f45c8e..ca87395b917 100644
--- a/pkgs/development/tools/database/sqldeveloper/18.2.nix
+++ b/pkgs/development/tools/database/sqldeveloper/18.2.nix
@@ -16,7 +16,7 @@ in
   stdenv.mkDerivation rec {
 
   inherit version;
-  name = "sqldeveloper-${version}";
+  pname = "sqldeveloper";
 
   src = requireFile rec {
     name = "sqldeveloper-${version}-no-jre.zip";
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 45e8ba4f7c0..461acacf4e9 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -16,7 +16,7 @@ in
   stdenv.mkDerivation rec {
 
   inherit version;
-  name = "sqldeveloper-${version}";
+  pname = "sqldeveloper";
 
   src = requireFile rec {
     name = "sqldeveloper-${version}-no-jre.zip";
diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix
index f9ca826cd62..685b9d2f13d 100644
--- a/pkgs/development/tools/dcadec/default.nix
+++ b/pkgs/development/tools/dcadec/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
   pname = "dcadec";
   version = "0.2.0";
 
diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix
index fbed4e905cf..7d106e5a251 100644
--- a/pkgs/development/tools/deadcode/default.nix
+++ b/pkgs/development/tools/deadcode/default.nix
@@ -6,7 +6,7 @@
 # TODO(yl): should we package https://github.com/remyoudompheng/go-misc instead of
 # the standalone extract of deadcode from it?
 buildGoPackage rec {
-  name = "deadcode-unstable-${version}";
+  pname = "deadcode-unstable";
   version = "2016-07-24";
   rev = "210d2dc333e90c7e3eedf4f2242507a8e83ed4ab";
 
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 172e81e1369..db232561add 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "deis-${version}";
+  pname = "deis";
   version = "1.13.4";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix
index 4285a674559..a344bcf91d8 100644
--- a/pkgs/development/tools/deisctl/default.nix
+++ b/pkgs/development/tools/deisctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "deis-${version}";
+  pname = "deis";
   version = "1.13.3";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index a0bd4e12063..fc38f3edb47 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "delve-${version}";
+  pname = "delve";
   version = "1.2.0";
 
   goPackagePath = "github.com/go-delve/delve";
diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix
index a486d786c37..456948a9795 100644
--- a/pkgs/development/tools/dep/default.nix
+++ b/pkgs/development/tools/dep/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "dep-${version}";
+  pname = "dep";
   version = "0.5.1";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index b23745a7b49..3108ffdcbba 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -7,7 +7,6 @@
 } :
 
 pythonPackages.buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "devpi-client";
   version = "4.1.0";
 
diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix
index dcaa4315669..b3134b0d0ad 100644
--- a/pkgs/development/tools/devtodo/default.nix
+++ b/pkgs/development/tools/devtodo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, readline, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "devtodo-${version}";
+  pname = "devtodo";
   version = "0.1.20";
 
   src = fetchurl {
-    url = "https://swapoff.org/files/devtodo/${name}.tar.gz";
+    url = "https://swapoff.org/files/devtodo/${pname}-${version}.tar.gz";
     sha256 = "029y173njydzlznxmdizrrz4wcky47vqhl87fsb7xjcz9726m71p";
   };
 
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index d7604f4de9d..86954ea9d7e 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "doctl-${version}";
+  pname = "doctl";
   version = "${major}.${minor}.${patch}";
   major = "1";
   minor = "18";
diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix
index 17aa94ebf36..1b559df8ef6 100644
--- a/pkgs/development/tools/drip/default.nix
+++ b/pkgs/development/tools/drip/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, jdk, which, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "drip";
   version = "0.2.4";
 
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index c223a8dc54a..5f359757eac 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -1,7 +1,7 @@
 {stdenv, lib, fetchFromGitHub, dmd, curl}:
 
 stdenv.mkDerivation rec {
-  name = "dtools-${version}";
+  pname = "dtools";
   version = "2.085.1";
 
   srcs = [
diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix
index 14d07a0108f..2a38626c552 100644
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "easyjson-unstable-${version}";
+  pname = "easyjson-unstable";
   version = "2019-02-21";
   goPackagePath = "github.com/mailru/easyjson";
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix
index 19ee4c6391b..bc46f0776a6 100644
--- a/pkgs/development/tools/ejson/default.nix
+++ b/pkgs/development/tools/ejson/default.nix
@@ -7,7 +7,7 @@ let
     inherit ruby;
   };
 in buildGoPackage rec {
-  name = "ejson-${version}";
+  pname = "ejson";
   version = "1.2.1";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index e67b417226f..736640eba8e 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -2,7 +2,7 @@
 , z3, python }:
 
 stdenv.mkDerivation rec {
-  name = "cuter-${version}";
+  pname = "cuter";
   version = "0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix
index 1ce49a4cbb9..f65dfe6565b 100644
--- a/pkgs/development/tools/errcheck/default.nix
+++ b/pkgs/development/tools/errcheck/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "errcheck-${version}";
+  pname = "errcheck";
   version = "1.1.0";
 
   goPackagePath = "github.com/kisielk/errcheck";
diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index 18367d14f6e..331c86ad88c 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
 
 buildGoPackage rec {
-  name = "fac-${version}";
+  pname = "fac";
   version = "2.0.0";
 
   goPackagePath = "github.com/mkchoi212/fac";
diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/development/tools/flock/default.nix
index ac145fae7ef..a6ba410ec71 100644
--- a/pkgs/development/tools/flock/default.nix
+++ b/pkgs/development/tools/flock/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "flock";
-  name = "${pname}-${version}";
   version = "0.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix
index 11880213bad..3100daae389 100644
--- a/pkgs/development/tools/fmbt/default.nix
+++ b/pkgs/development/tools/fmbt/default.nix
@@ -5,7 +5,7 @@
 }:
 stdenv.mkDerivation rec {
   version = "0.39";
-  name = "fMBT-${version}";
+  pname = "fMBT";
 
   src = fetchFromGitHub {
     owner = "intel";
diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix
index 292c0dc3a4e..eb6f937800a 100644
--- a/pkgs/development/tools/fusee-launcher/default.nix
+++ b/pkgs/development/tools/fusee-launcher/default.nix
@@ -7,7 +7,7 @@
 } :
 
 stdenv.mkDerivation rec {
-  name = "fusee-launcher-${version}";
+  pname = "fusee-launcher";
   version = "unstable-2018-07-14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix
index fac1a3958d3..15129bbebff 100644
--- a/pkgs/development/tools/galen/default.nix
+++ b/pkgs/development/tools/galen/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "galen";
   version = "2.4.4";
-  name = "${pname}-${version}";
 
   inherit jre8;
 
diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix
index 0857a3d4a7c..872c8fae527 100644
--- a/pkgs/development/tools/gamecube-tools/default.nix
+++ b/pkgs/development/tools/gamecube-tools/default.nix
@@ -2,7 +2,7 @@
   libtool, freeimage, mesa }:
 stdenv.mkDerivation rec {
   version = "v1.0.2";
-  name = "gamecube-tools-${version}";
+  pname = "gamecube-tools";
 
   nativeBuildInputs = [ which autoconf automake libtool ];
   buildInputs = [ freeimage mesa ];
diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index c750b553791..b284b7e7a04 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gauge-${version}";
+  pname = "gauge";
   version = "1.0.4";
 
   goPackagePath = "github.com/getgauge/gauge";
diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix
index 35328fdf66c..9cfa2f02c6e 100644
--- a/pkgs/development/tools/gdm/default.nix
+++ b/pkgs/development/tools/gdm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gdm-${version}";
+  pname = "gdm";
   version = "1.4";
 
   goPackagePath = "github.com/sparrc/gdm";
diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix
index 2d61b27e2c2..b0a59e632f1 100644
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pandoc, man }:
 stdenv.mkDerivation rec {
-  name = "git-ftp-${version}";
+  pname = "git-ftp";
   version = "1.5.2";
   src = fetchFromGitHub {
     owner = "git-ftp";
diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix
index 3408b960889..d13c75be9b7 100644
--- a/pkgs/development/tools/git-quick-stats/default.nix
+++ b/pkgs/development/tools/git-quick-stats/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "git-quick-stats-${version}";
+  pname = "git-quick-stats";
   version = "2.0.8";
   src = fetchFromGitHub {
     repo = "git-quick-stats";
diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
index 6a336b7015a..1bad76b246a 100644
--- a/pkgs/development/tools/github/cligh/default.nix
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }:
 
 buildPythonApplication rec {
-  name = "cligh-${version}";
+  pname = "cligh";
   version = "0.3";
 
   doCheck = false; # no tests
diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index bd83a63e5d6..93004348981 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "glide-${version}";
+  pname = "glide";
   version = "0.12.3";
 
   goPackagePath = "github.com/Masterminds/glide";
diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index b581e71129c..dfc5ed843e7 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gllvm-${version}";
+  pname = "gllvm";
   version = "1.2.3";
 
   goPackagePath = "github.com/SRI-CSL/gllvm";
diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix
index 361740def11..7341dfc90c4 100644
--- a/pkgs/development/tools/global-platform-pro/default.nix
+++ b/pkgs/development/tools/global-platform-pro/default.nix
@@ -5,7 +5,6 @@ stdenv.mkDerivation rec {
   pname = "global-platform-pro";
   version = "18.09.14";
   GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "martinpaljak";
@@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   deps = stdenv.mkDerivation {
-    name = "${name}-deps";
+    name = "${pname}-${version}-deps";
     inherit src;
     nativeBuildInputs = [ jdk maven ];
     installPhase = ''
diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix
index 35f7a2bfdea..d0e9cc9e2d3 100644
--- a/pkgs/development/tools/glock/default.nix
+++ b/pkgs/development/tools/glock/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "glock-${version}";
+  pname = "glock";
   version = "20160816-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276";
 
diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
index d85060add5e..20d1f7c0f1e 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "glslviewer-${version}";
+  pname = "glslviewer";
   version = "2019-04-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix
index 70b426dc594..8f9b9ddf0b5 100644
--- a/pkgs/development/tools/gnome-desktop-testing/default.nix
+++ b/pkgs/development/tools/gnome-desktop-testing/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2018.1";
-  name = "gnome-desktop-testing-${version}";
+  pname = "gnome-desktop-testing";
 
   src = fetchgit {
     url = https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;
diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix
index 249fc21cdfe..ffdb2a092a0 100644
--- a/pkgs/development/tools/go-bindata-assetfs/default.nix
+++ b/pkgs/development/tools/go-bindata-assetfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-bindata-assetfs-${version}";
+  pname = "go-bindata-assetfs";
   version = "20160814-${rev}";
   rev = "e1a2a7e";
   goPackagePath = "github.com/elazarl/go-bindata-assetfs";
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix
index 9a783deecee..4d07939bd7c 100644
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "go-bindata-${version}";
+  pname = "go-bindata";
   version = "20151023-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "a0ff2567cfb70903282db057e799fd826784d41d";
   
diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix
index 5e1a69a1692..3c6cf7e3d83 100644
--- a/pkgs/development/tools/go-junit-report/default.nix
+++ b/pkgs/development/tools/go-junit-report/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-junit-report-unstable-${version}";
+  pname = "go-junit-report-unstable";
   version = "2018-06-14";
   rev = "385fac0ced9acaae6dc5b39144194008ded00697";
 
diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix
index 62e276f2f42..52b2962a23d 100644
--- a/pkgs/development/tools/go-motion/default.nix
+++ b/pkgs/development/tools/go-motion/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "motion-unstable-${version}";
+  pname = "motion-unstable";
   version = "2018-04-09";
   rev = "218875ebe23806e7af82f3b5b14bb3355534f679";
 
diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix
index 4df506f908f..5f6088363f1 100644
--- a/pkgs/development/tools/go-outline/default.nix
+++ b/pkgs/development/tools/go-outline/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-outline-${version}";
+  pname = "go-outline";
   version = "unstable-2018-11-22";
   rev = "7182a932836a71948db4a81991a494751eccfe77";
 
diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix
index f818569dd00..febf71657eb 100644
--- a/pkgs/development/tools/go-protobuf/default.nix
+++ b/pkgs/development/tools/go-protobuf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "go-protobuf-${version}";
+  pname = "go-protobuf";
   version = "1.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
index 52cd37f9885..7fcec1937c7 100644
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "go-repo-root-${version}";
+  pname = "go-repo-root";
   version = "20140911-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
   
diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix
index dfeb6d52e72..e774ed71664 100644
--- a/pkgs/development/tools/go-symbols/default.nix
+++ b/pkgs/development/tools/go-symbols/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-symbols-${version}";
+  pname = "go-symbols";
   version = "0.1.1";
 
   goPackagePath = "github.com/acroca/go-symbols";
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 36634423fdb..26458a3ca2e 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -2,7 +2,7 @@
   fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go2nix-${version}";
+  pname = "go2nix";
   version = "1.3.0";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix
index 53d4bfaa483..24a21c8279c 100644
--- a/pkgs/development/tools/goa/default.nix
+++ b/pkgs/development/tools/goa/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "goa-${version}";
+  pname = "goa";
   version = "1.4.1";
 
   goPackagePath = "github.com/goadesign/goa";
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix
index f93bd9d28c8..1524984756f 100644
--- a/pkgs/development/tools/gocode-gomod/default.nix
+++ b/pkgs/development/tools/gocode-gomod/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gocode-gomod-unstable-${version}";
+  pname = "gocode-gomod-unstable";
   version = "2019-03-27";
   rev = "81059208699789f992bb4a4a3fedd734e335468d";
 
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 3351c0e986b..b67f8929e48 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gocode-unstable-${version}";
+  pname = "gocode-unstable";
   version = "2018-11-05";
   rev = "0af7a86943a6e0237c90f8aeb74a882e1862c898";
 
diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix
index 9ef94ffdc7f..0ee889d0265 100644
--- a/pkgs/development/tools/goconst/default.nix
+++ b/pkgs/development/tools/goconst/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "goconst-${version}";
+  pname = "goconst";
   version = "1.1.0";
 
   goPackagePath = "github.com/jgautheron/goconst";
diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix
index fcdb56460e1..1c4dd00b95e 100644
--- a/pkgs/development/tools/goconvey/default.nix
+++ b/pkgs/development/tools/goconvey/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "goconvey-${version}";
+  pname = "goconvey";
   version = "1.6.3";
 
   goPackagePath = "github.com/smartystreets/goconvey";
diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix
index 91ebaff803e..f446b728908 100644
--- a/pkgs/development/tools/gocyclo/default.nix
+++ b/pkgs/development/tools/gocyclo/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "gocyclo-unstable-${version}";
+  pname = "gocyclo-unstable";
   version = "2015-02-08";
   rev = "aa8f8b160214d8dfccfe3e17e578dd0fcc6fede7";
 
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index 993305bd98f..ce6c77b2cc3 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "godef-${version}";
+  pname = "godef";
   version = "1.1.1";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 7fd6fe62374..20c031ead4a 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -9,7 +9,7 @@ let
     pulseaudio = false;
   };
 in stdenv.mkDerivation rec {
-  name    = "godot-${version}";
+  pname = "godot";
   version = "3.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix
index 7724ee49465..61d0e7a73db 100644
--- a/pkgs/development/tools/gogetdoc/default.nix
+++ b/pkgs/development/tools/gogetdoc/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "gogetdoc-unstable-${version}";
+  pname = "gogetdoc-unstable";
   version = "2018-10-25";
   rev = "9098cf5fc236a5e25060730544af2ba6d65cd968";
 
diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index ae7f24a62a5..7a3d7882715 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name = "golangci-lint-${version}";
+  pname = "golangci-lint";
   version = "1.17.1";
   goPackagePath = "github.com/golangci/golangci-lint";
 
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index 9d404546d00..bd66f35e471 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "lint-${version}";
+  pname = "lint";
   version = "20181026-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "c67002cb31c3a748b7688c27f20d8358b4193582";
   
diff --git a/pkgs/development/tools/gometalinter/default.nix b/pkgs/development/tools/gometalinter/default.nix
index f63d33138fc..c2f2a8a597a 100644
--- a/pkgs/development/tools/gometalinter/default.nix
+++ b/pkgs/development/tools/gometalinter/default.nix
@@ -39,7 +39,7 @@ let
   ];
 
 in buildGoPackage rec {
-  name = "gometalinter-${version}";
+  pname = "gometalinter";
   version = "3.0.0";
 
   goPackagePath = "github.com/alecthomas/gometalinter";
diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix
index 112e1769f21..4d97415bc56 100644
--- a/pkgs/development/tools/gomodifytags/default.nix
+++ b/pkgs/development/tools/gomodifytags/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gomodifytags-unstable-${version}";
+  pname = "gomodifytags-unstable";
   version = "2018-09-14";
   rev = "141225bf62b6e5c9c0c9554a2e993e8c30aebb1d";
 
diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index ba4f4bb3f51..df3310893a4 100644
--- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -3,7 +3,7 @@
 with python27Packages;
 
 stdenv.mkDerivation rec {
-  name = "google-app-engine-go-sdk-${version}";
+  pname = "google-app-engine-go-sdk";
   version = "1.9.61";
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix
index 89a1da77270..778ed562637 100644
--- a/pkgs/development/tools/gopkgs/default.nix
+++ b/pkgs/development/tools/gopkgs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gopkgs-${version}";
+  pname = "gopkgs";
   version = "2.0.1";
 
   goPackagePath = "github.com/uudashr/gopkgs";
diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index 7ee87b8f848..cc2106cdc08 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/pkgs/development/tools/gosec/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "gosec-${version}";
+  pname = "gosec";
   version = "1.2.0";
 
   goPackagePath = "github.com/securego/gosec";
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
index b8230561fb4..881ae7e24d4 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gotags-${version}";
+  pname = "gotags";
   version = "20150803-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "be986a34e20634775ac73e11a5b55916085c48e7";
   
diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix
index 8eb65281b3f..e74b6c27b2b 100644
--- a/pkgs/development/tools/gotests/default.nix
+++ b/pkgs/development/tools/gotests/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gotests-${version}";
+  pname = "gotests";
   version = "1.5.3";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index d83f0ec4014..be7db5e8b8a 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, go, buildGoModule, fetchgit }:
 
 buildGoModule rec {
-  name = "gotools-unstable-${version}";
+  pname = "gotools-unstable";
   version = "2019-07-06";
   rev = "72ffa07ba3db8d09f5215feec0f89464f3028f8e";
 
diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix
index 2030c8ba444..804a9bf043e 100644
--- a/pkgs/development/tools/govendor/default.nix
+++ b/pkgs/development/tools/govendor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "govendor-${version}";
+  pname = "govendor";
   version = "1.0.9";
 
   goPackagePath = "github.com/kardianos/govendor";
diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index 152b619966c..ebce368ea9f 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "govers-${version}";
+  pname = "govers";
   version = "20160623-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43";
 
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index b28bf24892c..25b80d9cf69 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gox-${version}";
+  pname = "gox";
   version = "20181025";
 
   goPackagePath = "github.com/mitchellh/gox";
diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix
index 461110b63d7..009f475bb7d 100644
--- a/pkgs/development/tools/gpp/default.nix
+++ b/pkgs/development/tools/gpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "gpp-${version}";
+  pname = "gpp";
   version = "2.25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix
index ebe76197ef4..e0d2d3d1498 100644
--- a/pkgs/development/tools/gron/default.nix
+++ b/pkgs/development/tools/gron/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gron-${version}";
+  pname = "gron";
   version = "0.6.0";
 
   owner = "tomnomnom";
diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix
index 833b41ae985..27ca714b73a 100644
--- a/pkgs/development/tools/gtk-mac-bundler/default.nix
+++ b/pkgs/development/tools/gtk-mac-bundler/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gtk-mac-bundler-${version}";
+  pname = "gtk-mac-bundler";
   version = "0.7.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index 78f2e967123..15233979e15 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -1,12 +1,11 @@
 { fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "g-wrap";
   version = "1.9.15";
 
   src = fetchurl {
-    url = "mirror://savannah/${pname}/${name}.tar.gz";
+    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg";
   };
 
diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix
index fd9347a4007..b8efb30f5f1 100644
--- a/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/pkgs/development/tools/guile/guile-lint/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, guile }:
 
 stdenv.mkDerivation rec {
-  name = "guile-lint-${version}";
+  pname = "guile-lint";
   version = "14";
 
   src = fetchurl {
-    url = "https://download.tuxfamily.org/user42/${name}.tar.bz2";
+    url = "https://download.tuxfamily.org/user42/${pname}-${version}.tar.bz2";
     sha256 = "1gnhnmki05pkmzpbfc07vmb2iwza6vhy75y03bw2x2rk4fkggz2v";
   };
 
   buildInputs = [ guile ];
 
-  unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"'';
+  unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${pname}-${version}"'';
 
   prePatch = ''
     substituteInPlace guile-lint.in --replace \
diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix
index 3b52c262c0c..7d99a5e9a57 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix
@@ -5,7 +5,7 @@ let
   binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
 
 in stdenv.mkDerivation rec {
-  name = "hyper-haskell-${version}";
+  pname = "hyper-haskell";
   version = "0.1.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix
index 905580482d4..c97e35583b6 100644
--- a/pkgs/development/tools/hexio/default.nix
+++ b/pkgs/development/tools/hexio/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "hexio";
-  name = "${pname}-${version}";
   version = "1.0-RC1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index c287e40d823..b4f5d74d1d2 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -10,7 +10,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "icestorm-${version}";
+  pname = "icestorm";
   version = "2019.04.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/iferr/default.nix b/pkgs/development/tools/iferr/default.nix
index e2aebe9b2dc..5874d1eeed3 100644
--- a/pkgs/development/tools/iferr/default.nix
+++ b/pkgs/development/tools/iferr/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "iferr-unstable-${version}";
+  pname = "iferr-unstable";
   version = "2018-06-15";
   rev = "bb332a3b1d9129b6486c7ddcb7030c11b05cfc88";
 
diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix
index 62f33a2d251..b394e9e71fb 100644
--- a/pkgs/development/tools/imatix_gsl/default.nix
+++ b/pkgs/development/tools/imatix_gsl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pcre } :
 
 stdenv.mkDerivation rec {
-  name = "imatix_gsl-${version}";
+  pname = "imatix_gsl";
   version = "4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix
index 69bbf8afe5a..8d368ba528a 100644
--- a/pkgs/development/tools/impl/default.nix
+++ b/pkgs/development/tools/impl/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "impl-unstable-${version}";
+  pname = "impl-unstable";
   version = "2018-02-27";
   rev = "3d0f908298c49598b6aa84f101c69670e15d1d03";
 
diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix
index 10e5c61025a..06831e3a43c 100644
--- a/pkgs/development/tools/ineffassign/default.nix
+++ b/pkgs/development/tools/ineffassign/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "ineffassign-unstable-${version}";
+  pname = "ineffassign-unstable";
   version = "2018-09-09";
 	rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
 
diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix
index 274ced0b37c..2f505ef1c67 100644
--- a/pkgs/development/tools/interfacer/default.nix
+++ b/pkgs/development/tools/interfacer/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "interfacer-unstable-${version}";
+  pname = "interfacer-unstable";
   version = "2018-08-31";
   rev = "c20040233aedb03da82d460eca6130fcd91c629a";
 
diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
index b6a78071bc8..035964dafc0 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, llvmPackages, irony }:
 
 stdenv.mkDerivation rec {
-  name = "irony-server-${version}";
+  pname = "irony-server";
   inherit (irony) version;
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index 1f0d8f28609..382ef28c014 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "cfr-${version}";
+  pname = "cfr";
   version = "0.146";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix
index 4577de0cde4..dae39453495 100644
--- a/pkgs/development/tools/java/jhiccup/default.nix
+++ b/pkgs/development/tools/java/jhiccup/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "jhiccup-${version}";
+  pname = "jhiccup";
   version = "2.0.10";
 
   src = fetchzip {
diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 9682ceb93c7..04d5a0b2e76 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.3";
-  name = "visualvm-${version}";
+  pname = "visualvm";
 
   src = fetchzip {
     url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""]  version}.zip";
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index dbda476171a..79054c7f667 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.6.4";
-  name = "jbake-${version}";
+  pname = "jbake";
 
   src = fetchzip {
-    url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip";
+    url = "https://dl.bintray.com/jbake/binary/${pname}-${version}-bin.zip";
     sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw";
   };
 
diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix
index 3fe55de2ec8..b03fd7a0028 100644
--- a/pkgs/development/tools/jd/default.nix
+++ b/pkgs/development/tools/jd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "jd-${version}";
+  pname = "jd";
   version = "0.3.1";
   rev = "2729b5af166cfd72bd953ef8959b456c4db940fc";
 
diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix
index 4833755b3ee..cd0e125564f 100644
--- a/pkgs/development/tools/jid/default.nix
+++ b/pkgs/development/tools/jid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "jid-${version}";
+  pname = "jid";
   version = "0.7.2";
 
   goPackagePath = "github.com/simeji/jid";
diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix
index c53d6608efd..300c52961f3 100644
--- a/pkgs/development/tools/jmespath/default.nix
+++ b/pkgs/development/tools/jmespath/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "jmespath-${version}";
+  pname = "jmespath";
   version = "0.2.2";
   rev = "${version}";
 
diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix
index e8e8acd6a9a..e9ba5a7ddd7 100644
--- a/pkgs/development/tools/jp/default.nix
+++ b/pkgs/development/tools/jp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "jp-${version}";
+  pname = "jp";
   version = "0.1.2";
   rev = "${version}";
 
diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index ebb875c9298..a0dd5d542c8 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, oniguruma }:
 
 stdenv.mkDerivation rec {
-  name = "jq-${version}";
+  pname = "jq";
   version="1.6";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix
index dc8e618910c..11a96bc22fe 100644
--- a/pkgs/development/tools/jsduck/default.nix
+++ b/pkgs/development/tools/jsduck/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "jsduck";
-  name = "${pname}-${version}";
   version = (import ./gemset.nix).jsduck.version;
 
   env = bundlerEnv {
diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix
index 694428f55a6..4fe4e4c7eab 100644
--- a/pkgs/development/tools/json2hcl/default.nix
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -2,7 +2,6 @@
 
 buildGoPackage rec {
   pname = "json2hcl";
-  name = "${pname}-${version}";
   version = "0.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix
index 4a837bcef65..d1da88f60bd 100644
--- a/pkgs/development/tools/kafkacat/default.nix
+++ b/pkgs/development/tools/kafkacat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }:
 
 stdenv.mkDerivation rec {
-  name = "kafkacat-${version}";
+  pname = "kafkacat";
 
   version = "1.4.0";
 
diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix
index 3a2040e712a..5246a51aabb 100644
--- a/pkgs/development/tools/kind/default.nix
+++ b/pkgs/development/tools/kind/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "kind-${version}";
+  pname = "kind";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix
index 1bc9aa14e44..0ce221d9df6 100644
--- a/pkgs/development/tools/ktlint/default.nix
+++ b/pkgs/development/tools/ktlint/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "ktlint-${version}";
+  pname = "ktlint";
   version = "0.34.0";
 
   src = fetchurl {
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ jre ];
 
   unpackCmd = ''
-    mkdir -p ${name}
-    cp $curSrc ${name}/ktlint
+    mkdir -p ${pname}-${version}
+    cp $curSrc ${pname}-${version}/ktlint
   '';
 
   installPhase = ''
diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix
index af5c0e9c2f9..6083c03ebc9 100644
--- a/pkgs/development/tools/kube-aws/default.nix
+++ b/pkgs/development/tools/kube-aws/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "kube-aws-${version}";
+  pname = "kube-aws";
   version = "0.9.4";
 
   goPackagePath = "github.com/coreos/kube-aws";
diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix
index 20a26824e5e..8e6ca8e221e 100644
--- a/pkgs/development/tools/kube-prompt/default.nix
+++ b/pkgs/development/tools/kube-prompt/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "kube-prompt-${version}";
+  pname = "kube-prompt";
   version = "1.0.5";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix
index a63de550747..104b11c1ce1 100644
--- a/pkgs/development/tools/kubicorn/default.nix
+++ b/pkgs/development/tools/kubicorn/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "kubicorn-${version}";
+  pname = "kubicorn";
   version = "2018-10-13-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "4c7f3623e9188fba43778271afe161a4facfb657";
 
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
index be964cf4d30..a2a35c7fd1d 100644
--- a/pkgs/development/tools/leaps/default.nix
+++ b/pkgs/development/tools/leaps/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "leaps-${version}";
+  pname = "leaps";
   version = "0.9.0";
 
   goPackagePath = "github.com/Jeffail/leaps";
diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix
index 58f50dd2f7e..7f40824c472 100644
--- a/pkgs/development/tools/librarian-puppet-go/default.nix
+++ b/pkgs/development/tools/librarian-puppet-go/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "librarian-puppet-go-${version}";
+  pname = "librarian-puppet-go";
   version = "0.3.9";
 
   goPackagePath = "github.com/tmtk75/librarian-puppet-go";
diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix
index 00397978054..41c4b25c8b1 100644
--- a/pkgs/development/tools/literate-programming/nuweb/default.nix
+++ b/pkgs/development/tools/literate-programming/nuweb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec{
 
-  name = "nuweb-${version}";
+  pname = "nuweb";
   version = "1.58";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/nuweb/${name}.tar.gz";
+    url = "mirror://sourceforge/project/nuweb/${pname}-${version}.tar.gz";
     sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y";
   };
 
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec{
     make nuweb.pdf nuwebdoc.pdf all
   '';
   installPhase = ''
-    install -d $out/bin $out/share/man/man1 $out/share/doc/${name} $out/share/emacs/site-lisp
+    install -d $out/bin $out/share/man/man1 $out/share/doc/${pname}-${version} $out/share/emacs/site-lisp
     cp nuweb $out/bin
     cp nuweb.el $out/share/emacs/site-lisp
     gzip -c nuweb.1 > $out/share/man/man1/nuweb.1.gz
-    cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${name}
+    cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${pname}-${version}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix
index 404f3758ced..573e2aefb80 100644
--- a/pkgs/development/tools/makerpm/default.nix
+++ b/pkgs/development/tools/makerpm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec { 
   version = "1.0";
-  name = "makerpm-${version}";
+  pname = "makerpm";
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix
index 7e5cbaddd8b..3029ee38518 100644
--- a/pkgs/development/tools/maligned/default.nix
+++ b/pkgs/development/tools/maligned/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "maligned-unstable-${version}";
+  pname = "maligned-unstable";
   version = "2018-07-07";
   rev = "6e39bd26a8c8b58c5a22129593044655a9e25959";
 
diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix
index db0e41d27ab..37d49b1f35b 100644
--- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix
+++ b/pkgs/development/tools/misc/abi-compliance-checker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }:
 
 stdenv.mkDerivation rec {
-  name = "abi-compliance-checker-${version}";
+  pname = "abi-compliance-checker";
   version = "2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix
index 047cd466baa..ca59bf28b1e 100644
--- a/pkgs/development/tools/misc/abi-dumper/default.nix
+++ b/pkgs/development/tools/misc/abi-dumper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }:
 
 stdenv.mkDerivation rec {
-  name = "abi-dumper-${version}";
+  pname = "abi-dumper";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 7810ba6349c..664e7d28d79 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -15,7 +15,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name    = "arcanist-${version}";
+  pname = "arcanist";
   version = "20180916";
 
   src = [ arcanist libphutil ];
diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix
index d7cea5c3d4e..9901e46d578 100644
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
-  name = "autoconf-archive-${version}";
+  pname = "autoconf-archive";
   version = "2019.01.06";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index ff5ce659d2e..dc719789719 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "autogen-${version}";
+  pname = "autogen";
   version = "5.18.12";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix
index 38d2194dab8..8892142ad77 100644
--- a/pkgs/development/tools/misc/awf/default.nix
+++ b/pkgs/development/tools/misc/awf/default.nix
@@ -2,7 +2,7 @@
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "awf-${version}";
+  pname = "awf";
   version = "1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix
index 16182d26db3..72848d04930 100644
--- a/pkgs/development/tools/misc/bashdb/default.nix
+++ b/pkgs/development/tools/misc/bashdb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "bashdb-${version}";
+  pname = "bashdb";
   version = "4.4-1.0.0";
 
   src = fetchurl {
-    url =  "mirror://sourceforge/bashdb/${name}.tar.bz2";
+    url =  "mirror://sourceforge/bashdb/${pname}-${version}.tar.bz2";
     sha256 = "0p7i7bpzs6q1i7swnkr89kxqgzr146xw8d2acmqwqbslzm9dqlml";
   };
 
diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix
index ac7eb557f2e..ea9b340fb0b 100644
--- a/pkgs/development/tools/misc/bin_replace_string/default.nix
+++ b/pkgs/development/tools/misc/bin_replace_string/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libelf, txt2man }:
 
 stdenv.mkDerivation rec {
-  name = "bin_replace_string-${version}";
+  pname = "bin_replace_string";
   version = "0.2";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix
index 359ab125be9..dd84e3830c4 100644
--- a/pkgs/development/tools/misc/bsdbuild/default.nix
+++ b/pkgs/development/tools/misc/bsdbuild/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }:
 
 stdenv.mkDerivation rec {
-  name = "bsdbuild-${version}";
+  pname = "bsdbuild";
   version = "3.1";
 
   src = fetchurl {
-    url = "http://stable.hypertriton.com/bsdbuild/${name}.tar.gz";
+    url = "http://stable.hypertriton.com/bsdbuild/${pname}-${version}.tar.gz";
     sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl";
   };
 
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index ae7ecad7ea1..0577165bcff 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, zlib, makeWrapper }:
 
 let ccache = stdenv.mkDerivation rec {
-  name = "ccache-${version}";
+  pname = "ccache";
   version = "3.4.1";
 
   src = fetchurl {
     sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc";
-    url = "mirror://samba/ccache/${name}.tar.xz";
+    url = "mirror://samba/ccache/${pname}-${version}.tar.xz";
   };
 
   nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix
index f643ecab69d..008701615e7 100644
--- a/pkgs/development/tools/misc/ccls/default.nix
+++ b/pkgs/development/tools/misc/ccls/default.nix
@@ -2,7 +2,7 @@
 , cmake, llvmPackages, rapidjson, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name    = "ccls-${version}";
+  pname = "ccls";
   version = "0.20190314.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index 31e720b13f2..e5bbdc562b1 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, readline, flex, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "cgdb-${version}";
+  pname = "cgdb";
   version = "0.7.0";
 
   src = fetchurl {
-    url = "https://cgdb.me/files/${name}.tar.gz";
+    url = "https://cgdb.me/files/${pname}-${version}.tar.gz";
     sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz";
   };
 
diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix
index 5f98df54c0a..887a0f16ec1 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 stdenv.mkDerivation rec {
   version = "2.0.0.2";
-  name = "checkbashisms-${version}";
+  pname = "checkbashisms";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms";
diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix
index ed96befca5e..1aac0bd651c 100644
--- a/pkgs/development/tools/misc/chruby/default.nix
+++ b/pkgs/development/tools/misc/chruby/default.nix
@@ -8,7 +8,7 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  name = "chruby-${version}";
+  pname = "chruby";
 
   version = "0.3.9";
 
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 4040eda141f..861a6eff164 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name    = "coccinelle-${version}";
+  pname = "coccinelle";
   version = "1.0.6";
 
   src = fetchurl {
-    url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
+    url = "http://coccinelle.lip6.fr/distrib/${pname}-${version}.tgz";
     sha256 = "02g9hmwkvfl838zz690yra5jzrqjg6y6ffxkrfcsx790bhkfsll4";
   };
 
diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix
index d95c67fea6d..a2a39b81055 100644
--- a/pkgs/development/tools/misc/complexity/default.nix
+++ b/pkgs/development/tools/misc/complexity/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, autogen }:
 
 stdenv.mkDerivation rec {
-  name = "complexity-${version}";
+  pname = "complexity";
   version = "1.10";
 
   src = fetchurl {
-    url = "mirror://gnu/complexity/${name}.tar.gz";
+    url = "mirror://gnu/complexity/${pname}-${version}.tar.gz";
     sha256 = "1vfns9xm7w0wrz12a3w15slrqnrfh6qxk15nv7qkj3irll3ff522";
   };
 
diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix
index 8a0cb095d44..973caee64e8 100644
--- a/pkgs/development/tools/misc/cproto/default.nix
+++ b/pkgs/development/tools/misc/cproto/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "cproto-${version}";
+  pname = "cproto";
   version = "4.7o";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix
index 54ad7ca7071..02d480cf2cd 100644
--- a/pkgs/development/tools/misc/cquery/default.nix
+++ b/pkgs/development/tools/misc/cquery/default.nix
@@ -15,7 +15,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name    = "cquery-${version}";
+  pname = "cquery";
   version = "2018-10-14";
 
   inherit src;
diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix
index eff1af8cdb4..34cbadb38af 100644
--- a/pkgs/development/tools/misc/csmith/default.nix
+++ b/pkgs/development/tools/misc/csmith/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "csmith-${version}";
+  pname = "csmith";
   version = "2.3.0";
 
   src = fetchurl {
-    url = "https://embed.cs.utah.edu/csmith/${name}.tar.gz";
+    url = "https://embed.cs.utah.edu/csmith/${pname}-${version}.tar.gz";
     sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj";
   };
 
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     substituteInPlace $out/bin/compiler_test.pl \
-      --replace '$CSMITH_HOME/runtime' $out/include/${name} \
-      --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${name}" \
+      --replace '$CSMITH_HOME/runtime' $out/include/${pname}-${version} \
+      --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${pname}-${version}" \
       --replace '$CSMITH_HOME/src/csmith' $out/bin/csmith
 
     substituteInPlace $out/bin/launchn.pl \
diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix
index d8deb75d2d4..3a54a17a93a 100644
--- a/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/pkgs/development/tools/misc/cwebbin/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchurl, tie }:
 
 stdenv.mkDerivation rec {
-  name = "cwebbin-${version}";
+  pname = "cwebbin";
   version = "22p";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix
index 2657e570106..bf1effbe71a 100644
--- a/pkgs/development/tools/misc/dfu-util/default.nix
+++ b/pkgs/development/tools/misc/dfu-util/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name="dfu-util-${version}";
+  pname = "dfu-util";
   version = "0.9";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libusb1 ];
 
   src = fetchurl {
-    url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz";
+    url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
     sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin";
   };
 
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index efb850d5ade..378cc4683b4 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -8,13 +8,13 @@ assert withLibrary -> libtool != null;
 assert unicodeSupport -> ncurses.unicode && ncurses != null;
 
 stdenv.mkDerivation rec {
-  name = "dialog-${version}";
+  pname = "dialog";
   version = "1.3-20190211";
 
   src = fetchurl {
     urls = [
-      "ftp://ftp.invisible-island.net/dialog/${name}.tgz"
-      "https://invisible-mirror.net/archives/dialog/${name}.tgz"
+      "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"
+      "https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz"
     ];
     sha256 = "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29";
   };
diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix
index 51a5f52d375..23c01338f60 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/pkgs/development/tools/misc/elfinfo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "elfinfo-${version}";
+  pname = "elfinfo";
   version = "0.7.5";
 
   goPackagePath = "github.com/xyproto/elfinfo";
diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix
index 905fa0d4093..c7eaafd9c7a 100644
--- a/pkgs/development/tools/misc/elfkickers/default.nix
+++ b/pkgs/development/tools/misc/elfkickers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "elfkickers-${version}";
+  pname = "elfkickers";
   version = "3.1";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 424032e21af..7a3579f0635 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -2,11 +2,11 @@
 
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
-  name = "elfutils-${version}";
+  pname = "elfutils";
   version = "0.176";
 
   src = fetchurl {
-    url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
+    url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";
     sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb";
   };
 
diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix
index f58d0659965..b449c0a2d01 100644
--- a/pkgs/development/tools/misc/epm/default.nix
+++ b/pkgs/development/tools/misc/epm/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, rpm}:
 
 stdenv.mkDerivation rec {
-  name = "epm-${version}";
+  pname = "epm";
   version = "4.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix
index e84aa0ef555..152792dcee2 100644
--- a/pkgs/development/tools/misc/fsatrace/default.nix
+++ b/pkgs/development/tools/misc/fsatrace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "fsatrace-${version}";
+  pname = "fsatrace";
   version = "0.0.1-160";
 
   src = fetchFromGitHub {
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    mkdir -p $out/libexec/${name}
-    export makeFlags=INSTALLDIR=$out/libexec/${name}
+    mkdir -p $out/libexec/${pname}-${version}
+    export makeFlags=INSTALLDIR=$out/libexec/${pname}-${version}
   '';
 
   postInstall = ''
     mkdir -p $out/bin
-    ln -s $out/libexec/${name}/fsatrace $out/bin/
+    ln -s $out/libexec/${pname}-${version}/fsatrace $out/bin/
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 73de8eb8cb6..a5c32bd3dc1 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -10,7 +10,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fswatch-${version}";
+  pname = "fswatch";
   version = "1.14.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index 70a157bc084..1484e54289e 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }:
 
 stdenv.mkDerivation rec {
-  name = "gede-${version}";
+  pname = "gede";
   version = "2.14.1";
 
   src = fetchurl {
-    url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
+    url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz";
     sha256 = "1z7577zwz7h03d58as93hyx99isi3p4i3rhxr8l01zgi65mz0mr9";
   };
 
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index b2c71388fc5..2d756a655a4 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "global-${version}";
+  pname = "global";
   version = "6.6.3";
 
   src = fetchurl {
-    url = "mirror://gnu/global/${name}.tar.gz";
+    url = "mirror://gnu/global/${pname}-${version}.tar.gz";
     sha256 = "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb";
   };
 
diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix
index 25043f89463..108d6190cb7 100644
--- a/pkgs/development/tools/misc/gpshell/default.nix
+++ b/pkgs/development/tools/misc/gpshell/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gpshell-${version}";
+  pname = "gpshell";
   version = "1.4.4";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix
index aaaee20b81a..37a7a8c931c 100644
--- a/pkgs/development/tools/misc/gputils/default.nix
+++ b/pkgs/development/tools/misc/gputils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gputils-${version}";
+  pname = "gputils";
   version = "1.5.0-1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gputils/${name}.tar.bz2";
+    url = "mirror://sourceforge/gputils/${pname}-${version}.tar.bz2";
     sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g";
   };
 
diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix
index 0f9219f10a0..d3afbbc1bc7 100644
--- a/pkgs/development/tools/misc/hound/default.nix
+++ b/pkgs/development/tools/misc/hound/default.nix
@@ -7,7 +7,7 @@
 }:
 
 buildGoPackage rec {
-  name = "hound-unstable-${version}";
+  pname = "hound-unstable";
   version = "2018-11-02";
   rev = "74ec7448a234d8d09e800b92e52c92e378c07742";
 
diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix
index 294d1fa10dd..996dda4ca94 100644
--- a/pkgs/development/tools/misc/igprof/default.nix
+++ b/pkgs/development/tools/misc/igprof/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.9.16";
-  name = "igprof-${version}";
+  pname = "igprof";
 
   src = fetchFromGitHub {
     owner = "igprof";
diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index 8bc35ba01a6..b04de1832ab 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "inotify-tools-${version}";
+  pname = "inotify-tools";
   version = "3.20.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 281b09393b5..12197c2de40 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -3,7 +3,7 @@
 , procps, utilmacros, gtk-doc, openssl, peg }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gpu-tools-${version}";
+  pname = "intel-gpu-tools";
   version = "1.23";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index a9f451d31e7..c837728f72d 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, gettext, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "intltool-${version}";
+  pname = "intltool";
   version = "0.51.0";
 
   src = fetchurl {
-    url = "https://launchpad.net/intltool/trunk/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/intltool/trunk/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
   };
 
diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix
index b431e804d8d..8da3cd57703 100644
--- a/pkgs/development/tools/misc/kdbg/default.nix
+++ b/pkgs/development/tools/misc/kdbg/default.nix
@@ -3,10 +3,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "kdbg-${version}";
+  pname = "kdbg";
   version = "3.0.0";
   src = fetchurl {
-    url = "mirror://sourceforge/kdbg/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/kdbg/${version}/${pname}-${version}.tar.gz";
     sha256 = "0lxfal6jijdcrf0hc81gmapfmz0kq4569d5qzfm4p72rq9s4r5in";
   };
 
diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix
index 782bff68e34..ce88838cc73 100644
--- a/pkgs/development/tools/misc/kibana/5.x.nix
+++ b/pkgs/development/tools/misc/kibana/5.x.nix
@@ -16,11 +16,11 @@ let
     "x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll";
   };
 in stdenv.mkDerivation rec {
-  name = "kibana-${version}";
+  pname = "kibana";
   version = elk5Version;
 
   src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${elasticArch}.tar.gz";
+    url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${elasticArch}.tar.gz";
     sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
   };
 
diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix
index 240d52ca7d0..ace34f35059 100644
--- a/pkgs/development/tools/misc/loccount/default.nix
+++ b/pkgs/development/tools/misc/loccount/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoPackage, fetchFromGitLab }:
 buildGoPackage rec {
-  name = "loccount-${version}";
+  pname = "loccount";
   version = "1.2";
 
   goPackagePath = "gitlab.com/esr/loccount";
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 63003f338eb..d55dd65e5f1 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -3,7 +3,7 @@
 let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in
 
 stdenv.mkDerivation rec {
-  name = "lsof-${version}";
+  pname = "lsof";
   version = "4.91";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 42ca1a1b7d5..17837a54877 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "lttng-tools-${version}";
+  pname = "lttng-tools";
   version = "2.10.7";
 
   src = fetchurl {
-    url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
+    url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
     sha256 = "04hkga0hnyjmv42mxj3njaykqmq9x4abd5qfyds5r62x1khfnwgd";
   };
 
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index adc4bbd5c39..ad5276e5e1a 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -12,11 +12,11 @@
 # Debian builds with std.h (systemtap).
 
 stdenv.mkDerivation rec {
-  name = "lttng-ust-${version}";
+  pname = "lttng-ust";
   version = "2.10.4";
 
   src = fetchurl {
-    url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
+    url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2";
     sha256 = "0rx9q5r9qcdx3i9i0rx28p33yl52sd6f35qj7qs4li2w42xv9mbm";
   };
 
diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix
index ebe62452440..ce62634e7d7 100644
--- a/pkgs/development/tools/misc/macdylibbundler/default.nix
+++ b/pkgs/development/tools/misc/macdylibbundler/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "macdylibbundler-${version}";
+  pname = "macdylibbundler";
   version = "20180825";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix
index 23b7119e7d7..7cbd9246081 100644
--- a/pkgs/development/tools/misc/md2man/default.nix
+++ b/pkgs/development/tools/misc/md2man/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "go-md2man-${version}";
+  pname = "go-md2man";
   version = "1.0.6";
 
   goPackagePath = "github.com/cpuguy83/go-md2man";
diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix
index c45e7841d45..a5e4572d18d 100644
--- a/pkgs/development/tools/misc/moby/default.nix
+++ b/pkgs/development/tools/misc/moby/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "moby-${version}";
+  pname = "moby";
   version = "2017-07-06";
   rev = "d87a3f9990ed24ebbb51695879cd640cb07a4b40";
 
diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix
index a449c28ea28..dea6256824d 100644
--- a/pkgs/development/tools/misc/objconv/default.nix
+++ b/pkgs/development/tools/misc/objconv/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "objconv-${version}";
+  pname = "objconv";
   version = "2.51";
 
   src = fetchurl {
     # Versioned archive of objconv sources maintained by orivej.
-    url = "https://archive.org/download/objconv/${name}.zip";
+    url = "https://archive.org/download/objconv/${pname}-${version}.zip";
     sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs";
   };
 
diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix
index 874aa04157d..21e825ac0bf 100644
--- a/pkgs/development/tools/misc/opengrok/default.nix
+++ b/pkgs/development/tools/misc/opengrok/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "opengrok-${version}";
+  pname = "opengrok";
   version = "1.0";
 
   # binary distribution
   src = fetchurl {
-    url = "https://github.com/oracle/opengrok/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0h4rwfh8m41b7ij931gcbmkihri25m48373qf6ig0714s66xwc4i";
   };
 
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 7141fdcee7e..d85a05ca245 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }:
 
 stdenv.mkDerivation rec {
-  name = "openocd-${version}";
+  pname = "openocd";
   version = "0.10.0";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 29d713a9af4..c673bd26109 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-${version}";
+  pname = "patchelf";
   version = "0.10-pre-20190328";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix
index fbb21a8b7c6..0b91953a7c7 100644
--- a/pkgs/development/tools/misc/pmccabe/default.nix
+++ b/pkgs/development/tools/misc/pmccabe/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pmccabe-${version}";
+  pname = "pmccabe";
   version = "2.6";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix
index 8ceb3d4a436..d9d28580210 100644
--- a/pkgs/development/tools/misc/premake/5.nix
+++ b/pkgs/development/tools/misc/premake/5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "premake5-${version}";
+  pname = "premake5";
   version = "5.0.0-alpha12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
index 8f27609abab..7182144fd20 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -15,7 +15,7 @@
 , }:
 
 stdenv.mkDerivation rec {
-  name = "pwndbg-${version}";
+  pname = "pwndbg";
   version = "2019.01.25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
index 19e4423f7d8..0519e4d05e0 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -27,7 +27,6 @@ assert stdenv.hostPlatform.system == "x86_64-linux";
 stdenv.mkDerivation rec {
   pname = "saleae-logic";
   version = "1.2.18";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     name = "saleae-logic-${version}-64bit.zip";
diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix
index a506831cd8e..004975f10d8 100644
--- a/pkgs/development/tools/misc/sipp/default.nix
+++ b/pkgs/development/tools/misc/sipp/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "3.5.1";
 
-  name = "sipp-${version}";
+  pname = "sipp";
 
   src = fetchFromGitHub {
     owner = "SIPp";
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index acdc712786f..c809437f6fb 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, libunwind, buildPackages }:
 
 stdenv.mkDerivation rec {
-  name = "strace-${version}";
+  pname = "strace";
   version = "5.2";
 
   src = fetchurl {
-    url = "https://strace.io/files/${version}/${name}.tar.xz";
+    url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
     sha256 = "1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym";
   };
 
diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix
index b50aa088ac5..9872c91ac4b 100644
--- a/pkgs/development/tools/misc/tcptrack/default.nix
+++ b/pkgs/development/tools/misc/tcptrack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "tcptrack-${version}";
+  pname = "tcptrack";
   version = "1.4.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix
index 77b362c712c..29d809b5f05 100644
--- a/pkgs/development/tools/misc/tet/default.nix
+++ b/pkgs/development/tools/misc/tet/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation (rec {
   version = "3.8";
-  name = "tet-${version}";
+  pname = "tet";
 
   src = fetchurl {
     url = http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz ;
diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix
index 63e5bea19d7..5f4478bd4fb 100644
--- a/pkgs/development/tools/misc/texinfo/4.13a.nix
+++ b/pkgs/development/tools/misc/texinfo/4.13a.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, texinfo, ncurses, lzma }:
 
 stdenv.mkDerivation rec {
-  name = "texinfo-${version}";
+  pname = "texinfo";
   version = "4.13a";
 
   src = fetchurl {
-    url = "mirror://gnu/texinfo/${name}.tar.lzma";
+    url = "mirror://gnu/texinfo/${pname}-${version}.tar.lzma";
     sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
   };
 
diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix
index c380243a898..5e40152df8d 100644
--- a/pkgs/development/tools/misc/tie/default.nix
+++ b/pkgs/development/tools/misc/tie/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tie-${version}";
+  pname = "tie";
   version = "2.4";
 
   src = fetchurl {
-    url = "http://mirrors.ctan.org/web/tie/${name}.tar.gz";
+    url = "http://mirrors.ctan.org/web/tie/${pname}-${version}.tar.gz";
     sha256 = "1m5952kdfffiz33p1jw0wv7dh272mmw28mpxw9v7lkb352zv4xsj";
   };
 
diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix
index 11caf8e7b20..65a17fd1242 100644
--- a/pkgs/development/tools/misc/trv/default.nix
+++ b/pkgs/development/tools/misc/trv/default.nix
@@ -6,7 +6,7 @@
 assert stdenv.lib.versionOlder "4.02" ocaml.version;
 
 stdenv.mkDerivation rec {
-  name = "trv-${version}";
+  pname = "trv";
   version = "0.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index ebc85c19b39..68409a59f37 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "universal-ctags-${version}";
+  pname = "universal-ctags";
   version = "unstable-2019-07-30";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix
index 0fa854f9b2a..fb43ff61a81 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/data.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, tcl, usb-modeswitch }:
 
 stdenv.mkDerivation rec {
-  name = "usb-modeswitch-data-${version}";
+  pname = "usb-modeswitch-data";
   version = "20170806";
 
   src = fetchurl {
-    url    = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
+    url    = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2";
     sha256 = "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff";
   };
 
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
index d34a94e0467..7c119c92943 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "usb-modeswitch-${version}";
+  pname = "usb-modeswitch";
   version = "2.5.2";
 
   src = fetchurl {
-    url    = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
+    url    = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2";
     sha256 = "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb";
   };
 
diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix
index e806a779638..2b6e349b9fd 100644
--- a/pkgs/development/tools/misc/vtable-dumper/default.nix
+++ b/pkgs/development/tools/misc/vtable-dumper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libelf }:
 
 stdenv.mkDerivation rec {
-  name = "vtable-dumper-${version}";
+  pname = "vtable-dumper";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix
index d6b8eb5b95f..e2ea96cd590 100644
--- a/pkgs/development/tools/misc/watson-ruby/default.nix
+++ b/pkgs/development/tools/misc/watson-ruby/default.nix
@@ -2,7 +2,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "watson-ruby-${version}";
+  pname = "watson-ruby";
   version = (import ./gemset.nix).watson-ruby.version;
 
   env = bundlerEnv rec {
diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix
index 8f3f6c1b22a..6edf6551b06 100644
--- a/pkgs/development/tools/misc/xc3sprog/default.nix
+++ b/pkgs/development/tools/misc/xc3sprog/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "787";
-  name = "xc3sprog-${version}";
+  pname = "xc3sprog";
 
   src = fetchsvn rec {
     url = "https://svn.code.sf.net/p/xc3sprog/code/trunk";
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 2e67da18ae9..b409009b524 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ycmd-${version}";
+  pname = "ycmd";
   version = "2018-09-20";
 
   src = fetchgit {
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 76130f255fd..5520a4a30be 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, perl, icmake, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "yodl-${version}";
+  pname = "yodl";
   version = "4.02.01";
 
   nativeBuildInputs = [ icmake ];
diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix
index 6390c1d7fd2..60e948d593f 100644
--- a/pkgs/development/tools/mod/default.nix
+++ b/pkgs/development/tools/mod/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name = "mod-${version}";
+  pname = "mod";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix
index 2b5f42b2cbe..1d7784ae1cc 100644
--- a/pkgs/development/tools/msgpack-tools/default.nix
+++ b/pkgs/development/tools/msgpack-tools/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, unzip }:
 stdenv.mkDerivation rec {
-  name = "msgpack-tools-${version}";
+  pname = "msgpack-tools";
   version = "0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix
index 0b060624de3..41e74bc120f 100644
--- a/pkgs/development/tools/mustache-go/default.nix
+++ b/pkgs/development/tools/mustache-go/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mustache-go-${version}";
+  pname = "mustache-go";
   version = "1.0.1";
 
   goPackagePath = "github.com/cbroglie/mustache";
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index 57beec8f171..e052b724439 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -20,7 +20,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "nwjs-${version}";
+  pname = "nwjs";
   version = "0.12.3";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix
index 234f5a5bfae..081e86c44dd 100644
--- a/pkgs/development/tools/nrpl/default.nix
+++ b/pkgs/development/tools/nrpl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }:
 
 stdenv.mkDerivation rec {
-  name = "nrpl-${version}";
+  pname = "nrpl";
   version = "20150522";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix
index 7117d7dd628..0539e8de92b 100644
--- a/pkgs/development/tools/nsis/default.nix
+++ b/pkgs/development/tools/nsis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchzip, scons, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "nsis-${version}";
+  pname = "nsis";
   version = "3.04";
 
   src =
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 96516bfda48..30f531d7db2 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -32,7 +32,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "nwjs-${version}";
+  pname = "nwjs";
   version = "0.33.4";
 
   src = if sdk then fetchurl {
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index a83959fba39..4a4203a2f59 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -26,7 +26,7 @@ let param = {
 in
 
 stdenv.mkDerivation rec {
-  name = "camlp4-${version}";
+  pname = "camlp4";
   inherit (param) version;
 
   src = fetchzip {
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 91870a570b0..fb1eb4276d6 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-findlib-${version}";
+  pname = "ocaml-findlib";
   version = "1.8.1";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
index 1307635abb9..90e88979de4 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-${version}"; 
+	pname = "js_of_ocaml"; 
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
index ff59fa7cf8a..e9e7f9d279e 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
 	version = "3.2.1";
-	name = "js_of_ocaml-camlp4-${version}"; 
+	pname = "js_of_ocaml-camlp4"; 
 
 	src = fetchFromGitHub {
 		owner = "ocsigen";
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index c5a345f505b..c1526892312 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -7,7 +7,7 @@ then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-compiler-${version}";
+	pname = "js_of_ocaml-compiler";
 	version = "3.3.0";
 
 	src = fetchFromGitHub {
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index e7a31c1ce2e..65afee16afb 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-lwt-${version}"; 
+	pname = "js_of_ocaml-lwt"; 
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
index bf33b4e59e5..4b2b14d317b 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-ocamlbuild-${version}"; 
+	pname = "js_of_ocaml-ocamlbuild"; 
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
index 0649aee162a..277973afba8 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-ppx-${version}"; 
+	pname = "js_of_ocaml-ppx"; 
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
index ddea73b3c76..5b5f7d18f79 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-ppx_deriving_json-${version}";
+	pname = "js_of_ocaml-ppx_deriving_json";
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
index 1ba9ddd0ab7..c24162cccf7 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-tyxml-${version}";
+	pname = "js_of_ocaml-tyxml";
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 2364058729e..90b092f0e4b 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.10";
-  name = "ocaml-oasis-${version}";
+  pname = "ocaml-oasis";
 
   # You must manually update the url, not just the version. OCamlforge keys off
   # the number after download.php, not the filename.
diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix
index 87d592bd112..e7528d4f772 100644
--- a/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-	name = "obelisk-${version}";
+	pname = "obelisk";
 	version = "0.4.0";
 	src = fetchFromGitHub {
 		owner = "lelio-brun";
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 74dee630d29..dbf33424439 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
 
 stdenv.mkDerivation rec {
-  name = "ocamlmod-${version}";
+  pname = "ocamlmod";
   version = "0.0.9";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
index f91ae713200..09ab9587ddb 100644
--- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
+++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec
 {
   pname = "ocsigen-i18n";
-  name = "${pname}-${version}";
   version = "3.4.0";
 
   buildInputs = with ocamlPackages; [ ocaml findlib ];
diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index 0f536c489eb..da7a5b439ab 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "omake-${version}";
+  pname = "omake";
   version = "0.10.3";
 
   src = fetchurl {
-    url = "http://download.camlcity.org/download/${name}.tar.gz";
+    url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz";
     sha256 = "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz";
   };
 
diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix
index fa5393c1871..a49749ad716 100644
--- a/pkgs/development/tools/ocaml/opaline/default.nix
+++ b/pkgs/development/tools/ocaml/opaline/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.2";
-  name = "opaline-${version}";
+  pname = "opaline";
 
   src = fetchFromGitHub {
     owner = "jaapb";
diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix
index ddd8d4b9920..87490bcb617 100644
--- a/pkgs/development/tools/ocaml/opam/1.2.2.nix
+++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -44,7 +44,7 @@ let
     };
   };
 in stdenv.mkDerivation rec {
-  name = "opam-${version}";
+  pname = "opam";
   version = "1.2.2";
 
   buildInputs = [ unzip curl ncurses ocaml makeWrapper ];
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 452f162b235..763642e5da1 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -60,7 +60,7 @@ let
     };
   };
 in stdenv.mkDerivation rec {
-  name = "opam-${version}";
+  pname = "opam";
   version = "2.0.5";
 
   buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index d9e563952ea..1dcea0da4cb 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -8,7 +8,7 @@ else
 
 stdenv.mkDerivation rec {
   version = "2.3.0";
-  name = "utop-${version}";
+  pname = "utop";
 
   src = fetchurl {
     url = "https://github.com/diml/utop/archive/${version}.tar.gz";
diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index 725219c3d7c..f2915333427 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2 }:
 stdenv.mkDerivation rec {
 
-  name = "omniorb-${version}";
+  pname = "omniorb";
 
   version = "4.2.3";
 
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index 85f8955185f..784895845e5 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "omnisharp-roslyn-${version}";
+  pname = "omnisharp-roslyn";
   version = "1.32.19";
   
   src = fetchurl {
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 24a6404dc03..9e0da00dd52 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
-  name = "packer-${version}";
+  pname = "packer";
   version = "1.4.1";
 
   goPackagePath = "github.com/hashicorp/packer";
diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix
index 82849be40b2..54100dfdee9 100644
--- a/pkgs/development/tools/packet/default.nix
+++ b/pkgs/development/tools/packet/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "packet-${version}";
+  pname = "packet";
   version = "v2.2.2";
 
   goPackagePath = "github.com/ebsarr/packet";
diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix
index 616a2049c77..0f8ead579d0 100644
--- a/pkgs/development/tools/parse-cli-bin/default.nix
+++ b/pkgs/development/tools/parse-cli-bin/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "parse-cli-bin-${version}";
+  pname = "parse-cli-bin";
   version = "3.0.5";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix
index b53116b888e..9e86a29cf93 100644
--- a/pkgs/development/tools/parsing/antlr/3.4.nix
+++ b/pkgs/development/tools/parsing/antlr/3.4.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, jre}:
 
 stdenv.mkDerivation rec {
-  name = "antlr-${version}";
+  pname = "antlr";
   version = "3.4";
   src = fetchurl {
     url ="https://www.antlr3.org/download/antlr-${version}-complete.jar";
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index 9b3fd86b555..23ea39c6fa9 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "byacc-${version}";
+  pname = "byacc";
   version = "20190617";
 
   src = fetchurl {
     urls = [
-      "ftp://ftp.invisible-island.net/byacc/${name}.tgz"
-      "https://invisible-mirror.net/archives/byacc/${name}.tgz"
+      "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
+      "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
     ];
     sha256 = "13ai0az00c86s4k94cpgh48nf5dfccpvccpw635z42wjgcb6hy7q";
   };
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index d7d27ac9a1c..e46a494de76 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "flex-${version}";
+  pname = "flex";
   version = "2.6.4";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 681f90bbe5a..93f1d1ee649 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, bobcat, icmake, yodl }:
 
 stdenv.mkDerivation rec {
-  name = "flexc++-${version}";
+  pname = "flexc++";
   version = "2.05.00";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix
index bf5a2374fde..d41c113821a 100644
--- a/pkgs/development/tools/parsing/hammer/default.nix
+++ b/pkgs/development/tools/parsing/hammer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, glib, pkgconfig, python, scons }:
 
 stdenv.mkDerivation rec {
-  name = "hammer-${version}";
+  pname = "hammer";
   version = "e7aa734";
 
   src = fetchgit {
diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix
index 108576d0b11..aa7b63dafea 100644
--- a/pkgs/development/tools/parsing/lemon/default.nix
+++ b/pkgs/development/tools/parsing/lemon/default.nix
@@ -16,7 +16,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "lemon-${version}";
+  pname = "lemon";
   version = "1.69";
 
   phases = [ "buildPhase" "installPhase" ];
diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index 1d0545f6889..f6e35f08639 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "re2c-${version}";
+  pname = "re2c";
   version = "1.0.3";
 
   sourceRoot = "${src.name}/re2c";
diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix
index ce562bbf5ac..7953a55c7d9 100644
--- a/pkgs/development/tools/pet/default.nix
+++ b/pkgs/development/tools/pet/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name = "pet-${version}";
+  pname = "pet";
   version = "0.3.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix
index 6f26a48b9c4..e4b50f31776 100644
--- a/pkgs/development/tools/pew/default.nix
+++ b/pkgs/development/tools/pew/default.nix
@@ -1,6 +1,5 @@
 { stdenv, python3Packages }:
 with python3Packages; buildPythonApplication rec {
-    name = "${pname}-${version}";
     pname = "pew";
     version = "1.1.2";
 
diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix
index 47b426604da..8aaae2b1c43 100644
--- a/pkgs/development/tools/pgloader/default.nix
+++ b/pkgs/development/tools/pgloader/default.nix
@@ -2,7 +2,6 @@
 stdenv.mkDerivation rec {
   pname = "pgloader";
   version = "3.6.1";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/dimitri/pgloader/releases/download/v3.6.1/pgloader-bundle-3.6.1.tgz";
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index a37de2a3f62..29b8d4d5ae1 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -15,7 +15,7 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  name = "phantomjs-${version}";
+  pname = "phantomjs";
   version = "2.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix
index 8155f3016c3..b02ae3c544f 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1-7";
-  name = "EZTrace-${version}";
+  pname = "EZTrace";
 
   src = fetchurl {
     url = "https://gforge.inria.fr/frs/download.php/file/37155/eztrace-${version}.tar.gz";
diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index 5ff0d2ca2b1..5aaf3d436de 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "heaptrack-${version}";
+  pname = "heaptrack";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix
index 9130f31f21d..120fd89377b 100644
--- a/pkgs/development/tools/profiling/pprof/default.nix
+++ b/pkgs/development/tools/profiling/pprof/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "pprof-unstable-${version}";
+  pname = "pprof-unstable";
   version = "2018-08-15";
   rev = "781f11b1fcf71fae9d185e7189b5e686f575075a";
 
diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix
index 559383f45fe..6d6a02ab49f 100644
--- a/pkgs/development/tools/protoc-gen-doc/default.nix
+++ b/pkgs/development/tools/protoc-gen-doc/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name = "protoc-gen-doc-unstable-${version}";
+  pname = "protoc-gen-doc-unstable";
   version = "2019-04-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix
index 10a10fa21ef..13e8c233ec3 100644
--- a/pkgs/development/tools/pup/default.nix
+++ b/pkgs/development/tools/pup/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "pup-${version}";
+  pname = "pup";
   version = "0.4.0";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix
index 9292d124545..16bb654aa6b 100644
--- a/pkgs/development/tools/quicktemplate/default.nix
+++ b/pkgs/development/tools/quicktemplate/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "quicktemplate-unstable-${version}";
+  pname = "quicktemplate-unstable";
   version = "2019-01-31";
   goPackagePath = "github.com/valyala/quicktemplate";
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix
index a5683e7a953..a2ab9a47a79 100644
--- a/pkgs/development/tools/rdocker/default.nix
+++ b/pkgs/development/tools/rdocker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, openssh }:
 
 stdenv.mkDerivation rec {
-  name = "rdocker-${version}";
+  pname = "rdocker";
   version = "unstable-2018-07-17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index 939febae693..dfa31b30a7e 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -37,7 +37,7 @@ let
     xorg.libXScrnSaver
   ];
 in stdenv.mkDerivation rec {
-  name = "react-native-debugger-${version}";
+  pname = "react-native-debugger";
   version = "0.9.10";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix
index 3e69b4ffa07..b82c0694fec 100644
--- a/pkgs/development/tools/reflex/default.nix
+++ b/pkgs/development/tools/reflex/default.nix
@@ -2,7 +2,7 @@
 
 
 buildGoPackage rec {
-  name = "reflex-${version}";
+  pname = "reflex";
   version = "0.2.0";
 
   goPackagePath = "github.com/cespare/reflex";
diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix
index 6ef724022e8..2d5346f2112 100644
--- a/pkgs/development/tools/reftools/default.nix
+++ b/pkgs/development/tools/reftools/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "reftools-unstable-${version}";
+  pname = "reftools-unstable";
   version = "2018-09-14";
   rev = "654d0ba4f96d62286ca33cd46f7674b84f76d399";
 
diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix
index 35aab138292..80c64a65083 100644
--- a/pkgs/development/tools/reno/default.nix
+++ b/pkgs/development/tools/reno/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pythonPackages }:
 
 with pythonPackages; buildPythonApplication rec {
-  name = "reno-${version}";
+  pname = "reno";
   version = "2.3.2";
 
   src = fetchurl {
-    url = "mirror://pypi/r/reno/${name}.tar.gz";
+    url = "mirror://pypi/r/reno/${pname}-${version}.tar.gz";
     sha256 = "018vl9fj706jjf07xdx8q6761s53mrihjn69yjq09gp0vmp1g7i4";
   };
 
diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
index ffd9774ee44..44654e052d1 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre_headless, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "nexus-${version}";
+  pname = "nexus";
   version = "3.16.1-02";
 
   src = fetchurl {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0nfcpsb7byykiwrdz01c99a6hr5ww2d4471spzpgs9i64kbjj7ln";
   };
 
-  sourceRoot = name;
+  sourceRoot = "${pname}-${version}";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix
index aa537df1508..507402deed6 100644
--- a/pkgs/development/tools/richgo/default.nix
+++ b/pkgs/development/tools/richgo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "richgo-${version}";
+  pname = "richgo";
   version = "0.2.8";
   goPackagePath = "github.com/kyoh86/richgo";
 
diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix
index 499cec2e6a7..51801864796 100644
--- a/pkgs/development/tools/ronn/default.nix
+++ b/pkgs/development/tools/ronn/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, groff }:
 
 stdenv.mkDerivation rec {
-  name = "ronn-${version}";
+  pname = "ronn";
   version = env.gems.ronn.version;
 
   env = bundlerEnv rec {
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index da3b27ebacc..3a9ecb7697a 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "rtags-${version}";
+  pname = "rtags";
   version = "2.16";
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix
index 09008c9d63d..12b00ce93f3 100644
--- a/pkgs/development/tools/rucksack/default.nix
+++ b/pkgs/development/tools/rucksack/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.1.0";
-  name = "rucksack-${version}";
+  pname = "rucksack";
 
   src = fetchFromGitHub {
     owner = "andrewrk";
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index c6b3d0b4cd0..4cd8b328353 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "sauce-connect-${version}";
+  pname = "sauce-connect";
   version = "4.5.4";
 
   src = fetchurl (
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index f9128582092..5937b00f459 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -27,7 +27,7 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  name = "chromedriver-${version}";
+  pname = "chromedriver";
   version = "76.0.3809.68";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix
index a8085399b3d..3f4b8a22d64 100644
--- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix
+++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "htmlunit-driver-standalone-${version}";
+  pname = "htmlunit-driver-standalone";
   version = "2.27";
 
   src = fetchurl {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   dontUnpack = true;
 
-  installPhase = "install -D $src $out/share/lib/${name}/${name}.jar";
+  installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar";
 
   meta = {
     homepage = https://github.com/SeleniumHQ/htmlunit-driver;
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index 61b74ce108d..d3a8efaadb6 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -8,7 +8,7 @@ let
   patchVersion = "0";
 
 in stdenv.mkDerivation rec {
-  name = "selenium-server-standalone-${version}";
+  pname = "selenium-server-standalone";
   version = "${minorVersion}.${patchVersion}";
 
   src = fetchurl {
@@ -21,10 +21,10 @@ in stdenv.mkDerivation rec {
   buildInputs = [ jre makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/share/lib/${name}
-    cp $src $out/share/lib/${name}/${name}.jar
+    mkdir -p $out/share/lib/${pname}-${version}
+    cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar
     makeWrapper ${jre}/bin/java $out/bin/selenium-server \
-      --add-flags "-cp $out/share/lib/${name}/${name}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \
+      --add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \
       --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \
       --add-flags "org.openqa.grid.selenium.GridLauncherV3"
   '';
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index 04076a8f0cf..71f488c760a 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -4,7 +4,7 @@
 , GLUT }:
 
 stdenv.mkDerivation rec {
-  name = "simavr-${version}";
+  pname = "simavr";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index d5a6f3915f2..92199094f5d 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "skaffold-${version}";
+  pname = "skaffold";
   version = "0.30.0";
   # rev is the 0.30.0 commit, mainly for skaffold version command output
   rev = "fe31429012110e6fd70f97971288bd266ba95bed";
diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix
index 35ba9f8c006..c60238b93d2 100644
--- a/pkgs/development/tools/solarus-quest-editor/default.nix
+++ b/pkgs/development/tools/solarus-quest-editor/default.nix
@@ -4,7 +4,7 @@
   qtbase, qttools, glm }:
 
 stdenv.mkDerivation rec {
-  name = "solarus-quest-editor-${version}";
+  pname = "solarus-quest-editor";
   version = "1.6.0";
     
   src = fetchFromGitLab {
diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix
index f2f50c18e0b..d84322bb547 100644
--- a/pkgs/development/tools/sourcetrail/default.nix
+++ b/pkgs/development/tools/sourcetrail/default.nix
@@ -2,7 +2,7 @@
 , zlib, expat, dbus, openssl, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "sourcetrail-${version}";
+  pname = "sourcetrail";
   version = "2019.2.39";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index c9df2703daa..b44eaaf2d7d 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -6,7 +6,7 @@ in
 
 assert version == spirv-headers.version;
 stdenv.mkDerivation rec {
-  name = "spirv-tools-${version}";
+  pname = "spirv-tools";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix
index 4acfa4a2b0e..52c33f3e444 100644
--- a/pkgs/development/tools/sqsh/default.nix
+++ b/pkgs/development/tools/sqsh/default.nix
@@ -4,11 +4,11 @@ let
   mainVersion = "2.5";
 
 in stdenv.mkDerivation rec {
-  name = "sqsh-${version}";
+  pname = "sqsh";
   version = "${mainVersion}.16.1";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${name}.tgz";
+    url    = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${pname}-${version}.tgz";
     sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n";
   };
 
diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix
index 21068a8b05f..f1a1ceb9bb1 100644
--- a/pkgs/development/tools/stagit/default.nix
+++ b/pkgs/development/tools/stagit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, libgit2, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "stagit-${version}";
+  pname = "stagit";
   version = "0.9.1";
 
   src = fetchgit {
diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix
index 0ad7d7f78d4..c005ebeee78 100644
--- a/pkgs/development/tools/statik/default.nix
+++ b/pkgs/development/tools/statik/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "statik-unstable-${version}";
+  pname = "statik-unstable";
   version = "2018-11-28";
   goPackagePath = "github.com/rakyll/statik";
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
index a3499258a99..cc865e2bd52 100644
--- a/pkgs/development/tools/textql/default.nix
+++ b/pkgs/development/tools/textql/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, sqlite }:
 
 buildGoPackage rec {
-  name = "textql-${version}";
+  pname = "textql";
   version = "2.0.3";
 
   goPackagePath = "github.com/dinedal/textql";
diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix
index f07451ae840..50c34dc39ed 100644
--- a/pkgs/development/tools/thrust/default.nix
+++ b/pkgs/development/tools/thrust/default.nix
@@ -14,7 +14,7 @@ let
     ];
   };
 in stdenv.mkDerivation rec {
-  name = "thrust-${version}";
+  pname = "thrust";
   version = "0.7.6";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix
index 90d36c71caa..df6279b5a4c 100644
--- a/pkgs/development/tools/toluapp/default.nix
+++ b/pkgs/development/tools/toluapp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.93";
-  name = "toluapp-${version}";
+  pname = "toluapp";
 
   src = fetchFromGitHub {
     owner = "LuaDist";
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 2bbe2cfe16d..7f35d3c438d 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -5,7 +5,7 @@ let
   qscintillaLib = (qscintilla.override { withQt5 = true; });
 
 in mkDerivation rec {
-  name = "tora-${version}";
+  pname = "tora";
   version = "3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix
index 565ec7904f1..a5c13e2266e 100644
--- a/pkgs/development/tools/toxiproxy/default.nix
+++ b/pkgs/development/tools/toxiproxy/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "toxiproxy-${version}";
+  pname = "toxiproxy";
   version = "2.1.3";
   src = fetchFromGitHub {
     owner = "Shopify";
diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix
index a348e295933..565811b2048 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/pkgs/development/tools/trellis/default.nix
@@ -7,7 +7,7 @@ let
   boostWithPython3 = boost.override { python = python3; enablePython = true; };
 in
 stdenv.mkDerivation rec {
-  name = "trellis-${version}";
+  pname = "trellis";
   version = "2019.04.22";
 
   srcs = [
diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix
index 775e26eb6a8..01531d23c78 100644
--- a/pkgs/development/tools/tychus/default.nix
+++ b/pkgs/development/tools/tychus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }:
 
 buildGoPackage rec {
-  name = "tychus-${version}";
+  pname = "tychus";
   version = "0.6.3";
 
   goPackagePath = "github.com/devlocker/tychus";
diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix
index f62cd1aabb1..796d3509c1c 100644
--- a/pkgs/development/tools/uftrace/default.nix
+++ b/pkgs/development/tools/uftrace/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub}:
 
 stdenv.mkDerivation rec {
-  name = "uftrace-${version}";
+  pname = "uftrace";
   version = "0.9.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix
index 1e81c5b9f86..a6c087d7be7 100644
--- a/pkgs/development/tools/unconvert/default.nix
+++ b/pkgs/development/tools/unconvert/default.nix
@@ -5,7 +5,7 @@
 }:
 
 buildGoPackage rec {
-  name = "unconvert-unstable-${version}";
+  pname = "unconvert-unstable";
   version = "2018-07-03";
   rev = "1a9a0a0a3594e9363e49545fb6a4e24ac4c68b7b";
 
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 54ace72c5fb..0ca7e37ef70 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -23,7 +23,7 @@ let
   build = "f2";
 
 in stdenv.mkDerivation rec {
-  name = "unity-editor-${version}";
+  pname = "unity-editor";
   version = "${ver}x${build}";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index ebeb81c90ec..71c47a7394b 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}:
 stdenv.mkDerivation rec {
   version = "0.36.2";
-  name = "valadoc-${version}";
+  pname = "valadoc";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h";
   };
 
diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index f6c160de65c..8f3bc560905 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -4,7 +4,6 @@
 with python3Packages;
 
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "vcstool";
   version = "0.1.36";
 
diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix
index 9601771f75f..e8173a6b5b0 100644
--- a/pkgs/development/tools/vgo2nix/default.nix
+++ b/pkgs/development/tools/vgo2nix/default.nix
@@ -8,7 +8,7 @@
 }:
 
 buildGoPackage rec {
-  name = "vgo2nix-${version}";
+  pname = "vgo2nix";
   version = "unstable-2019-02-06";
   goPackagePath = "github.com/adisbladis/vgo2nix";
 
diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix
index 3e8a228bacf..27296edfac0 100644
--- a/pkgs/development/tools/vim-vint/default.nix
+++ b/pkgs/development/tools/vim-vint/default.nix
@@ -3,7 +3,7 @@
 with python3Packages;
 
 buildPythonApplication rec {
-  name = "vim-vint-${version}";
+  pname = "vim-vint";
   version = "0.3.20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix
index 42cf6f07f4d..197f48dbbfb 100644
--- a/pkgs/development/tools/vndr/default.nix
+++ b/pkgs/development/tools/vndr/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "vndr-unstable-${version}";
+  pname = "vndr-unstable";
   version = "2018-06-23";
   rev = "81cb8916aad3c8d06193f008dba3e16f82851f52";
 
diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
index e87ba2b52c1..b0768ca4b7e 100644
--- a/pkgs/development/tools/vogl/default.nix
+++ b/pkgs/development/tools/vogl/default.nix
@@ -8,7 +8,7 @@
 }:
 
 mkDerivation rec {
-  name = "vogl-${version}";
+  pname = "vogl";
   version = "2016-05-13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index 3c189d09f1c..984dbc1ee44 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -2,7 +2,7 @@
 , vulkan-headers, vulkan-loader, glslang
 , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
 stdenv.mkDerivation rec {
-  name = "vulkan-validation-layers-${version}";
+  pname = "vulkan-validation-layers";
   version = "1.1.106.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json!
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix
index 8e17c531547..7cc8ce6fe13 100644
--- a/pkgs/development/tools/vultr/default.nix
+++ b/pkgs/development/tools/vultr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "vultr-${version}";
+  pname = "vultr";
   version = "1.15.0";
   goPackagePath = "github.com/JamesClonk/vultr";
 
diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index e9ced0e753a..f8936e27516 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "wabt-${version}";
+  pname = "wabt";
   version = "1.0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index 4a056db6c0c..3a58e1088ea 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "watchman-${version}";
+  pname = "watchman";
   version = "4.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix
index aaf1b20ea6f..8db830b3284 100644
--- a/pkgs/development/tools/wiiload/default.nix
+++ b/pkgs/development/tools/wiiload/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, zlib }:
 stdenv.mkDerivation rec {
   version = "v0.5.1";
-  name = "wiiload-${version}";
+  pname = "wiiload";
 
   nativeBuildInputs = [ autoconf automake ];
   buildInputs = [ zlib ];
diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix
index 17c64f0548b..da1b493b0d2 100644
--- a/pkgs/development/tools/ws/default.nix
+++ b/pkgs/development/tools/ws/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "ws-${version}";
+  pname = "ws";
   version = "0.2.1";
   rev = "e9404cb37e339333088b36f6a7909ff3be76931d";
 
diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 29717d75394..0874c9e5515 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -16,7 +16,7 @@ let
     sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w";
   };
 in stdenv.mkDerivation rec {
-  name    = "xcbuild-${version}";
+  pname = "xcbuild";
 
   # Once a version is released that includes
   # https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710,
diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix
index c163c4cbcf6..44a7254a3d7 100644
--- a/pkgs/development/tools/xqilla/default.nix
+++ b/pkgs/development/tools/xqilla/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, xercesc }:
 
 stdenv.mkDerivation rec {
-  name    = "xqilla-${version}";
+  pname = "xqilla";
   version = "2.3.4";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix
index 1a8d7f13aff..ece440c692f 100644
--- a/pkgs/development/tools/yaml2json/default.nix
+++ b/pkgs/development/tools/yaml2json/default.nix
@@ -2,7 +2,7 @@
 
 
 buildGoPackage rec {
-  name = "yaml2json-${version}";
+  pname = "yaml2json";
   version = "unstable-2017-05-03";
   goPackagePath = "github.com/bronze1man/yaml2json";
 
diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix
index 3520bcfc1b1..a2076668f60 100644
--- a/pkgs/development/tools/yj/default.nix
+++ b/pkgs/development/tools/yj/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
-  name = "yj-${version}";
+  pname = "yj";
   version = "4.0.0";
   rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558";
 
diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix
index c157ddd65a8..82fac9f6be7 100644
--- a/pkgs/development/tools/yuicompressor/default.nix
+++ b/pkgs/development/tools/yuicompressor/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "yuicompressor-${version}";
+  pname = "yuicompressor";
   version = "2.4.8";
   
   src = fetchurl {
-    url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar";
+    url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar";
     sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
   };
 
diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix
index 4159e369049..4db0da4f418 100644
--- a/pkgs/development/web/csslint/default.nix
+++ b/pkgs/development/web/csslint/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.10.0";
-  name = "csslint-${version}";
+  pname = "csslint";
 
   src = fetchurl {
-    url = "https://registry.npmjs.org/csslint/-/${name}.tgz";
+    url = "https://registry.npmjs.org/csslint/-/${pname}-${version}.tgz";
     sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid";
   };
 
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 24f56789198..5427f66478f 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -10,7 +10,7 @@ let
     ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);
 in
 stdenv.mkDerivation rec {
-  name = "grails-${version}";
+  pname = "grails";
   version = "4.0.0";
 
   src = fetchurl {
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 26cec8f3730..81417f6287b 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -17,7 +17,7 @@ let
     stdenv.cc.cc
   ];
 in stdenv.mkDerivation rec {
-  name = "insomnia-${version}";
+  pname = "insomnia";
   version = "6.5.3";
 
   src = fetchurl {
diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix
index 485c4026afa..ec1ec527c5e 100644
--- a/pkgs/development/web/kcgi/default.nix
+++ b/pkgs/development/web/kcgi/default.nix
@@ -4,7 +4,6 @@ stdenv.mkDerivation rec {
   pname = "kcgi";
   version = "0.10.8";
   underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "kristapsdz";
diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix
index 91b4fe15e5a..eb3254dcd3a 100644
--- a/pkgs/development/web/now-cli/default.nix
+++ b/pkgs/development/web/now-cli/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "now-cli-${version}";
+  pname = "now-cli";
   version = "15.8.7";
 
   # TODO: switch to building from source, if possible
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 58b0f0e876f..1767eaab8bc 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "postman-${version}";
+  pname = "postman";
   version = "7.0.7";
 
   src = fetchurl {
     url = "https://dl.pstmn.io/download/version/${version}/linux64";
     sha256 = "47be1b955759520f3a2c7dcdecb85b4c52c38df717da294ba184f46f2058014a";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix
index 22404481f35..f27f143df04 100644
--- a/pkgs/development/web/remarkjs/default.nix
+++ b/pkgs/development/web/remarkjs/default.nix
@@ -17,7 +17,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "remarkjs-${version}";
+  pname = "remarkjs";
 
   version = "0.7.0";
 
diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix
index 266217d94e2..a625a815603 100644
--- a/pkgs/development/web/valum/default.nix
+++ b/pkgs/development/web/valum/default.nix
@@ -2,7 +2,7 @@
 , libgee, libsoup, fcgi }:
 
 stdenv.mkDerivation rec {
-  name = "valum-${version}";
+  pname = "valum";
   version = "0.3.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix
index bda6dab14d8..b77184e5652 100644
--- a/pkgs/development/web/woff2/default.nix
+++ b/pkgs/development/web/woff2/default.nix
@@ -1,7 +1,7 @@
 { brotli, cmake, fetchFromGitHub, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "woff2-${version}";
+  pname = "woff2";
   version = "1.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix
index f0966357d93..b9b0ccf7272 100644
--- a/pkgs/development/web/xmlindent/default.nix
+++ b/pkgs/development/web/xmlindent/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex }:
 
 stdenv.mkDerivation rec {
-  name = "xmlindent-${version}";
+  pname = "xmlindent";
   version = "0.2.17";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${pname}-${version}.tar.gz";
     sha256 = "0k15rxh51a5r4bvfm6c4syxls8al96cx60a9mn6pn24nns3nh3rs";
   };
 
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 2cfddd1066b..eeedae92440 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zeroad-unwrapped }:
 
 stdenv.mkDerivation rec {
-  name = "0ad-data-${version}";
+  pname = "0ad-data";
   inherit (zeroad-unwrapped) version;
 
   src = fetchurl {
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 74bc52875d2..ef285f8cb93 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -9,7 +9,7 @@
 assert withEditor -> wxGTK != null;
 
 stdenv.mkDerivation rec {
-  name = "0ad-${version}";
+  pname = "0ad";
   version = "0.0.23b";
 
   src = fetchurl {
diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix
index 5d91bc04114..446252062fa 100644
--- a/pkgs/games/2048-in-terminal/default.nix
+++ b/pkgs/games/2048-in-terminal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "2048-in-terminal-${version}";
+  pname = "2048-in-terminal";
   version = "2017-11-29";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix
index 02ea6f68806..19d2a01b472 100644
--- a/pkgs/games/airstrike/default.nix
+++ b/pkgs/games/airstrike/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, SDL, SDL_image }:
 
 stdenv.mkDerivation rec {
-  name = "airstrike-pre-${version}";
+  pname = "airstrike-pre";
   version = "6a";
 
   src = fetchurl {
diff --git a/pkgs/games/amoeba/data.nix b/pkgs/games/amoeba/data.nix
index b5c7f4b730b..fcde2d591f1 100644
--- a/pkgs/games/amoeba/data.nix
+++ b/pkgs/games/amoeba/data.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "amoeba-data-${version}";
+  pname = "amoeba-data";
   version = "1.1";
 
   src = fetchurl {
diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix
index 4bdfc87d8da..3b0693705b7 100644
--- a/pkgs/games/angband/default.nix
+++ b/pkgs/games/angband/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.1.3";
-  name = "angband-${version}";
+  pname = "angband";
 
   src = fetchFromGitHub {
     owner = "angband";
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index a8e9063a35f..5b1f240e7b5 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -10,7 +10,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "arx-libertatis-${version}";
+  pname = "arx-libertatis";
   version = "2019-02-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix
index b2c86222f2b..37593d3bd72 100644
--- a/pkgs/games/astromenace/default.nix
+++ b/pkgs/games/astromenace/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.2";
-  name = "astromenace-${version}";
+  pname = "astromenace";
 
   src = fetchurl {
     url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2";
diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix
index de9eb9bbb58..b11a177e045 100644
--- a/pkgs/games/atanks/default.nix
+++ b/pkgs/games/atanks/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, allegro }:
 
 stdenv.mkDerivation rec {
-  name = "atanks-${version}";
+  pname = "atanks";
   version = "6.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/atanks/atanks/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/atanks/atanks/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "0bijsbd51j4wsnmdxj54r92m7h8zqnvh9z3qqdig6zx7a8kjn61j";
   };
 
diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix
index 27ddec616bc..85b6fcefdd2 100644
--- a/pkgs/games/bastet/default.nix
+++ b/pkgs/games/bastet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, ncurses, boost }:
 
 stdenv.mkDerivation rec {
-  name = "bastet-${version}";
+  pname = "bastet";
   version = "0.43.2";
   buildInputs = [ ncurses boost ];
 
diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index af1228108d8..d3eb2348a0d 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, unzip}:
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "blobby-volley-${version}";
+  pname = "blobby-volley";
 
   src = fetchurl {
     url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz";
diff --git a/pkgs/games/braincurses/default.nix b/pkgs/games/braincurses/default.nix
index 808d7e37807..deb542e3a86 100644
--- a/pkgs/games/braincurses/default.nix
+++ b/pkgs/games/braincurses/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "braincurses-${version}";
+  pname = "braincurses";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix
index 5040886eaa0..e34dfc383a1 100644
--- a/pkgs/games/brogue/default.nix
+++ b/pkgs/games/brogue/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, ncurses, libtcod, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "brogue-${version}";
+  pname = "brogue";
   version = "1.7.5";
 
   src = fetchurl {
diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index 6c7e9ac76a9..56d2866a235 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -3,12 +3,11 @@
 , Carbon, CoreServices }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "bzflag";
   version = "2.4.18";
 
   src = fetchurl {
-    url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
+    url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1gmz31wmn3f8zq1bfilkgbf4qmi4fa0c93cs76mhg8h978pm23cx";
   };
 
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index 47432bca163..3b460daefd1 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "chessx-${version}";
+  pname = "chessx";
   version = "1.5.0";
 
   src = fetchurl {
diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix
index 47ab73ca269..81f1ee0cd15 100644
--- a/pkgs/games/ckan/default.nix
+++ b/pkgs/games/ckan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk2, curl }:
 
 stdenv.mkDerivation rec {
-  name = "ckan-${version}";
+  pname = "ckan";
   version = "1.16.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix
index a38678882c8..56164cfc017 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/pkgs/games/commandergenius/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "commandergenius-${version}";
+  pname = "commandergenius";
   version = "2.3.3";
 
   src = fetchFromGitLab {
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix
index c6ccac69b8c..9528c6d06cb 100644
--- a/pkgs/games/construo/default.nix
+++ b/pkgs/games/construo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, zlib, xorgproto, libGL ? null, freeglut ? null }:
 
 stdenv.mkDerivation rec {
-  name = "construo-${version}";
+  pname = "construo";
   version = "0.2.3";
 
   src = fetchurl {
-    url = "https://github.com/Construo/construo/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/Construo/construo/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1wmj527hbj1qv44cdsj6ahfjrnrjwg2dp8gdick8nd07vm062qxa";
   };
 
diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix
index 9526512f15c..c9dcd2d9d40 100644
--- a/pkgs/games/crafty/default.nix
+++ b/pkgs/games/crafty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "crafty-${version}";
+  pname = "crafty";
   version = "25.0.1";
 
   src = fetchurl {
diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix
index c77e0c8b485..756436c1ffc 100644
--- a/pkgs/games/cutemaze/default.nix
+++ b/pkgs/games/cutemaze/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmake, qttools, qtsvg }:
 
 stdenv.mkDerivation rec {
-  name = "cutemaze-${version}";
+  pname = "cutemaze";
   version = "1.2.4";
 
   src = fetchurl {
-    url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2";
+    url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2";
     sha256 = "0l727j28igs7cx6gvxs43vvzhp3hk0z61df7sprp1vdxzpzzfifl";
   };
 
diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix
index 19d857a8e78..f4e5290df27 100644
--- a/pkgs/games/cuyo/default.nix
+++ b/pkgs/games/cuyo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, SDL_mixer, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "cuyo-${version}";
+  pname = "cuyo";
   version = "2.1.0";
   
   src = fetchurl {
diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix
index 8b92c2e9d6f..441e9f66981 100644
--- a/pkgs/games/dhewm3/default.nix
+++ b/pkgs/games/dhewm3/default.nix
@@ -2,7 +2,7 @@
 , openal, curl }:
 
 stdenv.mkDerivation rec {
-  name = "dhewm3-${version}";
+  pname = "dhewm3";
   version = "1.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 652e4c18475..bcef336f342 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -2,7 +2,7 @@
 , qtdeclarative, cmake, texlive, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "dwarf-therapist-${version}";
+  pname = "dwarf-therapist";
   version = "41.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix
index caa9adeefd0..a59c8730690 100644
--- a/pkgs/games/dwarf-fortress/soundsense.nix
+++ b/pkgs/games/dwarf-fortress/soundsense.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   version = "2016-1_196";
   dfVersion = "0.44.12";
   inherit soundPack;
-  name = "soundsense-${version}";
+  pname = "soundsense";
   src = fetchzip {
     url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip";
     sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk";
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index 86d233b0378..518b63ed483 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -9,7 +9,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "dxx-rebirth-${version}";
+  pname = "dxx-rebirth";
   version = "0.59.100";
 
   src = fetchurl {
diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix
index c8b85da213a..1ebe219a736 100644
--- a/pkgs/games/easyrpg-player/default.nix
+++ b/pkgs/games/easyrpg-player/default.nix
@@ -4,7 +4,7 @@
 , mpg123 ? null, opusfile ? null, pcre, pixman, SDL2_mixer, speexdsp ? null, wildmidi ? null, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "easyrpg-player-${version}";
+  pname = "easyrpg-player";
   version = "0.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index 6815041c96b..18c83b8c5a4 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -9,7 +9,7 @@ let
   version = "${major}.${minor}.${patch}";
 
   serious-proton = stdenv.mkDerivation rec {
-    name = "serious-proton-${version}";
+    pname = "serious-proton";
     inherit version;
 
     src = fetchFromGitHub {
@@ -35,7 +35,7 @@ in
 
 
 stdenv.mkDerivation rec {
-  name = "empty-epsilon-${version}";
+  pname = "empty-epsilon";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix
index 742ca959135..af002a690e4 100644
--- a/pkgs/games/enyo-doom/default.nix
+++ b/pkgs/games/enyo-doom/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "enyo-doom-${version}";
+  pname = "enyo-doom";
   version = "1.06.9";
 
   src = fetchFromGitLab {
diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix
index 911308a078a..86a83d68f02 100644
--- a/pkgs/games/eternity-engine/default.nix
+++ b/pkgs/games/eternity-engine/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "eternity-engine-${version}";
+  pname = "eternity-engine";
   version = "3.42.02";
   src = fetchFromGitHub {
     owner = "team-eternity";
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index fba1ce01c45..30788c7ec5c 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.5";
-  name = "extremetuxracer-${version}";
+  pname = "extremetuxracer";
 
   src = fetchurl {
     url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix
index 85433e116fb..e06975e8db4 100644
--- a/pkgs/games/ezquake/default.nix
+++ b/pkgs/games/ezquake/default.nix
@@ -3,7 +3,6 @@
 , pkgconfig, SDL2, vim }:
 
 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
   pname = "ezquake";
   version = "3.0.1";
 
diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix
index 1aab0933b1b..44ed91da168 100644
--- a/pkgs/games/fairymax/default.nix
+++ b/pkgs/games/fairymax/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  name = "fairymax-${version}";
+  pname = "fairymax";
   version = "4.8";
   src = fetchurl {
     url = "http://home.hccnet.nl/h.g.muller/fmax4_8w.c";
diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix
index 2ab6e04e2d8..47f72c52c1f 100644
--- a/pkgs/games/fish-fillets-ng/default.nix
+++ b/pkgs/games/fish-fillets-ng/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, SDL, lua5_1, pkgconfig, SDL_mixer, SDL_image, SDL_ttf}:
 stdenv.mkDerivation rec {
-  name = "fish-fillets-ng-${version}";
+  pname = "fish-fillets-ng";
   version = "1.0.1";
   src = fetchurl {
     url = "mirror://sourceforge/fillets/fillets-ng-${version}.tar.gz";
diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix
index ef46ea840b7..957452aa162 100644
--- a/pkgs/games/fltrator/default.nix
+++ b/pkgs/games/fltrator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, fltk, which, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "fltrator-${version}";
+  pname = "fltrator";
   version = "2.3";
 
   src = fetchurl {
diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix
index 35bc22e8789..3ba383c7427 100644
--- a/pkgs/games/freecell-solver/default.nix
+++ b/pkgs/games/freecell-solver/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
-  name = "freecell-solver-${version}";
+  pname = "freecell-solver";
   version = "4.18.0";
 
   src = fetchurl {
-    url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz";
+    url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz";
     sha256 = "1cmaib69pijmcpvgjvrdry8j4xys8l906l80b8z21vvyhdwrfdnn";
   };
 
diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix
index 125f02005a3..d0f514f239d 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/pkgs/games/freeorion/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.8";
-  name = "freeorion-${version}";
+  pname = "freeorion";
 
   src = fetchFromGitHub {
     owner  = "freeorion";
diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix
index dd0707fe5c3..94efe1b650a 100644
--- a/pkgs/games/freesweep/default.nix
+++ b/pkgs/games/freesweep/default.nix
@@ -2,7 +2,7 @@
   updateAutotoolsGnuConfigScriptsHook }:
 
 stdenv.mkDerivation rec {
-  name = "freesweep-${version}";
+  pname = "freesweep";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix
index 3b4fb6842db..3dbd7bd928b 100644
--- a/pkgs/games/frotz/default.nix
+++ b/pkgs/games/frotz/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.44";
-  name = "frotz-${version}";
+  pname = "frotz";
 
   src = fetchFromGitHub {
     owner = "DavidGriffith";
diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix
index dd27f96f7d4..f5089b6395f 100644
--- a/pkgs/games/galaxis/default.nix
+++ b/pkgs/games/galaxis/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
-  name = "galaxis-${version}";
+  pname = "galaxis";
   version = "1.10";
 
   src = fetchurl{
-    url = "http://www.catb.org/~esr/galaxis/${name}.tar.gz";
+    url = "http://www.catb.org/~esr/galaxis/${pname}-${version}.tar.gz";
     sha256 = "1181x3z4r0794v2bkpigb5fablw1nayj42wvhy2am79p7j1iqq5r";
   };
 
diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix
index dabcfb19db0..de4a89eac07 100644
--- a/pkgs/games/gambatte/default.nix
+++ b/pkgs/games/gambatte/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, scons, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "gambatte-${version}";
+  pname = "gambatte";
   version = "2016-05-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix
index 066cadb13b1..4c57538e234 100644
--- a/pkgs/games/garden-of-coloured-lights/default.nix
+++ b/pkgs/games/garden-of-coloured-lights/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoconf, automake, allegro }:
 
 stdenv.mkDerivation rec {
-  name = "garden-of-coloured-lights-${version}";
+  pname = "garden-of-coloured-lights";
   version = "1.0.9";
 
   buildInputs = [ allegro autoconf automake ];
diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix
index 8d41070a61e..e5a4bca6192 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/pkgs/games/gcompris/default.nix
@@ -3,7 +3,7 @@
 }:
 stdenv.mkDerivation rec {
   version = "0.96";
-  name = "gcompris-${version}";
+  pname = "gcompris";
 
   src = fetchurl {
     url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix
index b718a92143c..3665467407a 100644
--- a/pkgs/games/gcs/default.nix
+++ b/pkgs/games/gcs/default.nix
@@ -29,10 +29,10 @@ let
     sha256 = "085jpp9mpv5kw00zds9sywmfq31mrlbrgahnwcjkx0z9i22amz4g";
   };
 in stdenv.mkDerivation rec {
-  name = "gcs-${version}";
+  pname = "gcs";
   version = "4.8.0";
 
-  src = runCommand "${name}-src" { preferLocalBuild = true; } ''
+  src = runCommand "${pname}-${version}-src" { preferLocalBuild = true; } ''
     mkdir -p $out
     cd $out
 
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index fc7bf7168dd..72afca4cd2c 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -3,7 +3,7 @@
 , libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "gemrb-${version}";
+  pname = "gemrb";
   version = "0.8.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix
index b9694811fa5..fb60808bab7 100644
--- a/pkgs/games/gl-117/default.nix
+++ b/pkgs/games/gl-117/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gl-117-${version}";
+  pname = "gl-117";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/${pname}-${version}.tar.bz2";
     sha256 = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4";
   };
 
diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix
index 2952edaa78d..fa8d59c0503 100644
--- a/pkgs/games/gnugo/default.nix
+++ b/pkgs/games/gnugo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gnugo-${version}";
+  pname = "gnugo";
   version = "3.8";
 
   src = fetchurl {
diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix
index 64c3954ba48..4bf460836d9 100644
--- a/pkgs/games/gnujump/default.nix
+++ b/pkgs/games/gnujump/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, SDL, SDL_image, SDL_mixer }:
 
 stdenv.mkDerivation rec {
-  name = "gnujump-${version}";
+  pname = "gnujump";
   version = "1.0.8";
   src = fetchurl {
-    url = "mirror://gnu/gnujump/${name}.tar.gz";
+    url = "mirror://gnu/gnujump/${pname}-${version}.tar.gz";
     sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk";
   };
   buildInputs = [ SDL SDL_image SDL_mixer ];
diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/games/gnushogi/default.nix
index e8567455030..381b4fd5959 100644
--- a/pkgs/games/gnushogi/default.nix
+++ b/pkgs/games/gnushogi/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "gnushogi-${version}";
+  pname = "gnushogi";
   version = "1.4.2";
   buildInputs = [ zlib ];
 
   src = fetchurl {
-    url = "mirror://gnu/gnushogi/${name}.tar.gz";
+    url = "mirror://gnu/gnushogi/${pname}-${version}.tar.gz";
     sha256 = "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y";
   };
 
diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
index b29b045a421..6031762d1d6 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/pkgs/games/gtypist/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, makeWrapper, libiconv, ncurses, perl, fortune}:
 
 stdenv.mkDerivation rec {
-  name = "gtypist-${version}";
+  pname = "gtypist";
   version = "2.9.5";
 
   src = fetchurl {
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index ed24f44356a..35a19179a52 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -3,7 +3,7 @@
 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }:
 
 stdenv.mkDerivation rec {
-  name = "gzdoom-${version}";
+  pname = "gzdoom";
   version = "4.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix
index 470e1d090fc..97aee425fd1 100644
--- a/pkgs/games/hawkthorne/default.nix
+++ b/pkgs/games/hawkthorne/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.12.1";
-  name = "hawkthorne-${version}";
+  pname = "hawkthorne";
 
   src = fetchgit {
     url = "https://github.com/hawkthorne/hawkthorne-journey.git";
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index ea229db6a74..7ef5c6a49b3 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -11,7 +11,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "1.0.0-beta1";
-  name = "hedgewars-${version}";
+  pname = "hedgewars";
   src = fetchhg {
     url = "https://hg.hedgewars.org/hedgewars/";
     rev = "7ab5cf405686";
diff --git a/pkgs/games/holdingnuts/default.nix b/pkgs/games/holdingnuts/default.nix
index e6d6febeac6..c20cce723c2 100644
--- a/pkgs/games/holdingnuts/default.nix
+++ b/pkgs/games/holdingnuts/default.nix
@@ -2,12 +2,11 @@
 
 let mirror = "http://download.holdingnuts.net";
 in stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
   pname   = "holdingnuts";
   version = "0.0.5";
 
   src = fetchurl {
-    url    = "${mirror}/release/${version}/${name}.tar.bz2";
+    url    = "${mirror}/release/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0iw25jmnqzscg34v66d4zz70lvgjp4l7gi16nna6491xnqha5a8g";
   };
 
diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix
index 760d82c026d..b4f5e4f7f63 100644
--- a/pkgs/games/hyperrogue/default.nix
+++ b/pkgs/games/hyperrogue/default.nix
@@ -2,7 +2,7 @@
   libpng, glew, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "hyperrogue-${version}";
+  pname = "hyperrogue";
   version = "10.5e";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix
index 39324843e5e..10d29657d7c 100644
--- a/pkgs/games/instead-launcher/default.nix
+++ b/pkgs/games/instead-launcher/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "instead-launcher-${version}";
+  pname = "instead-launcher";
 
   version = "0.7.0";
 
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index f84b83a3010..86f3f721446 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "ivan-${version}";
+  pname = "ivan";
   version = "056";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix
index 37c45e7aa60..94c614598bf 100644
--- a/pkgs/games/ja2-stracciatella/default.nix
+++ b/pkgs/games/ja2-stracciatella/default.nix
@@ -27,7 +27,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "ja2-stracciatella-${version}";
+  pname = "ja2-stracciatella";
   inherit src;
   inherit version;
 
diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index 4cea30c79e6..e2a4cff291b 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, curl, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "klavaro-${version}";
+  pname = "klavaro";
   version = "3.08";
 
   src = fetchurl {
-    url = "mirror://sourceforge/klavaro/${name}.tar.bz2";
+    url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2";
     sha256 = "0qmvr6d8wshwp0xvk5wbig4vlzxzcxrakhyhd32v8v3s18nhqsrc";
   };
 
diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix
index b5f858b99ad..0e6941a8acd 100644
--- a/pkgs/games/lbreakout2/default.nix
+++ b/pkgs/games/lbreakout2/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintl }:
 
 stdenv.mkDerivation rec {
-  name = "lbreakout2-${version}";
+  pname = "lbreakout2";
   version = "2.6.5";
   buildInputs = [ SDL SDL_mixer zlib libpng libintl ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/lgames/${name}.tar.gz";
+    url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
     sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i";
   };
 
diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix
index d00072d2455..d4621682cc6 100644
--- a/pkgs/games/leela-zero/default.nix
+++ b/pkgs/games/leela-zero/default.nix
@@ -2,7 +2,7 @@
 , opencl-headers, ocl-icd, qtbase , zlib }:
 
 stdenv.mkDerivation rec {
-  name = "leela-zero-${version}";
+  pname = "leela-zero";
   version = "0.17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix
index daf7dd7f61f..505d98c92db 100644
--- a/pkgs/games/lgogdownloader/default.nix
+++ b/pkgs/games/lgogdownloader/default.nix
@@ -2,7 +2,7 @@
 , htmlcxx, rhash, tinyxml-2, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "lgogdownloader-${version}";
+  pname = "lgogdownloader";
   version = "3.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix
index fef6e11d9be..0e819278dc3 100644
--- a/pkgs/games/liberal-crime-squad/default.nix
+++ b/pkgs/games/liberal-crime-squad/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2016-07-06";
-  name = "liberal-crime-squad-${version}";
+  pname = "liberal-crime-squad";
 
   src = fetchFromGitHub {
     owner = "Kamal-Sadek";
diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix
index 0abbfda33c7..fb98b1a3811 100644
--- a/pkgs/games/lincity/default.nix
+++ b/pkgs/games/lincity/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libICE, libSM, libpng12, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "lincity-${version}";
+  pname = "lincity";
   version = "1.13.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lincity/${name}.tar.gz";
+    url = "mirror://sourceforge/lincity/${pname}-${version}.tar.gz";
     sha256 = "0p81wl7labyfb6rgp0hi42l2akn3n7r2bnxal1wyvjylzw8vsk3v";
   };
 
diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix
index b860d2ee58b..cfc06e11e19 100644
--- a/pkgs/games/lincity/ng.nix
+++ b/pkgs/games/lincity/ng.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lincity-ng-${version}";
+  pname = "lincity-ng";
   version = "2.9beta.20170715";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix
index d748c96da24..0bd90f77b24 100644
--- a/pkgs/games/liquidwar/5.nix
+++ b/pkgs/games/liquidwar/5.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, allegro }:
 stdenv.mkDerivation rec {
   version = "5.6.4";
-  name = "liquidwar5-${version}";
+  pname = "liquidwar5";
   src = fetchurl {
     url = "https://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz";
     sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j";
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index af7101f216d..800ac0fc4c7 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -6,11 +6,11 @@
 , libogg, libvorbis, libcaca, csound, cunit } :
 
 stdenv.mkDerivation rec {
-  name = "liquidwar6-${version}";
+  pname = "liquidwar6";
   version = "0.6.3902";
 
   src = fetchurl {
-    url = "mirror://gnu/liquidwar6/${name}.tar.gz";
+    url = "mirror://gnu/liquidwar6/${pname}-${version}.tar.gz";
     sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn";
   };
 
diff --git a/pkgs/games/ltris/default.nix b/pkgs/games/ltris/default.nix
index 10a79a69673..d580d7586ff 100644
--- a/pkgs/games/ltris/default.nix
+++ b/pkgs/games/ltris/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, SDL, SDL_mixer }:
 
 stdenv.mkDerivation rec {
-  name = "ltris-${version}";
+  pname = "ltris";
   version = "1.0.19";
   buildInputs = [ SDL SDL_mixer ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/lgames/${name}.tar.gz";
+    url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
     sha256 = "1895wv1fqklrj4apkz47rnkcfhfav7zjknskw6p0886j35vrwslg";
   };
 
diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix
index da711f59af0..ed0b2be0d97 100644
--- a/pkgs/games/mar1d/default.nix
+++ b/pkgs/games/mar1d/default.nix
@@ -18,7 +18,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "MAR1D-${version}";
+  pname = "MAR1D";
   version = "0.2.0";
   options = "-w${toString width}"
           + " -s${toString sensitivity}"
diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix
index 21d2ad87dfb..8b0808d8e8c 100644
--- a/pkgs/games/meritous/default.nix
+++ b/pkgs/games/meritous/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "meritous-${version}";
+  pname = "meritous";
   version = "1.4";
 
   src = fetchFromGitLab {
diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 4fd44880b82..9ddae8b65bf 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, jre }:
 stdenv.mkDerivation rec {
-  name = "minecraft-server-${version}";
+  pname = "minecraft-server";
   version = "1.14.4";
 
   src = fetchurl {
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index dab83ddc900..4dcc7a6262f 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -2,7 +2,7 @@
 , boost, lua5_1, luafilesystem, luazip, lrexlib-pcre, luasql-sqlite3, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "mudlet-${version}";
+  pname = "mudlet";
   version = "3.0.0-delta";
 
   src = fetchurl {
diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix
index c806dfa5b80..c465b413db1 100644
--- a/pkgs/games/newtonwars/default.nix
+++ b/pkgs/games/newtonwars/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }:
 
 stdenv.mkDerivation rec {
-  name = "newtonwars-${version}";
+  pname = "newtonwars";
   version = "20150609";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix
index 8ac020f3ce0..b39519193e7 100644
--- a/pkgs/games/openarena/default.nix
+++ b/pkgs/games/openarena/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }:
 
 stdenv.mkDerivation rec {
-  name = "openarena-${version}";
+  pname = "openarena";
   version = "0.8.8";
 
   src = fetchurl {
diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix
index fa041119631..cce643e9f7d 100644
--- a/pkgs/games/openclonk/default.nix
+++ b/pkgs/games/openclonk/default.nix
@@ -11,7 +11,7 @@ let
   };
 in stdenv.mkDerivation rec {
   version = "8.1";
-  name = "openclonk-${version}";
+  pname = "openclonk";
 
   src = fetchurl {
     url = "https://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2";
diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix
index d2f1e27b10e..751eb6d5933 100644
--- a/pkgs/games/opendune/default.nix
+++ b/pkgs/games/opendune/default.nix
@@ -7,7 +7,7 @@
 # - download dune2 into [datadir] http://www.bestoldgames.net/eng/old-games/dune-2.php
 
 stdenv.mkDerivation rec {
-  name = "opendune-${version}";
+  pname = "opendune";
   version = "0.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix
index 3c4e85a91e5..d59afc330a7 100644
--- a/pkgs/games/opendungeons/default.nix
+++ b/pkgs/games/opendungeons/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "opendungeons-${version}";
+  pname = "opendungeons";
   version = "0.7.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index c57fe642dc3..c611190b3a9 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -12,12 +12,12 @@ let
   });
 in stdenv.mkDerivation rec {
   version = "0.45.0";
-  name = "openmw-${version}";
+  pname = "openmw";
 
   src = fetchFromGitHub {
     owner = "OpenMW";
     repo = "openmw";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1r87zrsnza2v9brksh809zzqj6zhk5xj15qs8iq11v1bscm2a2j4";
   };
 
diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix
index 63fb24dc4d7..fab4de64ee2 100644
--- a/pkgs/games/openrw/default.nix
+++ b/pkgs/games/openrw/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "2017-09-17";
-  name = "openrw-${version}";
+  pname = "openrw";
 
   src = fetchgit {
     url = "https://github.com/rwengine/openrw";
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index e0acf60144e..de05e1944f3 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "openspades-${version}";
+  pname = "openspades";
   version = "0.1.3";
   devPakVersion = "33";
 
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 91969a335f8..e3c23ad2671 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -28,11 +28,11 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "openttd-${version}";
+  pname = "openttd";
   version = "1.9.2";
 
   src = fetchurl {
-    url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz";
+    url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
     sha256 = "0jjnnzp1a2l8j1cla28pr460lx6cg4ql3acqfxhxv8a5a4jqrzzr";
   };
 
diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix
index c91f9807581..2dae58df976 100644
--- a/pkgs/games/opentyrian/default.nix
+++ b/pkgs/games/opentyrian/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, fetchzip, SDL, SDL_net}:
 
 stdenv.mkDerivation rec {
-  name = "opentyrian-${version}";
+  pname = "opentyrian";
   version = "2.1.20130907";
 
   src = fetchurl {
diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix
index 59e7c874d14..a0169debfef 100644
--- a/pkgs/games/pacvim/default.nix
+++ b/pkgs/games/pacvim/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "pacvim-${version}";
+  pname = "pacvim";
   version = "2018-05-16";
   src = fetchFromGitHub {
     owner = "jmoon018";
diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix
index c73c346512f..28487a7f8e8 100644
--- a/pkgs/games/performous/default.nix
+++ b/pkgs/games/performous/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "performous-${version}";
+  pname = "performous";
   version = "1.1";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix
index 6991735962d..4cfd7de6a55 100644
--- a/pkgs/games/pro-office-calculator/default.nix
+++ b/pkgs/games/pro-office-calculator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }:
 stdenv.mkDerivation rec {
   version = "1.0.13";
-  name = "pro-office-calculator-${version}";
+  pname = "pro-office-calculator";
 
   src = fetchFromGitHub {
     owner  = "RobJinman";
diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix
index 924101c2d4a..92429218178 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/games/qgo/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qgo-${version}";
+  pname = "qgo";
   version = "unstable-2017-12-18";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix
index dfd38476192..f161f53bfe1 100644
--- a/pkgs/games/qqwing/default.nix
+++ b/pkgs/games/qqwing/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "qqwing-${version}";
+  pname = "qqwing";
   version = "1.3.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix
index 1564ba19bd2..0602aace319 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/pkgs/games/quake2/yquake2/default.nix
@@ -14,7 +14,7 @@ let
   wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; };
 
   yquake2 = stdenv.mkDerivation rec {
-    name = "yquake2-${version}";
+    pname = "yquake2";
     version = "7.30";
 
     src = fetchFromGitHub {
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 7bc0863a33f..7f0fb6fd062 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ioquake3-git-${version}";
+  pname = "ioquake3-git";
   version = "2019-05-29";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix
index f61b0e23792..a8d740ea512 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/pkgs/games/quakespasm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, SDL, fetchurl, gzip, libvorbis, libmad }:
 stdenv.mkDerivation rec {
-  name = "quakespasm-${version}";
+  pname = "quakespasm";
   majorVersion = "0.93";
   version = "${majorVersion}.1";
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1bimv18f6rzhyjz78yvw2vqr5n0kdqbcqmq7cb3m951xgsxfcgpd";
   };
 
-  sourceRoot = "${name}/Quake";
+  sourceRoot = "${pname}-${version}/Quake";
 
   buildInputs = [
     gzip SDL libvorbis libmad
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 4cd073869dc..114f862888d 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -1,7 +1,7 @@
 { stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }:
 
 stdenv.mkDerivation rec {
-  name = "vkquake-${version}";
+  pname = "vkquake";
   majorVersion = "1.01";
   version = "${majorVersion}.0";
 
diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix
index c44072309b1..79d657e668d 100644
--- a/pkgs/games/residualvm/default.nix
+++ b/pkgs/games/residualvm/default.nix
@@ -9,7 +9,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.1.1";
-  name = "residualvm-${version}";
+  pname = "residualvm";
 
   src = fetchurl {
     url = "mirror://sourceforge/residualvm/residualvm-${version}-sources.tar.bz2";
diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix
index b6a74ad8be6..9ab63553053 100644
--- a/pkgs/games/rftg/default.nix
+++ b/pkgs/games/rftg/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "rftg-${version}";
+  pname = "rftg";
   version = "0.9.4";
 
   src = fetchurl {
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index 274a095de6f..09550339f83 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.7.0";
-  name = "rigsofrods-${version}";
+  pname = "rigsofrods";
 
   src = fetchFromGitHub {
     owner = "RigsOfRods";
diff --git a/pkgs/games/riko4/default.nix b/pkgs/games/riko4/default.nix
index 7cbfacd0b40..780025f5222 100644
--- a/pkgs/games/riko4/default.nix
+++ b/pkgs/games/riko4/default.nix
@@ -5,7 +5,7 @@ let
   # and this library does not have a proper release version, so let the
   # derivation for this stay next to the Riko4 derivation for now.
   sdl-gpu = stdenv.mkDerivation rec {
-    name = "sdl-gpu-${version}";
+    pname = "sdl-gpu";
     version = "2018-11-01";
     src = fetchFromGitHub {
       owner = "grimfang4";
@@ -27,7 +27,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "riko4-${version}";
+  pname = "riko4";
   version = "0.1.0";
   src = fetchFromGitHub {
     owner = "incinirate";
diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix
index 00d73f95bdb..fa1eb338a89 100644
--- a/pkgs/games/robotfindskitten/default.nix
+++ b/pkgs/games/robotfindskitten/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "robotfindskitten-${version}";
+  pname = "robotfindskitten";
   version = "2.7182818.701";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${name}.tar.gz";
+    url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${pname}-${version}.tar.gz";
     sha256 = "06fp6b4li50mzw83j3pkzqspm6dpgxgxw03b60xkxlkgg5qa6jbp";
   };
 
diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix
index a56365778fb..eaf1b3dc4fd 100644
--- a/pkgs/games/runelite/default.nix
+++ b/pkgs/games/runelite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }:
 
   stdenv.mkDerivation rec {
-  name = "runelite-${version}";
+  pname = "runelite";
   version = "1.6.0";
 
   src = fetchurl {
diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix
index 79fef674002..345ce33fca0 100644
--- a/pkgs/games/scid-vs-pc/default.nix
+++ b/pkgs/games/scid-vs-pc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "scid-vs-pc-${version}";
+  pname = "scid-vs-pc";
   version = "4.20";
 
   src = fetchurl {
diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix
index 301991c1a6f..040902ffd73 100644
--- a/pkgs/games/scid/default.nix
+++ b/pkgs/games/scid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "scid-${version}";
+  pname = "scid";
   version = "4.3";
 
   src = fetchurl {
diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix
index 430b22c9ba9..1527f61c4d0 100644
--- a/pkgs/games/scorched3d/default.nix
+++ b/pkgs/games/scorched3d/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "44";
-  name = "scorched3d-${version}";
+  pname = "scorched3d";
   src = fetchurl {
     url = "mirror://sourceforge/scorched3d/Scorched3D-${version}-src.tar.gz";
     sha256 = "1fldi9pn7cz6hc9h70pacgb7sbykzcac44yp3pkhn0qh4axj10qw";
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index 2ebc2c82e50..cb8223daa2b 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "scummvm-${version}";
+  pname = "scummvm";
   version = "2.0.0";
 
   src = fetchurl {
-    url = "http://scummvm.org/frs/scummvm/${version}/${name}.tar.xz";
+    url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz";
     sha256 = "0q6aiw97wsrf8cjw9vjilzhqqsr2rw2lll99s8i5i9svan6l314p";
   };
 
diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix
index 9f90c9f14aa..7811b4b7373 100644
--- a/pkgs/games/sdlmame/default.nix
+++ b/pkgs/games/sdlmame/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   version = "0.151.u0-1";
-  name    = "sdlmame-${version}";
+  pname = "sdlmame";
 
   src = if stdenv.hostPlatform.system == "x86_64-linux"
     then fetchurl {
-      url    = "http://seblu.net/a/archive/packages/s/sdlmame/${name}-x86_64.pkg.tar.xz";
+      url    = "http://seblu.net/a/archive/packages/s/sdlmame/${pname}-${version}-x86_64.pkg.tar.xz";
       sha256 = "1j9vjxhrhsskrlk5wr7al4wk2hh3983kcva42mqal09bmc8qg3m9";
     }
     else fetchurl {
-      url    = "http://seblu.net/a/archive/packages/s/sdlmame/${name}-i686.pkg.tar.xz";
+      url    = "http://seblu.net/a/archive/packages/s/sdlmame/${pname}-${version}-i686.pkg.tar.xz";
       sha256 = "1i38j9ml66pyxzm0zzf1fv4lb40f6w47cdgaw846q91pzakkkqn7";
     };
 
diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix
index de91f26d95d..a998a86370d 100644
--- a/pkgs/games/sil/default.nix
+++ b/pkgs/games/sil/default.nix
@@ -9,7 +9,7 @@ let
   '';
 in
 stdenv.mkDerivation rec {
-  name = "Sil-${version}";
+  pname = "Sil";
   version = "1.3.0";
 
   src = fetchzip {
diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix
index e8d915dd31a..1334f555bbd 100644
--- a/pkgs/games/snipes/default.nix
+++ b/pkgs/games/snipes/default.nix
@@ -7,7 +7,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "snipes-${version}";
+  pname = "snipes";
   version = "20180930";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index 7f9f49f363a..2ffd3f3d053 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -2,12 +2,12 @@
 , boost, eigen2, lua, luabind, libGLU_combined, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "soi-${version}";
+  pname = "soi";
   version = "0.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${version}-Source.tar.bz2";
-    name = "${name}.tar.bz2";
+    name = "${pname}-${version}.tar.bz2";
     sha256 = "03c3wnvhd42qh8mi68lybf8nv6wzlm1nx16d6pdcn2jzgx1j2lzd";
   };
 
diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix
index 1049b10d0b1..63a29a4f591 100644
--- a/pkgs/games/solarus/default.nix
+++ b/pkgs/games/solarus/default.nix
@@ -4,7 +4,7 @@
   qtbase, qttools }:
 
 stdenv.mkDerivation rec {
-  name = "solarus-${version}";
+  pname = "solarus";
   version = "1.6.0";
 
   src = fetchFromGitLab {
diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix
index 162db967269..2b69dfccad1 100644
--- a/pkgs/games/space-orbit/default.nix
+++ b/pkgs/games/space-orbit/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "space-orbit-${version}";
+  pname = "space-orbit";
   version = "1.01";
   patchversion = "9";
 
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 1dcf432ccd4..9bfd917d1aa 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "spring-${version}";
+  pname = "spring";
   version = "104.0";
 
   src = fetchurl {
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 8df4450d13d..b7c9b691c04 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -3,7 +3,7 @@
 , makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
 
 stdenv.mkDerivation rec {
-  name = "springlobby-${version}";
+  pname = "springlobby";
   version = "0.267";
 
   src = fetchurl {
diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix
index 1408b66ab41..9de9bd37e8d 100644
--- a/pkgs/games/stardust/default.nix
+++ b/pkgs/games/stardust/default.nix
@@ -2,11 +2,11 @@
 , libXi, libXmu, libXext, libGLU_combined }:
 
 stdenv.mkDerivation rec {
-  name = "stardust-${version}";
+  pname = "stardust";
   version = "0.1.13";
 
   src = fetchurl {
-    url = "http://iwar.free.fr/IMG/gz/${name}.tar.gz";
+    url = "http://iwar.free.fr/IMG/gz/${pname}-${version}.tar.gz";
     sha256 = "19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp";
   };
 
diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix
index 1ea7f067787..be865d20f2f 100644
--- a/pkgs/games/steam/steamcmd.nix
+++ b/pkgs/games/steam/steamcmd.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "steamcmd-${version}";
+  pname = "steamcmd";
   version = "20180104"; # According to steamcmd_linux.tar.gz mtime
 
   src = fetchurl {
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 86488874166..b29d22dfe73 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "stepmania-${version}";
+  pname = "stepmania";
   version = "5.1.0-b2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
index 3865d8fbef9..6b3da08b70c 100644
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@@ -2,7 +2,7 @@
 , makeWrapper, enet, libXcursor, bullet, openal }:
 
 stdenv.mkDerivation rec {
-  name = "stunt-rally-${version}";
+  pname = "stunt-rally";
   version = "2.6.1";
 
   src = fetchurl {
diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix
index cee65bfa563..6cfabc4ee6a 100644
--- a/pkgs/games/supertux/default.nix
+++ b/pkgs/games/supertux/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "supertux-${version}";
+  pname = "supertux";
   version = "0.6.0";
 
   src = fetchurl {
diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix
index 13d296e5961..5432824ce6c 100644
--- a/pkgs/games/terraria-server/default.nix
+++ b/pkgs/games/terraria-server/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, file, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name    = "terraria-server-${version}";
+  pname = "terraria-server";
   version = "1.3.5.3";
   urlVersion = lib.replaceChars ["."] [""] version;
 
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index 68114bb7565..9cc3bf7149f 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, qt5, box2d, which, cmake, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "tbe-${version}";
+  pname = "tbe";
   version = "0.9.3.1";
 
   src = fetchgit {
diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index 929641cfab5..b0901fcb9a0 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "the-powder-toy-${version}";
+  pname = "the-powder-toy";
   version = "94.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix
index f230a70c088..fb3ebf36db3 100644
--- a/pkgs/games/tinyfugue/default.nix
+++ b/pkgs/games/tinyfugue/default.nix
@@ -8,7 +8,7 @@ with stdenv.lib;
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "tinyfugue-${version}";
+  pname = "tinyfugue";
   version = "50b8";
   verUrl = "5.0%20beta%208";
 
diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix
index 8549a860d8e..b5ff38b93a1 100644
--- a/pkgs/games/trackballs/default.nix
+++ b/pkgs/games/trackballs/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "trackballs-${version}";
+  pname = "trackballs";
   version = "1.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix
index 470856af90e..802bdb08a87 100644
--- a/pkgs/games/tremulous/default.nix
+++ b/pkgs/games/tremulous/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal, runtimeShell }:
 stdenv.mkDerivation rec {
-  name = "tremulous-${version}";
+  pname = "tremulous";
   version = "1.1.0";
   src1 = fetchurl {
-    url = "mirror://sourceforge/tremulous/${name}.zip";
+    url = "mirror://sourceforge/tremulous/${pname}-${version}.zip";
     sha256 = "11w96y7ggm2sn5ncyaffsbg0vy9pblz2av71vqp9725wbbsndfy7";
   };
   # http://tremulous.net/wiki/Client_versions
diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix
index ddf0782b210..603fb3ef491 100644
--- a/pkgs/games/tuxpaint/default.nix
+++ b/pkgs/games/tuxpaint/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.22";
-  name = "tuxpaint-${version}";
+  pname = "tuxpaint";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tuxpaint/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz";
     sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca";
   };
 
diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix
index fa28dcefa5e..a32da556cc9 100644
--- a/pkgs/games/ue4/default.nix
+++ b/pkgs/games/ue4/default.nix
@@ -18,7 +18,7 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  name = "ue4-${version}";
+  pname = "ue4";
   version = "4.10.2";
   sourceRoot = "UnrealEngine-${version}-release";
   src = requireFile {
diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix
index f3eec52098d..8dd8222e55e 100644
--- a/pkgs/games/ultrastardx/default.nix
+++ b/pkgs/games/ultrastardx/default.nix
@@ -11,7 +11,7 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "ultrastardx-${version}";
+  pname = "ultrastardx";
   version = "2017.8.0";
   src = fetchFromGitHub {
     owner = "UltraStar-Deluxe";
diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix
index be1b5bd1195..ee3890aeea5 100644
--- a/pkgs/games/unnethack/default.nix
+++ b/pkgs/games/unnethack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, utillinux, ncurses, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "unnethack-${version}";
+  pname = "unnethack";
   version = "5.2.0";
 
   src = fetchgit {
diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix
index 00592f7c39b..638900c9e89 100644
--- a/pkgs/games/uqm/default.nix
+++ b/pkgs/games/uqm/default.nix
@@ -27,7 +27,7 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "uqm-${version}";
+  pname = "uqm";
   version = "0.7.0";
 
   src = fetchurl {
diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 1cd87541b8c..999799de58d 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, SDL, libGLU_combined, openal, curl, libXxf86vm }:
 
 stdenv.mkDerivation rec {
-  name = "urbanterror-${version}";
+  pname = "urbanterror";
   version = "4.3.4";
 
   srcs =
diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix
index 7039ff44a09..1790f083063 100644
--- a/pkgs/games/ut2004/demo.nix
+++ b/pkgs/games/ut2004/demo.nix
@@ -7,7 +7,7 @@ let
     else throw "Unsupported architecture";
 
 in stdenv.mkDerivation rec {
-  name = "ut2004-demo-${version}";
+  pname = "ut2004-demo";
   version = "3334";
 
   src = fetchurl {
diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix
index d57559a4d80..7f552bdd5d6 100644
--- a/pkgs/games/vitetris/default.nix
+++ b/pkgs/games/vitetris/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lib }:
 
 stdenv.mkDerivation rec {
-  name = "vitetris-${version}";
+  pname = "vitetris";
   version = "0.58.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix
index 91f77277d9e..1d4545f17b1 100644
--- a/pkgs/games/vms-empire/default.nix
+++ b/pkgs/games/vms-empire/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
-  name = "vms-empire-${version}";
+  pname = "vms-empire";
   version = "1.14";
 
   src = fetchurl{
-    url = "http://www.catb.org/~esr/vms-empire/${name}.tar.gz";
+    url = "http://www.catb.org/~esr/vms-empire/${pname}-${version}.tar.gz";
     sha256 = "0cymzhivvaahgqz0p11w25a710ls4w0jhyqj789jas5s07nvd890";
   };
 
diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix
index c1a9a2a7def..9ea9ec7bd12 100644
--- a/pkgs/games/voxelands/default.nix
+++ b/pkgs/games/voxelands/default.nix
@@ -2,11 +2,11 @@
 , libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "voxelands-${version}";
+  pname = "voxelands";
   version = "1512.00";
 
   src = fetchurl {
-    url = "http://voxelands.com/downloads/${name}-src.tar.bz2";
+    url = "http://voxelands.com/downloads/${pname}-${version}-src.tar.bz2";
     sha256 = "0bims0y0nyviv2f2nxfj37s3258cjbfp9xd97najz0yylnk3qdfw";
   };
 
diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix
index 04712b3ebff..a861e3725a2 100644
--- a/pkgs/games/warmux/default.nix
+++ b/pkgs/games/warmux/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "warmux-${version}";
+  pname = "warmux";
   version = "unstable-2017-10-20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index 1b51130768e..3d6a0399223 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, warsow-engine, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "warsow-${version}";
+  pname = "warsow";
   version = "2.1.2";
 
   src = fetchurl {
-    url = "http://sebastian.network/warsow/${name}.tar.gz";
+    url = "http://sebastian.network/warsow/${pname}-${version}.tar.gz";
     sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc";
   };
 
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index bf9e1cdd635..64231b9c39c 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -8,10 +8,8 @@ stdenv.mkDerivation rec {
   pname = "wesnoth";
   version = "1.14.7";
 
-  name = "${pname}-${version}";
-
   src = fetchurl {
-    url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
+    url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "0j2yvkcggj5k0r2cqk8ndnj77m37a00srfd9qg7pdpqffbinqpj7";
   };
 
diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix
index daf56b27e5d..6f3bc2c1195 100644
--- a/pkgs/games/widelands/default.nix
+++ b/pkgs/games/widelands/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "widelands-${version}";
+  pname = "widelands";
   version = "19";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix
index 028b5f49b66..dd59ebbedd9 100644
--- a/pkgs/games/xjump/default.nix
+++ b/pkgs/games/xjump/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }:
 
 stdenv.mkDerivation rec {
-  name = "xjump-${version}";
+  pname = "xjump";
   version = "2.9.3";
   src = fetchFromGitHub {
     owner = "hugomg";
diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix
index a0fc6d5ca71..d9bba3fdbdc 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@@ -3,7 +3,7 @@
 , SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "xmoto-${version}";
+  pname = "xmoto";
   version = "0.5.11";
 
   src = fetchurl {
diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix
index cd927a820aa..aefc8ad9876 100644
--- a/pkgs/games/xpilot/bloodspilot-client.nix
+++ b/pkgs/games/xpilot/bloodspilot-client.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.5.0";
-  name = "bloodspilot-client-${version}";
+  pname = "bloodspilot-client";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${version}/bloodspilot-client-sdl-${version}.tar.gz";
diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/games/xpilot/bloodspilot-server.nix
index 42bcb326316..2f37680bbaa 100644
--- a/pkgs/games/xpilot/bloodspilot-server.nix
+++ b/pkgs/games/xpilot/bloodspilot-server.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, expat }:
 
 stdenv.mkDerivation rec {
-  name = "bloodspilot-xpilot-fxi-server-${version}";
+  pname = "bloodspilot-xpilot-fxi-server";
   version = "1.4.6";
 
   src = fetchurl {
diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix
index 2ae25e957bb..d0fe9f61896 100644
--- a/pkgs/games/xpilot/default.nix
+++ b/pkgs/games/xpilot/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf
 , SDL_image, zlib, libXxf86misc }:
 stdenv.mkDerivation rec {
-  name = "xpilot-ng-${version}";
+  pname = "xpilot-ng";
   version = "4.7.3";
   src = fetchurl {
-    url = "mirror://sourceforge/xpilot/xpilot_ng/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/xpilot/xpilot_ng/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj";
   };
   buildInputs = [
diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix
index 07ed50d4e7b..b3011fbce77 100644
--- a/pkgs/games/xsnow/default.nix
+++ b/pkgs/games/xsnow/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
 
   version = "1.42";
-  name = "xsnow-${version}";
+  pname = "xsnow";
 
   src = fetchurl {
-    url = "https://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz";
+    url = "https://janswaal.home.xs4all.nl/Xsnow/${pname}-${version}.tar.gz";
     sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh";
   };
 
diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix
index 0aa0c97f07d..62cdaccc297 100644
--- a/pkgs/games/xsok/default.nix
+++ b/pkgs/games/xsok/default.nix
@@ -2,7 +2,6 @@
 , withNethackLevels ? true
 }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "xsok";
   version = "1.02";
 
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index cf08db68cf0..3f6062c4f68 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, xorgproto, libXpm, libXt }:
 
 stdenv.mkDerivation rec {
-  name = "xsokoban-${version}";
+  pname = "xsokoban";
   version = "3.3c";
 
   src = fetchurl {
-    url = "https://www.cs.cornell.edu/andru/release/${name}.tar.gz";
+    url = "https://www.cs.cornell.edu/andru/release/${pname}-${version}.tar.gz";
     sha256 = "006lp8y22b9pi81x1a9ldfgkl1fbmkdzfw0lqw5y9svmisbafbr9";
   };
 
diff --git a/pkgs/games/xtris/default.nix b/pkgs/games/xtris/default.nix
index 9203389355c..8f5f832058c 100644
--- a/pkgs/games/xtris/default.nix
+++ b/pkgs/games/xtris/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, xorg }:
 stdenv.mkDerivation rec {
-  name = "xtris-${version}";
+  pname = "xtris";
   version = "1.15";
 
   src = fetchzip {
diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix
index a5d9098242b..3d5160bb591 100644
--- a/pkgs/games/zandronum/fmod.nix
+++ b/pkgs/games/zandronum/fmod.nix
@@ -6,7 +6,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "fmod-${version}";
+  pname = "fmod";
   version = "4.44.64";
   shortVersion = builtins.replaceStrings [ "." ] [ "" ] version;
 
diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix
index 3d5da239115..0722e4bbbf9 100644
--- a/pkgs/games/zangband/default.nix
+++ b/pkgs/games/zangband/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
   pname = "zangband";
   version = "2.7.4b";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${pname}-${version}.tar.gz";
     sha256 = "0kkz6f9myhjnr3308sdab8q186rd55lapvcp38w8qmakdbhc828j";
   };
 
diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix
index d2b94a14fe4..f6fde241129 100644
--- a/pkgs/games/zdoom/default.nix
+++ b/pkgs/games/zdoom/default.nix
@@ -3,7 +3,7 @@
 , libsndfile, mpg123 }:
 
 stdenv.mkDerivation rec {
-  name = "zdoom-${version}";
+  pname = "zdoom";
   majorVersion = "2.8";
   version = "${majorVersion}.1";
 
diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix
index fa2cafa298a..430d5269a68 100644
--- a/pkgs/games/zdoom/zdbsp.nix
+++ b/pkgs/games/zdoom/zdbsp.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, unzip, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "zdbsp-${version}";
+  pname = "zdbsp";
   version = "1.19";
 
   src = fetchurl {
diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix
index 6292b8183b2..83bf552b8b7 100644
--- a/pkgs/misc/brightnessctl/default.nix
+++ b/pkgs/misc/brightnessctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "brightnessctl-${version}";
+  pname = "brightnessctl";
   version = "0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix
index f0be3cad723..5e7596032b3 100644
--- a/pkgs/misc/cups/cups-pk-helper.nix
+++ b/pkgs/misc/cups/cups-pk-helper.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.6";
-  name = "cups-pk-helper-${version}";
+  pname = "cups-pk-helper";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz";
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 11873e6f2a0..011a7622060 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -9,7 +9,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "cups-${version}";
+  pname = "cups";
 
   # After 2.2.6, CUPS requires headers only available in macOS 10.12+
   version = if stdenv.isDarwin then "2.2.6" else "2.2.11";
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 08cc222e4a5..948e5ed72ab 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, zlib, cups }:
 
 stdenv.mkDerivation rec {
-  name = "brlaser-${version}";
+  pname = "brlaser";
   version = "4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index 2634b712871..abd50850b18 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -2,7 +2,7 @@
 , withDebug ? false }:
 
 stdenv.mkDerivation rec {
-  name = "cnijfilter2-${version}";
+  pname = "cnijfilter2";
 
   version = "5.30";
 
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
index 27b86ab8919..15e3a1d97a9 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
@@ -7,7 +7,7 @@
    file included in the tarball */
 
 stdenv.mkDerivation rec {
-  name = "cnijfilter-${version}";
+  pname = "cnijfilter";
 
   /* important note about versions: cnijfilter packages seem to use
      versions in a non-standard way.  the version indicates which
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
index c8e5ddd09b1..ba8cffc0e65 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
@@ -12,7 +12,7 @@ let arch =
     else throw "Unsupported system ${stdenv.hostPlatform.system}";
 
 in stdenv.mkDerivation rec {
-  name = "cnijfilter-${version}";
+  pname = "cnijfilter";
 
   /* important note about versions: cnijfilter packages seem to use
      versions in a non-standard way.  the version indicates which
diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix
index 8abda27a5cf..c2b912007d8 100644
--- a/pkgs/misc/cups/drivers/dymo/default.nix
+++ b/pkgs/misc/cups/drivers/dymo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, cups, ... }:
 
 stdenv.mkDerivation rec {
-  name = "cups-dymo-${version}";
+  pname = "cups-dymo";
   version = "1.4.0.5";
 
   # exposed version and 'real' version may differ
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix
index 83093da9c0a..a2fdd1abc19 100644
--- a/pkgs/misc/cups/drivers/estudio/default.nix
+++ b/pkgs/misc/cups/drivers/estudio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "cups-toshiba-estudio-${version}";
+  pname = "cups-toshiba-estudio";
   version = "7.89";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
index ffcc46d66e3..23651a57df8 100644
--- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
+++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
@@ -6,7 +6,7 @@ let
          else throw "Unsupported system: ${stdenv.hostPlatform.system}";
 in
 stdenv.mkDerivation rec {
-  name = "fxlinuxprint-${version}";
+  pname = "fxlinuxprint";
   version = "1.1.2-1";
 
   src = fetchzip {
diff --git a/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/pkgs/misc/cups/drivers/googlecloudprint/default.nix
index b3fc87fbf1d..0dcd518de84 100644
--- a/pkgs/misc/cups/drivers/googlecloudprint/default.nix
+++ b/pkgs/misc/cups/drivers/googlecloudprint/default.nix
@@ -14,7 +14,7 @@ let pythonEnv = python2.buildEnv.override {
 };
 
 in stdenv.mkDerivation rec {
-  name    = "cups-googlecloudprint-${version}";
+  pname = "cups-googlecloudprint";
   version = "20160502";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
index 55b0deea971..90f9a8e943a 100644
--- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
+++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "hll2390dw-cups-${version}";
+  pname = "hll2390dw-cups";
   version = "4.0.0-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix
index 9b40e4ff50e..21a276f9d14 100644
--- a/pkgs/misc/cups/drivers/kyocera/default.nix
+++ b/pkgs/misc/cups/drivers/kyocera/default.nix
@@ -10,7 +10,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "cups-kyocera-${version}";
+  pname = "cups-kyocera";
   version = "1.1203";
 
   dontPatchELF = true;
diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix
index bcd2914da0c..fa16a136f97 100644
--- a/pkgs/misc/cups/drivers/kyodialog3/default.nix
+++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix
@@ -15,7 +15,7 @@ let
   debRegion = if region == "EU" then "EU." else "";
 in
 stdenv.mkDerivation rec {
-  name = "cups-kyodialog3-${version}";
+  pname = "cups-kyodialog3";
   version = "8.1601";
 
   dontStrip = true;
diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
index 72a40f41f88..c7484e6d30b 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mfcj470dwlpr, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "mfcj470dw-cupswrapper-${version}";
+  pname = "mfcj470dw-cupswrapper";
   version = "3.0.0-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
index f31dd9061ec..befafd855bc 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "mfcj470dw-cupswrapper-${version}";
+  pname = "mfcj470dw-cupswrapper";
   version = "3.0.0-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
index 4b31ccf3877..4ec9e3fc6c8 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mfcj6510dwlpr, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "mfcj6510dw-cupswrapper-${version}";
+  pname = "mfcj6510dw-cupswrapper";
   version = "3.0.0-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
index 9d9535ce37b..b12ef18e46c 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
@@ -20,7 +20,7 @@
 # The user can run brprintconf_mfcj6510dw in the shell.
 
 stdenv.mkDerivation rec {
-  name = "mfcj6510dwlpr-${version}";
+  pname = "mfcj6510dwlpr";
   version = "3.0.0-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
index 8e31cd2956a..91110104bc9 100644
--- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
@@ -1,11 +1,11 @@
 { coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl2700dnlpr-${version}";
+  pname = "mfcl2700dnlpr";
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf102085/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf102085/${pname}-${version}.i386.deb";
     sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
index 2099291d434..b58e7b4faa4 100644
--- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl2720dwcupswrapper-${version}";
+  pname = "mfcl2720dwcupswrapper";
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101802/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101802/${pname}-${version}.i386.deb";
     sha256 = "6d131926ce22c51b1854d2b91e426cc7ecbf5d6dabd698ef51a417090e35c598";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
index 8dbc56fe846..b4b16563610 100644
--- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
@@ -1,11 +1,11 @@
 { pkgs, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl2720dwlpr-${version}";
+  pname = "mfcl2720dwlpr";
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101801/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101801/${pname}-${version}.i386.deb";
     sha256 = "088217e9ad118ec1e7f3d3f8f60f3bd839fe2c7d7c1136b249e9ac648dc742af";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
index 0da85498723..f2303a45a2f 100644
--- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl2740dwcupswrapper-${version}";
+  pname = "mfcl2740dwcupswrapper";
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101726/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101726/${pname}-${version}.i386.deb";
     sha256 = "078453e19f20ab6c7fc4d63c3e09f162f3d1410c04c23a294b6ffbd720b35ffb";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
index 6d3cf18e529..c2209806724 100644
--- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
@@ -1,11 +1,11 @@
 { pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl2740dwlpr-${version}";
+  pname = "mfcl2740dwlpr";
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101727/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101727/${pname}-${version}.i386.deb";
     sha256 = "10a2bc672bd54e718b478f3afc7e47d451557f7d5513167d3ad349a3d00bffaf";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
index 17040498acc..50f3b583e42 100644
--- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
@@ -2,11 +2,11 @@
 mfcl8690cdwlpr, perl, stdenv}:
 
 stdenv.mkDerivation rec {
-  name = "mfcl8690cdwcupswrapper-${version}";
+  pname = "mfcl8690cdwcupswrapper";
   version = "1.4.0-0";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf103250/${name}.i386.deb";
+    url = "http://download.brother.com/welcome/dlf103250/${pname}-${version}.i386.deb";
     sha256 = "1bl9r8mmj4vnanwpfjqgq3c9lf2v46wp5k6r2n9iqprf7ldd1kb2";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
index a521b3ea021..0e088401c0a 100644
--- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
@@ -2,11 +2,11 @@
 makeWrapper, perl, pkgs, stdenv, which }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl8690cdwlpr-${version}";
+  pname = "mfcl8690cdwlpr";
   version = "1.3.0-0";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf103241/${name}.i386.deb";
+    url = "http://download.brother.com/welcome/dlf103241/${pname}-${version}.i386.deb";
     sha256 = "0x8zd4b1psmw1znp2ibncs37xm5mljcy9yza2rx8jm8lp0a3l85v";
   };
 
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
index b395d73a266..8c906db642e 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
@@ -7,7 +7,7 @@ let
       else "i386";
 
 in stdenv.mkDerivation rec {
-  name = "samsung-unified-linux-driver-${version}";
+  pname = "samsung-unified-linux-driver";
   version = "1.00.36";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
index b2c4bbb0f20..9135441a6e7 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix
+++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
@@ -7,7 +7,7 @@ let
       else "i386";
 
 in stdenv.mkDerivation rec {
-  name = "samsung-unified-linux-driver-${version}";
+  pname = "samsung-unified-linux-driver";
   version = "1.00.37";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
index df0a270a5b2..5dc39793070 100644
--- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
@@ -18,7 +18,7 @@
 let
   cups' = stdenv.lib.getLib cups;
 in stdenv.mkDerivation rec {
-  name = "samsung-UnifiedLinuxDriver-${version}";
+  pname = "samsung-UnifiedLinuxDriver";
   version = "4.00.39";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
index 547e25b6514..f81fa27503f 100644
--- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
@@ -20,7 +20,7 @@ let
   appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else "";
   libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
 in stdenv.mkDerivation rec {
-  name = "samsung-UnifiedLinuxDriver-${version}";
+  pname = "samsung-UnifiedLinuxDriver";
   version = "4.01.17";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix
index 9321cf526be..b70b5daa766 100644
--- a/pkgs/misc/cups/drivers/zj-58/default.nix
+++ b/pkgs/misc/cups/drivers/zj-58/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "cups-zj-58";
   version = "2018-02-22";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "klirichek";
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 2a0a4369860..927755fdb74 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -8,11 +8,11 @@ let
   binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ];
 
 in stdenv.mkDerivation rec {
-  name = "cups-filters-${version}";
+  pname = "cups-filters";
   version = "1.25.0";
 
   src = fetchurl {
-    url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
+    url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
     sha256 = "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1";
   };
 
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index d865a8906cf..a232552712d 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -200,7 +200,7 @@ let fwdir = symlinkJoin {
 };
 in
 let iscan-data = stdenv.mkDerivation rec {
-  name = "iscan-data-${version}";
+  pname = "iscan-data";
   version = "1.39.0-1";
 
   src = fetchurl {
@@ -216,7 +216,7 @@ let iscan-data = stdenv.mkDerivation rec {
 };
 in
 stdenv.mkDerivation rec {
-  name = "iscan-${version}";
+  pname = "iscan";
   version = "2.30.3-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index ce95ca00e11..c65c13e886f 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cups }:
 
 stdenv.mkDerivation rec {
-  name = "epson-escpr-${version}";
+  pname = "epson-escpr";
   version = "1.6.16";
 
   src = fetchurl {
diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix
index 9ce6f5d7b01..2110de6e4c1 100644
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ b/pkgs/misc/drivers/epson-escpr2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cups, busybox }:
 
 stdenv.mkDerivation rec {
-  name = "epson-inkjet-printer-escpr2-${version}";
+  pname = "epson-inkjet-printer-escpr2";
   version = "1.0.29";
 
   src = fetchurl {
-    url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${name}-1lsb3.2.src.rpm";
+    url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${pname}-${version}-1lsb3.2.src.rpm";
     sha256 = "064br52akpw5yrxb2wqw2klv4jrvyipa7w0rjj974xgyi781lqs5";
   };
 
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   unpackPhase = ''
     rpm2cpio $src | cpio -idmv
 
-    tar xvf ${name}-1lsb3.2.tar.gz
-    cd ${name}
+    tar xvf ${pname}-${version}-1lsb3.2.tar.gz
+    cd ${pname}-${version}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix
index 31b13baf796..fb6b4956ef1 100644
--- a/pkgs/misc/drivers/moltengamepad/default.nix
+++ b/pkgs/misc/drivers/moltengamepad/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, udev }:
 
 stdenv.mkDerivation rec {
-  name = "moltengamepad-git-${version}";
+  pname = "moltengamepad-git";
   version = "2016-05-04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix
index d44c90d198a..366535b51c6 100644
--- a/pkgs/misc/drivers/steamcontroller/default.nix
+++ b/pkgs/misc/drivers/steamcontroller/default.nix
@@ -5,7 +5,7 @@
 with python3Packages;
 
 buildPythonApplication rec {
-  name = "steamcontroller-${version}";
+  pname = "steamcontroller";
   version = "2017-08-11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix
index 36f6ca5b8c0..829367aa329 100644
--- a/pkgs/misc/dumb/default.nix
+++ b/pkgs/misc/dumb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, allegro, SDL2 }:
 
 stdenv.mkDerivation rec {
-  name = "dumb-${version}";
+  pname = "dumb";
   version = "2.0.3";
   enableParallelBuilding = true;
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix
index 5a37b1b32c5..2e6ccd0a491 100644
--- a/pkgs/misc/emulators/atari++/default.nix
+++ b/pkgs/misc/emulators/atari++/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
-  name = "atari++-${version}";
+  pname = "atari++";
   version = "1.81";
 
   src = fetchurl {
diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix
index 4806c7f9e0f..228da687094 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/pkgs/misc/emulators/atari800/default.nix
@@ -3,11 +3,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
-  name = "atari800-${version}";
+  pname = "atari800";
   version = "4.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/atari800/atari800/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/atari800/atari800/${version}/${pname}-${version}.tar.gz";
     sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88";
   };
 
diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix
index 601503dc07e..a725d9c9b08 100644
--- a/pkgs/misc/emulators/attract-mode/default.nix
+++ b/pkgs/misc/emulators/attract-mode/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "attract-mode-${version}";
+  pname = "attract-mode";
   version = "2.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix
index 666f953f6b5..88e8556ec6c 100644
--- a/pkgs/misc/emulators/blastem/default.nix
+++ b/pkgs/misc/emulators/blastem/default.nix
@@ -3,7 +3,7 @@
 let
   vasm =
     stdenv.mkDerivation rec {
-      name = "vasm-${version}";
+      pname = "vasm";
       version = "1.8c";
       src = fetchFromGitHub {
         owner = "mbitsnbites";
@@ -19,7 +19,7 @@ let
     };
 in
 stdenv.mkDerivation rec {
-  name = "blastem-${version}";
+  pname = "blastem";
   version = "0.5.1";
   src = fetchurl {
     url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz";
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index 33c5d3cebf1..71beaf12548 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, kernel }:
 
 stdenv.mkDerivation rec {
-  name = "vhba-${version}";
+  pname = "vhba";
   version = "20190410";
 
   src  = fetchurl {
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index 3e8f78c4411..efa1a881f4a 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:
 
 stdenv.mkDerivation rec { 
-  name = "citra-${version}";
+  pname = "citra";
   version = "2019-05-25";
 
   # Submodules
diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix
index 70e7351e295..bdec34e396f 100644
--- a/pkgs/misc/emulators/darcnes/default.nix
+++ b/pkgs/misc/emulators/darcnes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libX11, libXt, libXext, libXaw }:
 
 stdenv.mkDerivation rec {
-  name = "darcnes-${version}";
+  pname = "darcnes";
   version = "9b0401";
 
   src = fetchurl {
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix
index d177012546e..6bb5be3c713 100644
--- a/pkgs/misc/emulators/desmume/default.nix
+++ b/pkgs/misc/emulators/desmume/default.nix
@@ -10,11 +10,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "desmume-${version}";
+  pname = "desmume";
   version = "0.9.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/desmume/desmume/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/desmume/desmume/${version}/${pname}-${version}.tar.gz";
     sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs";
   };
 
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index 392f5618b6e..fe8e82d98be 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -5,7 +5,7 @@
 , libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-${version}";
+  pname = "dolphin-emu";
   version = "5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 4f48f1248f4..fe16598fa9c 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -19,7 +19,7 @@ let
     startupNotify = "false";
   };
 in stdenv.mkDerivation rec {
-  name = "dolphin-emu-${version}";
+  pname = "dolphin-emu";
   version = "5.0-10751";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 9dec1ecacae..7312ad41ada 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -2,7 +2,7 @@
 , freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }:
 
 stdenv.mkDerivation rec {
-  name = "emulationstation-${version}";
+  pname = "emulationstation";
   version = "2.0.1a";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index edf4fe017a2..6950e12e889 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -4,7 +4,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "epsxe-${version}";
+  pname = "epsxe";
   version = "2.0.5";
 
   src = let
diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix
index 882bf13f4ea..079af05e794 100644
--- a/pkgs/misc/emulators/firebird-emu/default.nix
+++ b/pkgs/misc/emulators/firebird-emu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
 
 stdenv.mkDerivation rec {
-  name = "firebird-emu-${version}";
+  pname = "firebird-emu";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 9856c93eda2..7e1272faf11 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "fs-uae-${version}";
+  pname = "fs-uae";
   version = "2.8.4";
 
   src = fetchurl {
-    url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz";
+    url = "https://fs-uae.net/fs-uae/stable/${version}/${pname}-${version}.tar.gz";
     sha256 = "19ccb3gbpjwwazqc9pyin3jicjl27m2gyvy5bb5zysq0mxpzassj";
   };
 
diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix
index ea2d6bbfecc..04c5b441f01 100644
--- a/pkgs/misc/emulators/gxemul/default.nix
+++ b/pkgs/misc/emulators/gxemul/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gxemul-${version}";
+  pname = "gxemul";
   version = "0.6.0.1";
 
   src = fetchurl {
-    url = "http://gxemul.sourceforge.net/src/${name}.tar.gz";
+    url = "http://gxemul.sourceforge.net/src/${pname}-${version}.tar.gz";
     sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407";
   };
 
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin;
-    mkdir -p $out/share/${name};
+    mkdir -p $out/share/${pname}-${version};
     cp gxemul $out/bin;
-    cp -r doc $out/share/${name};
-    cp -r demos $out/share/${name};
+    cp -r doc $out/share/${pname}-${version};
+    cp -r demos $out/share/${pname}-${version};
     cp -r ./man $out/;
   '';
 
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 1349fa0f0b6..ad96ca36bc1 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -10,7 +10,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "higan-${version}";
+  pname = "higan";
   version = "106";
   sourceName = "higan_v${version}-source";
 
diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix
index 32d3013d842..c2494d70270 100644
--- a/pkgs/misc/emulators/kega-fusion/default.nix
+++ b/pkgs/misc/emulators/kega-fusion/default.nix
@@ -4,7 +4,7 @@ let
   libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ];
 
 in stdenv.mkDerivation rec {
-  name = "kega-fusion-${version}";
+  pname = "kega-fusion";
   version = "3.63x";
 
   src = fetchurl {
diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix
index 32201c48ee9..edb70ba7264 100644
--- a/pkgs/misc/emulators/libdsk/default.nix
+++ b/pkgs/misc/emulators/libdsk/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libdsk-${version}";
+  pname = "libdsk";
   version = "1.5.10";
 
   src = fetchurl {
-    url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz";
+    url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz";
     sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g";
   };
 
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index 9101c1587c2..74c456cfb10 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -2,11 +2,11 @@
 , libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "mednafen-${version}";
+  pname = "mednafen";
   version = "0.9.48";
 
   src = fetchurl {
-    url = "https://mednafen.github.io/releases/files/${name}.tar.xz";
+    url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz";
     sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k";
   };
 
diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
index 75eeeea4c00..146d5320261 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mednafen-server-${version}";
+  pname = "mednafen-server";
   version = "0.5.2";
 
   src = fetchurl {
diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix
index c62d9c90ca7..40390068e7b 100644
--- a/pkgs/misc/emulators/mednaffe/default.nix
+++ b/pkgs/misc/emulators/mednaffe/default.nix
@@ -4,7 +4,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "mednaffe-${version}";
+  pname = "mednaffe";
   version = "0.8.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 039bc57e603..6dc7bc30f32 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -14,7 +14,7 @@ let
     startupNotify = "false";
   };
 in stdenv.mkDerivation rec {
-  name = "mgba-${version}";
+  pname = "mgba";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index 9ff99110ecc..460dd7ad5fb 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "mupen64plus-${version}";
+  pname = "mupen64plus";
   version = "2.5";
 
   src = fetchurl {
diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix
index 5bc7bcec9d4..6bef474d7ea 100644
--- a/pkgs/misc/emulators/nestopia/default.nix
+++ b/pkgs/misc/emulators/nestopia/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.47";
-  name = "nestopia-${version}";
+  pname = "nestopia";
 
   src = fetchFromGitHub {
     owner = "rdanbrook";
diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix
index d2539cbc817..8a95d6f2883 100644
--- a/pkgs/misc/emulators/openmsx/default.nix
+++ b/pkgs/misc/emulators/openmsx/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "openmsx-${version}";
+  pname = "openmsx";
   version = "git-2017-11-02";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix
index 851c05c0578..1924452e2ab 100644
--- a/pkgs/misc/emulators/pcsx2/default.nix
+++ b/pkgs/misc/emulators/pcsx2/default.nix
@@ -3,7 +3,7 @@
 , wxGTK30, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "pcsx2-${version}";
+  pname = "pcsx2";
   version = "1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix
index 5af3042bde4..8f1e5e02c18 100644
--- a/pkgs/misc/emulators/pcsxr/default.nix
+++ b/pkgs/misc/emulators/pcsxr/default.nix
@@ -3,7 +3,7 @@
 , fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "pcsxr-${version}";
+  pname = "pcsxr";
   version = "1.9.94";
 
   # codeplex does not support direct downloading
@@ -67,14 +67,14 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    mkdir -p "$out/share/doc/${name}"
+    mkdir -p "$out/share/doc/${pname}-${version}"
     cp README \
        AUTHORS \
        doc/keys.txt \
        doc/tweaks.txt \
        ChangeLog.df \
        ChangeLog \
-       "$out/share/doc/${name}"
+       "$out/share/doc/${pname}-${version}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 159eefad666..619938ba5c6 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -5,7 +5,7 @@ assert withGamepads -> (SDL2 != null);
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "ppsspp-${version}";
+  pname = "ppsspp";
   version = "1.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
index 65cc0bd9c05..ca8d87b3800 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -8,11 +8,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qmc2-${version}";
+  pname = "qmc2";
   version = "0.195";
 
   src = fetchurl {
-      url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${name}.tar.gz";
+      url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz";
       sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns";
   };
   
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index ee7ff114ec8..f26769cd28d 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -26,7 +26,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "retroarch-bare-${version}";
+  pname = "retroarch-bare";
   version = "1.7.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
index 1072a66e0ea..8bdc79f2d8e 100644
--- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
+++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
@@ -18,7 +18,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "kodi-retroarch-advanced-launchers-${version}";
+  pname = "kodi-retroarch-advanced-launchers";
   version = "0.2";
 
   dontBuild = true;
diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix
index 2537669bbc4..25af4f8d50a 100644
--- a/pkgs/misc/emulators/retrofe/default.nix
+++ b/pkgs/misc/emulators/retrofe/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "retrofe-${version}";
+  pname = "retrofe";
   version = "0.6.169";
 
   src = fetchhg {
diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix
index 4c44377c11e..ae1b1bf6bda 100644
--- a/pkgs/misc/emulators/rpcs3/default.nix
+++ b/pkgs/misc/emulators/rpcs3/default.nix
@@ -10,7 +10,7 @@ let
   gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
 in
 stdenv.mkDerivation rec {
-  name = "rpcs3-${version}";
+  pname = "rpcs3";
   version = "${majorVersion}-${gitVersion}";
 
   src = fetchgit {
diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index a58f95875cc..0ae92121cab 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -2,7 +2,7 @@
 , SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }:
 
 stdenv.mkDerivation rec {
-  name = "snes9x-gtk-${version}";
+  pname = "snes9x-gtk";
   version = "1.57";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index 41ba5a3b2e6..c2d98cda060 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "stella-${version}";
+  pname = "stella";
   version = "4.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/stella/stella/${version}/${name}-src.tar.gz";
+    url = "mirror://sourceforge/project/stella/stella/${version}/${pname}-${version}-src.tar.gz";
     sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1";
   };
 
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index c8712d20859..4df9086a317 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -14,7 +14,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "visualboyadvance-m-${version}";
+  pname = "visualboyadvance-m";
   version = "2.1.3";
   src = fetchFromGitHub {
     owner = "visualboyadvance-m";
diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix
index a2d462fd990..ed8652d08f1 100644
--- a/pkgs/misc/emulators/yabause/default.nix
+++ b/pkgs/misc/emulators/yabause/default.nix
@@ -2,11 +2,11 @@
 , freeglut ? null, openal ? null, SDL2 ? null }:
 
 stdenv.mkDerivation rec {
-  name = "yabause-${version}";
+  pname = "yabause";
   version = "0.9.15";
 
   src = fetchurl {
-    url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz";
+    url = "https://download.tuxfamily.org/yabause/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23";
   };
 
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
index 991be274ecc..0f2abedd3b5 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/pkgs/misc/gnash/default.nix
@@ -65,7 +65,7 @@ assert length renderers == 0 -> throw "at least one renderer must be enabled";
 
 
 stdenv.mkDerivation rec {
-  name = "gnash-${version}";
+  pname = "gnash";
   version = "0.8.11-2019-30-01";
 
   src = fetchgit {
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index 8c9838ccec5..cb487677881 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -14,7 +14,7 @@ let
   optCelt = shouldUsePkg celt;
 in
 stdenv.mkDerivation rec {
-  name = "jack1-${version}";
+  pname = "jack1";
   version = "0.125.0";
 
   src = fetchurl {
diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix
index 7f355bc8156..0c3370814bc 100644
--- a/pkgs/misc/libcardiacarrest/default.nix
+++ b/pkgs/misc/libcardiacarrest/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libcardiacarrest-${version}";
+  pname = "libcardiacarrest";
   version = "12.2.8"; # <PA API version>.<version>
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix
index d977d822351..06a6a7e6550 100644
--- a/pkgs/misc/mnemonicode/default.nix
+++ b/pkgs/misc/mnemonicode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "mnemonicode-${version}";
+  pname = "mnemonicode";
   version = "2015-11-30";
   src = fetchFromGitHub {
     owner = "singpolyma";
diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix
index fe9e8d3f4b0..d701bd654d2 100644
--- a/pkgs/misc/mxt-app/default.nix
+++ b/pkgs/misc/mxt-app/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec{
   version="1.28";
-  name = "mxt-app-${version}";
+  pname = "mxt-app";
 
   src = fetchFromGitHub {
     owner = "atmel-maxtouch";
diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix
index 25441a30d86..eefd83c7260 100644
--- a/pkgs/misc/sailsd/default.nix
+++ b/pkgs/misc/sailsd/default.nix
@@ -10,7 +10,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "0.2.0";
-  name = "sailsd-${version}";
+  pname = "sailsd";
   src = fetchFromGitHub {
     owner = "sails-simulator";
     repo = "sailsd";
diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix
index cd5db3067f4..d25f253bd00 100644
--- a/pkgs/misc/screensavers/betterlockscreen/default.nix
+++ b/pkgs/misc/screensavers/betterlockscreen/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "betterlockscreen-${version}";
+  pname = "betterlockscreen";
   version = "3.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
index 6b28c39f767..b1c2ec5c3bd 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -3,7 +3,6 @@
 , glee }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "electricsheep";
   version = "2.7b33-2017-10-20";
 
diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
index b3c48cb4024..ae61291b087 100644
--- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix
+++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
@@ -1,7 +1,7 @@
 { stdenv, i3lock, imagemagick, scrot, playerctl, fetchFromGitLab }:
 
 stdenv.mkDerivation rec {
-  name = "i3lock-pixeled-${version}";
+  pname = "i3lock-pixeled";
   version = "1.2.1";
 
   src = fetchFromGitLab {
diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix
index 9855e868886..5cfddaaea57 100644
--- a/pkgs/misc/screensavers/physlock/default.nix
+++ b/pkgs/misc/screensavers/physlock/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "11-dev";
-  name = "physlock-${version}";
+  pname = "physlock";
   src = fetchFromGitHub {
     owner = "muennich";
     repo = "physlock";
diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix
index 404346bba63..fb80f9922ce 100644
--- a/pkgs/misc/screensavers/pipes/default.nix
+++ b/pkgs/misc/screensavers/pipes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgs }:
 
 stdenv.mkDerivation rec {
-  name = "pipes-${version}";
+  pname = "pipes";
   version = "1.3.0";
 
   src = fetchurl {
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix
index e8b9346a872..7f6d99297ab 100644
--- a/pkgs/misc/screensavers/rss-glx/default.nix
+++ b/pkgs/misc/screensavers/rss-glx/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.1";
-  name = "rss-glx-${version}";
+  pname = "rss-glx";
 
   src = fetchurl {
     url = "mirror://sourceforge/rss-glx/rss-glx_${version}.tar.bz2";
diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix
index b6f82cd45d7..4d4e1c1fc41 100644
--- a/pkgs/misc/screensavers/xautolock/default.nix
+++ b/pkgs/misc/screensavers/xautolock/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xautolock-${version}";
+  pname = "xautolock";
   version = "2.2-7-ga23dd5c";
 
   # This repository contains xautolock-2.2 plus various useful patches that
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index d68ac0f9fc1..1dcf16585f0 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "7.0.2";
-  name = "seafile-shared-${version}";
+  pname = "seafile-shared";
 
   src = fetchFromGitHub {
     owner = "haiwen";
diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix
index 2556e7d9d83..1993b4bcce4 100644
--- a/pkgs/misc/sndio/default.nix
+++ b/pkgs/misc/sndio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "sndio-${version}";
+  pname = "sndio";
   version = "1.6.0";
   enableParallelBuilding = true;
   buildInputs = [ alsaLib ];
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix
index 6db3b44b686..f61c9f5e1b9 100644
--- a/pkgs/misc/sound-of-sorting/default.nix
+++ b/pkgs/misc/sound-of-sorting/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "sound-of-sorting-${version}";
+  pname = "sound-of-sorting";
   version = "unstable-2015-07-21";
 
   src = fetchgit {
diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix
index ec8ef076c2f..b5dc7a13f18 100644
--- a/pkgs/misc/stabber/default.nix
+++ b/pkgs/misc/stabber/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "stabber-unstable-${version}";
+  pname = "stabber-unstable";
   version = "2016-11-09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/adapta-kde/default.nix b/pkgs/misc/themes/adapta-kde/default.nix
index 875973c9d3f..a7624d2889b 100644
--- a/pkgs/misc/themes/adapta-kde/default.nix
+++ b/pkgs/misc/themes/adapta-kde/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "adapta-kde-theme-${version}";
+  pname = "adapta-kde-theme";
   version = "20180512";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 6d2a16cbfd2..5fd8f1a594e 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "adapta-gtk-theme-${version}";
+  pname = "adapta-gtk-theme";
   version = "3.95.0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/misc/themes/albatross/default.nix
index 14fe0f21d80..870b348cc32 100644
--- a/pkgs/misc/themes/albatross/default.nix
+++ b/pkgs/misc/themes/albatross/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "Albatross-${version}";
+  pname = "Albatross";
   version = "1.7.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/misc/themes/arc-kde/default.nix
index 42ff954a46b..054cd1aeffc 100644
--- a/pkgs/misc/themes/arc-kde/default.nix
+++ b/pkgs/misc/themes/arc-kde/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "arc-kde-theme-${version}";
+  pname = "arc-kde-theme";
   version = "2017-11-09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix
index 4b7702ed635..3a0636a658a 100644
--- a/pkgs/misc/themes/blackbird/default.nix
+++ b/pkgs/misc/themes/blackbird/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "Blackbird";
   version = "2017-12-13";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     repo = "${pname}";
diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/misc/themes/clearlooks-phenix/default.nix
index daeb7d7ad36..04929a4cb4d 100644
--- a/pkgs/misc/themes/clearlooks-phenix/default.nix
+++ b/pkgs/misc/themes/clearlooks-phenix/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "7.0.1";
-  name = "clearlooks-phenix-${version}";
+  pname = "clearlooks-phenix";
 
   src = fetchurl {
     url = "https://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz";
diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix
index f0bb2bf729d..9cdefb9bb54 100644
--- a/pkgs/misc/themes/e17gtk/default.nix
+++ b/pkgs/misc/themes/e17gtk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "e17gtk-${version}";
+  pname = "e17gtk";
   version = "3.22.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/misc/themes/equilux-theme/default.nix
index bc4b57e8b58..1a4241be865 100644
--- a/pkgs/misc/themes/equilux-theme/default.nix
+++ b/pkgs/misc/themes/equilux-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
 
 stdenv.mkDerivation rec {
-  name = "equilux-theme-${version}";
+  pname = "equilux-theme";
   version = "20181029";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/misc/themes/jade1/default.nix
index e6096ef829d..ebeb7f2d866 100644
--- a/pkgs/misc/themes/jade1/default.nix
+++ b/pkgs/misc/themes/jade1/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "theme-jade1-${version}";
+  pname = "theme-jade1";
   version = "3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/pkgs/misc/themes/numix-solarized/default.nix
index 97a018f929e..4fd06fae61b 100644
--- a/pkgs/misc/themes/numix-solarized/default.nix
+++ b/pkgs/misc/themes/numix-solarized/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "20170810";
-  name = "numix-solarized-gtk-theme-${version}";
+  pname = "numix-solarized-gtk-theme";
 
   src = fetchFromGitHub {
     owner = "Ferdi265";
diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix
index 9001ad9e5a3..dfa788f6ea7 100644
--- a/pkgs/misc/themes/numix-sx/default.nix
+++ b/pkgs/misc/themes/numix-sx/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2017-04-24";
-  name = "numix-sx-gtk-theme-${version}";
+  pname = "numix-sx-gtk-theme";
 
   src = fetchurl {
     url = "https://dl.opendesktop.org/api/files/download/id/1493077417/Numix-SX.tar.xz";
diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix
index eb4b8c76301..e01f8174e9e 100644
--- a/pkgs/misc/themes/numix/default.nix
+++ b/pkgs/misc/themes/numix/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.6.7";
-  name = "numix-gtk-theme-${version}";
+  pname = "numix-gtk-theme";
 
   src = fetchFromGitHub {
     repo = "numix-gtk-theme";
diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
index 8a8e88ff6f9..a7f640f9c56 100644
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ b/pkgs/misc/themes/obsidian2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "theme-obsidian2-${version}";
+  pname = "theme-obsidian2";
   version = "2.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix
index 5e4f8ffa3d4..64ead2f75f4 100644
--- a/pkgs/misc/themes/onestepback/default.nix
+++ b/pkgs/misc/themes/onestepback/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "onestepback-${version}";
+  pname = "onestepback";
   version = "0.991";
 
   srcs = [
diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix
index 8bcb48812a3..2f7a53dc2d4 100644
--- a/pkgs/misc/themes/paper/default.nix
+++ b/pkgs/misc/themes/paper/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2016-08-16";
-  name = "paper-gtk-theme-${version}";
+  pname = "paper-gtk-theme";
 
   src = fetchFromGitHub {
     owner = "snwh";
diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/misc/themes/solarc/default.nix
index 55cd6e1dac0..3d9403b84f4 100644
--- a/pkgs/misc/themes/solarc/default.nix
+++ b/pkgs/misc/themes/solarc/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "solarc-gtk-theme-${version}";
+  pname = "solarc-gtk-theme";
   version = "1.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index 06d42da7936..81c681f5371 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "theme-vertex";
   version = "20170128";
 
diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix
index e10fa1b06b7..a0b6be3a418 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/pkgs/misc/urbit/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "urbit-${version}";
+  pname = "urbit";
   version = "0.7.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix
index c8cda8482bf..a841acdca94 100644
--- a/pkgs/misc/xosd/default.nix
+++ b/pkgs/misc/xosd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, libXext, libXt, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "xosd-${version}";
+  pname = "xosd";
   version = "2.2.14";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libxosd/${name}.tar.gz";
+    url = "mirror://sourceforge/libxosd/${pname}-${version}.tar.gz";
     sha256 = "025m7ha89q29swkc7s38knnbn8ysl24g2h5s7imfxflm91psj7sg";
   };
 
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 4d33fc0f3f8..ba5002c8c48 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -4,7 +4,7 @@ let
   # sadly needs to be exported because security_tool needs it
   sdk = stdenv.mkDerivation rec {
     version = "10.12";
-    name    = "MacOS_SDK-${version}";
+    pname = "MacOS_SDK";
 
     # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by:
     #  1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version
diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
index 28dcbdcb4a2..6a0c819a0a3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "551.1";
-  name    = "objc4-${version}";
+  pname = "objc4";
 
   src = fetchapplesource {
     inherit version;
diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix
index 9dd1205c114..12b35812651 100644
--- a/pkgs/os-specific/darwin/chunkwm/default.nix
+++ b/pkgs/os-specific/darwin/chunkwm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }:
 
 stdenv.mkDerivation rec {
-  name = "chunkwm-${version}";
+  pname = "chunkwm";
   version = "0.4.9";
   src = fetchzip {
     url = "http://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz";
diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix
index a9051fd1279..5c63b8e0dfb 100644
--- a/pkgs/os-specific/darwin/duti/default.nix
+++ b/pkgs/os-specific/darwin/duti/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "duti";
-  name = "${pname}-${version}";
   version = "1.5.4pre";
   src = fetchFromGitHub {
     owner = "moretension";
diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
index 190c0ae2213..e374bd2f11c 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "goku-${version}";
+  pname = "goku";
   version = "0.1.11";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
index 3ff03aace4e..be855498307 100644
--- a/pkgs/os-specific/darwin/iproute2mac/default.nix
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.1";
-  name = "iproute2mac-${version}";
+  pname = "iproute2mac";
 
   src = fetchFromGitHub {
     owner = "brona";
diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index fb7bb12a493..90f92b0b644 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }:
 
 stdenv.mkDerivation rec {
-  name = "khd-${version}";
+  pname = "khd";
   version = "3.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix
index 3076392ecb2..c3fa76f5096 100644
--- a/pkgs/os-specific/darwin/kwm/default.nix
+++ b/pkgs/os-specific/darwin/kwm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "kwm-${version}";
+  pname = "kwm";
   version = "4.0.5";
 
   src = fetchzip {
diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix
index 0b59ecb2299..cb81c2e8149 100644
--- a/pkgs/os-specific/darwin/lsusb/default.nix
+++ b/pkgs/os-specific/darwin/lsusb/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "lsusb-${version}";
+  pname = "lsusb";
 
   src = fetchFromGitHub {
     owner = "jlhonora";
diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix
index 75f1113e9f0..12bf02bf89f 100644
--- a/pkgs/os-specific/darwin/m-cli/default.nix
+++ b/pkgs/os-specific/darwin/m-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "m-cli-${version}";
+  pname = "m-cli";
   version = "0.2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix
index 960e0677da1..23b5ded1fe6 100644
--- a/pkgs/os-specific/darwin/opencflite/default.nix
+++ b/pkgs/os-specific/darwin/opencflite/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, icu, libuuid, tzdata }:
 
 stdenv.mkDerivation rec {
-  name = "opencflite-${version}";
+  pname = "opencflite";
   version = "476.19.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/opencflite/${name}.tar.gz";
+    url = "mirror://sourceforge/opencflite/${pname}-${version}.tar.gz";
     sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v";
   };
 
diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix
index 404e752c279..77e63c779b9 100644
--- a/pkgs/os-specific/darwin/osxfuse/default.nix
+++ b/pkgs/os-specific/darwin/osxfuse/default.nix
@@ -17,7 +17,6 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
 
   pname = "osxfuse";
   inherit version;
diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix
index aa7bfb5c3be..19ab34145e8 100644
--- a/pkgs/os-specific/darwin/qes/default.nix
+++ b/pkgs/os-specific/darwin/qes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, Carbon }:
 
 stdenv.mkDerivation rec {
-  name = "qes-${version}";
+  pname = "qes";
   version = "0.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index 631c59523e2..9f5f8aa4422 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "reattach-to-user-namespace-${version}";
+  pname = "reattach-to-user-namespace";
   version = "2.7";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index 713847313c2..ba5d3e9255b 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, Carbon }:
 
 stdenv.mkDerivation rec {
-  name = "skhd-${version}";
+  pname = "skhd";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix
index b18c603a911..9efa230d3b7 100644
--- a/pkgs/os-specific/darwin/smimesign/default.nix
+++ b/pkgs/os-specific/darwin/smimesign/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name    = "smimesign-${version}";
+  pname = "smimesign";
   version = "v0.0.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix
index fcbcfe00a3e..50c6d4fd2f4 100644
--- a/pkgs/os-specific/darwin/trash/default.nix
+++ b/pkgs/os-specific/darwin/trash/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.2";
-  name = "trash-${version}";
+  pname = "trash";
 
   src = fetchFromGitHub {
     owner = "ali-rantakari";
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index 37de98780b6..cc7317f5520 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "acpi-${version}";
+  pname = "acpi";
   version = "1.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz";
     sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp";
   };
 
diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix
index 14b10e6752b..743e8f3576b 100644
--- a/pkgs/os-specific/linux/alsa-tools/default.nix
+++ b/pkgs/os-specific/linux/alsa-tools/default.nix
@@ -3,11 +3,11 @@
 # some use gtk2, some gtk3 (and some even fltk13).
 
 stdenv.mkDerivation rec {
-  name = "alsa-tools-${version}";
+  pname = "alsa-tools";
   version = "1.1.7";
 
   src = fetchurl {
-    url = "mirror://alsa/tools/${name}.tar.bz2";
+    url = "mirror://alsa/tools/${pname}-${version}.tar.bz2";
     sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950";
   };
 
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 09c430bcd53..6f23d190318 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-utils-${version}";
+  pname = "alsa-utils";
   version = "1.1.9";
 
   src = fetchurl {
-    url = "mirror://alsa/utils/${name}.tar.bz2";
+    url = "mirror://alsa/utils/${pname}-${version}.tar.bz2";
     sha256 = "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx";
   };
 
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index b03636d6f7f..aed0ed374a7 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -5,7 +5,7 @@
 #   services.udev.packages = [ pkgs.android-udev-rules ];
 
 stdenv.mkDerivation rec {
-  name = "android-udev-rules-${version}";
+  pname = "android-udev-rules";
   version = "20190315";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix
index 5d002bf72ea..5144add3a37 100644
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/pkgs/os-specific/linux/atop/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.4.0";
-  name = "atop-${version}";
+  pname = "atop";
 
   src = fetchurl {
     url = "https://www.atoptool.nl/download/atop-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix
index a2ebc0cdc53..7f5cd206f32 100644
--- a/pkgs/os-specific/linux/bpftrace/default.nix
+++ b/pkgs/os-specific/linux/bpftrace/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bpftrace-${version}";
+  pname = "bpftrace";
   version = "0.9.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix
index d77539fb89e..44c2cfff5a2 100644
--- a/pkgs/os-specific/linux/cachefilesd/default.nix
+++ b/pkgs/os-specific/linux/cachefilesd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cachefilesd-${version}";
+  pname = "cachefilesd";
   version = "0.10.10";
 
   src = fetchurl {
-    url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2";
+    url = "https://people.redhat.com/dhowells/fscache/${pname}-${version}.tar.bz2";
     sha256 = "00hsw4cdlm13wijlygp8f0aq6gxdp0skbxs9r2vh5ggs3s2hj0qd";
   };
 
diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix
index 0c32c3f5e62..0149398bfa3 100644
--- a/pkgs/os-specific/linux/can-isotp/default.nix
+++ b/pkgs/os-specific/linux/can-isotp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, kernel, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "can-isotp-${version}";
+  pname = "can-isotp";
   version = "20180629";
 
   hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix
index 616c99c8f46..7913c703b5b 100644
--- a/pkgs/os-specific/linux/can-utils/default.nix
+++ b/pkgs/os-specific/linux/can-utils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "can-utils-${version}";
+  pname = "can-utils";
   # There are no releases (source archives or git tags), so use the date of the
   # latest commit in git master as version number.
   version = "20170830";
diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
index 674b695b1ee..b724112af88 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bison, flex, libsepol }:
 
 stdenv.mkDerivation rec {
-  name = "checkpolicy-${version}";
+  pname = "checkpolicy";
   version = "2.7";
   inherit (libsepol) se_release se_url;
 
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index ba66bd309bc..ea6a6e77572 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -2,11 +2,11 @@
 , kerberos, keyutils, pam, talloc }:
 
 stdenv.mkDerivation rec {
-  name = "cifs-utils-${version}";
+  pname = "cifs-utils";
   version = "6.9";
 
   src = fetchurl {
-    url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2";
+    url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
     sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q";
   };
 
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 1af37c2168d..ad30f52d145 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -67,7 +67,7 @@ assert journalSupport      -> systemd != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "conky-${version}";
+  pname = "conky";
   version = "1.11.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix
index 755e88b46cb..20c441ffae2 100644
--- a/pkgs/os-specific/linux/conntrack-tools/default.nix
+++ b/pkgs/os-specific/linux/conntrack-tools/default.nix
@@ -3,11 +3,11 @@
 , libnetfilter_cthelper, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "conntrack-tools-${version}";
+  pname = "conntrack-tools";
   version = "1.4.5";
 
   src = fetchurl {
-    url = "https://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
+    url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2";
     sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin";
   };
 
diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix
index d813376da8e..8ea3e3445cc 100644
--- a/pkgs/os-specific/linux/consoletools/default.nix
+++ b/pkgs/os-specific/linux/consoletools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "linuxconsoletools-${version}";
+  pname = "linuxconsoletools";
   version = "1.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2";
+    url = "mirror://sourceforge/linuxconsole/${pname}-${version}.tar.bz2";
     sha256 = "0d2r3j916fl2y7pk1y82b9fvbr10dgs1gw7rqwzfpispdidb1mp9";
   };
 
diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix
index 940913d6a6c..84c113c648c 100644
--- a/pkgs/os-specific/linux/crda/default.nix
+++ b/pkgs/os-specific/linux/crda/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libgcrypt, libnl, pkgconfig, python2Packages, wireless-regdb }:
 
 stdenv.mkDerivation rec {
-  name = "crda-${version}";
+  pname = "crda";
   version = "3.18";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 0821fbdc15c..354eea40b24 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -3,11 +3,11 @@
 , which, python, makeWrapper, docbook_xml_dtd_45 }:
 
 stdenv.mkDerivation rec {
-  name    = "criu-${version}";
+  pname = "criu";
   version = "3.12";
 
   src = fetchurl {
-    url    = "https://download.openvz.org/criu/${name}.tar.bz2";
+    url    = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2";
     sha256 = "1z0fpym8fi2jqx99himqs8pm5l4mzrswjqxcyfwjmbabzb77dwhf";
   };
 
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 82b0bb2f356..5f5005d8b97 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -2,7 +2,7 @@
 , dbus, linuxHeaders, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-broker-${version}";
+  pname = "dbus-broker";
   version = "21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix
index e8c1e9bfe5e..5896262ac21 100644
--- a/pkgs/os-specific/linux/directvnc/default.nix
+++ b/pkgs/os-specific/linux/directvnc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "directvnc-${version}";
+  pname = "directvnc";
   version = "0.7.7.2015-04-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 2ea939ccdb0..7ce5535313c 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -10,7 +10,7 @@ let
   libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ];
 
 in stdenv.mkDerivation rec {
-  name = "displaylink-${version}";
+  pname = "displaylink";
   version = "4.4.24";
 
   src = requireFile rec {
diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index 534e5735447..1d67b16a492 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, bash, perl, python }:
 
 stdenv.mkDerivation rec {
-  name = "dmtcp-${version}";
+  pname = "dmtcp";
   version = "2.5.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix
index 936dbf719a8..f5b7e44a3fb 100644
--- a/pkgs/os-specific/linux/dropwatch/default.nix
+++ b/pkgs/os-specific/linux/dropwatch/default.nix
@@ -4,7 +4,6 @@
 stdenv.mkDerivation rec {
   pname = "dropwatch";
   version = "1.5";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "nhorman";
diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix
index 9d92575b668..23bd39ff388 100644
--- a/pkgs/os-specific/linux/ebtables/default.nix
+++ b/pkgs/os-specific/linux/ebtables/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ebtables-${version}";
+  pname = "ebtables";
   version = "2.0.10-4";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index 0e8377141ed..55f42f3e3ff 100644
--- a/pkgs/os-specific/linux/eventstat/default.nix
+++ b/pkgs/os-specific/linux/eventstat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchzip, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "eventstat-${version}";
+  pname = "eventstat";
   version = "0.04.06";
   src = fetchzip {
     url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix
index 28a92d31eaa..6aaaaec1b13 100644
--- a/pkgs/os-specific/linux/extrace/default.nix
+++ b/pkgs/os-specific/linux/extrace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "extrace-${version}";
+  pname = "extrace";
   version = "0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 94ea85f433d..b99f719f836 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python3, which }:
 
 stdenv.mkDerivation rec {
-  name = "fatrace-${version}";
+  pname = "fatrace";
   version = "0.13";
 
   src = fetchurl {
-    url = "https://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2";
+    url = "https://launchpad.net/fatrace/trunk/${version}/+download/${pname}-${version}.tar.bz2";
     sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx";
   };
 
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
index 2637beb517a..959c0c74618 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, b43FirmwareCutter }:
 
 stdenv.mkDerivation rec {
-  name = "b43-firmware-${version}";
+  pname = "b43-firmware";
   version = "6.30.163.46";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
index a57a6f1d70f..4d5271a9ddf 100644
--- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
@@ -4,7 +4,7 @@
 # this packages as they expect the firmware to be named "BCM.hcd"
 # see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865
 stdenv.mkDerivation rec {
-  name = "broadcom-bt-firmware-${version}";
+  pname = "broadcom-bt-firmware";
   version = "12.0.1.1012";
 
   src = fetchurl {
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cabextract bt-fw-converter ];
 
   unpackCmd = ''
-    mkdir -p ${name}
-    cabextract $src --directory ${name}
+    mkdir -p ${pname}-${version}
+    cabextract $src --directory ${pname}-${version}
   '';
 
   installPhase = ''
diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
index 8927e1a28e7..9a99881be46 100644
--- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
+++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }:
 
 stdenv.mkDerivation  rec {
-  name = "bt-fw-converter-${version}";
+  pname = "bt-fw-converter";
   version = "2017-02-19";
   rev = "2d8b34402df01c6f7f4b8622de9e8b82fadf4153";
 
@@ -15,8 +15,8 @@ stdenv.mkDerivation  rec {
   buildInputs = [ perl perlPackages.RegexpGrammars bluez ];
 
   unpackCmd = ''
-    mkdir -p ${name}
-    cp $src ${name}/bt-fw-converter.pl
+    mkdir -p ${pname}-${version}
+    cp $src ${pname}-${version}/bt-fw-converter.pl
   '';
 
   installPhase = ''
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index c251e3963e7..380444f0269 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "firmware-linux-nonfree-${version}";
+  pname = "firmware-linux-nonfree";
   version = "2019-07-17";
 
   src = fetchgit {
diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
index b60ce6f1b4a..421a3300f7b 100644
--- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "openelec-dvb-firmware-${version}";
+  pname = "openelec-dvb-firmware";
   version = "0.0.51";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
index e64c4c09ebd..26ed2020635 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "raspberrypi-wireless-firmware-${version}";
+  pname = "raspberrypi-wireless-firmware";
   version = "2018-08-20";
 
   srcs = [
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
index 4685f675717..321ce8ffc06 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "raspberrypi-tools-${version}";
+  pname = "raspberrypi-tools";
   version = "2018-10-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix
index 0a6364f07df..0abd458aa8f 100644
--- a/pkgs/os-specific/linux/flashbench/default.nix
+++ b/pkgs/os-specific/linux/flashbench/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "flashbench-${version}";
+  pname = "flashbench";
   version = "2012-06-06";
 
   src = fetchgit {
diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix
index 5b398bcec9a..4ebb9d6e950 100644
--- a/pkgs/os-specific/linux/fnotifystat/default.nix
+++ b/pkgs/os-specific/linux/fnotifystat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fnotifystat-${version}";
+  pname = "fnotifystat";
   version = "0.02.02";
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index 8432f72e0c9..adcab03ac13 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "forkstat-${version}";
+  pname = "forkstat";
   version = "0.02.10";
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix
index a091b2f17c5..09774016ef2 100644
--- a/pkgs/os-specific/linux/freefall/default.nix
+++ b/pkgs/os-specific/linux/freefall/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   inherit (kernel) version src;
 
-  name = "freefall-${version}";
+  pname = "freefall";
 
   postPatch = ''
     cd tools/laptop/freefall
diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index da787d84d79..35e1972b574 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -3,7 +3,7 @@
 # Don't use this for anything important yet!
 
 buildGoPackage rec {
-  name = "fscrypt-${version}";
+  pname = "fscrypt";
   version = "0.2.4";
 
   goPackagePath = "github.com/google/fscrypt";
diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix
index 8622dc001a8..ecab0350d78 100644
--- a/pkgs/os-specific/linux/fscryptctl/default.nix
+++ b/pkgs/os-specific/linux/fscryptctl/default.nix
@@ -3,7 +3,7 @@
 # Don't use this for anything important yet!
 
 stdenv.mkDerivation rec {
-  name = "fscryptctl-unstable-${version}";
+  pname = "fscryptctl-unstable";
   version = "2017-10-23";
 
   goPackagePath = "github.com/google/fscrypt";
diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix
index 915431c0cb1..4d283d5dc0c 100644
--- a/pkgs/os-specific/linux/ftop/default.nix
+++ b/pkgs/os-specific/linux/ftop/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ftop-${version}";
+  pname = "ftop";
   version = "1.0";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${name}.tar.bz2";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${pname}-${version}.tar.bz2";
     sha256 = "3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82";
   };
 
diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 4531de86b1b..07252b8bc31 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -2,7 +2,7 @@
 , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }:
 
 stdenv.mkDerivation rec {
-  name = "fwts-${version}";
+  pname = "fwts";
   version = "19.07.00";
 
   src = fetchzip {
diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/os-specific/linux/gfxtablet/default.nix
index 9fc052c5ac1..56fa4f1d7d6 100644
--- a/pkgs/os-specific/linux/gfxtablet/default.nix
+++ b/pkgs/os-specific/linux/gfxtablet/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4";
-  name = "gfxtablet-uinput-driver-${version}";
+  pname = "gfxtablet-uinput-driver";
 
   buildInputs = [
     linuxHeaders
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index fc308285dd6..03018c98818 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, autoreconfHook, pam, qrencode }:
 
 stdenv.mkDerivation rec {
-  name = "google-authenticator-libpam-${version}";
+  pname = "google-authenticator-libpam";
   version = "1.06";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix
index d56253c6ced..0325461763a 100644
--- a/pkgs/os-specific/linux/gpu-switch/default.nix
+++ b/pkgs/os-specific/linux/gpu-switch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gpu-switch-unstable-${version}";
+  pname = "gpu-switch-unstable";
   version = "2017-04-28";
   src = fetchFromGitHub {
     owner = "0xbb";
diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index 7f64ed22771..bea70da995b 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "gradm-${version}";
+  pname = "gradm";
   version = "3.1-201608131257";
 
   src  = fetchurl {
-    url    = "http://grsecurity.net/stable/${name}.tar.gz";
+    url    = "http://grsecurity.net/stable/${pname}-${version}.tar.gz";
     sha256 = "0y5565rhil5ciprwz7nx4s4ah7dsxx7zrkg42dbq0mcg8m316xrb";
   };
 
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index acafa0376f5..8e6db2a5774 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -6,7 +6,7 @@ assert pulseaudioSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   version = "2.0.6";
-  name = "guvcview-${version}";
+  pname = "guvcview";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 7629a20473b..e90470cd589 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
 
 stdenv.mkDerivation rec {
-  name = "hostapd-${version}";
+  pname = "hostapd";
   version = "2.8";
 
   src = fetchurl {
-    url = "https://w1.fi/releases/${name}.tar.gz";
+    url = "https://w1.fi/releases/${pname}-${version}.tar.gz";
     sha256 = "1c74rrazkhy4lr7pwgwa2igzca7h9l4brrs7672kiv7fwqmm57wj";
   };
 
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index dfca87e2716..38335682ddb 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "hwdata-${version}";
+  pname = "hwdata";
   version = "0.316";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix
index f89747dc200..36ca1eb16b4 100644
--- a/pkgs/os-specific/linux/hyperv-daemons/default.nix
+++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix
@@ -2,7 +2,7 @@
 
 let
   daemons = stdenv.mkDerivation rec {
-    name = "hyperv-daemons-bin-${version}";
+    pname = "hyperv-daemons-bin";
     inherit (kernel) src version;
 
     nativeBuildInputs = [ makeWrapper ];
@@ -55,7 +55,7 @@ let
     '';
 
 in stdenv.mkDerivation rec {
-  name    = "hyperv-daemons-${version}";
+  pname = "hyperv-daemons";
 
   inherit (kernel) version;
 
diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix
index 5b061183356..1b87619faa3 100644
--- a/pkgs/os-specific/linux/i2c-tools/default.nix
+++ b/pkgs/os-specific/linux/i2c-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, read-edid }:
 
 stdenv.mkDerivation rec {
-  name = "i2c-tools-${version}";
+  pname = "i2c-tools";
   version = "4.1";
 
   src = fetchurl {
-    url = "https://www.kernel.org/pub/software/utils/i2c-tools/${name}.tar.xz";
+    url = "https://www.kernel.org/pub/software/utils/i2c-tools/${pname}-${version}.tar.xz";
     sha256 = "1m97hpwqfaqjl9xvr4pvz2vdrsdvxbcn0nnx8pamnyc3s7pikcjp";
   };
 
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index ac5f9fc5ba3..2f792cb7ea7 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -2,7 +2,7 @@
 , withGui ? false, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "i7z-${version}";
+  pname = "i7z";
   version = "0.27.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/pkgs/os-specific/linux/ifenslave/default.nix
index b9390d1d589..1b22c1eafd3 100644
--- a/pkgs/os-specific/linux/ifenslave/default.nix
+++ b/pkgs/os-specific/linux/ifenslave/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ifenslave-${version}";
+  pname = "ifenslave";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix
index 6de3b19afd7..69ec6560d83 100644
--- a/pkgs/os-specific/linux/ima-evm-utils/default.nix
+++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-  name = "ima-evm-utils-${version}";
+  pname = "ima-evm-utils";
   version = "1.1";
 
   src = fetchgit {
diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix
index cd0fc01384b..c6248ee9083 100644
--- a/pkgs/os-specific/linux/input-utils/default.nix
+++ b/pkgs/os-specific/linux/input-utils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, linuxHeaders }:
 
 stdenv.mkDerivation rec {
-  name = "input-utils-${version}";
+  pname = "input-utils";
   version = "1.3";
   
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix
index 38069981723..1f67208db8b 100644
--- a/pkgs/os-specific/linux/intel-ocl/default.nix
+++ b/pkgs/os-specific/linux/intel-ocl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "intel-ocl-${version}";
+  pname = "intel-ocl";
   version = "5.0-63503";
 
   src = fetchzip {
diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix
index a9be26a2026..5a0555f6680 100644
--- a/pkgs/os-specific/linux/iptstate/default.nix
+++ b/pkgs/os-specific/linux/iptstate/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libnetfilter_conntrack, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "iptstate-${version}";
+  pname = "iptstate";
   version = "2.2.6";
 
   src = fetchurl {
-    url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${name}.tar.bz2";
+    url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${pname}-${version}.tar.bz2";
     sha256 = "bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068";
   };
 
diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix
index 67a123a3764..f5d80dc5258 100644
--- a/pkgs/os-specific/linux/ipvsadm/default.nix
+++ b/pkgs/os-specific/linux/ipvsadm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }:
 
 stdenv.mkDerivation rec {
-  name = "ipvsadm-${version}";
+  pname = "ipvsadm";
   version = "1.30";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/kernel/ipvsadm/${name}.tar.xz";
+    url = "mirror://kernel/linux/utils/kernel/ipvsadm/${pname}-${version}.tar.xz";
     sha256 = "033srm20n3114aci3b6cwxnkm7n68k09di2aziiryg27vxq3smwm";
   };
 
diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix
index e606e3db6ee..8dc9e2694d4 100644
--- a/pkgs/os-specific/linux/irqbalance/default.nix
+++ b/pkgs/os-specific/linux/irqbalance/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }:
 
 stdenv.mkDerivation rec {
-  name = "irqbalance-${version}";
+  pname = "irqbalance";
   version = "1.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index a37e65f8cb5..3386a7f9206 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "kbd-${version}";
+  pname = "kbd";
   version = "2.0.4";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz";
+    url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz";
     sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz";
   };
 
diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/pkgs/os-specific/linux/kbd/keymaps.nix
index 32c9f690680..e6e89811894 100644
--- a/pkgs/os-specific/linux/kbd/keymaps.nix
+++ b/pkgs/os-specific/linux/kbd/keymaps.nix
@@ -2,7 +2,7 @@
 
 {
   dvp = stdenv.mkDerivation rec {
-    name = "dvp-${version}";
+    pname = "dvp";
     version = "1.2.1";
 
     src = fetchurl {
@@ -19,7 +19,7 @@
   };
 
   neo = stdenv.mkDerivation rec {
-    name = "neo-${version}";
+    pname = "neo";
     version = "2476";
 
     src = fetchurl {
diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix
index 44a63c9f1ec..6df3e4fffe7 100644
--- a/pkgs/os-specific/linux/kbdlight/default.nix
+++ b/pkgs/os-specific/linux/kbdlight/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "kbdlight-${version}";
+  pname = "kbdlight";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 8adb862a265..326afdfff46 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "kexec-tools-${version}";
+  pname = "kexec-tools";
   version = "2.0.19";
 
   src = fetchurl {
     urls = [
-      "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
-      "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
+      "mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz"
+      "http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz"
     ];
     sha256 = "03jyi4c47ywclycf3a253xpqs7p6ys8inz9q66b8m3xc6nrh307d";
   };
diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix
index 1d9497a7edd..7d6ee61030c 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "keyutils-${version}";
+  pname = "keyutils";
   version = "1.6";
 
   src = fetchurl {
-    url = "https://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";
+    url = "https://people.redhat.com/dhowells/keyutils/${pname}-${version}.tar.bz2";
     sha256 = "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk";
   };
 
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 8cae61d56a9..8e224c8f33b 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "klibc-${version}";
+  pname = "klibc";
   version = "2.0.4";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix
index 949c8135df7..fef7a3236b3 100644
--- a/pkgs/os-specific/linux/libaio/default.nix
+++ b/pkgs/os-specific/linux/libaio/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.110";
-  name = "libaio-${version}";
+  pname = "libaio";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/releases/l/i/libaio/${name}.tar.gz";
+    url = "https://fedorahosted.org/releases/l/i/libaio/${pname}-${version}.tar.gz";
     sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0";
   };
 
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index a23c0cb0926..1294bd3d268 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -5,7 +5,7 @@
 with builtins;
 
 stdenv.mkDerivation rec {
-  name = "libbpf-${version}";
+  pname = "libbpf";
   version = "0.0.3pre114_${substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix
index 981e928ba65..d0fc97d0dd3 100644
--- a/pkgs/os-specific/linux/libcap-ng/default.nix
+++ b/pkgs/os-specific/linux/libcap-ng/default.nix
@@ -3,13 +3,13 @@
 assert python2 != null || python3 != null -> swig != null;
 
 stdenv.mkDerivation rec {
-  name = "libcap-ng-${version}";
+  pname = "libcap-ng";
   # When updating make sure to test that the version with
   # all of the python bindings still works
   version = "0.7.9";
 
   src = fetchurl {
-    url = "${meta.homepage}/${name}.tar.gz";
+    url = "${meta.homepage}/${pname}-${version}.tar.gz";
     sha256 = "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa";
   };
 
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 87f354aa75d..9c730bb9659 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, attr, perl, pam }:
 
 stdenv.mkDerivation rec {
-  name = "libcap-${version}";
+  pname = "libcap";
   version = "2.27";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${name}.tar.xz";
+    url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
     sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs";
   };
 
@@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     rm "$lib"/lib/*.a
-    mkdir -p "$doc/share/doc/${name}"
-    cp License "$doc/share/doc/${name}/"
+    mkdir -p "$doc/share/doc/${pname}-${version}"
+    cp License "$doc/share/doc/${pname}-${version}/"
   '' + stdenv.lib.optionalString (pam != null) ''
     mkdir -p "$pam/lib/security"
     mv "$lib"/lib/security "$pam/lib"
diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix
index 1e920247a75..026b43fc615 100644
--- a/pkgs/os-specific/linux/libcgroup/default.nix
+++ b/pkgs/os-specific/linux/libcgroup/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, pam, yacc, flex }:
 
 stdenv.mkDerivation rec {
-  name    = "libcgroup-${version}";
+  pname = "libcgroup";
   version = "0.41";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libcg/${name}.tar.bz2";
+    url = "mirror://sourceforge/libcg/${pname}-${version}.tar.bz2";
     sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4";
   };
 
diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 34d10d3aa5f..0789d53b434 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -2,7 +2,7 @@
 , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}:
 
 stdenv.mkDerivation rec {
-  name = "libnl-${version}";
+  pname = "libnl";
   version = "3.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix
index 5dab4b34f46..a09bb2a6ceb 100644
--- a/pkgs/os-specific/linux/libratbag/default.nix
+++ b/pkgs/os-specific/linux/libratbag/default.nix
@@ -2,7 +2,7 @@
 , glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "libratbag-${version}";
+  pname = "libratbag";
   version = "0.9.905";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 51e1a322094..028c008eccf 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -8,7 +8,7 @@ assert enablePython -> swig != null && python != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libselinux-${version}";
+  pname = "libselinux";
   version = "2.7";
   inherit (libsepol) se_release se_url;
 
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 59f5f11d076..4fe323ee23d 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libsemanage-${version}";
+  pname = "libsemanage";
   version = "2.7";
   inherit (libsepol) se_release se_url;
 
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index f16c241a0a1..e96ea01cce4 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, flex }:
 
 stdenv.mkDerivation rec {
-  name = "libsepol-${version}";
+  pname = "libsepol";
   version = "2.7";
   se_release = "20170804";
   se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 874faf7799b..d0ae1852853 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -3,7 +3,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "libsmbios-${version}";
+  pname = "libsmbios";
   version = "2.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix
index c0c6ad54579..ecdc658f2f1 100644
--- a/pkgs/os-specific/linux/libudev0-shim/default.nix
+++ b/pkgs/os-specific/linux/libudev0-shim/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, udev }:
 
 stdenv.mkDerivation rec {
-  name = "libudev0-shim-${version}";
+  pname = "libudev0-shim";
   version = "1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/os-specific/linux/libwebcam/default.nix
index 879e85a0c94..5cccc82b843 100644
--- a/pkgs/os-specific/linux/libwebcam/default.nix
+++ b/pkgs/os-specific/linux/libwebcam/default.nix
@@ -9,7 +9,6 @@
 stdenv.mkDerivation rec {
   pname = "libwebcam";
   version = "0.2.5";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${pname}/source/${pname}-src-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix
index 1856c8861cc..6a0dd34d021 100644
--- a/pkgs/os-specific/linux/light/default.nix
+++ b/pkgs/os-specific/linux/light/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2";
-  name = "light-${version}";
+  pname = "light";
   src = fetchFromGitHub {
     owner = "haikarainen";
     repo = "light";
diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix
index 0536ba064a3..b9e58cb5a4c 100644
--- a/pkgs/os-specific/linux/lm-sensors/default.nix
+++ b/pkgs/os-specific/linux/lm-sensors/default.nix
@@ -5,7 +5,7 @@
 assert sensord -> rrdtool != null;
 
 stdenv.mkDerivation rec {
-  name = "lm-sensors-${version}";
+  pname = "lm-sensors";
   version = "3.5.0";
 
   src = fetchzip {
diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix
index 3c7ceb1270c..74abd12868d 100644
--- a/pkgs/os-specific/linux/lockdep/default.nix
+++ b/pkgs/os-specific/linux/lockdep/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "lockdep-${version}";
+  pname = "lockdep";
   version = "4.1.2";
   fullver = "4.1.2";
 
diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix
index c215d940194..9aa1698b766 100644
--- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/logitech-udev-rules/default.nix
@@ -4,7 +4,7 @@
 # up-to-date so we simply use that instead of having to maintain our own rules
 
 stdenv.mkDerivation rec {
-  name = "logitech-udev-rules-${version}";
+  pname = "logitech-udev-rules";
   inherit (solaar) version;
 
   buildCommand = ''
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index a61d8574cc0..5928b77a988 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxc-${version}";
+  pname = "lxc";
   version = "3.2.1";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix
index c335031f2e5..ec76cda9769 100644
--- a/pkgs/os-specific/linux/macchanger/default.nix
+++ b/pkgs/os-specific/linux/macchanger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "macchanger-${version}";
+  pname = "macchanger";
   version = "1.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index 9528b9be7f7..8b62ce76409 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "mbpfan-${version}";
+  pname = "mbpfan";
   version = "2.1.1";
   src = fetchFromGitHub {
     owner = "dgraziotin";
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 394dbf63f17..659f875bc2b 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "mcelog-${version}";
+  pname = "mcelog";
   version = "162";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix
index 485272b1401..c81a0c9097a 100644
--- a/pkgs/os-specific/linux/microcode/iucode-tool.nix
+++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "iucode-tool-${version}";
+  pname = "iucode-tool";
   version = "2.3.1";
 
   src = fetchFromGitLab {
diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix
index b65486cb2fe..0edf322cce5 100644
--- a/pkgs/os-specific/linux/miraclecast/default.nix
+++ b/pkgs/os-specific/linux/miraclecast/default.nix
@@ -2,7 +2,7 @@
 , glib, readline, pcre, systemd, udev }:
 
 stdenv.mkDerivation rec {
-  name = "miraclecast-${version}";
+  pname = "miraclecast";
   version = "1.0-20190403";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix
index 533cd90a2d3..a7f0a332beb 100644
--- a/pkgs/os-specific/linux/mmc-utils/default.nix
+++ b/pkgs/os-specific/linux/mmc-utils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "mmc-utils-${version}";
+  pname = "mmc-utils";
   version = "2018-03-27";
 
   src = fetchgit {
diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix
index ac083e545fe..766c01eed3f 100644
--- a/pkgs/os-specific/linux/molly-guard/default.nix
+++ b/pkgs/os-specific/linux/molly-guard/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, dpkg, busybox, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "molly-guard-${version}";
+  pname = "molly-guard";
   version = "0.6.3";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix
index 128f3eac263..f7b81bd3915 100644
--- a/pkgs/os-specific/linux/msr-tools/default.nix
+++ b/pkgs/os-specific/linux/msr-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "msr-tools-${version}";
+  pname = "msr-tools";
   version = "1.3";
 
   src = fetchurl {
-    url = "https://01.org/sites/default/files/downloads/msr-tools/${name}.zip";
+    url = "https://01.org/sites/default/files/downloads/msr-tools/${pname}-${version}.zip";
     sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr";
   };
 
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix
index 078f894f73e..afe07a5c4db 100644
--- a/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/pkgs/os-specific/linux/multipath-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }:
 
 stdenv.mkDerivation rec {
-  name = "multipath-tools-${version}";
+  pname = "multipath-tools";
   version = "0.8.2";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz";
     sha256 = "0x6cjlb9mjrmpaqk5v6v47qz6n9zyqmw13i7pq5x6ppwyqdxhn5s";
   };
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index 42f745b02e3..3cd8f224ce4 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "net-tools-${version}";
+  pname = "net-tools";
   version = "1.60_p20170221182432";
 
   src = fetchurl {
-    url = "mirror://gentoo/distfiles/${name}.tar.xz";
+    url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz";
     sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a";
   };
 
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 7984e357c82..fd8c42c9be7 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -8,11 +8,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "nfs-utils-${version}";
+  pname = "nfs-utils";
   version = "2.3.4";
 
   src = fetchurl {
-    url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz";
+    url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz";
     sha256 = "1kcn11glc3rma1gvykbk1s542mgz36ipi7yqxlk9jyh8hsiqncpq";
   };
 
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index b4878ff4eac..87ae0cc1e26 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.0";
-  name = "nftables-${version}";
+  pname = "nftables";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/nftables/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2";
     sha256 = "14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd";
   };
 
diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix
index 5f425c9685c..cb6dd4ab946 100644
--- a/pkgs/os-specific/linux/nmon/default.nix
+++ b/pkgs/os-specific/linux/nmon/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "nmon-${version}";
+  pname = "nmon";
   version = "16k";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix
index 2db2e12bb96..4417ffb569b 100644
--- a/pkgs/os-specific/linux/numactl/default.nix
+++ b/pkgs/os-specific/linux/numactl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "numactl-${version}";
+  pname = "numactl";
   version = "2.0.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix
index 4bf1e41bd57..4194a679698 100644
--- a/pkgs/os-specific/linux/nvme-cli/default.nix
+++ b/pkgs/os-specific/linux/nvme-cli/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "nvme-cli-${version}";
+  pname = "nvme-cli";
   version = "1.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
index bead5f84eac..4040d70260c 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "odp-dpdk-${version}";
+  pname = "odp-dpdk";
   version = "1.19.0.0_DPDK_17.11";
 
   src = fetchurl {
-    url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${name}.tar.gz";
+    url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz";
     sha256 = "05bwjaxl9hqc6fbkp95nniq11g3kvzmlxw0bq55i7p2v35nv38px";
   };
 
diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix
index 93cf33979f4..70f46519375 100644
--- a/pkgs/os-specific/linux/ofp/default.nix
+++ b/pkgs/os-specific/linux/ofp/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ofp-${version}";
+  pname = "ofp";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index a2644fcbc3f..274e960a89b 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "open-iscsi-${version}";
+  pname = "open-iscsi";
   version = "2.0.877";
 
   nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix
index 21d32af3ba8..7b34c1029ba 100644
--- a/pkgs/os-specific/linux/open-isns/default.nix
+++ b/pkgs/os-specific/linux/open-isns/default.nix
@@ -1,7 +1,7 @@
 { stdenv, openssl, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "open-isns-${version}";
+  pname = "open-isns";
   version = "0.99";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index a2a272f1b3a..bf26b9e2b28 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -8,10 +8,10 @@ let
   _kernel = kernel;
 in stdenv.mkDerivation rec {
   version = "2.5.4";
-  name = "openvswitch-${version}";
+  pname = "openvswitch";
 
   src = fetchurl {
-    url = "http://openvswitch.org/releases/${name}.tar.gz";
+    url = "http://openvswitch.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1lji87wg953lqcdf02f1zv2m54vhd2x9jd03bb91lnlb4qlhifiv";
   };
 
diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index e1525a951a9..5d7357cb838 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "pagemon-${version}";
+  pname = "pagemon";
   version = "0.01.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 1f2a7d3edf2..d1a035d7448 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4 }:
 
 stdenv.mkDerivation rec {
-  name = "linux-pam-${version}";
+  pname = "linux-pam";
   version = "1.3.1";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix
index 10856bb52c9..a1c91516ce0 100644
--- a/pkgs/os-specific/linux/pam_pgsql/default.nix
+++ b/pkgs/os-specific/linux/pam_pgsql/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }:
 
 stdenv.mkDerivation rec {
-  name = "pam_pgsql-${version}";
+  pname = "pam_pgsql";
   version = "0.7.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index 72846e185eb..6e9ab379dbc 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libu2f-host, libu2f-server, pam }:
 
 stdenv.mkDerivation rec {
-  name    = "pam_u2f-${version}";
+  pname = "pam_u2f";
   version = "1.0.8";
 
   src     = fetchurl {
-    url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz";
+    url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz";
     sha256 = "16awjzx348imjz141fzzldy00qpdmw2g37rnq430w5mnzak078jj";
   };
 
diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix
index 8fdd2356c30..754f6bcac33 100644
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, elf-header }:
 
 stdenv.mkDerivation rec {
-  name = "paxctl-${version}";
+  pname = "paxctl";
   version = "0.9";
 
   src = fetchurl {
-    url = "https://pax.grsecurity.net/${name}.tar.gz";
+    url = "https://pax.grsecurity.net/${pname}-${version}.tar.gz";
     sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53";
   };
 
diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix
index c1500e51ac3..e01f84576ce 100644
--- a/pkgs/os-specific/linux/paxtest/default.nix
+++ b/pkgs/os-specific/linux/paxtest/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, paxctl }:
 
 stdenv.mkDerivation rec {
-  name    = "paxtest-${version}";
+  pname = "paxtest";
   version = "0.9.15";
 
   src = fetchurl {
-    url    = "https://www.grsecurity.net/~spender/${name}.tar.gz";
+    url    = "https://www.grsecurity.net/~spender/${pname}-${version}.tar.gz";
     sha256 = "0zv6vlaszlik98gj9200sv0irvfzrvjn46rnr2v2m37x66288lym";
   };
 
diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix
index 6365175290a..9b9e563f803 100644
--- a/pkgs/os-specific/linux/pcm/default.nix
+++ b/pkgs/os-specific/linux/pcm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "201902";
-  name = "pcm-${version}";
+  pname = "pcm";
 
   src = fetchFromGitHub {
     owner = "opcm";
diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
index 1155a793b01..f3e63133d1e 100644
--- a/pkgs/os-specific/linux/pflask/default.nix
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "pflask-${version}";
+  pname = "pflask";
   version = "git-2015-12-17";
   rev = "599418bb6453eaa0ccab493f9411f13726c1a636";
 
diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix
index 523f7382a2c..62aa18fa643 100644
--- a/pkgs/os-specific/linux/pipework/default.nix
+++ b/pkgs/os-specific/linux/pipework/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pipework-${version}";
+  pname = "pipework";
   version = "2017-08-22";
   src = fetchFromGitHub {
     owner = "jpetazzo";
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index a7bb4a81510..0d92c7c6909 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -16,7 +16,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "pktgen-${version}";
+  pname = "pktgen";
   version = "3.5.0";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix
index 2092a50041f..b074c6d7244 100644
--- a/pkgs/os-specific/linux/plymouth/default.nix
+++ b/pkgs/os-specific/linux/plymouth/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "plymouth-${version}";
+  pname = "plymouth";
   version = "0.9.4";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz";
+    url = "https://www.freedesktop.org/software/plymouth/releases/${pname}-${version}.tar.xz";
     sha256 = "0l8kg7b2vfxgz9gnrn0v2w4jvysj2cirp0nxads5sy05397pl6aa";
   };
 
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix
index cd0e277b2c6..0981a0b5a4b 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -8,7 +8,7 @@
 assert stdenv.lib.hasSuffix "/" mediaDir;
 
 stdenv.mkDerivation rec {
-  name = "pmount-${version}";
+  pname = "pmount";
   version = "0.9.23";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index a7cac46ae6a..fb507d4da48 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }:
 
 stdenv.mkDerivation rec {
-  name = "policycoreutils-${version}";
+  pname = "policycoreutils";
   version = "2.7";
   inherit (libsepol) se_release se_url;
 
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 1a4919a5d9d..3daab3917e8 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -17,7 +17,7 @@ in
 stdenv.mkDerivation rec {
   version = "${prl_major}.2.1-41615";
   prl_major = "12";
-  name = "prl-tools-${version}";
+  pname = "prl-tools";
 
   # We download the full distribution to extract prl-tools-lin.iso from
   # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/os-specific/linux/procdump/default.nix
index aa7d0ec4604..0185d3022bc 100644
--- a/pkgs/os-specific/linux/procdump/default.nix
+++ b/pkgs/os-specific/linux/procdump/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, bash, coreutils, gdb, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "procdump-${version}";
+  pname = "procdump";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 1ed85bc94cb..1f39a99ea0b 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "procps-${version}";
+  pname = "procps";
   version = "3.3.15";
 
   # The project's releases are on SF, but git repo on gitlab.
diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix
index b6c16948339..844ce769aea 100644
--- a/pkgs/os-specific/linux/pscircle/default.nix
+++ b/pkgs/os-specific/linux/pscircle/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }:
 
 stdenv.mkDerivation rec {
-  name = "pscircle-${version}";
+  pname = "pscircle";
   version = "1.3.0";
 
   src = fetchFromGitLab {
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 68e51afdf1b..413b7d5dcbd 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "psmisc";
   version = "23.2";
-  name = "${pname}-${version}";
 
   src = fetchFromGitLab {
     owner = pname;
diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index 36ad73c48d6..c013a0107ea 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -2,7 +2,7 @@
 , ncurses, libdrm, libpciaccess, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "radeontop-${version}";
+  pname = "radeontop";
   version = "2019-06-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix
index 3e57bbc11bd..815005ae290 100644
--- a/pkgs/os-specific/linux/read-edid/default.nix
+++ b/pkgs/os-specific/linux/read-edid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl, cmake, libx86 }:
 
 stdenv.mkDerivation rec {
-  name = "read-edid-${version}";
+  pname = "read-edid";
   version = "3.0.2";
 
   src = fetchurl {
-    url = "http://www.polypux.org/projects/read-edid/${name}.tar.gz";
+    url = "http://www.polypux.org/projects/read-edid/${pname}-${version}.tar.gz";
     sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7";
   };
 
diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index bd25dc65ec8..c078fb18c4e 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.0";
-  name = "reptyr-${version}";
+  pname = "reptyr";
 
   src = fetchFromGitHub {
     owner = "nelhage";
diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix
index 8c7b75a881f..b1afbfea0de 100644
--- a/pkgs/os-specific/linux/rewritefs/default.nix
+++ b/pkgs/os-specific/linux/rewritefs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: 
 
 stdenv.mkDerivation rec {
-  name = "rewritefs-${version}";
+  pname = "rewritefs";
   version = "2017-08-14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix
index ecaa4e89d49..1f5b31d0deb 100644
--- a/pkgs/os-specific/linux/roccat-tools/default.nix
+++ b/pkgs/os-specific/linux/roccat-tools/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "roccat-tools-${version}";
+  pname = "roccat-tools";
   version = "5.9.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/roccat/${name}.tar.bz2";
+    url = "mirror://sourceforge/roccat/${pname}-${version}.tar.bz2";
     sha256 = "12j02rzbz3iqxprz8cj4kcfcdgnqlva142ci177axqmckcq6crvg";
   };
 
diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix
index b29b1f639cf..447f9127d60 100644
--- a/pkgs/os-specific/linux/rtlwifi_new/default.nix
+++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix
@@ -5,7 +5,7 @@ with lib;
 let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtlwifi";
 
 in stdenv.mkDerivation rec {
-  name = "rtlwifi_new-${version}";
+  pname = "rtlwifi_new";
   version = "2018-02-17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix
index 2c02ef924c3..316c9800079 100644
--- a/pkgs/os-specific/linux/schedtool/default.nix
+++ b/pkgs/os-specific/linux/schedtool/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "schedtool-${version}";
+  pname = "schedtool";
   version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "freequaos";
     repo = "schedtool";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1wdw6fnf9a01xfjhdah3mn8bp1bvahf2lfq74i6hk5b2cagkppyp";
   };
 
diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix
index a8d5112c63b..5517f163b3e 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/pkgs/os-specific/linux/sdparm/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "sdparm-${version}";
+  pname = "sdparm";
   version = "1.10";
 
   src = fetchurl {
-    url = "http://sg.danny.cz/sg/p/${name}.tar.xz";
+    url = "http://sg.danny.cz/sg/p/${pname}-${version}.tar.xz";
     sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx";
   };
 
diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix
index 527c94de46b..b8f80a0124c 100644
--- a/pkgs/os-specific/linux/selinux-python/default.nix
+++ b/pkgs/os-specific/linux/selinux-python/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 with python3.pkgs;
 
 stdenv.mkDerivation rec {
-  name = "selinux-python-${version}";
+  pname = "selinux-python";
   version = "2.7";
   se_release = "20170804";
   se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix
index 71d2ee6e80a..99bbfbe7287 100644
--- a/pkgs/os-specific/linux/selinux-sandbox/default.nix
+++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix
@@ -8,7 +8,7 @@ with stdenv.lib;
 with python3.pkgs;
 
 stdenv.mkDerivation rec {
-  name = "selinux-sandbox-${version}";
+  pname = "selinux-sandbox";
   version = "2.7";
   se_release = "20170804";
 
diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix
index 10ba1a3c7d0..178d102381e 100644
--- a/pkgs/os-specific/linux/semodule-utils/default.nix
+++ b/pkgs/os-specific/linux/semodule-utils/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libsepol }:
 
 stdenv.mkDerivation rec {
-  name = "semodule-utils-${version}";
+  pname = "semodule-utils";
   version = "2.7";
 
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
-    url = "${se_url}/${se_release}/${name}.tar.gz";
+    url = "${se_url}/${se_release}/${pname}-${version}.tar.gz";
     sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch";
   };
 
diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix
index 4067e5f70e2..53250b345e8 100644
--- a/pkgs/os-specific/linux/sepolgen/default.nix
+++ b/pkgs/os-specific/linux/sepolgen/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libsepol, python }:
 
 stdenv.mkDerivation rec {
-  name = "sepolgen-${version}";
+  pname = "sepolgen";
   version = "1.2.2";
   inherit (libsepol) se_release se_url;
 
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 6b808f0d6a6..ccc0df59d10 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -18,7 +18,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "shadow-${version}";
+  pname = "shadow";
   version = "4.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix
index de12b3719af..f40652922d8 100644
--- a/pkgs/os-specific/linux/smem/default.nix
+++ b/pkgs/os-specific/linux/smem/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "smem-${version}";
+  pname = "smem";
   version = "1.5";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix
index 55336e3b2a0..15520b236be 100644
--- a/pkgs/os-specific/linux/smemstat/default.nix
+++ b/pkgs/os-specific/linux/smemstat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "smemstat-${version}";
+  pname = "smemstat";
   version = "0.02.04";
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix
index 449edf481a9..6f2e6306003 100644
--- a/pkgs/os-specific/linux/speedometer/default.nix
+++ b/pkgs/os-specific/linux/speedometer/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "speedometer-${version}";
+  pname = "speedometer";
   version = "2.8";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 80c5c1f650b..3dbdb99549a 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -11,11 +11,11 @@ let
   docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml";
 in
 stdenv.mkDerivation rec {
-  name = "sssd-${version}";
+  pname = "sssd";
   version = "1.16.4";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/released/sssd/${name}.tar.gz";
+    url = "https://fedorahosted.org/released/sssd/${pname}-${version}.tar.gz";
     sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb";
   };
 
diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix
index c7543aee933..db362613d37 100644
--- a/pkgs/os-specific/linux/syscall_limiter/default.nix
+++ b/pkgs/os-specific/linux/syscall_limiter/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "syscall_limiter-${version}";
+  pname = "syscall_limiter";
   version = "2017-01-23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index cf1f2f242f4..ce2bd1fa99f 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "sysdig-${version}";
+  pname = "sysdig";
   version = "0.26.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index b7f1af618fe..45f4d60e4e3 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   version = "242";
-  name = "systemd-${version}";
+  pname = "systemd";
 
   # When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
   # Also fresh patches should be cherry-picked from that tree to our current one.
diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 5df7bb827aa..309d69ebad5 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -4,7 +4,7 @@ let
   vanillaVersion = "7.6.q";
   patchLevel = "26";
 in stdenv.mkDerivation rec {
-  name = "tcp-wrappers-${version}";
+  pname = "tcp-wrappers";
   version = "${vanillaVersion}-${patchLevel}";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix
index faf47c96a5e..299ac8ad220 100644
--- a/pkgs/os-specific/linux/thunderbolt/default.nix
+++ b/pkgs/os-specific/linux/thunderbolt/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "thunderbolt-${version}";
+  pname = "thunderbolt";
   version = "0.9.3";
   src = fetchFromGitHub {
     owner = "01org";
diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix
index 3c833de8b0c..47b89f138c5 100644
--- a/pkgs/os-specific/linux/tiptop/default.nix
+++ b/pkgs/os-specific/linux/tiptop/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, libxml2, ncurses, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "tiptop-${version}";
+  pname = "tiptop";
   version = "2.3.1";
 
   src = fetchurl {
-    url = "${meta.homepage}/releases/${name}.tar.gz";
+    url = "${meta.homepage}/releases/${pname}-${version}.tar.gz";
     sha256 = "10j1138y3cj3hsmfz4w0bmk90523b0prqwi9nhb4z8xvjnf49i2i";
   };
 
diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix
index 53b6cbc3401..dfcf4c9937b 100644
--- a/pkgs/os-specific/linux/tiscamera/default.nix
+++ b/pkgs/os-specific/linux/tiscamera/default.nix
@@ -16,12 +16,11 @@
 stdenv.mkDerivation rec {
   pname = "tiscamera";
   version = "0.9.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "TheImagingSource";
     repo = pname;
-    rev = "v-${name}";
+    rev = "v-${pname}-${version}";
     sha256 = "143yp6bpzj3rqfnrcnlrcwggay37fg6rkphh4w9y9v7v4wllzf87";
   };
 
diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index 880fd61ec2c..9fde8406024 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tomb-${version}";
+  pname = "tomb";
   version = "2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix
index b4e584f2979..bb6d51669e6 100644
--- a/pkgs/os-specific/linux/tpacpi-bat/default.nix
+++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix
@@ -2,7 +2,7 @@
 
 # Requires the acpi_call kernel module in order to run.
 stdenv.mkDerivation rec {
-  name = "tpacpi-bat-${version}";
+  pname = "tpacpi-bat";
   version = "3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index 3133602b44e..e6571b46ee0 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }:
 stdenv.mkDerivation rec {
-  name    = "trace-cmd-${version}";
+  pname = "trace-cmd";
   version = "2.8.3";
 
   src = fetchgit (import ./src.nix);
diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix
index 739bd447192..d4f83eb8caf 100644
--- a/pkgs/os-specific/linux/untie/default.nix
+++ b/pkgs/os-specific/linux/untie/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "untie-${version}";
+  pname = "untie";
   version = "0.3";
   src = fetchurl {
-    url = "http://guichaz.free.fr/untie/files/${name}.tar.bz2";
+    url = "http://guichaz.free.fr/untie/files/${pname}-${version}.tar.bz2";
     sha256 = "1334ngvbi4arcch462mzi5vxvxck4sy1nf0m58116d9xmx83ak0m";
   };
 
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix
index 3df0023bd67..64d18fe075a 100644
--- a/pkgs/os-specific/linux/usbguard/default.nix
+++ b/pkgs/os-specific/linux/usbguard/default.nix
@@ -13,12 +13,12 @@ assert libgcrypt != null -> libsodium == null;
 
 stdenv.mkDerivation rec {
   version = "0.7.4";
-  name = "usbguard-${version}";
+  pname = "usbguard";
 
   repo = "https://github.com/USBGuard/usbguard";
 
   src = fetchurl {
-    url = "${repo}/releases/download/${name}/${name}.tar.gz";
+    url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "1qkskd6q5cwlh2cpcsbzmmmgk6w63z0825wlb2sjwqq3kfgwjb3k";
   };
 
diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix
index 1a40ec50c99..19f59d00680 100644
--- a/pkgs/os-specific/linux/uvcdynctrl/default.nix
+++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.0";
-  name = "uvcdynctrl-${version}";
+  pname = "uvcdynctrl";
 
   src = fetchFromGitHub {
     owner = "cshorler";
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index ede9fa68280..9bb6fcdd0a0 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -7,11 +7,11 @@
 # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT)
 
 mkDerivation rec {
-  name = "v4l-utils-${version}";
+  pname = "v4l-utils";
   version = "1.16.6";
 
   src = fetchurl {
-    url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
+    url = "https://linuxtv.org/downloads/v4l-utils/${pname}-${version}.tar.bz2";
     sha256 = "1bkqlrizx0j2rd6ybam2x17bjrpwzl4v4szmnzm3cmixis3w3npr";
   };
 
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 02e08bec7ad..570eb4ca4ef 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -4,7 +4,7 @@
 assert stdenv.lib.versionAtLeast kernel.version "3.10";
 
 stdenv.mkDerivation rec {
-  name = "wireguard-${version}";
+  pname = "wireguard";
   inherit (wireguard-tools) src version;
 
   preConfigure = ''
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 61f48758676..935b1635e29 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -6,10 +6,10 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   version = "2.8";
 
-  name = "wpa_supplicant-${version}";
+  pname = "wpa_supplicant";
 
   src = fetchurl {
-    url = "https://w1.fi/releases/${name}.tar.gz";
+    url = "https://w1.fi/releases/${pname}-${version}.tar.gz";
     sha256 = "15ixzm347n8w6gdvi3j3yks3i15qmp6by9ayvswm34d929m372d6";
   };
 
diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix
index 7911a2172ba..1c2aaa8ee01 100644
--- a/pkgs/os-specific/linux/x86info/default.nix
+++ b/pkgs/os-specific/linux/x86info/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.30";
-  name = "x86info-${version}";
+  pname = "x86info";
 
   src = fetchurl {
-    url = "http://codemonkey.org.uk/projects/x86info/${name}.tgz";
+    url = "http://codemonkey.org.uk/projects/x86info/${pname}-${version}.tgz";
     sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y";
   };
 
diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix
index 5f7bca097bf..440a797a723 100644
--- a/pkgs/os-specific/linux/xsensors/default.nix
+++ b/pkgs/os-specific/linux/xsensors/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, gtk2, pkgconfig, lm_sensors }:
 
 stdenv.mkDerivation rec {
-  name = "xsensors-${version}";
+  pname = "xsensors";
   version = "0.70";
   src = fetchurl {
     url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz";
diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix
index 3738760bb29..a6c74d029c5 100644
--- a/pkgs/os-specific/windows/cygwin-setup/default.nix
+++ b/pkgs/os-specific/windows/cygwin-setup/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "cygwin-setup-${version}";
+  pname = "cygwin-setup";
   version = "20131101";
 
   src = fetchcvs {
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 9538747da6d..14a0df25747 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -4,13 +4,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rabbitmq-server-${version}";
+  pname = "rabbitmq-server";
 
   version = "3.7.17";
 
   # when updating, consider bumping elixir version in all-packages.nix
   src = fetchurl {
-    url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz";
+    url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
     sha256 = "1ychgvjbi6ikapfcp4rgwa0vihhs1f34c2advb7833jym8alazrr";
   };
 
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index dca2c072185..0c1c69982fa 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -50,7 +50,7 @@ with versionMap.${majorVersion};
 
 stdenv.mkDerivation rec {
   version = "${scalaVersion}-${kafkaVersion}";
-  name = "apache-kafka-${version}";
+  pname = "apache-kafka";
 
   src = fetchurl {
     url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz";
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 47ef9934a5e..6e47fce3e48 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -8,7 +8,7 @@
 let
   common = {version, sha256, externals}: stdenv.mkDerivation rec {
     inherit version;
-    name = "asterisk-${version}";
+    pname = "asterisk";
 
     buildInputs = [ jansson libedit libxml2 libxslt ncurses openssl sqlite
                     dmidecode libuuid newt
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index 2f7a7c80cb6..f6b24f6de35 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "atlassian-confluence-${version}";
+  pname = "atlassian-confluence";
   version = "6.15.6";
 
   src = fetchurl {
-    url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz";
+    url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
     sha256 = "0bb404d5i8jdry1jw8qdrcpgp9lvdkyxry58331pwpw16mlh0r2m";
   };
 
diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index 1d0e28ac9f2..81b90091e66 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@@ -2,11 +2,11 @@
 , port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }:
 
 stdenv.mkDerivation rec {
-  name = "atlassian-crowd-${version}";
+  pname = "atlassian-crowd";
   version = "3.4.5";
 
   src = fetchurl {
-    url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
+    url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz";
     sha256 = "1k72aar68iqiaf0l75i6pp81dpsllqkp69f70hja754hrzvhz8j3";
   };
 
diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index 5bd91b14f32..a863ae6a0e5 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "atlassian-jira-${version}";
+  pname = "atlassian-jira";
   version = "8.3.0";
 
   src = fetchurl {
diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix
index 528dc8a48a0..58ebbf88f78 100644
--- a/pkgs/servers/beanstalkd/default.nix
+++ b/pkgs/servers/beanstalkd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   version = "1.11";
-  name = "beanstalkd-${version}";
+  pname = "beanstalkd";
 
   installPhase=''make install "PREFIX=$out"'';
 
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 61316d0a60a..675f1beb891 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "caddy-${version}";
+  pname = "caddy";
   version = "1.0.0";
 
   goPackagePath = "github.com/mholt/caddy";
diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix
index befa36edd9e..f9532d48a11 100644
--- a/pkgs/servers/cayley/default.nix
+++ b/pkgs/servers/cayley/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "cayley-${version}";
+  pname = "cayley";
   version = "0.6.1";
 
   goPackagePath = "github.com/cayleygraph/cayley";
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 8530d8cb068..e48dec7d20c 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "clickhouse-${version}";
+  pname = "clickhouse";
   version = "19.13.1.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix
index 21a5bad72fc..bf8623f0a89 100644
--- a/pkgs/servers/cloud-print-connector/default.nix
+++ b/pkgs/servers/cloud-print-connector/default.nix
@@ -8,7 +8,7 @@
 # - https://github.com/Mic92/dotfiles/blob/ba2a01144cfdc71c829d872a3fc816c64663ad7f/nixos/vms/matchbox/modules/cloud-print-connector.nix
 
 buildGoPackage rec {
-  name = "cloud-print-connector-unstable-${version}";
+  pname = "cloud-print-connector-unstable";
   version = "1.16";
   rev = "481ad139cc023a3ba65e769f08f277368fa8a5de";
 
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index c18e71977d8..bba33d99aa2 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "slurm-${version}";
+  pname = "slurm";
   version = "19.05.1.2";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "SchedMD";
     repo = "slurm";
     # The release tags use - instead of .
-    rev = "${builtins.replaceStrings ["."] ["-"] name}";
+    rev = "${builtins.replaceStrings ["."] ["-"] "${pname}-${version}"}";
     sha256 = "1r2hxfshz929fcys90rmnj8s7f204q364m6bazhiy8hhm3bsf42k";
   };
 
diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix
index 84985b8f0eb..93794ce7052 100644
--- a/pkgs/servers/confluent-platform/default.nix
+++ b/pkgs/servers/confluent-platform/default.nix
@@ -2,7 +2,7 @@
 , jre, makeWrapper, bash, gnused }:
 
 stdenv.mkDerivation rec {
-  name = "confluent-platform-${version}";
+  pname = "confluent-platform";
   version = "5.3.0";
   scalaVersion = "2.12";
 
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index d364c2a5bcd..4c8877e92de 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "consul-${version}";
+  pname = "consul";
   version = "1.5.2";
   rev = "v${version}";
 
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index ad15db070f4..e1d02d2f9d7 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, libevent }:
 
 stdenv.mkDerivation rec {
-  name = "coturn-${version}";
+  pname = "coturn";
   version = "4.5.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix
index 8b2895392be..a528cd2ca26 100644
--- a/pkgs/servers/couchpotato/default.nix
+++ b/pkgs/servers/couchpotato/default.nix
@@ -3,7 +3,7 @@
 with pythonPackages;
 
 buildPythonApplication rec {
-  name = "couchpotato-${version}";
+  pname = "couchpotato";
   version = "3.0.1";
   disabled = isPy3k;
 
diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix
index 1c093facde5..24e607f4b00 100644
--- a/pkgs/servers/dante/default.nix
+++ b/pkgs/servers/dante/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pam, libkrb5, cyrus_sasl, miniupnpc }:
 
 stdenv.mkDerivation rec {
-  name = "dante-${version}";
+  pname = "dante";
   version = "1.4.2";
 
   src = fetchurl {
-    url = "https://www.inet.no/dante/files/${name}.tar.gz";
+    url = "https://www.inet.no/dante/files/${pname}-${version}.tar.gz";
     sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms";
   };
 
diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix
index 5056df06e59..8e89b6f980f 100644
--- a/pkgs/servers/dgraph/default.nix
+++ b/pkgs/servers/dgraph/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "dgraph-${version}";
+  pname = "dgraph";
   version = "0.8.2";
 
   goPackagePath = "github.com/dgraph-io/dgraph";
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index c45098b2ae0..b4ad70f8277 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "dictd-${version}";
+  pname = "dictd";
   version = "1.12.1";
 
   src = fetchurl {
diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix
index 13e4757fe89..b7dbf04026d 100644
--- a/pkgs/servers/dict/dictd-wiktionary.nix
+++ b/pkgs/servers/dict/dictd-wiktionary.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "20161001";
-  name = "dict-db-wiktionary-${version}";
+  pname = "dict-db-wiktionary";
   data = fetchurl {
     url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
     sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m";
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix
index 8a1bb6313ad..2c97101d9cb 100644
--- a/pkgs/servers/dict/dictd-wordnet.nix
+++ b/pkgs/servers/dict/dictd-wordnet.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "542";
-  name = "dict-db-wordnet-${version}";
+  pname = "dict-db-wordnet";
 
   buildInputs = [python wordnet];
   convert = ./wordnet_structures.py;
diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix
index f5c0cf230af..d9f831c862f 100644
--- a/pkgs/servers/dict/libmaa.nix
+++ b/pkgs/servers/dict/libmaa.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.2";
-  name = "libmaa-${version}";
+  pname = "libmaa";
 
   src = fetchurl {
     url = "mirror://sourceforge/dict/libmaa-${version}.tar.gz";
diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix
index 2199d62b4dd..cfa6e34fa4c 100644
--- a/pkgs/servers/diod/default.nix
+++ b/pkgs/servers/diod/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "diod-${version}";
+  pname = "diod";
   version = "1.0.24";
 
   src = fetchurl {
-    url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/chaos/diod/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl";
   };
 
diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 214c3e91f0e..def78223f12 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "coredns-${version}";
+  pname = "coredns";
   version = "1.3.1";
 
   goPackagePath = "github.com/coredns/coredns";
diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix
index 6757542050a..cb004a596d2 100644
--- a/pkgs/servers/dns/dnsdist/default.nix
+++ b/pkgs/servers/dns/dnsdist/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, systemd
 , boost, libsodium, libedit, re2
 , net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec {
-  name = "dnsdist-${version}";
+  pname = "dnsdist";
   version = "1.3.2";
 
   src = fetchurl {
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 718028b2bc0..8191bf5acbf 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -6,7 +6,7 @@ let inherit (stdenv.lib) optional optionals; in
 
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
-  name = "knot-dns-${version}";
+  pname = "knot-dns";
   version = "2.8.3";
 
   src = fetchurl {
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 1d8896bfc10..22b1f2a67e2 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -22,11 +22,11 @@ exportLuaPathsFor = luaPkgs: ''
 '';
 
 unwrapped = stdenv.mkDerivation rec {
-  name = "knot-resolver-${version}";
+  pname = "knot-resolver";
   version = "4.2.0";
 
   src = fetchurl {
-    url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
+    url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
     sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4";
   };
 
diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index fcddd569b36..0a584ce1aca 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -7,7 +7,7 @@ assert enableProtoBuf -> protobuf != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "pdns-recursor-${version}";
+  pname = "pdns-recursor";
   version = "4.2.0";
 
   src = fetchurl {
diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index 105e9f232c1..d363eb715d6 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "powerdns-${version}";
+  pname = "powerdns";
   version = "4.1.10";
 
   src = fetchurl {
diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix
index e71abb8bc00..0a0b6c0e1d1 100644
--- a/pkgs/servers/echoip/default.nix
+++ b/pkgs/servers/echoip/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "echoip-${version}";
+  pname = "echoip";
   version = "unstable-2018-11-20";
 
   goPackagePath = "github.com/mpolden/echoip";
diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix
index d52fdd14301..5293b18368e 100644
--- a/pkgs/servers/elasticmq-server-bin/default.nix
+++ b/pkgs/servers/elasticmq-server-bin/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "elasticmq-server";
   version = "0.14.6";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${name}.jar";
+    url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${pname}-${version}.jar";
     sha256 = "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz";
   };
 
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index d3c5555fa6a..5a693fd7529 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "etcd-${version}";
+  pname = "etcd";
   version = "3.3.13"; # After updating check that nixos tests pass
   rev = "v${version}";
 
diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix
index 5e2381ada1d..1e05c856ab5 100644
--- a/pkgs/servers/exhibitor/default.nix
+++ b/pkgs/servers/exhibitor/default.nix
@@ -1,6 +1,6 @@
 { fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }:
 stdenv.mkDerivation rec {
-  name = "exhibitor-${version}";
+  pname = "exhibitor";
   version = "1.5.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix
index 8bab12116b0..c8ddcf438f7 100644
--- a/pkgs/servers/fcgiwrap/default.nix
+++ b/pkgs/servers/fcgiwrap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcgiwrap-${version}";
+  pname = "fcgiwrap";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix
index 5ce680e3646..7be7416d04d 100644
--- a/pkgs/servers/felix/default.nix
+++ b/pkgs/servers/felix/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "apache-felix-${version}";
+  pname = "apache-felix";
   version = "5.6.1";
   src = fetchurl {
     url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz";
diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix
index 3ac3c98718f..2fe628db046 100644
--- a/pkgs/servers/felix/remoteshell.nix
+++ b/pkgs/servers/felix/remoteshell.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.2";
-  name = "apache-felix-remoteshell-bundle-${version}";
+  pname = "apache-felix-remoteshell-bundle";
   src = fetchurl {
     url = "http://apache.proserve.nl/felix/org.apache.felix.shell.remote-${version}.jar";
     sha256 = "147zw5ppn98wfl3pr32isyb267xm3gwsvdfdvjr33m9g2v1z69aq";
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index caf7d8360f0..31de5925916 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -39,7 +39,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.5.7.27050-0";
-  name = "firebird-${version}";
+  pname = "firebird";
 
   # enableParallelBuilding = false; build fails
 
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index 87e4a22b051..e8a1a633e4d 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -22,7 +22,7 @@ let
     , officialRelease ? true
     , patches ? []
     }: stdenv.mkDerivation rec {
-        name = "foundationdb-${version}";
+        pname = "foundationdb";
         inherit version;
 
         src = fetchFromGitHub {
diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix
index 0eb71492be3..34b9f6ecaf0 100644
--- a/pkgs/servers/foundationdb/vsmake.nix
+++ b/pkgs/servers/foundationdb/vsmake.nix
@@ -46,7 +46,7 @@ let
 
     , patches ? []
     }: stdenv.mkDerivation rec {
-        name = "foundationdb-${version}";
+        pname = "foundationdb";
         inherit version;
 
         src = fetchFromGitHub {
diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index ed36b33bdeb..6c6eb2b0c09 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -42,7 +42,7 @@ assert withRest -> curl != null && withJson;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "freeradius-${version}";
+  pname = "freeradius";
   version = "3.0.19";
 
   src = fetchurl {
diff --git a/pkgs/servers/gnatsd/default.nix b/pkgs/servers/gnatsd/default.nix
index e8e08271b3b..1bb2ebc4f86 100644
--- a/pkgs/servers/gnatsd/default.nix
+++ b/pkgs/servers/gnatsd/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "gnatsd-${version}";
+  pname = "gnatsd";
   version = "1.4.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix
index 754cba58825..1bec32e5125 100644
--- a/pkgs/servers/gopher/gofish/default.nix
+++ b/pkgs/servers/gopher/gofish/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "gofish-${version}";
+  pname = "gofish";
   version = "1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/gofish/gofish/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/gofish/gofish/${version}/${pname}-${version}.tar.gz";
     sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s";
   };
   	
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index ebade244bdf..da24b0a0e26 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gotty-${version}";
+  pname = "gotty";
   version = "0.0.13";
   rev = "v${version}";
 
diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix
index c4be1f3c3b3..ff127e705e5 100644
--- a/pkgs/servers/h2/default.nix
+++ b/pkgs/servers/h2/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, jre, makeWrapper }:
 stdenv.mkDerivation rec {
-  name = "h2-${version}";
+  pname = "h2";
 
   version = "1.4.193";
 
diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix
index 6a33ac638d2..3d05933f513 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper }:
 stdenv.mkDerivation rec {
-  name = "hbase-${version}";
+  pname = "hbase";
   version = "0.98.24";
 
   src = fetchurl {
diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix
index 58033edb07d..7bc2da8b023 100644
--- a/pkgs/servers/hitch/default.nix
+++ b/pkgs/servers/hitch/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, docutils, libev, openssl, pkgconfig }:
 stdenv.mkDerivation rec {
   version = "1.5.0";
-  name = "hitch-${version}";
+  pname = "hitch";
 
   src = fetchurl {
-    url = "https://hitch-tls.org/source/${name}.tar.gz";
+    url = "https://hitch-tls.org/source/${pname}-${version}.tar.gz";
     sha256 = "02sd2p3jsbnqmldsjwzk5qcjc45k9n1x4ygjkx0kxxwjj9lm9hhf";
   };
 
diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix
index 664953ca34d..6e4be4a36fe 100644
--- a/pkgs/servers/http/4store/default.nix
+++ b/pkgs/servers/http/4store/default.nix
@@ -7,7 +7,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "4store-${version}";
+  pname = "4store";
   version = "1.1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 3c3d4c20df1..4ffbb010016 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -17,7 +17,7 @@ assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
   version = "2.4.39";
-  name = "apache-httpd-${version}";
+  pname = "apache-httpd";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index 8a773631ee6..6bad43a62f0 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "mod_auth_mellon-${version}";
+  pname = "mod_auth_mellon";
   version = "0.13.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index ff71e460b2a..568b6ecd174 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, apacheHttpd, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "mod_wsgi-${version}";
+  pname = "mod_wsgi";
   version = "4.6.7";
 
   src = fetchurl {
diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix
index aa826a9c528..65ec2510d34 100644
--- a/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/pkgs/servers/http/apt-cacher-ng/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "apt-cacher-ng-${version}";
+  pname = "apt-cacher-ng";
   version = "3.2";
 
   src = fetchurl {
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix
index cb630c26688..538584e147a 100644
--- a/pkgs/servers/http/couchdb/2.0.0.nix
+++ b/pkgs/servers/http/couchdb/2.0.0.nix
@@ -2,13 +2,13 @@
 , coreutils, bash, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "couchdb-${version}";
+  pname = "couchdb";
   version = "2.3.0";
 
   # when updating this, please consider bumping the OTP version
   # in all-packages.nix
   src = fetchurl {
-    url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
+    url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
     sha256 = "0lpk64n6fip85j1jz59kq20jdliwv6mh8j2h5zyxjn5i8b86hf0b";
   };
 
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 2299f732a76..f2e5e67dd7a 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -2,11 +2,11 @@
 , sphinx, which, file, pkgconfig, getopt }:
 
 stdenv.mkDerivation rec {
-  name = "couchdb-${version}";
+  pname = "couchdb";
   version = "1.7.1";
 
   src = fetchurl {
-    url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
+    url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
     sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i";
   };
 
diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix
index 3efc97f6296..42de9904f90 100644
--- a/pkgs/servers/http/darkhttpd/default.nix
+++ b/pkgs/servers/http/darkhttpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "darkhttpd-${version}";
+  pname = "darkhttpd";
   version = "1.12";
 
   src = fetchurl {
-    url = "https://unix4lyfe.org/darkhttpd/${name}.tar.bz2";
+    url = "https://unix4lyfe.org/darkhttpd/${pname}-${version}.tar.bz2";
     sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155";
   };
 
diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix
index ceffd3e0260..2a26af53709 100644
--- a/pkgs/servers/http/h2o/default.nix
+++ b/pkgs/servers/http/h2o/default.nix
@@ -6,7 +6,7 @@
 with builtins;
 
 stdenv.mkDerivation rec {
-  name = "h2o-${version}";
+  pname = "h2o";
   version = "2.2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index 742db556707..a3bcb64e6c0 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -16,7 +16,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "hiawatha-${version}";
+  pname = "hiawatha";
   version = "10.9";
 
   src = fetchFromGitLab {
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 80a3d6b105c..5ce44322e92 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "jetty-${version}";
+  pname = "jetty";
   version = "9.4.16.v20190411";
   src = fetchurl {
     url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix
index 878211ebf02..f692832e882 100644
--- a/pkgs/servers/http/lwan/default.nix
+++ b/pkgs/servers/http/lwan/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "lwan";
   version = "0.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "lpereira";
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index 479c9e41aa9..bef7f43ea71 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -3,7 +3,7 @@
 , lighttpd, iproute }:
 stdenv.mkDerivation rec {
   version = "2014-06-29-1";
-  name = "nix-binary-cache-${version}";
+  pname = "nix-binary-cache";
 
   phases = ["installPhase"];
 
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 6bb4ce46a43..3990c5de818 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -4,7 +4,7 @@ gd, geoip, perl }:
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "openresty-${version}";
+  pname = "openresty";
   version = "1.15.8.1";
 
   src = fetchurl {
diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix
index c38ca046a35..19d0b9a2641 100644
--- a/pkgs/servers/http/pshs/default.nix
+++ b/pkgs/servers/http/pshs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }:
 
 stdenv.mkDerivation rec {
-  name = "pshs-${version}";
+  pname = "pshs";
   version = "0.3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix
index b5d5d5f7992..d118e8af66d 100644
--- a/pkgs/servers/http/spawn-fcgi/default.nix
+++ b/pkgs/servers/http/spawn-fcgi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "spawn-fcgi-${version}";
+  pname = "spawn-fcgi";
   version = "1.6.4";
 
   src = fetchsvn {
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index cac31ed9d59..a7ea61de042 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "2.3.1";
-  name = "tengine-${version}";
+  pname = "tengine";
 
   src = fetchurl {
     url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz";
diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix
index 6e012c98737..b72439bc37a 100644
--- a/pkgs/servers/http/thttpd/default.nix
+++ b/pkgs/servers/http/thttpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "thttpd-${version}";
+  pname = "thttpd";
   version = "2.29";
 
   src = fetchurl {
-    url = "https://acme.com/software/thttpd/${name}.tar.gz";
+    url = "https://acme.com/software/thttpd/${pname}-${version}.tar.gz";
     sha256 = "15x3h4b49wgfywn82i3wwbf38mdns94mbi4ma9xiwsrjv93rzh4r";
   };
 
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index 5da89200816..59a4ab6e5b4 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, apacheAnt, jdk, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "axis2-${version}";
+  pname = "axis2";
   version = "1.7.9";
 
   src = fetchurl {
-    url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip";
+    url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip";
     sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac";
   };
 
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index fded6bdfafb..38b4974e155 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -3,11 +3,11 @@
 let
 
   common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec {
-    name = "apache-tomcat-${version}";
+    pname = "apache-tomcat";
     version = "${versionMajor}.${versionMinor}";
 
     src = fetchurl {
-      url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz";
+      url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz";
       inherit sha256;
     };
 
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 39b9b31f7f0..eaa15d4f46b 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -16,7 +16,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "1.9.0";
-  name = "unit-${version}";
+  pname = "unit";
 
   src = fetchFromGitHub {
     owner = "nginx";
diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix
index 3fb3890f9c4..79c7d9e9eca 100644
--- a/pkgs/servers/http/webfs/default.nix
+++ b/pkgs/servers/http/webfs/default.nix
@@ -7,11 +7,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "webfs-${version}";
+  pname = "webfs";
   version = "1.21";
 
   src = fetchurl {
-    url = "https://www.kraxel.org/releases/webfs/${name}.tar.gz";
+    url = "https://www.kraxel.org/releases/webfs/${pname}-${version}.tar.gz";
     sha256 = "98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a";
   };
 
diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix
index 5d6b47d28b5..707b4878648 100644
--- a/pkgs/servers/http/webhook/default.nix
+++ b/pkgs/servers/http/webhook/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "webhook-${version}";
+  pname = "webhook";
   version = "2.6.8";
 
   goPackagePath = "github.com/adnanh/webhook";
diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix
index 827f6122b57..109f7bc06dc 100644
--- a/pkgs/servers/http/yaws/default.nix
+++ b/pkgs/servers/http/yaws/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, erlang, pam, perl }:
 
 stdenv.mkDerivation rec {
-  name = "yaws-${version}";
+  pname = "yaws";
   version = "2.0.6";
 
   src = fetchurl {
-    url = "http://yaws.hyber.org/download/${name}.tar.gz";
+    url = "http://yaws.hyber.org/download/${pname}-${version}.tar.gz";
     sha256 = "03nh97g7smsgm6sw5asssmlq7zgx6y2gnn7jn0lv2x5mkf5nzyb9";
   };
 
diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index 912e520180e..075226f3607 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/pkgs/servers/hydron/default.nix
@@ -2,7 +2,7 @@
 , quicktemplate, go-bindata, easyjson }:
 
 buildGoPackage rec {
-  name = "hydron-unstable-${version}";
+  pname = "hydron-unstable";
   version = "2019-02-17";
   goPackagePath = "github.com/bakape/hydron";
   goDeps = ./deps.nix;
diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index 9216464f1e4..bdfc6d7096b 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec {
-  name = "icingaweb2-${version}";
+  pname = "icingaweb2";
   version = "2.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix
index fdad63d67af..8171f61c112 100644
--- a/pkgs/servers/identd/nullidentdmod/default.nix
+++ b/pkgs/servers/identd/nullidentdmod/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
-  name = "nullidentdmod-${version}";
+  pname = "nullidentdmod";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix
index 81eeae804d2..8e0395529bc 100644
--- a/pkgs/servers/identd/oidentd/default.nix
+++ b/pkgs/servers/identd/oidentd/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "oidentd-${version}";
+  pname = "oidentd";
   version = "2.3.2";
   nativeBuildInputs = [ bison flex ];
 
   src = fetchurl {
-    url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz";
+    url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "10c5jkhirkvm1s4v3zdj4micfi6rkfjj32q4k7wjwh1fnzrwyb5n";
   };
 
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index f57c94cd108..9823a36d754 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -3,7 +3,7 @@
 , buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "interlock-${version}";
+  pname = "interlock";
   version = "2016.04.13";
   rev = "v${version}";
 
diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix
index 002760ff0fd..e7d6d9ac52a 100644
--- a/pkgs/servers/irker/default.nix
+++ b/pkgs/servers/irker/default.nix
@@ -2,7 +2,7 @@
 , xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }:
 
 stdenv.mkDerivation rec {
-  name = "irker-${version}";
+  pname = "irker";
   version = "2017-02-12";
 
   src = fetchFromGitLab {
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index d2ead585e7d..c70f3d4de61 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mono, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "jackett-${version}";
+  pname = "jackett";
   version = "0.11.559";
 
   src = fetchurl {
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/{bin,share/${name}}
-    cp -r * $out/share/${name}
+    mkdir -p $out/{bin,share/${pname}-${version}}
+    cp -r * $out/share/${pname}-${version}
 
     makeWrapper "${mono}/bin/mono" $out/bin/Jackett \
-      --add-flags "$out/share/${name}/JackettConsole.exe" \
+      --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \
       --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib"
   '';
 
diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix
index bbf39e5be46..2f8241e7b09 100644
--- a/pkgs/servers/jetbrains/youtrack.nix
+++ b/pkgs/servers/jetbrains/youtrack.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "youtrack-${version}";
+  pname = "youtrack";
   version = "2018.2.44329";
 
   jar = fetchurl {
-    url = "https://download.jetbrains.com/charisma/${name}.jar";
+    url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar";
     sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk";
   };
 
diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix
index 3ebcaf7286b..bec8ccbbf18 100644
--- a/pkgs/servers/kippo/default.nix
+++ b/pkgs/servers/kippo/default.nix
@@ -60,10 +60,10 @@ let
   };
 
 in stdenv.mkDerivation rec {
-    name = "kippo-${version}";
+    pname = "kippo";
     version = "0.8";
     src = fetchurl {
-      url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${name}.tar.gz";
+      url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${pname}-${version}.tar.gz";
       sha256 = "0rd2mk36d02qd24z8s4xyy64fy54rzpar4379iq4dcjwg7l7f63d";
     };
     buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ];
diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix
index 7c7755dee48..4eb0b26c306 100644
--- a/pkgs/servers/kwakd/default.nix
+++ b/pkgs/servers/kwakd/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "kwakd-${version}";
+  pname = "kwakd";
   version = "0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix
index fc88d645f27..43ddc5f7b0f 100644
--- a/pkgs/servers/lidarr/default.nix
+++ b/pkgs/servers/lidarr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "lidarr-${version}";
+  pname = "lidarr";
   version = "0.6.2.883";
 
   src = fetchurl {
diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
index 2e17001abc5..798bda8e306 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/pkgs/servers/livepeer/default.nix
@@ -3,7 +3,7 @@
 }:
 
 buildGoPackage rec {
-  name = "livepeer-${version}";
+  pname = "livepeer";
   version = "0.2.4";
 
   goPackagePath = "github.com/livepeer/go-livepeer";
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix
index 080cbc89775..5a318c311af 100644
--- a/pkgs/servers/mail/archiveopteryx/default.nix
+++ b/pkgs/servers/mail/archiveopteryx/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, openssl, perl, zlib, jam }:
 stdenv.mkDerivation rec {
   version = "3.2.0";
-  name = "archiveopteryx-${version}";
+  pname = "archiveopteryx";
 
   src = fetchurl {
-    url = "http://archiveopteryx.org/download/${name}.tar.bz2";
+    url = "http://archiveopteryx.org/download/${pname}-${version}.tar.bz2";
     sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx";
   };
 
diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index 30c6f2f44dd..ede01bff074 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, dovecot, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-pigeonhole-${version}";
+  pname = "dovecot-pigeonhole";
   version = "0.5.7.1";
 
   src = fetchurl {
diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix
index 019c84d2898..429d735ffcd 100644
--- a/pkgs/servers/mail/mailhog/default.nix
+++ b/pkgs/servers/mail/mailhog/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "MailHog-${version}";
+  pname = "MailHog";
   version = "1.0.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index 91445afa97d..e9f66b92be2 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "mailman-${version}";
+  pname = "mailman";
   version = "2.1.29";
 
   src = fetchurl {
-    url = "mirror://gnu/mailman/${name}.tgz";
+    url = "mirror://gnu/mailman/${pname}-${version}.tgz";
     sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243";
   };
 
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix
index 98b270ad7d4..2c1c07e502a 100644
--- a/pkgs/servers/mail/mlmmj/default.nix
+++ b/pkgs/servers/mail/mlmmj/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "mlmmj-${version}";
+  pname = "mlmmj";
   version = "1.3.0";
 
   src = fetchurl {
-    url = "http://mlmmj.org/releases/${name}.tar.gz";
+    url = "http://mlmmj.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn";
   };
 
diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix
index 4b753bdf0cd..7738c4eb3d4 100644
--- a/pkgs/servers/mail/nullmailer/default.nix
+++ b/pkgs/servers/mail/nullmailer/default.nix
@@ -5,7 +5,7 @@ assert tls -> gnutls != null;
 stdenv.mkDerivation rec {
 
   version = "2.2";
-  name = "nullmailer-${version}";
+  pname = "nullmailer";
 
   src = fetchurl {
     url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz";
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index cd48ab12e24..7dc3968139f 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensmtpd-${version}";
+  pname = "opensmtpd";
   version = "6.4.1p2";
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ libasr libevent zlib libressl db pam ];
 
   src = fetchurl {
-    url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
+    url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
     sha256 = "0cppqlx4fk6l8rbim5symh2fm1kzshf421256g596j6c9f9q96xn";
   };
 
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
index 1d4ad63c37d..71b27facbab 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/pkgs/servers/mail/opensmtpd/extras.nix
@@ -10,11 +10,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensmtpd-extras-${version}";
+  pname = "opensmtpd-extras";
   version = "6.4.0";
 
   src = fetchurl {
-    url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
+    url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
     sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb";
   };
 
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 10d3b397b26..c5377247046 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -24,12 +24,12 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "postfix-${version}";
+  pname = "postfix";
 
   version = "3.4.6";
 
   src = fetchurl {
-    url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
+    url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
     sha256 = "09p3vg2xlh6iq45gp6zanbp1728fc31r7zz71r131vh20ssajx6n";
   };
 
diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix
index f13c57e3b35..49854927e57 100644
--- a/pkgs/servers/mail/postsrsd/default.nix
+++ b/pkgs/servers/mail/postsrsd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "postsrsd-${version}";
+  pname = "postsrsd";
   version = "1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix
index d5e410a86c1..5da94ca8026 100644
--- a/pkgs/servers/mail/pypolicyd-spf/default.nix
+++ b/pkgs/servers/mail/pypolicyd-spf/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonApplication, fetchurl, pyspf }:
 
 buildPythonApplication rec {
-  name = "pypolicyd-spf-${version}";
+  pname = "pypolicyd-spf";
   majorVersion = "2.0";
   version = "${majorVersion}.2";
 
   src = fetchurl {
-    url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z";
   };
 
diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
index 739270326e5..9d7730e399f 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -7,7 +7,7 @@ let patchedLibmilter = stdenv.lib.overrideDerivation  libmilter (_ : {
 in
 
 stdenv.mkDerivation rec {
-  name = "rmilter-${version}";
+  pname = "rmilter";
   version = "1.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 25e7807659d..f4f2e616dc7 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -13,7 +13,7 @@ let libmagic = file;  # libmagic provided by file package ATM
 in
 
 stdenv.mkDerivation rec {
-  name = "rspamd-${version}";
+  pname = "rspamd";
   version = "1.9.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index 9e5a9ffe780..673d3f1f21b 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchurl }:
 
 buildGoPackage rec {
-  name = "matterbridge-${version}";
+  pname = "matterbridge";
   version = "1.11.0";
 
   goPackagePath = "github.com/42wim/matterbridge";
diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index 6707055eaa6..bb6d1584a67 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "matterircd-${version}";
+  pname = "matterircd";
   version = "0.18.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 824f8ea2025..3d79d8421dd 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mautrix-unstable-${version}";
+  pname = "mautrix-unstable";
   version = "2019-07-04";
 
   goPackagePath = "maunium.net/go/mautrix-whatsapp";
diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix
index 33b7674cf9e..33151c4063b 100644
--- a/pkgs/servers/mediatomb/default.nix
+++ b/pkgs/servers/mediatomb/default.nix
@@ -3,7 +3,7 @@
 , pkgconfig, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "mediatomb-${version}";
+  pname = "mediatomb";
   version = "0.12.1";
 
   src = fetchgit {
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index d983c067719..3318b6fa5ef 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -3,7 +3,7 @@
 , nodePackages, emscripten, opencv, statik }:
 
 buildGoPackage rec {
-  name = "meguca-unstable-${version}";
+  pname = "meguca-unstable";
   version = "2019-03-12";
   goPackagePath = "github.com/bakape/meguca";
   goDeps = ./server_deps.nix;
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index f30b5af6cad..a9873261d78 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.5.16";
-  name = "memcached-${version}";
+  pname = "memcached";
 
   src = fetchurl {
-    url = "https://memcached.org/files/${name}.tar.gz";
+    url = "https://memcached.org/files/${pname}-${version}.tar.gz";
     sha256 = "0nnccb697jhdn5gqrh3phibzs6xr4nf4ryv7nmyv5vf11n4jr8j5";
   };
 
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
index fe1f1c6760d..8430f2d61e8 100644
--- a/pkgs/servers/mesos-dns/default.nix
+++ b/pkgs/servers/mesos-dns/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mesos-dns-${version}";
+  pname = "mesos-dns";
   version = "0.1.2";
   rev = "v${version}";
   
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index a20793a849c..b6a70864cc5 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "minio-${version}";
+  pname = "minio";
   version = "2019-02-26T19-51-46Z";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix
index 10c8811c548..48817f76bda 100644
--- a/pkgs/servers/mirrorbits/default.nix
+++ b/pkgs/servers/mirrorbits/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, zlib, geoip }:
 
 buildGoPackage rec {
-  name = "mirrorbits-${version}";
+  pname = "mirrorbits";
   version = "0.4";
   rev = "v${version}";
 
diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix
index d0ce73f5410..34601ed708b 100644
--- a/pkgs/servers/misc/airsonic/default.nix
+++ b/pkgs/servers/misc/airsonic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "airsonic-${version}";
+  pname = "airsonic";
   version = "10.3.1";
 
   src = fetchurl {
diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix
index 50e754791e6..be5188f177a 100644
--- a/pkgs/servers/misc/subsonic/default.nix
+++ b/pkgs/servers/misc/subsonic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "subsonic-${version}";
+  pname = "subsonic";
   version = "6.1.5";
 
   src = fetchurl {
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
   # for a directory to be created in the unpack phase.
   unpackPhase = ''
     runHook preUnpack
-    mkdir ${name}
-    tar -C ${name} -xzf $src
+    mkdir ${pname}-${version}
+    tar -C ${pname}-${version} -xzf $src
     runHook postUnpack
   '';
   installPhase = ''
     runHook preInstall
     mkdir $out
-    cp -r ${name}/* $out
+    cp -r ${pname}-${version}/* $out
     runHook postInstall
   '';
 
diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix
index f15b7ca2e82..0ab921a6f6f 100644
--- a/pkgs/servers/misc/taskserver/default.nix
+++ b/pkgs/servers/misc/taskserver/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "taskserver-${version}";
+  pname = "taskserver";
   version = "1.1.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index c8eb0731924..957bb59b121 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "bosun-${version}";
+  pname = "bosun";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index 502a3026b2a..66b848a1975 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, go, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "cadvisor-${version}";
+  pname = "cadvisor";
   version = "0.33.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
index a888549bb6a..707d0129f70 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "consul-alerts-${version}";
+  pname = "consul-alerts";
   version = "0.5.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix
index efa62e261b7..e5f30f4e614 100644
--- a/pkgs/servers/monitoring/facette/default.nix
+++ b/pkgs/servers/monitoring/facette/default.nix
@@ -2,7 +2,7 @@
 , go, pkgconfig, nodejs, nodePackages, pandoc, rrdtool }:
 
 stdenv.mkDerivation rec {
-  name = "facette-${version}";
+  pname = "facette";
   version = "0.4.1";
   src = fetchFromGitHub {
     owner = "facette";
diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix
index 1004947d5b1..502ff10b092 100644
--- a/pkgs/servers/monitoring/grafana-reporter/default.nix
+++ b/pkgs/servers/monitoring/grafana-reporter/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "reporter-${version}";
+  pname = "reporter";
   version = "2.1.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index c9e6da89d93..570dd0ff20e 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "6.3.2";
-  name = "grafana-${version}";
+  pname = "grafana";
   goPackagePath = "github.com/grafana/grafana";
 
   excludedPackages = [ "release_publisher" ];
diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix
index 969a58aff85..f33a418fe5c 100644
--- a/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/pkgs/servers/monitoring/kapacitor/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "kapacitor-${version}";
+  pname = "kapacitor";
   version = "1.5.1";
 
   goPackagePath = "github.com/influxdata/kapacitor";
diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix
index af5f2880a0f..cc67bdfa56d 100644
--- a/pkgs/servers/monitoring/lcdproc/default.nix
+++ b/pkgs/servers/monitoring/lcdproc/default.nix
@@ -2,7 +2,7 @@
 , doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }:
 
 stdenv.mkDerivation rec {
-  name = "lcdproc-${version}";
+  pname = "lcdproc";
   version = "0.5.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index 223026c3b41..ed37c7f3987 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "0.2.0";
-  name = "grafana-loki-${version}";
+  pname = "grafana-loki";
   goPackagePath = "github.com/grafana/loki";
 
   doCheck = true;
diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix
index 45e380379d2..5459d58ceb9 100644
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/pkgs/servers/monitoring/longview/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.5";
-  name = "longview-${version}";
+  pname = "longview";
 
   src = fetchFromGitHub {
     owner = "linode";
diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix
index 5044aef2bb5..31a6501ea3a 100644
--- a/pkgs/servers/monitoring/mtail/default.nix
+++ b/pkgs/servers/monitoring/mtail/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, gotools, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "mtail-${version}";
+  pname = "mtail";
   version = "3.0.0-rc4";
   goPackagePath = "github.com/google/mtail";
 
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 34beada87e8..183cc3a2b95 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.49";
-  name = "munin-${version}";
+  pname = "munin";
 
   src = fetchFromGitHub {
     owner = "munin-monitoring";
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index 92713a43ea2..475d79a090a 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "nagios-${version}";
+  pname = "nagios";
   version = "4.4.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "0nkbv8lzpiknddiq0466dlpp3hw8lqmaidk8931hp4664cdsaw57";
   };
 
diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index cdfd8ab9bee..35d02a5f9e2 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "check_ssl_cert-${version}";
+  pname = "check_ssl_cert";
   version = "1.80.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
index 401f9ffc406..2dc1bdf9681 100644
--- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix
+++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "newrelic-sysmond-${version}";
+  pname = "newrelic-sysmond";
   version = "2.3.0.132";
 
   src = fetchurl {
diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix
index 9f03c9ea96f..79303849156 100644
--- a/pkgs/servers/monitoring/plugins/uptime.nix
+++ b/pkgs/servers/monitoring/plugins/uptime.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "check-uptime-${version}";
+  pname = "check-uptime";
   version = "20161112";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index e104f31a74d..95e2822d65b 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -1,7 +1,7 @@
 { stdenv, go, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "alertmanager-${version}";
+  pname = "alertmanager";
   version = "0.16.2";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
index db58c7e14e5..07c8a14ce0b 100644
--- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "bind_exporter-${version}";
+  pname = "bind_exporter";
   version = "20161221-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba";
 
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 9803ba09e16..970f49713a3 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "blackbox_exporter-${version}";
+  pname = "blackbox_exporter";
   version = "0.14.0";
   rev = version;
 
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index 0d6fbac60e5..ce4bacfc9b7 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "collectd-exporter-${version}";
+  pname = "collectd-exporter";
   version = "0.3.1";
   rev = version;
 
diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix
index 47abcb33ee7..aaee2e8d770 100644
--- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "consul_exporter-${version}";
+  pname = "consul_exporter";
   version = "0.3.0";
 
   goPackagePath = "github.com/prometheus/consul_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
index e43488bbaae..b01fa0024de 100644
--- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "dnsmasq_exporter-${version}";
+  pname = "dnsmasq_exporter";
   version = "0.1.0";
 
   goPackagePath = "github.com/google/dnsmasq_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
index 5a3fd23ec22..6f6370ce14d 100644
--- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "dovecot_exporter-${version}";
+  pname = "dovecot_exporter";
   version = "0.1.3";
 
   goPackagePath = "github.com/kumina/dovecot_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
index 071035b2a4a..95b0db7dbc6 100644
--- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "fritzbox-exporter-${version}";
+  pname = "fritzbox-exporter";
   version = "v1.0-32-g90fc0c5";
   rev = "90fc0c572d3340803f7c2aafc4b097db7af1f871";
 
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index b2a0e387589..4a84db38f78 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "haproxy_exporter-${version}";
+  pname = "haproxy_exporter";
   version = "0.8.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
index aeb7b7445a5..f126b8a7da1 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -2,7 +2,7 @@
 { buildGoPackage, fetchFromGitHub, fetchpatch, lib }:
 
 buildGoPackage rec {
-  name = "prometheus-json-exporter-${version}";
+  pname = "prometheus-json-exporter";
   version = "unstable-2017-10-06";
 
   goPackagePath = "github.com/kawamuray/prometheus-json-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
index 129c2b33372..21c6c8da643 100644
--- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mailexporter-${version}";
+  pname = "mailexporter";
   version = "2019-07-14";
 
   goPackagePath = "github.com/cherti/mailexporter";
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index ade9bb87d99..04fbc7fbed9 100644
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mesos_exporter-${version}";
+  pname = "mesos_exporter";
   version = "0.1.0";
   rev = version;
 
diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
index 8b6c54d41f9..7d460773802 100644
--- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
-  name = "minio-exporter-${version}";
+  pname = "minio-exporter";
   version = "0.2.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index 9180a511349..a7934227ffa 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mysqld_exporter-${version}";
+  pname = "mysqld_exporter";
   version = "0.10.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 963315f00c1..c51574610e8 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "nginx_exporter-${version}";
+  pname = "nginx_exporter";
   version = "0.4.2";
 
   goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 80ad4a32be7..d0f55226d2f 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "node_exporter-${version}";
+  pname = "node_exporter";
   version = "0.17.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
index eac962f7560..5dfada4f55d 100644
--- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "openvpn_exporter-unstable-${version}";
+  pname = "openvpn_exporter-unstable";
   version = "2017-05-15";
   rev = "a2a179a222144fa9a10030367045f075375a2803";
 
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
index 97df26aea4e..01d9ec02833 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
@@ -4,7 +4,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "postfix_exporter-${version}";
+  pname = "postfix_exporter";
   version = "0.1.2";
 
   goPackagePath = "github.com/kumina/postfix_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
index ffa71f3ad0c..57574481cf6 100644
--- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "postgres_exporter-${version}";
+  pname = "postgres_exporter";
   version = "0.5.1";
 
   goPackagePath = "github.com/wrouesnel/postgres_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index 5e4ebb58140..efe146c843f 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "prom2json-${version}";
+  pname = "prom2json";
   version = "0.1.0";
   rev = "${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 1c00f734c19..48afc610c61 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -1,7 +1,7 @@
 { stdenv, go, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "pushgateway-${version}";
+  pname = "pushgateway";
   version = "0.8.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
index 34120ad3fda..331503dfe7d 100644
--- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "rabbitmq_exporter-${version}";
+  pname = "rabbitmq_exporter";
   version = "0.25.2";
 
   goPackagePath = "github.com/kbudde/rabbitmq_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index be8fbd3d85c..cbafabb18b5 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, net_snmp }:
 
 buildGoPackage rec {
-  name = "snmp_exporter-${version}";
+  pname = "snmp_exporter";
   version = "0.13.0";
 
   goPackagePath = "github.com/prometheus/snmp_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
index 792e0b33aee..f4aa8344f77 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "statsd_exporter-${version}";
+  pname = "statsd_exporter";
   version = "0.9.0";
   rev = version;
 
diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
index 0c5cc626765..07b5055831e 100644
--- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "surfboard_exporter-${version}";
+  pname = "surfboard_exporter";
   version = "2.0.0";
 
   goPackagePath = "github.com/ipstatic/surfboard_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
index 18fa3f98db2..cd72f98ecfb 100644
--- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "unifi-exporter-${version}";
+  pname = "unifi-exporter";
   version = "0.4.0+git1";
   rev = "9a4e69fdea91dd0033bda4842998d751b40a6130";
 
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index 50325144fca..9de6e6923e3 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "riemann-${version}";
+  pname = "riemann";
   version = "0.3.3";
 
   src = fetchurl {
-    url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2";
+    url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2";
     sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq";
   };
 
diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix
index ab8365c23f8..eb98e45c36c 100644
--- a/pkgs/servers/monitoring/seyren/default.nix
+++ b/pkgs/servers/monitoring/seyren/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "seyren-${version}";
+  pname = "seyren";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index ee3b9d818ce..dfe2bdb71b2 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "telegraf-${version}";
+  pname = "telegraf";
   version = "1.10.2";
 
   goPackagePath = "github.com/influxdata/telegraf";
diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix
index 4c3479d8662..fe90d4d6408 100644
--- a/pkgs/servers/monitoring/zipkin/default.nix
+++ b/pkgs/servers/monitoring/zipkin/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, makeWrapper, jre}:
 stdenv.mkDerivation rec {
   version = "1.28.1";
-  name = "zipkin-server-${version}";
+  pname = "zipkin-server";
   src = fetchurl {
     url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar";
     sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa";
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index d8aed78e28a..76b00b4cb29 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.16";
-  name = "libmpdclient-${version}";
+  pname = "libmpdclient";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 740fd4739ab..7fcb5f94579 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -39,7 +39,7 @@ let
   minor = "23";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-${version}";
+  pname = "mpd";
   version = "${major}${if minor == "" then "" else "." + minor}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index 04daa2f4a85..bfcc7aeacff 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -3,7 +3,7 @@
 , systemd ? null, withSystemd ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
-  name = "mosquitto-${version}";
+  pname = "mosquitto";
   version = "1.6.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix
index cc73b2e1f6f..079c877ab7a 100644
--- a/pkgs/servers/nats-streaming-server/default.nix
+++ b/pkgs/servers/nats-streaming-server/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "nats-streaming-server-${version}";
+  pname = "nats-streaming-server";
   version = "0.11.2";
   rev = "v${version}";
 
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index a78d2e26bf7..b3adb4007f4 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nextcloud-${version}";
+  pname = "nextcloud";
   version = "16.0.3";
 
   src = fetchurl {
-    url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
+    url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
     sha256 = "1ww1517i05gaf71szx0qpdc87aczllcb39cvc8c26dm18z76hgx1";
   };
 
diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix
index d7c36b0cb41..a89604c4e7c 100644
--- a/pkgs/servers/nginx-sso/default.nix
+++ b/pkgs/servers/nginx-sso/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub, stdenv }:
 
 buildGoPackage rec {
-  name = "nginx-sso-${version}";
+  pname = "nginx-sso";
   version = "0.16.1";
   rev = "v${version}";
 
diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix
index c5290709b62..ccd8a9b0237 100644
--- a/pkgs/servers/nosql/aerospike/default.nix
+++ b/pkgs/servers/nosql/aerospike/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "aerospike-server-${version}";
+  pname = "aerospike-server";
   version = "4.2.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 05f572c8caa..fd0a97d029d 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -15,12 +15,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "cassandra-${version}";
+  pname = "cassandra";
   inherit version;
 
   src = fetchurl {
     inherit sha256;
-    url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
+    url = "mirror://apache/cassandra/${version}/apache-${pname}-${version}-bin.tar.gz";
   };
 
   nativeBuildInputs = [ makeWrapper coreutils ];
@@ -30,16 +30,16 @@ stdenv.mkDerivation rec {
     mv * $out
 
     # Clean up documentation.
-    mkdir -p $out/share/doc/${name}
+    mkdir -p $out/share/doc/${pname}-${version}
     mv $out/CHANGES.txt \
        $out/LICENSE.txt \
        $out/NEWS.txt \
        $out/NOTICE.txt \
        $out/javadoc \
-       $out/share/doc/${name}
+       $out/share/doc/${pname}-${version}
 
     if [[ -d $out/doc ]]; then
-      mv "$out/doc/"* $out/share/doc/${name}
+      mv "$out/doc/"* $out/share/doc/${pname}-${version}
       rmdir $out/doc
     fi
 
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index f3035e13140..ff4a7f07ec0 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -15,7 +15,7 @@ in
 
 stdenv.mkDerivation rec {
 
-  name = "EventStore-${version}";
+  pname = "EventStore";
   version = "5.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 9b173e538d3..f471017a336 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "neo4j-${version}";
+  pname = "neo4j";
   version = "3.5.8";
 
   src = fetchurl {
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 0ce948c715e..94c58096f16 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "5.0.5";
-  name = "redis-${version}";
+  pname = "redis";
 
   src = fetchurl {
-    url = "http://download.redis.io/releases/${name}.tar.gz";
+    url = "http://download.redis.io/releases/${pname}-${version}.tar.gz";
     sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91";
   };
 
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index d6ee407e341..e000eb8ba4d 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rethinkdb-${version}";
+  pname = "rethinkdb";
   version = "2.3.6";
 
   src = fetchurl {
-    url = "https://download.rethinkdb.com/dist/${name}.tgz";
+    url = "https://download.rethinkdb.com/dist/${pname}-${version}.tgz";
     sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4";
   };
 
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
index d48587c924e..19352984712 100644
--- a/pkgs/servers/nsq/default.nix
+++ b/pkgs/servers/nsq/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "nsq-${version}";
+  pname = "nsq";
   version = "0.3.5";
   rev = "v${version}";
 
diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix
index 22f09994ebf..6fbabc3d003 100644
--- a/pkgs/servers/openafs/1.6/default.nix
+++ b/pkgs/servers/openafs/1.6/default.nix
@@ -7,7 +7,7 @@
 with (import ./srcs.nix { inherit fetchurl; });
 
 stdenv.mkDerivation rec {
-  name = "openafs-${version}";
+  pname = "openafs";
   inherit version srcs;
 
   nativeBuildInputs = [ autoconf automake flex yacc perl which libxslt ];
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index c77bef6ad24..23e1cfae47c 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -8,7 +8,7 @@
 with (import ./srcs.nix { inherit fetchurl; });
 
 stdenv.mkDerivation rec {
-  name = "openafs-${version}";
+  pname = "openafs";
   inherit version srcs;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 8eca1fb7790..c0018529ea8 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}:
 
 stdenv.mkDerivation rec {
-  name = "osrm-backend-${version}";
+  pname = "osrm-backend";
   version = "5.22.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix
index 1f58c309aa5..67e125d7a8c 100644
--- a/pkgs/servers/p910nd/default.nix
+++ b/pkgs/servers/p910nd/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "p910nd-${version}";
+  pname = "p910nd";
   version = "0.97";
 
   src = fetchurl {
     sha256 = "0vy2qf386dif1nqznmy3j953mq7c4lk6j2hgyzkbmfi4msiq1jaa";
-    url = "mirror://sourceforge/p910nd/${name}.tar.bz2";
+    url = "mirror://sourceforge/p910nd/${pname}-${version}.tar.bz2";
   };
 
   postPatch = ''
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 84d4d04cac7..588483b8343 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -10,7 +10,6 @@
 stdenv.mkDerivation rec {
   version = "1.16.3.1402-22929c8a2";
   pname = "plexmediaserver";
-  name = "${pname}-${version}";
 
   # Fetch the source
   src = fetchurl {
diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix
index a7a0791b852..a6b65cde89f 100644
--- a/pkgs/servers/polipo/default.nix
+++ b/pkgs/servers/polipo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "polipo-${version}";
+  pname = "polipo";
   version = "1.1.1";
 
   src = fetchurl {
-    url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${name}.tar.gz";
+    url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${pname}-${version}.tar.gz";
     sha256 = "05g09sg9qkkhnc2mxldm1w1xkxzs2ylybkjzs28w8ydbjc3pand2";
   };
 
diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix
index 6aaaf95fae1..86a96dde540 100644
--- a/pkgs/servers/ps3netsrv/default.nix
+++ b/pkgs/servers/ps3netsrv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "ps3netsrv-${version}";
+  pname = "ps3netsrv";
   version = "1.1.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index 1d8f0c36cae..fc130965cf1 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/pkgs/servers/quagga/default.nix
@@ -2,11 +2,11 @@
   pkgconfig, c-ares }:
 
 stdenv.mkDerivation rec {
-  name = "quagga-${version}";
+  pname = "quagga";
   version = "1.2.4";
 
   src = fetchurl {
-    url = "mirror://savannah/quagga/${name}.tar.gz";
+    url = "mirror://savannah/quagga/${pname}-${version}.tar.gz";
     sha256 = "1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73";
   };
 
diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index a293643a6f6..854f73be187 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "radarr-${version}";
+  pname = "radarr";
   version = "0.2.0.1358";
 
   src = fetchurl {
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/{bin,share/${name}}
-    cp -r * $out/share/${name}/.
+    mkdir -p $out/{bin,share/${pname}-${version}}
+    cp -r * $out/share/${pname}-${version}/.
 
     makeWrapper "${mono}/bin/mono" $out/bin/Radarr \
-      --add-flags "$out/share/${name}/Radarr.exe" \
+      --add-flags "$out/share/${pname}-${version}/Radarr.exe" \
       --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
           curl sqlite libmediainfo ]}
   '';
diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix
index 13db868845a..bfc681c921b 100644
--- a/pkgs/servers/radicale/1.x.nix
+++ b/pkgs/servers/radicale/1.x.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "radicale-${version}";
+  pname = "radicale";
   version = "1.1.6";
 
   src = fetchurl {
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index 3dcb6605a61..4000c25acea 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -100,7 +100,7 @@ let
     fetchSubmodules = false;
   };
 in stdenv.mkDerivation rec {
-  name = "rippled-${version}";
+  pname = "rippled";
   version = "1.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index fc28f621959..c8fd5c059a8 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -2,7 +2,7 @@
 , useSystemd ? true, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "rpcbind-${version}";
+  pname = "rpcbind";
   version = "1.2.5";
 
   src = fetchgit {
diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix
index b2e40a8ede0..4d8ead30add 100644
--- a/pkgs/servers/rt/default.nix
+++ b/pkgs/servers/rt/default.nix
@@ -31,12 +31,12 @@
 #
 # Good luck.
 stdenv.mkDerivation rec {
-  name = "rt-${version}";
+  pname = "rt";
 
   version = "4.4.4";
 
   src = fetchurl {
-    url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz";
+    url = "https://download.bestpractical.com/pub/rt/release/${pname}-${version}.tar.gz";
     sha256 = "1108jhz1gvalcfnbzgpbk7fkxzxkkc7m74a3bnwyjzldlyj1dhrl";
   };
 
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 364fcb118ce..57c774ebcb0 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -6,7 +6,6 @@ let
 in stdenv.mkDerivation rec {
   version = "2.3.9";
   pname = "sabnzbd";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = pname;
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 2a4093d412f..4ec00506b33 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}";
+  pname = "samba";
   version = "4.10.6";
 
   src = fetchurl {
-    url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
+    url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
     sha256 = "0hpgdqlyczj98pkh2ldglvvnkrb1q541r3qikdvxq0qjvd9fpywy";
   };
 
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
index 6142d751dab..c64687054ab 100644
--- a/pkgs/servers/search/elasticsearch/5.x.nix
+++ b/pkgs/servers/search/elasticsearch/5.x.nix
@@ -5,10 +5,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = elk5Version;
-  name = "elasticsearch-${version}";
+  pname = "elasticsearch";
 
   src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
+    url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz";
     sha256 = "0zy7awb2cm2fk3c7zc7v8b8pl0jw49awqwpa1jvilmvx6dcml0vb";
   };
 
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index f86596150ea..cf7caed3984 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
 
-  name    = "groonga-${version}";
+  pname = "groonga";
   version = "9.0.5";
 
   src = fetchurl {
-    url    = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
+    url    = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
     sha256 = "15y5dddvziw9lbl24z4j5yf1ibv79bn052lmx08rbxh78777csw3";
   };
 
diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix
index 4c5f71cb37d..585fc2b73ef 100644
--- a/pkgs/servers/serf/default.nix
+++ b/pkgs/servers/serf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "serf-${version}";
+  pname = "serf";
   version = "0.8.1";
   rev = "v${version}";
 
diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix
index 2ab3bf66685..03d86c209f0 100644
--- a/pkgs/servers/serviio/default.nix
+++ b/pkgs/servers/serviio/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "serviio-${version}";
+  pname = "serviio";
   version = "2.0";
 
   src = fetchurl {
-    url = "http://download.serviio.org/releases/${name}-linux.tar.gz";
+    url = "http://download.serviio.org/releases/${pname}-${version}-linux.tar.gz";
     sha256 = "1zq1ax0pdxfn0nw0vm7s23ik47w8nwh1n83a7yka8dnknxjf5nng";
   };
 
diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix
index e5312b92902..1c726c47764 100644
--- a/pkgs/servers/shairplay/default.nix
+++ b/pkgs/servers/shairplay/default.nix
@@ -2,7 +2,7 @@
 , avahi, libao }:
 
 stdenv.mkDerivation rec {
-  name = "shairplay-unstable-${version}";
+  pname = "shairplay-unstable";
   version = "2018-08-24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index 639fa322525..40b88c34e8d 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.3.2";
-  name = "shairport-sync-${version}";
+  pname = "shairport-sync";
 
   src = fetchFromGitHub {
     sha256 = "14f09sj2rxmixd5yjmwp82j49rxn1fvcxkvh7qjif893xgk98a3w";
diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index 70bf5c32b3d..af1992fc869 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.20";
-  name = "shellinabox-${version}";
+  pname = "shellinabox";
 
   src = fetchFromGitHub {
     owner = "shellinabox";
diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix
index 083a224d155..3ac32509ba3 100644
--- a/pkgs/servers/simplehttp2server/default.nix
+++ b/pkgs/servers/simplehttp2server/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "simplehttp2server-${version}";
+  pname = "simplehttp2server";
   version = "3.1.3";
 
   goPackagePath = "github.com/GoogleChromeLabs/simplehttp2server";
diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix
index deeeabda745..b6a24e94ee0 100644
--- a/pkgs/servers/sks/default.nix
+++ b/pkgs/servers/sks/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }:
 
 stdenv.mkDerivation rec {
-  name = "sks-${version}";
+  pname = "sks";
   version = "1.1.6";
 
   src = fetchFromBitbucket {
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index 82d79785b11..340ef36ac59 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "skydns-${version}";
+  pname = "skydns";
   version = "2.5.3a";
   rev = "${version}";
   
diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index 3409fc00066..730d1bbdddc 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/pkgs/servers/smcroute/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "smcroute-${version}";
+  pname = "smcroute";
   version = "2.4.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix
index 7eaa5b3e8a0..2b21bef7d6f 100644
--- a/pkgs/servers/softether/4.25.nix
+++ b/pkgs/servers/softether/4.25.nix
@@ -14,7 +14,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "softether-${version}";
+  pname = "softether";
   version = "4.25";
   build = "9656";
   compiledDate = "2018.01.15";
diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/4.29.nix
index e26e8f057b6..1d80752a41a 100644
--- a/pkgs/servers/softether/4.29.nix
+++ b/pkgs/servers/softether/4.29.nix
@@ -3,7 +3,7 @@
 , dataDir ? "/var/lib/softether" }:
 
 stdenv.mkDerivation rec {
-  name = "softether-${version}";
+  pname = "softether";
   version = "4.29";
   build = "9680";
 
diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index 12cd3bfaad9..afaa8edcc14 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }:
 
 stdenv.mkDerivation rec {
-  name = "sonarr-${version}";
+  pname = "sonarr";
   version = "2.0.0.5322";
 
   src = fetchurl {
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 22ec301bced..a34b7f03be8 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -12,7 +12,7 @@ let
 
 in
 buildGoPackage rec {
-  name = "cockroach-${version}";
+  pname = "cockroach";
   version = "19.1.1";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 7d34dd8d63b..ac14015c4cf 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -218,7 +218,7 @@ server = stdenv.mkDerivation (common // {
 });
 
 connector-c = stdenv.mkDerivation rec {
-  name = "mariadb-connector-c-${version}";
+  pname = "mariadb-connector-c";
   version = "2.3.7";
 
   src = fetchurl {
@@ -259,7 +259,7 @@ connector-c = stdenv.mkDerivation rec {
 };
 
 galera = stdenv.mkDerivation rec {
-  name = "mariadb-galera-${version}";
+  pname = "mariadb-galera";
   version = "25.3.26";
 
   src = fetchFromGitHub {
@@ -286,7 +286,7 @@ galera = stdenv.mkDerivation rec {
 
   installPhase = ''
     # copied with modifications from scripts/packages/freebsd.sh
-    GALERA_LICENSE_DIR="$share/licenses/${name}"
+    GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
     install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
     install -m 555 "garb/garbd"                       "$out/bin/garbd"
     install -m 444 "libgalera_smm.so"                 "$out/lib/galera/libgalera_smm.so"
diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix
index a50d623acbc..062de0c2368 100644
--- a/pkgs/servers/sql/oracle-xe/default.nix
+++ b/pkgs/servers/sql/oracle-xe/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "oracle-xe-${version}";
+  pname = "oracle-xe";
   version = "11.2.0";
 
   src = requireFile {
-    name = "${name}-1.0.x86_64.rpm";
+    name = "${pname}-${version}-1.0.x86_64.rpm";
     sha256 = "0s2jj2xn56v5ys6hxb7l7045hw9c1mm1lhj4p2fvqbs02kqchab6";
 
     url = "http://www.oracle.com/technetwork/"
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ];
 
   unpackCmd = ''
-    (mkdir -p "${name}" && cd "${name}" &&
+    (mkdir -p "${pname}-${version}" && cd "${pname}-${version}" &&
       ${rpmextract}/bin/rpmextract "$curSrc")
   '';
 
diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix
index c77330bd2ac..7f8f0786e03 100644
--- a/pkgs/servers/sql/percona/5.6.x.nix
+++ b/pkgs/servers/sql/percona/5.6.x.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }:
 
 stdenv.mkDerivation rec {
-  name = "percona-server-${version}";
+  pname = "percona-server";
   version = "5.6.43-84.3";
 
   src = fetchurl {
diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix
index 3b4a0543e18..ccf8ac264e9 100644
--- a/pkgs/servers/sql/pgbouncer/default.nix
+++ b/pkgs/servers/sql/pgbouncer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, libevent }:
 
 stdenv.mkDerivation rec {
-  name = "pgbouncer-${version}";
+  pname = "pgbouncer";
   version = "1.10.0";
 
   src = fetchurl {
-    url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz";
+    url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
     sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q";
   };
 
diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix
index 3db62aa491c..6a9423bc4e4 100644
--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/pkgs/servers/sql/pgpool/default.nix
@@ -3,11 +3,10 @@
 stdenv.mkDerivation rec {
   pname = "pgpool-II";
   version = "4.0.5";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "http://www.pgpool.net/download.php?f=${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
+    url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz";
     sha256 = "0v2g2ksikn10kxsa8i47gv0kbklrsscvlddza3caf522q1k0fic4";
   };
 
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 711ad35bcc1..ca3c3af74f2 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -20,11 +20,11 @@ let
     icuEnabled = atLeast "10";
 
   in stdenv.mkDerivation rec {
-    name = "postgresql-${version}";
+    pname = "postgresql";
     inherit version;
 
     src = fetchurl {
-      url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+      url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2";
       inherit sha256;
     };
 
diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
index f2e814543db..71fe9a72b56 100644
--- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql, protobufc }:
 
 stdenv.mkDerivation rec {
-  name = "cstore_fdw-${version}";
+  pname = "cstore_fdw";
   version = "1.6.2";
 
   nativeBuildInputs = [ protobufc ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index bccec1107b9..c7978aa6860 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql }:
 
 stdenv.mkDerivation rec {
-  name = "pg_hll-${version}";
+  pname = "pg_hll";
   version = "2.12";
 
   buildInputs = [ postgresql ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index 381a174838e..7b64de381f3 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
 
 stdenv.mkDerivation rec {
-  name = "pg_repack-${version}";
+  pname = "pg_repack";
   version = "1.4.4";
 
   buildInputs = [ postgresql openssl zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
index 1a5aa91ae6e..e25a6d0d54f 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql }:
 
 stdenv.mkDerivation rec {
-  name = "pg_topn-${version}";
+  pname = "pg_topn";
   version = "2.2.2";
 
   buildInputs = [ postgresql ];
diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
index c68ba9b1728..ac79c1b3b38 100644
--- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name    = "pgjwt-${version}";
+  pname = "pgjwt";
   version = "unstable-2017-04-24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
index 7dd6a5882b2..804356e9f6b 100644
--- a/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }:
 
 stdenv.mkDerivation rec {
-  name = "pgtap-${version}";
+  pname = "pgtap";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 63b8a39b0e2..33d050497da 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -13,7 +13,7 @@
 , libiconv
 }:
 stdenv.mkDerivation rec {
-  name = "postgis-${version}";
+  pname = "postgis";
   version = "2.5.2";
 
   outputs = [ "out" "doc" ];
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 77da47b00e0..5f995995820 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -7,7 +7,7 @@
 # }
 
 stdenv.mkDerivation rec {
-  name = "timescaledb-${version}";
+  pname = "timescaledb";
   version = "1.4.1";
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
index 7be23003b58..9e3fe74aa6c 100644
--- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
+++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, postgresql }:
 
 stdenv.mkDerivation rec {
-  name = "tsearch-extras-${version}";
+  pname = "tsearch-extras";
   version = "0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix
index 4e40d876152..f5444bb0683 100644
--- a/pkgs/servers/sql/sqlite/jdbc/default.nix
+++ b/pkgs/servers/sql/sqlite/jdbc/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "sqlite-jdbc";
-  name = "${pname}-${version}";
   version = "3.25.2";
 
   src = fetchMavenArtifact {
@@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
   phases = [ "installPhase" ];
 
   installPhase = ''
-    install -m444 -D ${src}/share/java/*${name}.jar "$out/share/java/${name}.jar"
+    install -m444 -D ${src}/share/java/*${pname}-${version}.jar "$out/share/java/${pname}-${version}.jar"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix
index 45540955759..f7b4dd84d32 100644
--- a/pkgs/servers/sslh/default.nix
+++ b/pkgs/servers/sslh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "sslh-${version}";
+  pname = "sslh";
   version = "1.20";
 
   src = fetchurl {
diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index d074ddf4d72..67d441e76c7 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   version = "2.1.33";
   pname = "Tautulli";
-  name = "${pname}-${version}";
 
   pythonPath = [ python.pkgs.setuptools ];
   buildInputs = [ python.pkgs.setuptools ];
diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix
index 967eea25d3f..ac3dccdab73 100644
--- a/pkgs/servers/tegola/default.nix
+++ b/pkgs/servers/tegola/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "tegola-${version}";
+  pname = "tegola";
   version = "0.8.1";
   rev = "8b2675a63624ad1d69a8d2c84a6a3f3933e25ca1";
 
diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
index e645ef2dc35..121983e7031 100644
--- a/pkgs/servers/teleport/default.nix
+++ b/pkgs/servers/teleport/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, zip, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "teleport-${version}";
+  pname = "teleport";
   version = "4.0.2";
 
   # This repo has a private submodule "e" which fetchgit cannot handle without failing.
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index a65bf5bd916..c740e003694 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}:
 
 buildGoPackage rec {
-  name = "traefik-${version}";
+  pname = "traefik";
   version = "1.7.12";
 
   goPackagePath = "github.com/containous/traefik";
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index fcea0f398e4..fc7d104a480 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "trezord-go-${version}";
+  pname = "trezord-go";
   version = "2.0.27";
 
   # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix
index ce8947bcdda..c1694316f3e 100644
--- a/pkgs/servers/tt-rss/default.nix
+++ b/pkgs/servers/tt-rss/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tt-rss-${version}";
+  pname = "tt-rss";
   version = "2019-01-29";
   rev = "c7c9c5fb0ab6b3d4ea3078865670d6c1dfe2ecac";
 
diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
index 6fad061ce99..0600640155b 100644
--- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
+++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "tt-rss-plugin-auth-ldap-${version}";
+  pname = "tt-rss-plugin-auth-ldap";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
index 27416537e33..7ddc3abb0b4 100644
--- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
+++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
-  name = "tt-rss-plugin-ff-instagram-${version}";
+  pname = "tt-rss-plugin-ff-instagram";
   version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
index 702b95b3f0e..7c3d6a5b57e 100644
--- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
+++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
-  name = "tt-rss-plugin-tumblr-gdpr-${version}";
+  pname = "tt-rss-plugin-tumblr-gdpr";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix
index d0b279eb859..c35667546c6 100644
--- a/pkgs/servers/tt-rss/theme-feedly/default.nix
+++ b/pkgs/servers/tt-rss/theme-feedly/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec {
-  name = "tt-rss-theme-feedly-${version}";
+  pname = "tt-rss-theme-feedly";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix
index bae43412e78..720d277d0d2 100644
--- a/pkgs/servers/ttyd/default.nix
+++ b/pkgs/servers/ttyd/default.nix
@@ -17,7 +17,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "ttyd-${version}";
+  pname = "ttyd";
   version = "1.4.2_pre${toString revCount}_${substring 0 8 src.rev}";
   inherit src;
 
diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix
index 9e9816c941d..12f2a08c7f4 100644
--- a/pkgs/servers/udpt/default.nix
+++ b/pkgs/servers/udpt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, boost, sqlite, cmake, gtest }:
 
 stdenv.mkDerivation rec {
-  name = "udpt-${version}";
+  pname = "udpt";
   version = "2017-09-27";
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix
index ba628360aaa..0dfec772a18 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "uftp-${version}";
+  pname = "uftp";
   version = "4.10";
 
   src = fetchurl {
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
index 52866784faa..6483973546c 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/pkgs/servers/uhub/default.nix
@@ -4,7 +4,7 @@
 assert tlsSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "uhub-${version}";
+  pname = "uhub";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix
index 9bccd5b99fb..3fb2817277a 100644
--- a/pkgs/servers/ums/default.nix
+++ b/pkgs/servers/ums/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ums-${version}";
+  pname = "ums";
   version = "6.2.2";
   
   src = fetchurl {
-    url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz";
+    url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + "-Java8.tgz";
     sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15";
-    name = "${name}.tgz";
+    name = "${pname}-${version}.tgz";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 1e846487472..76efdc31705 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -48,11 +48,11 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "
 in
 
 stdenv.mkDerivation rec {
-  name = "uwsgi-${version}";
+  pname = "uwsgi";
   version = "2.0.18";
 
   src = fetchurl {
-    url = "https://projects.unbit.it/downloads/${name}.tar.gz";
+    url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz";
     sha256 = "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9";
   };
 
diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix
index e4dd9b0f2dc..3d43862cbe0 100644
--- a/pkgs/servers/web-apps/morty/default.nix
+++ b/pkgs/servers/web-apps/morty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "morty-${version}";
+  pname = "morty";
   version = "0.2.0";
 
   goPackagePath = "github.com/asciimoo/morty";
diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
index c4f49b36bf8..ef2b3b653bf 100644
--- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
+++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lib } : 
 
 stdenv.mkDerivation rec {
-  name = "pgpkeyserver-lite-${version}";
+  pname = "pgpkeyserver-lite";
   version = "2017-07-18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix
index 946606e3701..5c105e85a87 100644
--- a/pkgs/servers/web-apps/restya-board/default.nix
+++ b/pkgs/servers/web-apps/restya-board/default.nix
@@ -15,7 +15,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "rstya-board-${version}";
+  pname = "rstya-board";
   version = "0.6";
 
   src = fetchurl {
diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix
index 615efa3b367..f6000fc4211 100644
--- a/pkgs/servers/web-apps/selfoss/default.nix
+++ b/pkgs/servers/web-apps/selfoss/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "selfoss-${version}";
+  pname = "selfoss";
   version = "2.18";
 
   src = fetchurl {
-    url = "https://github.com/SSilence/selfoss/releases/download/${version}/${name}.zip";
+    url = "https://github.com/SSilence/selfoss/releases/download/${version}/${pname}-${version}.zip";
     sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b";
   };
 
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 64ae1dbbe1d..33db6fb6e65 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "shaarli-${version}";
+  pname = "shaarli";
   version = "0.11.0";
 
   src = fetchurl {
diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix
index 5fd941e9467..ef0a4331d41 100644
--- a/pkgs/servers/web-apps/shaarli/material-theme.nix
+++ b/pkgs/servers/web-apps/shaarli/material-theme.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "shaarli-material-${version}";
+  pname = "shaarli-material";
   version = "0.10.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix
index 0c51b6b13cd..4be14b37bd2 100644
--- a/pkgs/servers/web-apps/virtlyst/default.nix
+++ b/pkgs/servers/web-apps/virtlyst/default.nix
@@ -2,7 +2,7 @@
 , qtbase, libvirt, cutelyst, grantlee }:
 
 stdenv.mkDerivation rec {
-  name = "virtlyst-${version}";
+  pname = "virtlyst";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index eafe916d02c..a105531ff4e 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wallabag-${version}";
+  pname = "wallabag";
   version = "2.3.8";
 
   # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix
index 0a008227b9f..af526730ca9 100644
--- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix
+++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.3";
-  name = "xcb-util-xrm-${version}";
+  pname = "xcb-util-xrm";
 
   src = fetchurl {
-    url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2";
+    url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${pname}-${version}.tar.bz2";
     sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h";
   };
 
diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix
index b0d3dccf30f..c25c4baf13b 100644
--- a/pkgs/servers/xmpp/biboumi/default.nix
+++ b/pkgs/servers/xmpp/biboumi/default.nix
@@ -2,7 +2,7 @@
   libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } :
 
 stdenv.mkDerivation rec {
-  name = "biboumi-${version}";
+  pname = "biboumi";
   version = "8.3";
 
   src = fetchurl {
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 5db000e7a4a..2fa31fff299 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -25,10 +25,10 @@ let
 
 in stdenv.mkDerivation rec {
   version = "19.05";
-  name = "ejabberd-${version}";
+  pname = "ejabberd";
 
   src = fetchurl {
-    url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
+    url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz";
     sha256 = "1lczck2760bcsl7vqc5xv4rizps0scdmss2zc4b1l59wzlmnfg7h";
   };
 
diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix
index 0e6fcd5e989..ab377e3d53b 100644
--- a/pkgs/servers/xmpp/openfire/default.nix
+++ b/pkgs/servers/xmpp/openfire/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "openfire-${version}";
+  pname = "openfire";
   version  = "3_6_3";
 
   src = fetchurl {
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 928c4832965..7bf21cbf22f 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -15,10 +15,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.11.2"; # also update communityModules
-  name = "prosody-${version}";
+  pname = "prosody";
 
   src = fetchurl {
-    url = "https://prosody.im/downloads/source/${name}.tar.gz";
+    url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
     sha256 = "0ca8ivqb4hxqka08pwnaqi1bqxrdl8zw47g6z7nw9q5r57fgc4c9";
   };
 
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
index 8df8499d11e..f5bdfd9fe85 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } :
 
 stdenv.mkDerivation rec {
-  name = "pyIRCt-${version}";
+  pname = "pyIRCt";
   version = "0.4";
 
   src = fetchurl {
@@ -19,18 +19,18 @@ stdenv.mkDerivation rec {
   # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/${name}
+    mkdir -p $out/bin $out/share/${pname}-${version}
     sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py
     sed -e '/configFiles/iimport os' -i config.py
-    cp * $out/share/${name}
+    cp * $out/share/${pname}-${version}
     cat > $out/bin/pyIRCt <<EOF
       #!${runtimeShell}
-      cd $out/share/${name}
+      cd $out/share/${pname}-${version}
       ./irc.py \"$@\"
     EOF
-    chmod a+rx  $out/bin/pyIRCt $out/share/${name}/irc.py
+    chmod a+rx  $out/bin/pyIRCt $out/share/${pname}-${version}/irc.py
     wrapPythonPrograms
   '';
 
diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix
index 76861ab842b..719acfd3a66 100644
--- a/pkgs/servers/xmpp/pyMAILt/default.nix
+++ b/pkgs/servers/xmpp/pyMAILt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } :
 
 stdenv.mkDerivation rec {
-  name = "pyMAILt-${version}";
+  pname = "pyMAILt";
   version = "20090101";
 
   src = fetchcvs {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   /* doConfigure should be removed if not needed */
   installPhase = ''
     cd mail-transport
-    mkdir -p $out/bin $out/share/${name}
+    mkdir -p $out/bin $out/share/${pname}-${version}
     sed -e 's@/usr/bin/@${python}/bin/@' -i mail.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
     cp * $out/share/$name
     cat > $out/bin/pyMAILt <<EOF
       #!${runtimeShell}
-      cd $out/share/${name}
+      cd $out/share/${pname}-${version}
       ./mail.py \"$@\"
     EOF
-    chmod a+rx  $out/bin/pyMAILt $out/share/${name}/mail.py
+    chmod a+rx  $out/bin/pyMAILt $out/share/${pname}-${version}/mail.py
     wrapPythonPrograms
   '';
 
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index 5a052df9e0a..c10721ee78b 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -77,7 +77,7 @@ let
   perlBin = "${perl}/bin/perl";
 
 in stdenv.mkDerivation rec {
-  name = "zoneminder-${version}";
+  pname = "zoneminder";
   version = "1.32.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index 5bacaf2982e..44b96d4209a 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, makeWrapper, bash, coreutils, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "zookeeper-${version}";
+  pname = "zookeeper";
   version = "3.4.13";
 
   src = fetchurl {
-    url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
+    url = "mirror://apache/zookeeper/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "0karf13zks3ba2rdmma2lyabvmasc04cjmgxp227f0nj8677kvbw";
   };
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out
-    cp -R conf docs lib ${name}.jar $out
+    cp -R conf docs lib ${pname}-${version}.jar $out
     mkdir -p $out/bin
     cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer}.sh $out/bin
     patchShebangs $out/bin
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
     chmod -x $out/bin/zkEnv.sh
 
     mkdir -p $out/share/zooinspector
-    cp -r contrib/ZooInspector/{${name}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector
+    cp -r contrib/ZooInspector/{${pname}-${version}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector
 
-    classpath="$out/${name}.jar:$out/share/zooinspector/${name}-ZooInspector.jar"
+    classpath="$out/${pname}-${version}.jar:$out/share/zooinspector/${pname}-${version}-ZooInspector.jar"
     for jar in $out/lib/*.jar $out/share/zooinspector/lib/*.jar; do
       classpath="$classpath:$jar"
     done
diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix
index 21f40858ea2..d2b7a4929e1 100644
--- a/pkgs/shells/any-nix-shell/default.nix
+++ b/pkgs/shells/any-nix-shell/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "any-nix-shell-${version}";
+  pname = "any-nix-shell";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix
index b5f600da8f7..0476cbd1f3f 100644
--- a/pkgs/shells/bash/bash-completion/default.nix
+++ b/pkgs/shells/bash/bash-completion/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "bash-completion-${version}";
+  pname = "bash-completion";
   version = "2.8";
 
   src = fetchurl {
-    url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/scop/bash-completion/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "0kgmflrr1ga9wfk770vmakna3nj46ylb5ky9ipd0v2k9ymq5a7y0";
   };
 
diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix
index 5ac117cf1e5..affbd219958 100644
--- a/pkgs/shells/bash/nix-bash-completions/default.nix
+++ b/pkgs/shells/bash/nix-bash-completions/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.7";
-  name = "nix-bash-completions-${version}";
+  pname = "nix-bash-completions";
 
   src = fetchFromGitHub {
     owner = "hedning";
diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix
index c3c2da329a9..4fd88d3261b 100644
--- a/pkgs/shells/dgsh/default.nix
+++ b/pkgs/shells/dgsh/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dgsh-unstable-${version}";
+  pname = "dgsh-unstable";
   version = "2017-02-05";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index df8b5d824f1..1ef3c4b6fd9 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -88,7 +88,7 @@ let
   '';
 
   fish = stdenv.mkDerivation rec {
-    name = "fish-${version}";
+    pname = "fish";
     version = "3.0.2";
 
     etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
@@ -96,7 +96,7 @@ let
     src = fetchurl {
       # There are differences between the release tarball and the tarball github packages from the tag
       # Hence we cannot use fetchFromGithub
-      url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${name}.tar.gz";
+      url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz";
       sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl";
     };
 
diff --git a/pkgs/shells/fish/fish-foreign-env/default.nix b/pkgs/shells/fish/fish-foreign-env/default.nix
index 445e961c649..b2aecdf6c14 100644
--- a/pkgs/shells/fish/fish-foreign-env/default.nix
+++ b/pkgs/shells/fish/fish-foreign-env/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnused, bash, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "fish-foreign-env-${version}";
+  pname = "fish-foreign-env";
   version = "git-20170324";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix
index d16704b71d5..74e70feaa8d 100644
--- a/pkgs/shells/ksh/default.nix
+++ b/pkgs/shells/ksh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "ksh-${version}";
+  pname = "ksh";
   version = "93v";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index 2115e17c332..9b48c5c68a1 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mksh-${version}";
+  pname = "mksh";
   version = "57";
 
   src = fetchurl {
diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix
index 2e200a74f7b..09a54c8a3b8 100644
--- a/pkgs/shells/oh/default.nix
+++ b/pkgs/shells/oh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "oh-${version}";
+  pname = "oh";
   version = "20160522-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4";
 
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index a434ef7e4fb..a9b05110f34 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx"
                        (if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]);
 in
 stdenv.mkDerivation rec {
-  name = "powershell-${version}";
+  pname = "powershell";
   version = "6.2.2";
 
   src = fetchzip {
diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix
index 298c4a1c32f..a8a7d4f6e77 100644
--- a/pkgs/shells/rc/default.nix
+++ b/pkgs/shells/rc/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rc-${version}";
+  pname = "rc";
   version = "1.7.4";
 
   src = fetchurl {
diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix
index d061c888f60..ecefbff7d22 100644
--- a/pkgs/shells/rssh/default.nix
+++ b/pkgs/shells/rssh/default.nix
@@ -5,11 +5,11 @@
 { stdenv, fetchurl, openssh, rsync, cvs }:
 
 stdenv.mkDerivation rec {
-  name = "rssh-${version}";
+  pname = "rssh";
   version = "2.3.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/rssh/rssh/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/rssh/rssh/${version}/${pname}-${version}.tar.gz";
     sha256 = "f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9";
   };
 
diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index 43dd8a40480..f13919e52e7 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -2,14 +2,14 @@
 , ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "tcsh-${version}";
+  pname = "tcsh";
   version = "6.21.00";
 
   src = fetchurl {
     urls = [
-      "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${name}.tar.gz"
-      "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz"
-      "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz"
+      "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"
+      "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"
+      "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz"
     ];
     sha256 = "0wp9cqkzdj5ahfyg9bn5z1wnyblqyv9vz4sc5aqmj7rp91a34f64";
   };
diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix
index cf22207ef09..c754d7bbe58 100644
--- a/pkgs/shells/zsh/antigen/default.nix
+++ b/pkgs/shells/zsh/antigen/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.2.3";
-  name = "antigen-${version}";
+  pname = "antigen";
 
   src = fetchurl {
     url = "https://github.com/zsh-users/antigen/releases/download/v${version}/antigen.zsh";
diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix
index b9047a93a41..ed46a21325c 100644
--- a/pkgs/shells/zsh/gradle-completion/default.nix
+++ b/pkgs/shells/zsh/gradle-completion/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gradle-completion-${version}";
+  pname = "gradle-completion";
   version = "1.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix
index 0051df7073b..2d7dd4f24aa 100644
--- a/pkgs/shells/zsh/grml-zsh-config/default.nix
+++ b/pkgs/shells/zsh/grml-zsh-config/default.nix
@@ -4,7 +4,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "grml-zsh-config-${version}";
+  pname = "grml-zsh-config";
   version = "0.16.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 6afe6d286ee..61e60e97edd 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "2019-08-07";
-  name = "oh-my-zsh-${version}";
+  pname = "oh-my-zsh";
   rev = "40fafe0f59371d1a9d83b83c614acfd1d740aabb";
 
   src = fetchgit { inherit rev;
diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix
index 28b116523ac..4e089dd4d73 100644
--- a/pkgs/shells/zsh/spaceship-prompt/default.nix
+++ b/pkgs/shells/zsh/spaceship-prompt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec{
-  name = "spaceship-prompt-${version}";
+  pname = "spaceship-prompt";
   version = "3.7.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
index 6af1869da7e..4e00fee3d27 100644
--- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix
+++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
@@ -3,7 +3,7 @@
 # To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option
 
 stdenv.mkDerivation rec {
-  name = "zsh-autosuggestions-${version}";
+  pname = "zsh-autosuggestions";
   version = "0.6.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix
index c81c1ea46c5..3e403b62322 100644
--- a/pkgs/shells/zsh/zsh-command-time/default.nix
+++ b/pkgs/shells/zsh/zsh-command-time/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   version = "2018-04-30";
-  name = "zsh-command-time-${version}";
+  pname = "zsh-command-time";
 
   src = fetchFromGitHub {
     owner = "popstas";
diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix
index 726f2b7ad73..2ed4301e55a 100644
--- a/pkgs/shells/zsh/zsh-completions/default.nix
+++ b/pkgs/shells/zsh/zsh-completions/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub}:
 
 stdenv.mkDerivation rec {
-  name = "zsh-completions-${version}";
+  pname = "zsh-completions";
   version = "0.30.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/shells/zsh/zsh-history-substring-search/default.nix
index 42de7d48d83..b7521654667 100644
--- a/pkgs/shells/zsh/zsh-history-substring-search/default.nix
+++ b/pkgs/shells/zsh/zsh-history-substring-search/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "zsh-history-substring-search-${version}";
+  pname = "zsh-history-substring-search";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
index 30c45ea3c9b..00e7612b17b 100644
--- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
@@ -4,7 +4,7 @@
 # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";`
 
 stdenv.mkDerivation rec {
-  name = "powerlevel9k-${version}";
+  pname = "powerlevel9k";
   version = "2017-11-10";
   src = fetchFromGitHub {
     owner = "bhilburn";
diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
index b7b44098fd7..741587ef960 100644
--- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
+++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.0";
-  name = "zsh-syntax-highlighting-${version}";
+  pname = "zsh-syntax-highlighting";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix
index c9bf7141804..db17788cea0 100644
--- a/pkgs/tools/X11/autocutsel/default.nix
+++ b/pkgs/tools/X11/autocutsel/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.10.0";
-  name = "autocutsel-${version}";
+  pname = "autocutsel";
  
   src = fetchurl {
-    url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2";
   };
  
diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix
index 488c97ad36b..66d845b0587 100644
--- a/pkgs/tools/X11/bgs/default.nix
+++ b/pkgs/tools/X11/bgs/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "bgs-${version}";
+  pname = "bgs";
   version = "0.8";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 1b6c540b3d8..478f0d7fed9 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, perl, xkeyboard_config }:
 
 stdenv.mkDerivation rec {
-  name = "ckbcomp-${version}";
+  pname = "ckbcomp";
   version = "1.192";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/tools/X11/dispad/default.nix
index 1d119220e58..7c1457d3e2a 100644
--- a/pkgs/tools/X11/dispad/default.nix
+++ b/pkgs/tools/X11/dispad/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libX11, libXi, libconfuse }:
 
 stdenv.mkDerivation rec {
-  name = "dispad-${version}";
+  pname = "dispad";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix
index 28f7edcfd04..f15d099016a 100644
--- a/pkgs/tools/X11/dragon-drop/default.nix
+++ b/pkgs/tools/X11/dragon-drop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, gtk, pkgconfig, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "dragon-drop-${version}";
+  pname = "dragon-drop";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix
index 3283cea1db5..d6c86d60bc1 100644
--- a/pkgs/tools/X11/ffcast/default.nix
+++ b/pkgs/tools/X11/ffcast/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "ffcast-${version}";
+  pname = "ffcast";
   version = "2.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
index c750a5ce1c6..01d82b4a112 100644
--- a/pkgs/tools/X11/go-sct/default.nix
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -1,7 +1,7 @@
 { stdenv, xorg, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-sct-${version}";
+  pname = "go-sct";
   version = "20180605-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "eb1e851f2d5017038d2b8e3653645c36d3a279f4";
 
diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix
index 1a7fc91311e..f917bda6f71 100644
--- a/pkgs/tools/X11/grobi/default.nix
+++ b/pkgs/tools/X11/grobi/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "0.5.1";
-  name = "grobi-${version}";
+  pname = "grobi";
 
   goPackagePath = "github.com/fd0/grobi";
 
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix
index cf2227403b0..239dfa0963b 100644
--- a/pkgs/tools/X11/hsetroot/default.nix
+++ b/pkgs/tools/X11/hsetroot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "hsetroot-${version}";
+  pname = "hsetroot";
   version = "1.0.2";
 
   # The primary download site seems to no longer exist; use Gentoo's mirror for now.
diff --git a/pkgs/tools/X11/jumpapp/default.nix b/pkgs/tools/X11/jumpapp/default.nix
index 5d3810c7d64..38de9e9f80b 100644
--- a/pkgs/tools/X11/jumpapp/default.nix
+++ b/pkgs/tools/X11/jumpapp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, perl, pandoc, fetchFromGitHub, xdotool, wmctrl, xprop, nettools }:
 
 stdenv.mkDerivation rec {
-  name = "jumpapp-${version}";
+  pname = "jumpapp";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/numlockx/default.nix b/pkgs/tools/X11/numlockx/default.nix
index 2c4807e4661..b59e9dc30ac 100644
--- a/pkgs/tools/X11/numlockx/default.nix
+++ b/pkgs/tools/X11/numlockx/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, libX11, libXext, autoconf }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   version = "1.2";
   pname = "numlockx";
 
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix
index 516ed9da272..ecd672250be 100644
--- a/pkgs/tools/X11/nx-libs/default.nix
+++ b/pkgs/tools/X11/nx-libs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo,
   libpng, libtool, libxml2, pkgconfig, which, xorg }:
 stdenv.mkDerivation rec {
-  name = "nx-libs-${version}";
+  pname = "nx-libs";
   version = "3.5.99.20";
   src = fetchFromGitHub {
     owner = "ArcticaProject";
diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
index 2e02338631b..6b1b353b09b 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -2,7 +2,7 @@
   imlib2, libstartup_notification, makeWrapper, libSM }:
 
 stdenv.mkDerivation rec {
-  name = "obconf-${version}";
+  pname = "obconf";
   version = "2.0.4";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/oblogout/default.nix b/pkgs/tools/X11/oblogout/default.nix
index 33470beca2d..ad2ee549a6d 100644
--- a/pkgs/tools/X11/oblogout/default.nix
+++ b/pkgs/tools/X11/oblogout/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, intltool, file, pythonPackages, cairo }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "oblogout-unstable-${version}";
+  pname = "oblogout-unstable";
   version = "2009-11-18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix
index ea661b0f8c7..ae4dc08770d 100644
--- a/pkgs/tools/X11/run-scaled/default.nix
+++ b/pkgs/tools/X11/run-scaled/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "git-2018-06-03";
-  name = "run-scaled-${version}";
+  pname = "run-scaled";
 
   src = fetchFromGitHub {
     owner  = "kaueraal";
diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix
index 1323da585c8..479617b6b93 100644
--- a/pkgs/tools/X11/runningx/default.nix
+++ b/pkgs/tools/X11/runningx/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "runningx-${version}";
+  pname = "runningx";
   version = "1.0";
   
   src = fetchurl {
diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index 92f24f2b4aa..8b4a1e19572 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "screen-message-${version}";
+  pname = "screen-message";
   version = "0.25";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix
index b8714fc9eca..bb113c90849 100644
--- a/pkgs/tools/X11/setroot/default.nix
+++ b/pkgs/tools/X11/setroot/default.nix
@@ -6,7 +6,7 @@ assert enableXinerama -> libXinerama != null;
 
 stdenv.mkDerivation rec {
   version = "2.0.2";
-  name = "setroot-${version}";
+  pname = "setroot";
 
   src = fetchFromGitHub {
     owner = "ttzhou";
diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix
index 16462f5243b..4fd9678733d 100644
--- a/pkgs/tools/X11/skippy-xd/default.nix
+++ b/pkgs/tools/X11/skippy-xd/default.nix
@@ -9,7 +9,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "git-2015-03-01";
-  name = "skippy-xd-${version}";
+  pname = "skippy-xd";
   inherit buildInputs;
   src = fetchgit {
     url = "https://github.com/richardgv/skippy-xd/";
diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix
index 2b58dd6c911..30f99cd40f2 100644
--- a/pkgs/tools/X11/sselp/default.nix
+++ b/pkgs/tools/X11/sselp/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.2";
-  name = "sselp-${version}";
+  pname = "sselp";
  
   src = fetchurl {
-    url = "https://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz";
     sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd";
   };
  
diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index 47b54bec312..92afa30e616 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }:
 
 stdenv.mkDerivation rec {
-  name = "virtualgl-lib-${version}";
+  pname = "virtualgl-lib";
   version = "2.6.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix
index a5a75c9df4f..f906a6d403e 100644
--- a/pkgs/tools/X11/wayv/default.nix
+++ b/pkgs/tools/X11/wayv/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchFromGitHub, libX11}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "wayv";
   version = "0.3";
 
diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index cd9d6aecdef..e8b2be4b783 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -3,12 +3,12 @@
 
 let
   base = pythonPackages.buildPythonApplication rec {
-    name = "winswitch-${version}";
+    pname = "winswitch";
     namePrefix = "";
     version = "0.12.23";
 
     src = fetchurl {
-      url = "http://winswitch.org/src/${name}.src.tar.bz2";
+      url = "http://winswitch.org/src/${pname}-${version}.src.tar.bz2";
       sha256 = "1m0akjcdlsgng426rwvzlcl76kjm993icj0pggvha40cizig1yd9";
     };
 
diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix
index 4200293ed08..fe5c70f6ce2 100644
--- a/pkgs/tools/X11/wmutils-core/default.nix
+++ b/pkgs/tools/X11/wmutils-core/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "wmutils-core-${version}";
+  pname = "wmutils-core";
   version = "1.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/tools/X11/wmutils-opt/default.nix
index c01aa8dc75f..c1230303862 100644
--- a/pkgs/tools/X11/wmutils-opt/default.nix
+++ b/pkgs/tools/X11/wmutils-opt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "wmutils-opt-${version}";
+  pname = "wmutils-opt";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 169f420357e..acf0fc9aabf 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -3,7 +3,7 @@
   autoreconfHook, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "x11vnc-${version}";
+  pname = "x11vnc";
   version = "0.9.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix
index 5a08cf5c817..d52698b0ed7 100644
--- a/pkgs/tools/X11/xannotate/default.nix
+++ b/pkgs/tools/X11/xannotate/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchFromBitbucket, libX11}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "xannotate";
   version = "20150301";
   
diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/tools/X11/xbanish/default.nix
index 142d7d17fe7..8e838bfe906 100644
--- a/pkgs/tools/X11/xbanish/default.nix
+++ b/pkgs/tools/X11/xbanish/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   version = "1.6";
   pname = "xbanish";
-  name = "${pname}-${version}";
 
   buildInputs = [
     libX11 libXi libXt libXfixes libXext
diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix
index 987293878d8..bb83effe601 100644
--- a/pkgs/tools/X11/xbindkeys-config/default.nix
+++ b/pkgs/tools/X11/xbindkeys-config/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }:
 
 stdenv.mkDerivation rec {
-  name = "xbindkeys-config-${version}";
+  pname = "xbindkeys-config";
   version = "0.1.3";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix
index 1d42f791fb5..c36334d478d 100644
--- a/pkgs/tools/X11/xcwd/default.nix
+++ b/pkgs/tools/X11/xcwd/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2016-09-30";
-  name = "xcwd-${version}";
+  pname = "xcwd";
 
   src = fetchFromGitHub {
     owner   = "schischi";
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 44016b801e5..f1e6e28627c 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -16,11 +16,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "xdg-utils-${version}";
+  pname = "xdg-utils";
   version = "1.1.3";
 
   src = fetchurl {
-    url = "https://portland.freedesktop.org/download/${name}.tar.gz";
+    url = "https://portland.freedesktop.org/download/${pname}-${version}.tar.gz";
     sha256 = "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p";
   };
 
diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix
index bb6abfa9b58..d20714befba 100644
--- a/pkgs/tools/X11/xdotool/default.nix
+++ b/pkgs/tools/X11/xdotool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }:
 
 stdenv.mkDerivation rec {
-  name = "xdotool-${version}";
+  pname = "xdotool";
   version = "3.20160805.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix
index 43b46fcb8d7..9aee0d778c4 100644
--- a/pkgs/tools/X11/xinput_calibrator/default.nix
+++ b/pkgs/tools/X11/xinput_calibrator/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "xinput_calibrator";
   version = "0.7.5";
-  name = "${pname}-${version}";
   src = fetchurl {
     url = "https://github.com/tias/${pname}/archive/v${version}.tar.gz";
     sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9";
diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix
index e3bbd599075..c22715d6181 100644
--- a/pkgs/tools/X11/xkb-switch/default.nix
+++ b/pkgs/tools/X11/xkb-switch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libX11, libxkbfile }:
 
 stdenv.mkDerivation rec {
-  name = "xkb-switch-${version}";
+  pname = "xkb-switch";
   version = "1.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/tools/X11/xloadimage/default.nix
index a58d16ab82e..3bd9f525683 100644
--- a/pkgs/tools/X11/xloadimage/default.nix
+++ b/pkgs/tools/X11/xloadimage/default.nix
@@ -21,7 +21,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "4.1";
-  name = "xloadimage-${version}";
+  pname = "xloadimage";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/x/xloadimage/xloadimage_${version}.orig.tar.gz";
diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix
index fd944f40044..13a18efccba 100644
--- a/pkgs/tools/X11/xmacro/default.nix
+++ b/pkgs/tools/X11/xmacro/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }:
 
 stdenv.mkDerivation rec {
-  name = "xmacro-${version}";
+  pname = "xmacro";
   version = "0.4.6";
 
   src = fetchurl {
-    url = "http://download.sarine.nl/xmacro/${name}.tar.gz";
+    url = "http://download.sarine.nl/xmacro/${pname}-${version}.tar.gz";
     sha256 = "1p9jljxyn4j6piljiyi2xv6f8jhjbzhabprp8p0qmqxaxgdipi61";
   };
 
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index a84f101cdf7..58569dcd59c 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.19";
-  name = "xnee-${version}";
+  pname = "xnee";
 
   src = fetchurl {
-    url = "mirror://gnu/xnee/${name}.tar.gz";
+    url = "mirror://gnu/xnee/${pname}-${version}.tar.gz";
     sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j";
   };
 
diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix
index 8acabeef218..5dfe74fd373 100644
--- a/pkgs/tools/X11/xosview2/default.nix
+++ b/pkgs/tools/X11/xosview2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xosview2-${version}";
+  pname = "xosview2";
   version = "2.3.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xosview/${name}.tar.gz";
+    url = "mirror://sourceforge/xosview/${pname}-${version}.tar.gz";
     sha256 = "1drp0n6qjbxyc0104a3aw2g94rh5p218wmrqwxh3kwwm7pmr9xip";
   };
 
diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix
index 435f2b2e980..dfac2cf88a5 100644
--- a/pkgs/tools/X11/xpointerbarrier/default.nix
+++ b/pkgs/tools/X11/xpointerbarrier/default.nix
@@ -1,6 +1,6 @@
 { stdenv, xorg, fetchgit }:
 stdenv.mkDerivation rec {
-  name = "xpointerbarrier-${version}";
+  pname = "xpointerbarrier";
   version = "18.06";
   src = fetchgit {
     url = "https://www.uninformativ.de/git/xpointerbarrier.git";
diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix
index d6fab2b1910..770024aa4ba 100644
--- a/pkgs/tools/X11/xpra/libfakeXinerama.nix
+++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, libXinerama }:
 
 stdenv.mkDerivation  rec {
-  name = "libfakeXinerama-${version}";
+  pname = "libfakeXinerama";
   version = "0.1.0";
 
   src = fetchurl {
-    url = "https://www.xpra.org/src/${name}.tar.bz2";
+    url = "https://www.xpra.org/src/${pname}-${version}.tar.bz2";
     sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx";
   };
 
diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix
index e54ced714e7..b528078870a 100644
--- a/pkgs/tools/X11/xrectsel/default.nix
+++ b/pkgs/tools/X11/xrectsel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xrectsel-${version}";
+  pname = "xrectsel";
   version = "0.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix
index 4f9b7bcb42e..70b471c795e 100644
--- a/pkgs/tools/X11/xrestop/default.nix
+++ b/pkgs/tools/X11/xrestop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, xorg, pkgconfig, ncurses }:
 stdenv.mkDerivation rec {
 
-  name = "xrestop-${version}";
+  pname = "xrestop";
   version = "0.4";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix
index a7a7c2b6c0d..8766e3c0d54 100644
--- a/pkgs/tools/X11/xsecurelock/default.nix
+++ b/pkgs/tools/X11/xsecurelock/default.nix
@@ -3,7 +3,7 @@
 , pam, apacheHttpd, imagemagick, pamtester, xscreensaver, xset }:
 
 stdenv.mkDerivation rec {
-  name = "xsecurelock-${version}";
+  pname = "xsecurelock";
   version = "1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix
index 2f84711e61c..bee6cdb748f 100644
--- a/pkgs/tools/X11/xsettingsd/default.nix
+++ b/pkgs/tools/X11/xsettingsd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xsettingsd-${version}";
+  pname = "xsettingsd";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 368012b468f..5f789a0151f 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -2,7 +2,7 @@
 , libXi, libXpm, xorgproto, gccmakedep, Xaw3d }:
 
 stdenv.mkDerivation rec {
-  name = "xvkbd-${version}";
+  pname = "xvkbd";
   version = "3.9";
   src = fetchurl {
     url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz";
diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix
index b6b87fffb47..7b30e5c5815 100644
--- a/pkgs/tools/X11/xwinmosaic/default.nix
+++ b/pkgs/tools/X11/xwinmosaic/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.2";
-  name = "xwinmosaic-${version}";
+  pname = "xwinmosaic";
 
   src = fetchgit {
     url = "https://github.com/soulthreads/xwinmosaic/";
diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix
index 3314089d746..df0e47d71a0 100644
--- a/pkgs/tools/admin/acme.sh/default.nix
+++ b/pkgs/tools/admin/acme.sh/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }:
 stdenv.mkDerivation rec {
-  name = "acme.sh-${version}";
+  pname = "acme.sh";
   version = "2.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix
index 7ece3acbd67..5522fd7a68b 100644
--- a/pkgs/tools/admin/adtool/default.nix
+++ b/pkgs/tools/admin/adtool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openldap }:
 
 stdenv.mkDerivation rec {
-  name = "adtool-${version}";
+  pname = "adtool";
   version = "1.3.3";
 
   src = fetchurl {
-    url = "https://gp2x.org/adtool/${name}.tar.gz";
+    url = "https://gp2x.org/adtool/${pname}-${version}.tar.gz";
     sha256  = "1awmpjamrwivi69i0j2fyrziy9s096ckviqd9c4llc3990mfsn4n";
   };
 
diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
index 02386a135f1..b3e688c681d 100644
--- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
+++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub, lib, ... }:
 
 buildGoPackage rec {
-  name = "amazon-ecr-credential-helper-${version}";
+  pname = "amazon-ecr-credential-helper";
   version = "0.3.0";
 
   goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper";
diff --git a/pkgs/tools/admin/aws-env/default.nix b/pkgs/tools/admin/aws-env/default.nix
index 37bf0e6c45d..dff37520797 100644
--- a/pkgs/tools/admin/aws-env/default.nix
+++ b/pkgs/tools/admin/aws-env/default.nix
@@ -3,7 +3,6 @@
 buildGoPackage rec {
   pname = "aws-env";
   version = "0.4";
-  name = "${pname}-${version}";
   rev = "v${version}";
 
   goPackagePath = "github.com/Droplr/aws-env";
diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix
index e03e7f34535..70f1c64c7f2 100644
--- a/pkgs/tools/admin/aws-rotate-key/default.nix
+++ b/pkgs/tools/admin/aws-rotate-key/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "aws-rotate-key-${version}";
+  pname = "aws-rotate-key";
   version = "1.0.4";
 
   goPackagePath = "github.com/Fullscreen/aws-rotate-key";
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index 03b0ff5c001..ddecd15b6ad 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -1,6 +1,5 @@
 { buildGoPackage, lib, fetchFromGitHub }:
 buildGoPackage rec {
-  name = "${pname}-${version}";
   pname = "aws-vault";
   version = "4.5.1";
 
diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix
index 8b6395d85d0..f97a6e5df89 100644
--- a/pkgs/tools/admin/bluemix-cli/default.nix
+++ b/pkgs/tools/admin/bluemix-cli/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "bluemix-cli-${version}";
+  pname = "bluemix-cli";
   version = "0.8.0";
 
   src =
diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index 3ac9e3c0e94..e4b27d98dff 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxslt, docbook_xsl, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "bubblewrap-${version}";
+  pname = "bubblewrap";
   version = "0.3.3";
 
   src = fetchurl {
-    url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
+    url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz";
     sha256 = "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966";
   };
 
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index e6ce5d07798..61f284cf85f 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -2,7 +2,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "cli53-${version}";
+  pname = "cli53";
   version = "0.8.12";
 
   goPackagePath = "github.com/barnybug/cli53";
diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix
index 71bef380544..a71958f8a09 100644
--- a/pkgs/tools/admin/docker-credential-gcr/default.nix
+++ b/pkgs/tools/admin/docker-credential-gcr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "docker-credential-gcr-${version}";
+  pname = "docker-credential-gcr";
   version = "1.4.3";
 
   goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr";
diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix
index 3dbc8eea87b..afb044ad583 100644
--- a/pkgs/tools/admin/fastlane/default.nix
+++ b/pkgs/tools/admin/fastlane/default.nix
@@ -1,14 +1,13 @@
 { stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fastlane";
   version = (import ./gemset.nix).fastlane.version;
 
   nativeBuildInputs = [ makeWrapper ];
 
   env = bundlerEnv {
-    name = "${name}-gems";
+    name = "${pname}-${version}-gems";
     inherit pname ruby;
     gemdir = ./.;
   };
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 91f233df81d..b35fe709f95 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -29,10 +29,10 @@ let
   }.${system};
 
 in stdenv.mkDerivation rec {
-  name = "google-cloud-sdk-${version}";
+  pname = "google-cloud-sdk";
   version = "255.0.0";
 
-  src = fetchurl (sources name stdenv.hostPlatform.system);
+  src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
 
   buildInputs = [ python makeWrapper ];
 
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index ec31d3ebbe9..9269b2c7cda 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -5,13 +5,13 @@
 , python3 }:
 
 stdenv.mkDerivation rec {
-  name = "gtk-vnc-${version}";
+  pname = "gtk-vnc";
   version = "0.9.0";
 
   outputs = [ "out" "bin" "man" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1dya1wc9vis8h0fv625pii1n70cckf1xjg1m2hndz989d118i6is";
   };
 
diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix
index d4ee4d61293..e09cd2f5285 100644
--- a/pkgs/tools/admin/iamy/default.nix
+++ b/pkgs/tools/admin/iamy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "iamy-${version}";
+  pname = "iamy";
   version = "2.3.2";
 
   goPackagePath = "github.com/99designs/iamy";
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index ebdf6b17ed6..2df63ea1e15 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -20,7 +20,7 @@ let
 
 in stdenv.mkDerivation rec {
   inherit version;
-  name = "pulumi-${version}";
+  pname = "pulumi";
 
   src = fetchurl pulumiArchPackage.${stdenv.hostPlatform.system};
 
diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix
index b246c7712ec..3365d87bba4 100644
--- a/pkgs/tools/admin/scaleway-cli/default.nix
+++ b/pkgs/tools/admin/scaleway-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec{
-  name = "scaleway-cli-${version}";
+  pname = "scaleway-cli";
   version = "1.17";
 
   goPackagePath = "github.com/scaleway/scaleway-cli";
diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix
index f8e89307815..e6a83c397c5 100644
--- a/pkgs/tools/admin/ssl-cert-check/default.nix
+++ b/pkgs/tools/admin/ssl-cert-check/default.nix
@@ -13,7 +13,6 @@
 
 stdenv.mkDerivation rec {
   pname = "ssl-cert-check";
-  name = "${pname}-${version}";
   version = "3.31";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 37a0f47c7af..5a964a7fe70 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -12,7 +12,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "1.9.0";
-  name = "tigervnc-${version}";
+  pname = "tigervnc";
 
   src = fetchFromGitHub {
     owner = "TigerVNC";
diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix
index 0d983ad98ea..538464499fa 100644
--- a/pkgs/tools/admin/vncdo/default.nix
+++ b/pkgs/tools/admin/vncdo/default.nix
@@ -4,7 +4,6 @@
 pythonPackages.buildPythonPackage rec {
   pname = "vncdo";
   version = "0.11.2";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "sibson";
diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix
index 0014febf40e..13da95a28b5 100644
--- a/pkgs/tools/archivers/afio/default.nix
+++ b/pkgs/tools/archivers/afio/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.5.2";
-  name = "afio-${version}";
+  pname = "afio";
 
   src = fetchurl {
-    url = "http://members.chello.nl/~k.holtman/${name}.tgz";
+    url = "http://members.chello.nl/~k.holtman/${pname}-${version}.tgz";
     sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66";
   };
 
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index c2e7f75fc7f..caf507670f4 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, acl }:
 
 stdenv.mkDerivation rec {
-  name = "gnutar-${version}";
+  pname = "gnutar";
   version = "1.32";
 
   src = fetchurl {
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 3b212b186aa..465bc474a9e 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "p7zip-${version}";
+  pname = "p7zip";
   version = "16.02";
 
   src = fetchurl {
diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix
index f99ee963dbe..b9eaf3dba65 100644
--- a/pkgs/tools/archivers/runzip/default.nix
+++ b/pkgs/tools/archivers/runzip/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4";
-  name = "runzip-${version}";
+  pname = "runzip";
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ libzip ];
diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix
index d5349900756..48e5cc6c436 100644
--- a/pkgs/tools/archivers/s-tar/default.nix
+++ b/pkgs/tools/archivers/s-tar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "s-tar-${version}";
+  pname = "s-tar";
   version = "1.6";
   src = fetchurl {
     url = "mirror://sourceforge/s-tar/star-${version}.tar.bz2";
diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix
index 217a8ab35a9..61e60996e75 100644
--- a/pkgs/tools/archivers/unarj/default.nix
+++ b/pkgs/tools/archivers/unarj/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "unarj-${version}";
+  pname = "unarj";
   version = "2.65";
 
   src = fetchurl {
     sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p";
-    url = "https://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz";
+    url = "https://src.fedoraproject.org/repo/pkgs/unarj/${pname}-${version}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${pname}-${version}.tar.gz";
   };
 
   preInstall = ''
diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix
index 89bb816aa57..9d072c9bb19 100644
--- a/pkgs/tools/archivers/undmg/default.nix
+++ b/pkgs/tools/archivers/undmg/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.3";
-  name = "undmg-${version}";
+  pname = "undmg";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix
index b9c549d670b..e1cac4fc61f 100644
--- a/pkgs/tools/archivers/unp/default.nix
+++ b/pkgs/tools/archivers/unp/default.nix
@@ -8,7 +8,7 @@ let
   runtime_bins =  [ file unzip gzip ] ++ extraBackends;
 
 in stdenv.mkDerivation rec {
-  name = "unp-${version}";
+  pname = "unp";
   version = "2.0-pre7";
   buildInputs = [ perl makeWrapper ];
 
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 2a51e4d7bc9..07f62fa02ad 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "unrar-${version}";
+  pname = "unrar";
   version = "5.7.5";
 
   src = fetchurl {
diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix
index 3febb557bf8..cfab2443032 100644
--- a/pkgs/tools/archivers/unshield/default.nix
+++ b/pkgs/tools/archivers/unshield/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, zlib, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "unshield-${version}";
+  pname = "unshield";
   version = "1.4.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix
index 3c52e1944d8..9d58bf5c2f8 100644
--- a/pkgs/tools/archivers/wimlib/default.nix
+++ b/pkgs/tools/archivers/wimlib/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   version = "1.13.1";
-  name = "wimlib-${version}";
+  pname = "wimlib";
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [ openssl fuse libxml2 ntfs3g ];
 
   src = fetchurl {
-    url = "https://wimlib.net/downloads/${name}.tar.gz";
+    url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz";
     sha256 = "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27";
   };
 
diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix
index 07e76ea7f62..ff98e96655f 100644
--- a/pkgs/tools/archivers/xarchive/default.nix
+++ b/pkgs/tools/archivers/xarchive/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.8-6";
-  name = "xarchive-${version}";
+  pname = "xarchive";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xarchive/${name}.tar.gz";
+    url = "mirror://sourceforge/xarchive/${pname}-${version}.tar.gz";
     sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4";
   };
 
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix
index 9860c2b34bd..07684155a7e 100644
--- a/pkgs/tools/archivers/xarchiver/default.nix
+++ b/pkgs/tools/archivers/xarchiver/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.4.14";
-  name = "xarchiver-${version}";
+  pname = "xarchiver";
 
   src = fetchFromGitHub {
     owner = "ib";
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index c99221b36ba..09c4e914bd8 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "zpaq-${version}";
+  pname = "zpaq";
   version = "7.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index 6c587f5cc5c..39ad4626f3e 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }:
 
 stdenv.mkDerivation rec {
-  name = "abcm2ps-${version}";
+  pname = "abcm2ps";
   version = "8.14.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index 572c66a01d6..4ee9ef352bb 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "abcMIDI-${version}";
+  pname = "abcMIDI";
   version = "2019.08.02";
 
   src = fetchzip {
-    url = "https://ifdo.ca/~seymour/runabc/${name}.zip";
+    url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
     sha256 = "1iz4m86lc4nyf312qk749kgvq60g6x1zn2y70859g16ki16mk8m3";
   };
 
diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/tools/audio/accuraterip-checksum/default.nix
index 502859cd52d..4590a0dfbc3 100644
--- a/pkgs/tools/audio/accuraterip-checksum/default.nix
+++ b/pkgs/tools/audio/accuraterip-checksum/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "accuraterip-checksum-${version}";
+  pname = "accuraterip-checksum";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
index 4c28c4f3458..acd205a30de 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }:
 
 stdenv.mkDerivation rec {
-  name = "acoustid-fingerprinter-${version}";
+  pname = "acoustid-fingerprinter";
   version = "0.6";
 
   src = fetchurl {
     url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/"
-        + "${name}.tar.gz";
+        + "${pname}-${version}.tar.gz";
     sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0";
   };
 
diff --git a/pkgs/tools/audio/aucdtect/default.nix b/pkgs/tools/audio/aucdtect/default.nix
index 825e1a0cc07..21adf3b972a 100644
--- a/pkgs/tools/audio/aucdtect/default.nix
+++ b/pkgs/tools/audio/aucdtect/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "aucdtext-${version}";
+  pname = "aucdtext";
   version = "0.8-2";
 
   src = fetchurl {
diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix
index 38902f234a2..75d8975ab32 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/pkgs/tools/audio/beets/alternatives-plugin.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, beets, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "beets-alternatives-${version}";
+  pname = "beets-alternatives";
   version = "0.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
index 3cfb9a05b2d..c5f7bcd5a71 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "darkice-${version}";
+  pname = "darkice";
   version = "1.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix
index 6524bedf939..fbf90d2211c 100644
--- a/pkgs/tools/audio/ezstream/default.nix
+++ b/pkgs/tools/audio/ezstream/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ezstream-${version}";
+  pname = "ezstream";
   version = "0.6.0";
 
   src = fetchurl {
-    url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${name}.tar.gz";
+    url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${pname}-${version}.tar.gz";
     sha256 = "f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9";
   };
 
diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix
index 23a33122c9f..665e2da3329 100644
--- a/pkgs/tools/audio/glyr/default.nix
+++ b/pkgs/tools/audio/glyr/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.10";
-  name = "glyr-${version}";
+  pname = "glyr";
 
   src = fetchFromGitHub {
     owner = "sahib";
diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix
index 08bd864792b..bfb4f81c816 100644
--- a/pkgs/tools/audio/mpdas/default.nix
+++ b/pkgs/tools/audio/mpdas/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, mpd_clientlib, curl }:
 
 stdenv.mkDerivation rec {
-  name = "mpdas-${version}";
+  pname = "mpdas";
   version = "0.4.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index 5b5a0d9c0e0..3b59d5aceb0 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -8,7 +8,7 @@ let
   };
 in stdenv.mkDerivation rec {
   version = "20161228";
-  name    = "mpdcron-${version}";
+  pname = "mpdcron";
 
   src = fetchFromGitHub {
     owner = "alip";
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index 4b72ed3bfd3..d13dfbe8f43 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -4,7 +4,6 @@
 
 stdenv.mkDerivation rec {
   pname = "mpDris2";
-  name = "${pname}-${version}";
   version = "0.8";
 
   src = fetchurl {
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index c0f0aa1bf93..782ea314359 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -4,13 +4,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pasystray-${version}";
+  pname = "pasystray";
   version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "christophgysin";
     repo = "pasystray";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk";
   };
 
diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index cda89302abd..8a8cd258145 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "playerctl-${version}";
+  pname = "playerctl";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index 9906fa449dd..5b27a00a955 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "pnmixer-${version}";
+  pname = "pnmixer";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix
index a4dd7197be0..d72cb856437 100644
--- a/pkgs/tools/audio/trx/default.nix
+++ b/pkgs/tools/audio/trx/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }:
 
 stdenv.mkDerivation rec {
-  name = "trx-unstable-${version}";
+  pname = "trx-unstable";
   version = "2018-01-23";
 
   src = fetchgit {
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix
index ed955876250..36afd11aa2c 100644
--- a/pkgs/tools/audio/volumeicon/default.nix
+++ b/pkgs/tools/audio/volumeicon/default.nix
@@ -1,7 +1,7 @@
 { pkgs, fetchurl, stdenv, gtk3, pkgconfig, intltool, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "volumeicon-${version}";
+  pname = "volumeicon";
   version = "0.5.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index ad0001f22e1..ce77ebe8c1a 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -11,14 +11,14 @@ let
   withGlusterfs = "\${with_glusterfs_directory}";
 in
 stdenv.mkDerivation rec {
-  name = "bareos-${version}";
+  pname = "bareos";
   version = "17.2.7";
 
   src = fetchFromGitHub {
     owner = "bareos";
     repo = "bareos";
     rev = "Release/${version}";
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     sha256 = "1awf5i4mw2nfd7z0dmqnywapnx9nz6xwqv8rxp0y2mnrhzdpbrbz";
   };
 
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index dfa28203dbf..9fd3e854065 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -2,11 +2,11 @@
 , utillinux, asciidoc, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "btrbk-${version}";
+  pname = "btrbk";
   version = "0.28.0";
 
   src = fetchurl {
-    url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz";
+    url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz";
     sha256 = "1bqgcbkdd5s3l3ba1ifa9l523r8cr5y3arjdy9f6rmm840kn7xzf";
   };
 
diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix
index 8aa2d015205..5c0be4a2de7 100644
--- a/pkgs/tools/backup/burp/default.nix
+++ b/pkgs/tools/backup/burp/default.nix
@@ -2,7 +2,7 @@
 , acl, librsync, ncurses, openssl, zlib, uthash }:
 
 stdenv.mkDerivation rec {
-  name = "burp-${version}";
+  pname = "burp";
   version = "2.2.18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix
index 3ab1eba5b6f..736a3122a6f 100644
--- a/pkgs/tools/backup/chunksync/default.nix
+++ b/pkgs/tools/backup/chunksync/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4";
-  name = "chunksync-${version}";
+  pname = "chunksync";
 
   src = fetchurl {
     url = "https://chunksync.florz.de/chunksync_${version}.tar.gz";
diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index ac01dc6022b..352f320dadf 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -4,10 +4,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "2.6.5";
-  name = "dar-${version}";
+  pname = "dar";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dar/${name}.tar.gz";
+    url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
     sha256 = "1x2zr5nw3qq1vmbs4bva6mx1cx0180dri5i2971ynzcxybn75znd";
   };
 
diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix
index 3a5ffc30f8f..97d876da127 100644
--- a/pkgs/tools/backup/diskrsync/default.nix
+++ b/pkgs/tools/backup/diskrsync/default.nix
@@ -1,8 +1,6 @@
 { buildGoPackage, fetchFromGitHub, stdenv, openssh, makeWrapper }:
 
 buildGoPackage rec {
-
-  name = "${pname}-${version}";
   pname = "diskrsync";
   version = "unstable-2018-02-03";
 
diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix
index c774711b874..be039fa47c0 100644
--- a/pkgs/tools/backup/duplicati/default.nix
+++ b/pkgs/tools/backup/duplicati/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, mono, sqlite, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "duplicati-${version}";
+  pname = "duplicati";
   version = "2.0.4.5";
   channel = "beta";
   build_date = "2018-11-28";
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/{bin,share/${name}}
-    cp -r * $out/share/${name}
+    mkdir -p $out/{bin,share/${pname}-${version}}
+    cp -r * $out/share/${pname}-${version}
     makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \
-      --add-flags "$out/share/${name}/Duplicati.CommandLine.exe" \
+      --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \
       --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
           sqlite ]}
     makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \
-      --add-flags "$out/share/${name}/Duplicati.Server.exe" \
+      --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \
       --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
           sqlite ]}
   '';
diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
index d476b797f38..3e4375cb76c 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "duply-${version}";
+  pname = "duply";
   version = "2.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix
index ceb6feae396..412c9696d02 100644
--- a/pkgs/tools/backup/easysnap/default.nix
+++ b/pkgs/tools/backup/easysnap/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, zfs }:
 
 stdenv.mkDerivation rec {
-  name = "easysnap-${version}";
+  pname = "easysnap";
   version = "unstable-2019-02-17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix
index 224b8b12906..739f14ca1a6 100644
--- a/pkgs/tools/backup/flockit/default.nix
+++ b/pkgs/tools/backup/flockit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "flockit-${version}";
+  pname = "flockit";
   version = "2012-08-11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index 6d761354b6a..6fe614195a4 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.49.2";
-  name = "httrack-${version}";
+  pname = "httrack";
 
   src = fetchurl {
     url = "https://mirror.httrack.com/httrack-${version}.tar.gz";
diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix
index e29acc6f3c8..8cf3eb29462 100644
--- a/pkgs/tools/backup/httrack/qt.nix
+++ b/pkgs/tools/backup/httrack/qt.nix
@@ -2,11 +2,11 @@
 , httrack, qtbase, qtmultimedia }:
 
 stdenv.mkDerivation rec {
-  name = "httraqt-${version}";
+  pname = "httraqt";
   version = "1.4.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/httraqt/${name}.tar.gz";
+    url = "mirror://sourceforge/httraqt/${pname}-${version}.tar.gz";
     sha256 = "0pjxqnqchpbla4xiq4rklc06484n46cpahnjy03n9rghwwcad25b";
   };
 
diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
index e8787855125..5538b45c5f1 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.5";
-  name = "mydumper-${version}";
+  pname = "mydumper";
 
   src = fetchFromGitHub {
     owner  = "maxbube";
diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
index 279652b0cd0..e07eb33abb5 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.1";
-  name = "ori-${version}";
+  pname = "ori";
 
   src = fetchurl {
     url = "https://bitbucket.org/orifs/ori/downloads/ori-0.8.1.tar.xz";
diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix
index 021f783e0fd..fa4346c8ccc 100644
--- a/pkgs/tools/backup/partclone/default.nix
+++ b/pkgs/tools/backup/partclone/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "partclone-${version}";
+  pname = "partclone";
   version = "0.3.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix
index 712d0af29a9..98eae9cc670 100644
--- a/pkgs/tools/backup/percona-xtrabackup/default.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/default.nix
@@ -4,13 +4,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "percona-xtrabackup-${version}";
+  pname = "percona-xtrabackup";
   version = "2.4.12";
 
   src = fetchFromGitHub {
     owner = "percona";
     repo = "percona-xtrabackup";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1w17v2c677b3vfnm81bs63kjbfiin7f12wl9fbgp83hfpyx5msan";
   };
 
diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/tools/backup/rdup/default.nix
index 33e3c77db88..56f9c4f9daf 100644
--- a/pkgs/tools/backup/rdup/default.nix
+++ b/pkgs/tools/backup/rdup/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "rdup-${version}";
+  pname = "rdup";
   version = "1.1.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index da44e389bdd..b78fc9b61f7 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "restic-${version}";
+  pname = "restic";
   version = "0.9.5";
 
   goPackagePath = "github.com/restic/restic";
diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix
index d9f889897aa..c7f12cb751b 100644
--- a/pkgs/tools/backup/restic/rest-server.nix
+++ b/pkgs/tools/backup/restic/rest-server.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "restic-rest-server-${version}";
+  pname = "restic-rest-server";
   version = "0.9.7";
 
   goPackagePath = "github.com/restic/rest-server";
diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix
index 96bbea4791e..4c13c831ba9 100644
--- a/pkgs/tools/backup/rsbep/default.nix
+++ b/pkgs/tools/backup/rsbep/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, coreutils, gnused, gawk, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "rsbep-${version}";
+  pname = "rsbep";
   version = "0.1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
index 7324f75d95f..a0f568b16b3 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   version = "3.5";
 
-  name = "store-backup-${version}";
+  pname = "store-backup";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index 3767a377cfc..d24da778dcd 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -7,7 +7,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "tarsnap-${version}";
+  pname = "tarsnap";
   version = "1.0.39";
 
   src = fetchurl {
diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix
index 3b66ac1b491..c5a9ad4b3f9 100644
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/pkgs/tools/backup/wal-e/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "wal-e-${version}";
+  pname = "wal-e";
   version = "0.6.10";
 
   namePrefix = "";
diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix
index ce9237a7c6b..70cc8a425c1 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, brotli }:
 
 buildGoPackage rec {
-  name = "wal-g-${version}";
+  pname = "wal-g";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix
index c9fb1c54726..928ba9842b2 100644
--- a/pkgs/tools/backup/zbackup/default.nix
+++ b/pkgs/tools/backup/zbackup/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } :
 stdenv.mkDerivation rec {
-  name = "zbackup-${version}";
+  pname = "zbackup";
   version = "1.4.4";
   src = fetchurl {
     url = "https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz";
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 84a2375302f..b28e50d54b0 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -8,11 +8,11 @@ let
   binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];
 
 in stdenv.mkDerivation rec {
-  name = "blueman-${version}";
+  pname = "blueman";
   version = "2.0.8";
 
   src = fetchurl {
-    url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "0kkh6jppqcn3yf70vnny1l015kxrz3dxw4g774gl02lh9ixx1bq4";
   };
 
diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix
index f13db4572e0..097b7ae00d7 100644
--- a/pkgs/tools/bluetooth/bluez-alsa/default.nix
+++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix
@@ -12,7 +12,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "bluez-alsa-${version}";
+  pname = "bluez-alsa";
   version = "1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 0cdcd4c58df..4ddc7554294 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -13,7 +13,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "refind-${version}";
+  pname = "refind";
   version = "0.11.4";
   srcName = "refind-src-${version}";
 
diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix
index 63a429e50de..ccf632dfe5a 100644
--- a/pkgs/tools/cd-dvd/bashburn/default.nix
+++ b/pkgs/tools/cd-dvd/bashburn/default.nix
@@ -3,13 +3,13 @@
 , vorbis-tools, xorriso }:
 
 stdenv.mkDerivation rec {
-  name = "bashburn-${version}";
+  pname = "bashburn";
   version = "3.1.0";
 
   src = fetchurl {
     sha256 = "0g5va5rjdrvacanmqr6pbxk2rl565ahkfbsvxsp1jvhvxvhmv3dp";
     url = "http://bashburn.dose.se/index.php?s=file_download&id=25";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
   };
 
   nativeBuildInputs = [ utillinux ];
diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix
index aa47edcb96c..b4f0d1039ed 100644
--- a/pkgs/tools/cd-dvd/bchunk/default.nix
+++ b/pkgs/tools/cd-dvd/bchunk/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "bchunk-${version}";
+  pname = "bchunk";
   version = "1.2.2";
 
   src = fetchurl {
-    url = "http://he.fi/bchunk/${name}.tar.gz";
+    url = "http://he.fi/bchunk/${pname}-${version}.tar.gz";
     sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
   };
 
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index 402073ff524..a9f5b321d3d 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -9,10 +9,10 @@ let
 
 in stdenv.mkDerivation rec {
   version = "${major}.${minor}";
-  name = "brasero-${version}";
+  pname = "brasero";
 
   src = fetchurl {
-    url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz";
+    url = "http://download.gnome.org/sources/brasero/${major}/${pname}-${version}.tar.xz";
     sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8";
   };
 
diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix
index a65f2d47d8f..00a1864b035 100644
--- a/pkgs/tools/cd-dvd/cdi2iso/default.nix
+++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "cdi2iso-${version}";
+  pname = "cdi2iso";
   version = "0.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cdi2iso.berlios/${name}-src.tar.gz";
+    url = "mirror://sourceforge/cdi2iso.berlios/${pname}-${version}-src.tar.gz";
     sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh";
   };
 
diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix
index 888711a8501..d617a9a6c54 100644
--- a/pkgs/tools/cd-dvd/cdimgtools/default.nix
+++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }:
 
 stdenv.mkDerivation rec {
-  name = "cdimgtools-${version}";
+  pname = "cdimgtools";
   version = "0.3";
 
   src = fetchFromRepoOrCz {
diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix
index 6523c8a0cf3..970b32eb08f 100644
--- a/pkgs/tools/cd-dvd/cue2pops/default.nix
+++ b/pkgs/tools/cd-dvd/cue2pops/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "cue2pops-${version}";
+  pname = "cue2pops";
   version = "git-2018-01-04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix
index 99908f06b10..2cb90129ed9 100644
--- a/pkgs/tools/cd-dvd/dvd-vr/default.nix
+++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dvd-vr-${version}";
+  pname = "dvd-vr";
   version = "0.9.7";
   src = fetchurl {
     url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${version}.tar.gz";
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 82f1842e963..6a4161ba1fa 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dvdisaster-${version}";
+  pname = "dvdisaster";
   version = "0.79.5";
 
   src = fetchurl {
-    url = "http://dvdisaster.net/downloads/${name}.tar.bz2";
+    url = "http://dvdisaster.net/downloads/${pname}-${version}.tar.bz2";
     sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w";
   };
 
diff --git a/pkgs/tools/cd-dvd/ecm-tools/default.nix b/pkgs/tools/cd-dvd/ecm-tools/default.nix
index ec814d97bde..922ab39063a 100644
--- a/pkgs/tools/cd-dvd/ecm-tools/default.nix
+++ b/pkgs/tools/cd-dvd/ecm-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "ecm-tools-${version}";
+  pname = "ecm-tools";
   version = "1.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/tools/cd-dvd/mdf2iso/default.nix
index f33ba31beee..dbad9d36247 100644
--- a/pkgs/tools/cd-dvd/mdf2iso/default.nix
+++ b/pkgs/tools/cd-dvd/mdf2iso/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchgit}:
 
 stdenv.mkDerivation rec {
-  name = "mdf2iso-${version}";
+  pname = "mdf2iso";
   version = "0.3.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/tools/cd-dvd/mkcue/default.nix
index 0a9d61e9da8..357992d7291 100644
--- a/pkgs/tools/cd-dvd/mkcue/default.nix
+++ b/pkgs/tools/cd-dvd/mkcue/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mkcue-${version}";
+  pname = "mkcue";
   version = "1";
 
   src = fetchurl {
diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix
index 98853d1ba61..43ed7ea7d38 100644
--- a/pkgs/tools/cd-dvd/nrg2iso/default.nix
+++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "nrg2iso-${version}";
+  pname = "nrg2iso";
   version = "0.4";
 
   src = fetchurl {
-    url = "http://gregory.kokanosky.free.fr/v4/linux/${name}.tar.gz";
+    url = "http://gregory.kokanosky.free.fr/v4/linux/${pname}-${version}.tar.gz";
     sha256 = "18sam7yy50rbfhjixwd7wx7kmfn1x1y5j80vwfxi5v408s39s115";
   };
 
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 502937dd565..9495f8dac99 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -2,7 +2,7 @@
 , p7zip, mtools, syslinux }:
 
 stdenv.mkDerivation rec {
-  name = "unetbootin-${version}";
+  pname = "unetbootin";
   version = "661";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix
index 4f288b9e56f..8bee8059fe2 100644
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/pkgs/tools/compression/advancecomp/default.nix
@@ -2,7 +2,7 @@
 , autoreconfHook, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "advancecomp-${version}";
+  pname = "advancecomp";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index a3987085c8e..33b6f12cd46 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -3,7 +3,7 @@
 # ?TODO: there's also python lib in there
 
 stdenv.mkDerivation rec {
-  name = "brotli-${version}";
+  pname = "brotli";
   version = "1.0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix
index 4c88e58e6c1..c1ddb242dad 100644
--- a/pkgs/tools/compression/bsc/default.nix
+++ b/pkgs/tools/compression/bsc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openmp ? null }:
 
 stdenv.mkDerivation rec {
-  name = "bsc-${version}";
+  pname = "bsc";
   version = "3.1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix
index 617d86e7f1e..a5b527d70b7 100644
--- a/pkgs/tools/compression/bsdiff/default.nix
+++ b/pkgs/tools/compression/bsdiff/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name    = "bsdiff-${version}";
+  pname = "bsdiff";
   version = "4.3";
 
   src = fetchurl {
-    url    = "https://www.daemonology.net/bsdiff/${name}.tar.gz";
+    url    = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz";
     sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq";
   };
 
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index a0ec6c07055..a440c08bd1b 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bzip2-${version}";
+  pname = "bzip2";
   version = "1.0.6.0.1";
 
   /* We use versions patched to use autotools style properly,
       saving lots of trouble. */
   src = fetchurl {
     urls = map
-      (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${name}.tar.gz")
+      (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${pname}-${version}.tar.gz")
       [
         "http://ftp.uni-kl.de/pub/linux/suse"
         "ftp://ftp.hs.uni-hamburg.de/pub/mirrors/suse"
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index c9ec557ab1f..19bc2fdc176 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -12,7 +12,7 @@ let
   ++ [ bzip2 xz lzip ]);
 
 in pythonPackages.buildPythonApplication rec {
-  name = "dtrx-${version}";
+  pname = "dtrx";
   version = "7.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index bd4d85e90e3..e6409f05122 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
-  name = "gzip-${version}";
+  pname = "gzip";
   version = "1.10";
 
   src = fetchurl {
-    url = "mirror://gnu/gzip/${name}.tar.xz";
+    url = "mirror://gnu/gzip/${pname}-${version}.tar.xz";
     sha256 = "1h6p374d3j8d4cdfydzls021xa2yby8myc0h8d6m8bc7k6ncq9c4";
   };
 
diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix
index 083a71f6a75..2c6765b2e83 100644
--- a/pkgs/tools/compression/lrzip/default.nix
+++ b/pkgs/tools/compression/lrzip/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.631";
-  name = "lrzip-${version}";
+  pname = "lrzip";
 
   src = fetchurl {
-    url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2";
+    url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.bz2";
     sha256 = "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d";
   };
 
diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix
index 0bf15580798..ef185f706dc 100644
--- a/pkgs/tools/compression/lzfse/default.nix
+++ b/pkgs/tools/compression/lzfse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "lzfse-${version}";
+  pname = "lzfse";
   version = "2017-03-08";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index dfd91bf37d3..4ec40deab6c 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "lzip-${version}";
+  pname = "lzip";
   version = "1.21";
 
   nativeBuildInputs = [ texinfo ];
 
   src = fetchurl {
-    url = "mirror://savannah/lzip/${name}.tar.gz";
+    url = "mirror://savannah/lzip/${pname}-${version}.tar.gz";
     sha256 = "12qdcw5k1cx77brv9yxi1h4dzwibhfmdpigrj43nfk8nscwm12z4";
   };
 
diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix
index 9b9de8d8302..28c7c1d69f7 100644
--- a/pkgs/tools/compression/mozlz4a/default.nix
+++ b/pkgs/tools/compression/mozlz4a/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, python3, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "mozlz4a";
   version = "2018-08-23";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix
index bbba21f2b34..13e5882788d 100644
--- a/pkgs/tools/compression/pbzx/default.nix
+++ b/pkgs/tools/compression/pbzx/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "pbzx";
   version = "1.0.2";
-  name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "NiklasRosenstein";
     repo = "pbzx";
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index 60023d028a9..7f9c7cb7773 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, ucl, zlib, perl }:
 
 stdenv.mkDerivation rec {
-  name = "upx-${version}";
+  pname = "upx";
   version = "3.95";
   src = fetchurl {
-    url = "https://github.com/upx/upx/releases/download/v${version}/${name}-src.tar.xz";
+    url = "https://github.com/upx/upx/releases/download/v${version}/${pname}-${version}-src.tar.xz";
     sha256 = "14jmgy7hvx4zqra20w8260wrcxmjf2h6ba2yrw7pcp18im35a3rv";
   };
 
diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix
index 3421045fe4c..61dd5e30f0d 100644
--- a/pkgs/tools/compression/xar/default.nix
+++ b/pkgs/tools/compression/xar/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.1";
-  name    = "xar-${version}";
+  pname = "xar";
 
   src = fetchurl {
-    url    = "https://github.com/downloads/mackyle/xar/${name}.tar.gz";
+    url    = "https://github.com/downloads/mackyle/xar/${pname}-${version}.tar.gz";
     sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf";
   };
 
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 32de493ec77..034cdb7d94e 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -9,7 +9,7 @@ let
     then "--with-${name}"
     else "--without-${name}";
 in stdenv.mkDerivation rec {
-  name = "xdelta-${version}";
+  pname = "xdelta";
   version = "3.0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix
index c870e501209..bf2601dd373 100644
--- a/pkgs/tools/compression/xdelta/unstable.nix
+++ b/pkgs/tools/compression/xdelta/unstable.nix
@@ -9,7 +9,7 @@ let
     then "--with-${name}"
     else "--without-${name}";
 in stdenv.mkDerivation rec {
-  name = "xdelta-${version}";
+  pname = "xdelta";
   version = "3.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
index 06c7e6439a9..accead9db0b 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, fetchpatch, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "zopfli-${version}";
+  pname = "zopfli";
   version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "zopfli";
-    rev = name;
-    name = "${name}-src";
+    rev = "${pname}-${version}";
+    name = "${pname}-${version}-src";
     sha256 = "1l551hx2p4qi0w9lk96qklbv6ll68gxbah07fhqx1ly28rv5wy9y";
   };
 
diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix
index 74ba47ceee1..137b00802df 100644
--- a/pkgs/tools/filesystems/afpfs-ng/default.nix
+++ b/pkgs/tools/filesystems/afpfs-ng/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fuse, readline, libgcrypt, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "afpfs-ng-${version}";
+  pname = "afpfs-ng";
   version = "0.8.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix
index 5fc614de4a7..356d7ada6d0 100644
--- a/pkgs/tools/filesystems/avfs/default.nix
+++ b/pkgs/tools/filesystems/avfs/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, fuse, xz }:
 
 stdenv.mkDerivation rec {
-  name = "avfs-${version}";
+  pname = "avfs";
   version = "1.1.0";
   src = fetchurl {
-    url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2";
     sha256 = "19rk2c0xd3mi66kr88ykrcn81fv09c09md0gf6mnm9z1bd7p7wx7";
   };
 
diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix
index cd0f3ea2322..d449bf1266a 100644
--- a/pkgs/tools/filesystems/bashmount/default.nix
+++ b/pkgs/tools/filesystems/bashmount/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub}:
 
 stdenv.mkDerivation rec {
-  name = "bashmount-${version}";
+  pname = "bashmount";
   version = "3.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index efd48fb87fe..d3e790a3cf1 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, utillinux, bash }:
 
 stdenv.mkDerivation rec {
-  name = "bcache-tools-${version}";
+  pname = "bcache-tools";
   version = "1.0.7";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz";
     sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4";
   };
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index f12e8af84b8..842ef6712ac 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -6,7 +6,7 @@ let
   sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh";
 
   bees = stdenv.mkDerivation rec {
-    name = "bees-${version}";
+    pname = "bees";
     inherit version;
 
     src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index 6a9d17772c8..a8849e6af22 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.14.1";
-  name    = "bindfs-${version}";
+  pname = "bindfs";
 
   src = fetchurl {
-    url    = "https://bindfs.org/downloads/${name}.tar.gz";
+    url    = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
     sha256 = "111i4ba4px3idmrr5qhgq01926fas1rs2yx2shnwgdk3ziqcszxl";
   };
 
diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix
index b5694535e94..067f200e201 100644
--- a/pkgs/tools/filesystems/blobfuse/default.nix
+++ b/pkgs/tools/filesystems/blobfuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "blobfuse-${version}";
+  pname = "blobfuse";
   version = "1.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix
index 9c9dbede83f..a0983004fcc 100644
--- a/pkgs/tools/filesystems/boxfs/default.nix
+++ b/pkgs/tools/filesystems/boxfs/default.nix
@@ -22,7 +22,7 @@ let
     };
   };
 in stdenv.mkDerivation rec {
-  name = "boxfs-${version}";
+  pname = "boxfs";
   version = "2-20150109";
 
   src = srcs.boxfs2;
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 168542f57df..75649845edc 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "btrfs-progs-${version}";
+  pname = "btrfs-progs";
   version = "5.1.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix
index 47428e7f52e..6c0a6c28703 100644
--- a/pkgs/tools/filesystems/chunkfs/default.nix
+++ b/pkgs/tools/filesystems/chunkfs/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7";
-  name = "chunkfs-${version}";
+  pname = "chunkfs";
 
   src = fetchurl {
     url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz";
diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix
index 8af745ed436..00ef368ad3d 100644
--- a/pkgs/tools/filesystems/convoy/default.nix
+++ b/pkgs/tools/filesystems/convoy/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, lvm2 }:
 
 buildGoPackage rec {
-  name = "convoy-${version}";
+  pname = "convoy";
   version = "0.5.0";
 
   goPackagePath = "github.com/rancher/convoy";
diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix
index 71e27c94dbd..67016af8c0d 100644
--- a/pkgs/tools/filesystems/cryfs/default.nix
+++ b/pkgs/tools/filesystems/cryfs/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cryfs-${version}";
+  pname = "cryfs";
   version = "0.9.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index 4952036a860..4d40d61b570 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
 
 stdenv.mkDerivation rec {
-  name = "darling-dmg-${version}";
+  pname = "darling-dmg";
   version = "1.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix
index b8028741d57..5137719790a 100644
--- a/pkgs/tools/filesystems/disorderfs/default.nix
+++ b/pkgs/tools/filesystems/disorderfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, fuse, attr, asciidoc }:
 
 stdenv.mkDerivation rec {
-  name = "disorderfs-${version}";
+  pname = "disorderfs";
   version = "0.5.6";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix
index e8deeaf4b47..e3c8c2944fb 100644
--- a/pkgs/tools/filesystems/djmount/default.nix
+++ b/pkgs/tools/filesystems/djmount/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "djmount-${version}";
+  pname = "djmount";
   version = "0.71";
   src = fetchurl {
-    url = "mirror://sourceforge/djmount/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/djmount/${version}/${pname}-${version}.tar.gz";
     sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa";
   };
 
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 82f64362fad..369d2e74f30 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "dosfstools-${version}";
+  pname = "dosfstools";
   version = "4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix
index e1b11a37055..a61c3c80e6d 100644
--- a/pkgs/tools/filesystems/duff/default.nix
+++ b/pkgs/tools/filesystems/duff/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "duff-${version}";
+  pname = "duff";
   # The last release (0.5.2) is more than 2 years old and lacks features like -D,
   # limiting its usefulness. Upstream appears comatose if not dead.
   version = "2014-07-03";
diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix
index 208cbb83209..0950445bd3e 100644
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "duperemove-${version}";
+  pname = "duperemove";
   version = "0.11.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix
index dcaad81a5a3..14f6afa99f0 100644
--- a/pkgs/tools/filesystems/e2tools/default.nix
+++ b/pkgs/tools/filesystems/e2tools/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "e2tools";
   version = "0.0.16";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${name}.tar.gz";
+    url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${pname}-${version}.tar.gz";
     sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f";
   };
 
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 1a9951a33fd..19767b7013a 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "encfs-${version}";
+  pname = "encfs";
   version = "1.9.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix
index 97a96651a68..24db663aee0 100644
--- a/pkgs/tools/filesystems/exfat/default.nix
+++ b/pkgs/tools/filesystems/exfat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "exfat-${version}";
+  pname = "exfat";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix
index 0211ab63b3e..40159b5fb6e 100644
--- a/pkgs/tools/filesystems/ext4magic/default.nix
+++ b/pkgs/tools/filesystems/ext4magic/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.2";
-  name = "ext4magic-${version}";
+  pname = "ext4magic";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ext4magic/${name}.tar.gz";
+    url = "mirror://sourceforge/ext4magic/${pname}-${version}.tar.gz";
     sha256 = "8d9c6a594f212aecf4eb5410d277caeaea3adc03d35378257dfd017ef20ea115";
   };
 
diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix
index e0c5ea3def4..274126e1a71 100644
--- a/pkgs/tools/filesystems/extundelete/default.nix
+++ b/pkgs/tools/filesystems/extundelete/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.4";
-  name = "extundelete-${version}";
+  pname = "extundelete";
 
   src = fetchurl {
     url = "mirror://sourceforge/extundelete/extundelete-0.2.4.tar.bz2";
diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index 90bb443dfdd..d7fa971c987 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "f2fs-tools-${version}";
+  pname = "f2fs-tools";
   version = "1.11.0";
 
   src = fetchgit {
diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix
index 598263c8895..d2887582938 100644
--- a/pkgs/tools/filesystems/f3/default.nix
+++ b/pkgs/tools/filesystems/f3/default.nix
@@ -3,7 +3,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "f3";
   version = "7.2";
 
diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix
index 7bb5dd415a6..a00104510bf 100644
--- a/pkgs/tools/filesystems/fatresize/default.nix
+++ b/pkgs/tools/filesystems/fatresize/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
 
   version = "1.0.2";
-  name = "fatresize-${version}";
+  pname = "fatresize";
 
   src = fetchurl {
     url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2";
diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix
index 18d9097dacb..aee053ad135 100644
--- a/pkgs/tools/filesystems/fatsort/default.nix
+++ b/pkgs/tools/filesystems/fatsort/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.5.0.456";
-  name = "fatsort-${version}";
+  pname = "fatsort";
 
   src = fetchurl {
-    url = "mirror://sourceforge/fatsort/${name}.tar.xz";
+    url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz";
     sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8";
   };
 
diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
index 82e2b404b82..a8eb1118f4d 100644
--- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix
+++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkgconfig, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fuse-7z-ng";
   version = "git-2014-06-08";
 
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index ccc5f1f2d4a..fe46fccf271 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -2,7 +2,7 @@
 { lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gcsfuse-${version}";
+  pname = "gcsfuse";
   version = "0.23.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix
index 581970e34fa..e905222ad45 100644
--- a/pkgs/tools/filesystems/genimage/default.nix
+++ b/pkgs/tools/filesystems/genimage/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libconfuse, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "genimage-${version}";
+  pname = "genimage";
   version = "9";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix
index 6a3e280aae3..1e6c73f725a 100644
--- a/pkgs/tools/filesystems/genromfs/default.nix
+++ b/pkgs/tools/filesystems/genromfs/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.2";
-  name = "genromfs-${version}";
+  pname = "genromfs";
 
   src = fetchurl {
-    url = "mirror://sourceforge/romfs/genromfs/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/romfs/genromfs/${version}/${pname}-${version}.tar.gz";
     sha256 = "0q6rpq7cmclmb4ayfyknvzbqysxs4fy8aiahlax1sb2p6k3pzwrh";
   };
 
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
index 72e43725ef5..605e341c4d7 100644
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -1,7 +1,7 @@
 { pkgconfig, libusb1, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "go-mtpfs-${version}";
+  pname = "go-mtpfs";
   version = "2018-02-09";
   rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb";
 
diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix
index ca2d0a627ab..59b4785888b 100644
--- a/pkgs/tools/filesystems/gpart/default.nix
+++ b/pkgs/tools/filesystems/gpart/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "gpart-${version}";
+  pname = "gpart";
   version = "0.3";
 
   # GitHub repository 'collating patches for gpart from all distributions':
diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix
index 4f7c2248a8e..59ee358e028 100644
--- a/pkgs/tools/filesystems/grive2/default.nix
+++ b/pkgs/tools/filesystems/grive2/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.0";
-  name = "grive2-${version}";
+  pname = "grive2";
 
   src = fetchFromGitHub {
     owner = "vitalif";
diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix
index 4594aa9370c..9b1c2b66e7a 100644
--- a/pkgs/tools/filesystems/hubicfuse/default.nix
+++ b/pkgs/tools/filesystems/hubicfuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }:
 
 stdenv.mkDerivation rec {
-  name = "hubicfuse-${version}";
+  pname = "hubicfuse";
   version = "3.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix
index 083bae24d60..aef6087d3f2 100644
--- a/pkgs/tools/filesystems/ifuse/default.nix
+++ b/pkgs/tools/filesystems/ifuse/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
   pname = "ifuse";
   version = "2018-10-08";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix
index f6637b621b8..6a9d68291f2 100644
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/pkgs/tools/filesystems/lizardfs/default.nix
@@ -28,7 +28,7 @@ let
     sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
   };
 in stdenv.mkDerivation rec {
-  name = "lizardfs-${version}";
+  pname = "lizardfs";
   version = "3.12.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix
index 15bb390e364..4d90e189b95 100644
--- a/pkgs/tools/filesystems/mhddfs/default.nix
+++ b/pkgs/tools/filesystems/mhddfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fuse, pkgconfig, attr, uthash }:
 
 stdenv.mkDerivation rec {
-  name = "mhddfs-${version}";
+  pname = "mhddfs";
   version = "0.1.39";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix
index 48f13925ab0..6733b3df45e 100644
--- a/pkgs/tools/filesystems/mkspiffs/default.nix
+++ b/pkgs/tools/filesystems/mkspiffs/default.nix
@@ -4,7 +4,7 @@
 # overriding the same-named attributes. See ./presets.nix for examples.
 
 stdenv.mkDerivation rec {
-  name = "mkspiffs-${version}";
+  pname = "mkspiffs";
   version = "0.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix
index cc8ca841124..b453067eaef 100644
--- a/pkgs/tools/filesystems/mp3fs/default.nix
+++ b/pkgs/tools/filesystems/mp3fs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "mp3fs-${version}";
+  pname = "mp3fs";
   version = "0.91";
 
   src = fetchurl {
-    url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "14ngiqg24p3a0s6hp33zjl4i46d8qn4v9id36psycq3n3csmwyx4";
   };
 
diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix
index d0ceaf94a75..c4910b166de 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/tools/filesystems/mtdutils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libuuid, lzo, zlib, acl }:
 
 stdenv.mkDerivation rec {
-  name = "mtd-utils-${version}";
+  pname = "mtd-utils";
   version = "1.5.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 24aab7dc6dd..48a72c5dd62 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -8,12 +8,12 @@
 assert useNixUdev -> systemd != null;
 
 buildPythonApplication rec {
-  name = "blivet-${version}";
+  pname = "blivet";
   version = "0.17-1";
 
   src = fetchurl {
     url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
-        + "${name}.tar.bz2";
+        + "${pname}-${version}.tar.bz2";
     sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci";
   };
 
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 6a1c12e3e72..306783d6308 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -54,7 +54,7 @@ let
   };
 
 in buildPythonApplication rec {
-  name = "nixpart-${version}";
+  pname = "nixpart";
   version = "0.4.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
index 881301ed38e..408d02bced7 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python, lvm2, dmraid }:
 
 stdenv.mkDerivation rec {
-  name = "pyblock-${version}";
+  pname = "pyblock";
   version = "0.53";
   md5_path = "f6d33a8362dee358517d0a9e2ebdd044";
 
   src = fetchurl rec {
     url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/"
-        + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2";
+        + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2";
     sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
   };
 
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
index ce1d0bf28a1..ffe31b464b8 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
@@ -1,13 +1,13 @@
 { stdenv, python, buildPythonApplication, fetchurl, urlgrabber }:
 
 buildPythonApplication rec {
-  name = "pykickstart-${version}";
+  pname = "pykickstart";
   version = "1.99.39";
   md5_path = "d249f60aa89b1b4facd63f776925116d";
 
   src = fetchurl rec {
     url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
-        + "${name}.tar.gz/${md5_path}/${name}.tar.gz";
+        + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz";
     sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a";
   };
 
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
index fd6c5b91309..e0947b01f51 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }:
 
 buildPythonApplication rec {
-  name = "pyparted-${version}";
+  pname = "pyparted";
   version = "3.10";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz";
+    url = "https://fedorahosted.org/releases/p/y/pyparted/${pname}-${version}.tar.gz";
     sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv";
   };
 
diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index ce00367c771..8f59ff809a8 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildPythonApplication, blivet }:
 
 buildPythonApplication rec {
-  name = "nixpart-${version}";
+  pname = "nixpart";
   version = "1.0.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index c919bfade3a..3660649553d 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -4,7 +4,6 @@
 stdenv.mkDerivation rec {
   pname = "ntfs3g";
   version = "2017.3.23";
-  name = "${pname}-${version}";
 
   outputs = [ "out" "dev" "man" "doc" ];
 
diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix
index 2457ac59a21..424f84ec34f 100644
--- a/pkgs/tools/filesystems/rdfind/default.nix
+++ b/pkgs/tools/filesystems/rdfind/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, nettle }:
 
 stdenv.mkDerivation rec {
-  name = "rdfind-${version}";
+  pname = "rdfind";
   version = "1.4.1";
 
   src = fetchurl {
-    url = "https://rdfind.pauldreik.se/${name}.tar.gz";
+    url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz";
     sha256 = "132y3wwgnbpdx6f90q0yahd3nkr4cjzcy815ilc8p97b4vn17iih";
   };
 
diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix
index 8fb002b2d7f..73f88964f2c 100644
--- a/pkgs/tools/filesystems/s3backer/default.nix
+++ b/pkgs/tools/filesystems/s3backer/default.nix
@@ -3,7 +3,7 @@
 , fuse, curl, expat }:
 
 stdenv.mkDerivation rec {
-  name = "s3backer-${version}";
+  pname = "s3backer";
   version = "1.5.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 816c09161dc..3fc082dad46 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "s3fs-fuse-${version}";
+  pname = "s3fs-fuse";
   version = "1.85";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix
index a21aacb7e6b..c5a5af212d9 100644
--- a/pkgs/tools/filesystems/securefs/default.nix
+++ b/pkgs/tools/filesystems/securefs/default.nix
@@ -3,7 +3,7 @@
 , fuse }:
 
 stdenv.mkDerivation rec {
-  name = "securefs-${version}";
+  pname = "securefs";
   version = "0.8.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/tools/filesystems/simg2img/default.nix
index 94c45ec4689..997aa321afa 100644
--- a/pkgs/tools/filesystems/simg2img/default.nix
+++ b/pkgs/tools/filesystems/simg2img/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "simg2img-${version}";
+  pname = "simg2img";
   version = "1.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix
index 26cef4ac90f..be46abb2694 100644
--- a/pkgs/tools/filesystems/smbnetfs/default.nix
+++ b/pkgs/tools/filesystems/smbnetfs/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }:
 
 stdenv.mkDerivation rec {
-  name = "smbnetfs-${version}";
+  pname = "smbnetfs";
   version = "0.6.1";
   src = fetchurl {
-    url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${pname}-${version}.tar.bz2";
     sha256 = "02iqjnm6pdwc1q38z56akiwdbp0xisr6qwrmxs1lrk5mq7j8x2w4";
   };
 
diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix
index 725ff3e56dc..b5ffdade98f 100644
--- a/pkgs/tools/filesystems/snapraid/default.nix
+++ b/pkgs/tools/filesystems/snapraid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "snapraid-${version}";
+  pname = "snapraid";
   version = "11.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 59a786116df..9a0073f939f 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -7,7 +7,7 @@
 assert lz4Support -> (lz4 != null);
 
 stdenv.mkDerivation rec {
-  name = "squashfs-${version}";
+  pname = "squashfs";
   version = "4.4dev_20180612";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix
index 40e350846c5..abe89680102 100644
--- a/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/pkgs/tools/filesystems/squashfuse/default.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
 
   pname = "squashfuse";
   version = "0.1.103";
-  name = "${pname}-${version}";
 
   meta = {
     description = "FUSE filesystem to mount squashfs archives";
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 73b7f51fd36..4a1215397be 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.5.2";
-  name = "sshfs-fuse-${version}";
+  pname = "sshfs-fuse";
 
   src = fetchFromGitHub {
     owner = "libfuse";
diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix
index fd557a7ff56..67e21ac4c2c 100644
--- a/pkgs/tools/filesystems/tmsu/default.nix
+++ b/pkgs/tools/filesystems/tmsu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, fetchFromGitHub, go, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "tmsu-${version}";
+  pname = "tmsu";
   version = "0.7.4";
 
   go-sqlite3 = fetchgit {
diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix
index 65eafe76710..62b4b930139 100644
--- a/pkgs/tools/filesystems/u3-tool/default.nix
+++ b/pkgs/tools/filesystems/u3-tool/default.nix
@@ -3,12 +3,11 @@
 stdenv.mkDerivation rec {
   pname = "u3-tool";
   version = "0.3";
-  name = "${pname}-${version}";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1p9c9kibd1pdbdfa0nd0i3n7bvzi3xg0chm38jg3xfl8gsn0390f";
   };
 
diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix
index f17f9e0d2de..11ea490446d 100644
--- a/pkgs/tools/filesystems/udftools/default.nix
+++ b/pkgs/tools/filesystems/udftools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "udftools-${version}";
+  pname = "udftools";
   version = "2.0";
   src = fetchFromGitHub {
     owner = "pali";
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index cfe3ff421fe..73272b83989 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "unionfs-fuse-${version}";
+  pname = "unionfs-fuse";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index 98cc327bc29..aa28ee62596 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -10,7 +10,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "xfsprogs-${version}";
+  pname = "xfsprogs";
   version = "4.19.0";
 
   src = fetchgit {
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 4c0c2343dd2..557367ea22c 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0";
   };
 
-  name = "XtreemFS-${version}";
+  pname = "XtreemFS";
   version = "1.5.1.81";
 
   buildInputs = [ which attr makeWrapper python ];
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 61fd5f26e30..041d9a4e3f8 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -14,11 +14,11 @@ let
 in
 stdenv.mkDerivation rec {
 
-  name = "yandex-disk-${version}";
+  pname = "yandex-disk";
   version = "0.1.5.1039";
 
   src = fetchurl {
-    url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";
+    url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm";
     sha256 = p.sha256;
   };
 
diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix
index c311ac1af23..734c8df9b6a 100644
--- a/pkgs/tools/filesystems/zerofree/default.nix
+++ b/pkgs/tools/filesystems/zerofree/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, e2fsprogs }:
 
 stdenv.mkDerivation rec {
-  name = "zerofree-${version}";
+  pname = "zerofree";
   version = "1.1.1";
 
   src = fetchurl {
-    url = "https://frippery.org/uml/${name}.tgz";
+    url = "https://frippery.org/uml/${pname}-${version}.tgz";
     sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm";
   };
 
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix
index 0e182d3bd2e..0269df84634 100644
--- a/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/pkgs/tools/filesystems/zkfuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }:
 
 stdenv.mkDerivation rec {
-  name = "zkfuse-${version}";
+  pname = "zkfuse";
   inherit (zookeeper) version src;
 
   sourceRoot = "${zookeeper.name}/src/contrib/zkfuse";
diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix
index 72f1a418807..87686108720 100644
--- a/pkgs/tools/graphics/appleseed/default.nix
+++ b/pkgs/tools/graphics/appleseed/default.nix
@@ -9,7 +9,7 @@ let boost_static = boost165.override {
 };
 in stdenv.mkDerivation rec {
 
-  name = "appleseed-${version}";
+  pname = "appleseed";
   version = "2.0.5-beta";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index de09c2b2780..179085e1fd6 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   version = "0.99";
   pname = "barcode";
   src = fetchurl {
-    url = "mirror://gnu/${pname}/${name}.tar.xz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
     sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8";
   };
 
diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix
index ad72933cc77..b4f99a9192c 100644
--- a/pkgs/tools/graphics/blockhash/default.nix
+++ b/pkgs/tools/graphics/blockhash/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "blockhash-${version}";
+  pname = "blockhash";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix
index c65d1302dca..2c96e872f4e 100644
--- a/pkgs/tools/graphics/cfdg/default.nix
+++ b/pkgs/tools/graphics/cfdg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpng, bison, flex, ffmpeg }:
 
 stdenv.mkDerivation rec {
-  name = "cfdg-${version}";
+  pname = "cfdg";
   version = "3.0.9";
   src = fetchurl {
     sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp cfdg $out/bin/
 
-    mkdir -p $out/share/doc/${name}
-    cp *.txt $out/share/doc/${name}
+    mkdir -p $out/share/doc/${pname}-${version}
+    cp *.txt $out/share/doc/${pname}-${version}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix
index 12fc6934531..b1ce3082d25 100644
--- a/pkgs/tools/graphics/convchain/default.nix
+++ b/pkgs/tools/graphics/convchain/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, mono}:
 stdenv.mkDerivation rec {
-  name = "convchain-${version}";
+  pname = "convchain";
   version = "0.0pre20160901";
   src = fetchFromGitHub {
     owner = "mxgmn";
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 9fcb7ba404d..04b73995580 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, imagemagick }:
 
 stdenv.mkDerivation rec {
-  name = "cuneiform-${version}";
+  pname = "cuneiform";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix
index 33e94866337..f21b84c1521 100644
--- a/pkgs/tools/graphics/dpic/default.nix
+++ b/pkgs/tools/graphics/dpic/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dpic-${version}";
+  pname = "dpic";
   version = "2016.01.12";
 
   src = fetchurl {
-    url = "https://ece.uwaterloo.ca/~aplevich/dpic/${name}.tar.gz";
+    url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz";
     sha256 = "0iwwf8shgm8n4drz8mndvk7jga93yy8plnyby3lgk8376g5ps6cz";
   };
 
diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix
index 2ffe4eb7f80..79c90575653 100644
--- a/pkgs/tools/graphics/enblend-enfuse/default.nix
+++ b/pkgs/tools/graphics/enblend-enfuse/default.nix
@@ -3,11 +3,11 @@
 , help2man, pkgconfig, perl, texlive }:
 
 stdenv.mkDerivation rec {
-  name = "enblend-enfuse-${version}";
+  pname = "enblend-enfuse";
   version = "4.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/enblend/${name}.tar.gz";
+    url = "mirror://sourceforge/enblend/${pname}-${version}.tar.gz";
     sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7";
   };
 
diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix
index 9735adca53d..2ad52d2de43 100644
--- a/pkgs/tools/graphics/epstool/default.nix
+++ b/pkgs/tools/graphics/epstool/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.08";
-  name = "epstool-${version}";
+  pname = "epstool";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}+repack.orig.tar.gz";
diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix
index 02a3a70fe51..aab2e111e85 100644
--- a/pkgs/tools/graphics/facedetect/default.nix
+++ b/pkgs/tools/graphics/facedetect/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages }:
 
 stdenv.mkDerivation rec {
-  name = "facedetect-${version}";
+  pname = "facedetect";
   version = "0.1";
 
   src = fetchFromGitHub {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    install -v -m644 -D README.rst $out/share/doc/${name}/README.rst
+    install -v -m644 -D README.rst $out/share/doc/${pname}-${version}/README.rst
     install -v -m755 -D facedetect $out/bin/facedetect
     wrapPythonPrograms
   '';
diff --git a/pkgs/tools/graphics/fast-neural-doodle/default.nix b/pkgs/tools/graphics/fast-neural-doodle/default.nix
index 5d42482b309..17e1c710586 100644
--- a/pkgs/tools/graphics/fast-neural-doodle/default.nix
+++ b/pkgs/tools/graphics/fast-neural-doodle/default.nix
@@ -2,7 +2,7 @@
   , python, numpy, scipy, h5py, scikitlearn, pillow
   }:
 stdenv.mkDerivation rec {
-  name = "fast-neural-doodle-${version}";
+  pname = "fast-neural-doodle";
   version = "0.0pre2016-07-01";
   buildInputs = [
     torch torch-hdf5 python numpy h5py scikitlearn scipy pillow
diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix
index 7303f27fe11..296ba43a5ed 100644
--- a/pkgs/tools/graphics/fim/default.nix
+++ b/pkgs/tools/graphics/fim/default.nix
@@ -10,11 +10,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fim-${version}";
+  pname = "fim";
   version = "0.6";
 
   src = fetchurl {
-    url = "mirror://savannah/fbi-improved/${name}-trunk.tar.gz";
+    url = "mirror://savannah/fbi-improved/${pname}-${version}-trunk.tar.gz";
     sha256 = "124b7c4flx5ygmy5sqq0gpvxqzafnknbcj6f45ddnbdxik9lazzp";
   };
 
diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix
index e619a889219..e05f05a977b 100644
--- a/pkgs/tools/graphics/flam3/default.nix
+++ b/pkgs/tools/graphics/flam3/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "flam3";
   version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "e0801543538451234d7a8a240ba3b417cbda5b21";
diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix
index 0ed1855a338..de02865c36e 100644
--- a/pkgs/tools/graphics/ggobi/default.nix
+++ b/pkgs/tools/graphics/ggobi/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.1.11";
-  name = "ggobi-${version}";
+  pname = "ggobi";
 
   src = fetchurl {
     url = "http://www.ggobi.org/downloads/ggobi-${version}.tar.bz2";
diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix
index 52f5a099727..ae6291811a4 100644
--- a/pkgs/tools/graphics/glee/default.nix
+++ b/pkgs/tools/graphics/glee/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchgit, cmake, libGLU_combined, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "glee";
   rev = "f727ec7463d514b6279981d12833f2e11d62b33d";
   version = "20170205-${stdenv.lib.strings.substring 0 7 rev}";
diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix
index 1331e38aef7..111a9b59afd 100644
--- a/pkgs/tools/graphics/glmark2/default.nix
+++ b/pkgs/tools/graphics/glmark2/default.nix
@@ -2,7 +2,7 @@
   python27, wayland, udev, mesa, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "glmark2-${version}";
+  pname = "glmark2";
   version = "2017-09-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 1f8a98e0296..0710f47cb57 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libGL, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "glxinfo-${version}";
+  pname = "glxinfo";
   version = "8.4.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix
index 1d3a8b26aae..4c251f21c71 100644
--- a/pkgs/tools/graphics/gromit-mpx/default.nix
+++ b/pkgs/tools/graphics/gromit-mpx/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gromit-mpx-${version}";
+  pname = "gromit-mpx";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/tools/graphics/ibniz/default.nix
index 11fad25b85a..564685c1cea 100644
--- a/pkgs/tools/graphics/ibniz/default.nix
+++ b/pkgs/tools/graphics/ibniz/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "ibniz-${version}";
+  pname = "ibniz";
   version = "1.18";
 
   src = fetchurl {
-    url = "http://www.pelulamu.net/ibniz/${name}.tar.gz";
+    url = "http://www.pelulamu.net/ibniz/${pname}-${version}.tar.gz";
     sha256 = "10b4dka8zx7y84m1a58z9j2vly8mz9aw9wn8z9vx9av739j95wp2";
   };
 
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix
index 8db5b6c7dea..1099b11176c 100644
--- a/pkgs/tools/graphics/imgur-screenshot/default.nix
+++ b/pkgs/tools/graphics/imgur-screenshot/default.nix
@@ -3,7 +3,7 @@
 let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ];
 in stdenv.mkDerivation rec {
   version = "1.7.4";
-  name = "imgur-screenshot-${version}";
+  pname = "imgur-screenshot";
 
   src = fetchFromGitHub {
     owner = "jomo";
diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix
index e4405455097..a2592d5522b 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/pkgs/tools/graphics/jhead/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "jhead-${version}";
+  pname = "jhead";
   version = "3.03";
 
   src = fetchurl {
-    url = "http://www.sentex.net/~mwandel/jhead/${name}.tar.gz";
+    url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz";
     sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2";
   };
 
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
     mkdir -p \
       $out/bin \
       $out/man/man1 \
-      $out/share/doc/${name}
+      $out/share/doc/${pname}-${version}
 
     cp -v jhead $out/bin
     cp -v jhead.1 $out/man/man1
-    cp -v *.txt $out/share/doc/${name}
+    cp -v *.txt $out/share/doc/${pname}-${version}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix
index fec092db0c5..b0836d67086 100644
--- a/pkgs/tools/graphics/lepton/default.nix
+++ b/pkgs/tools/graphics/lepton/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.1";
-  name = "lepton-${version}";
+  pname = "lepton";
 
   src = fetchFromGitHub {
     repo = "lepton";
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index a3cefddeb41..1f1da8df3f2 100644
--- a/pkgs/tools/graphics/logstalgia/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix
@@ -2,11 +2,11 @@
 , libGLU_combined, boost, glm, freetype }:
 
 stdenv.mkDerivation rec {
-  name = "logstalgia-${version}";
+  pname = "logstalgia";
   version = "1.1.2";
 
   src = fetchurl {
-    url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz";
+    url = "https://github.com/acaudwell/Logstalgia/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd";
   };
 
diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix
index ffba2280e8a..b65cbfca7bb 100644
--- a/pkgs/tools/graphics/luxcorerender/default.nix
+++ b/pkgs/tools/graphics/luxcorerender/default.nix
@@ -14,7 +14,7 @@ let boost_static = boost165.override {
     };
 
 in stdenv.mkDerivation rec {
-  name = "luxcorerender-${version}";
+  pname = "luxcorerender";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index 360a233e139..63758e23b15 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "maim-${version}";
+  pname = "maim";
   version = "5.5.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/neural-style/default.nix b/pkgs/tools/graphics/neural-style/default.nix
index 99421cfde17..a4706e95cee 100644
--- a/pkgs/tools/graphics/neural-style/default.nix
+++ b/pkgs/tools/graphics/neural-style/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, torch, loadcaffe, fetchurl, bash}:
 stdenv.mkDerivation rec {
-  name = "neural-style-${version}";
+  pname = "neural-style";
   version = "0.0pre2016.08.15";
   buildInputs = [torch loadcaffe];
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix
index 42da24e3239..ebebe508752 100644
--- a/pkgs/tools/graphics/nifskope/default.nix
+++ b/pkgs/tools/graphics/nifskope/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "nifskope-${version}";
+  pname = "nifskope";
   version = "2.0.dev7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix
index bc141907075..c1138e5f458 100644
--- a/pkgs/tools/graphics/optar/default.nix
+++ b/pkgs/tools/graphics/optar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, imagemagick, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "optar-${version}";
+  pname = "optar";
   version = "20150210";
 
   src = fetchurl {
diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix
index 058900b8e23..46eb61d1cf7 100644
--- a/pkgs/tools/graphics/pdf2svg/default.nix
+++ b/pkgs/tools/graphics/pdf2svg/default.nix
@@ -2,7 +2,7 @@
 , cairo, gtk2, poppler }:
 
 stdenv.mkDerivation rec {
-  name = "pdf2svg-${version}";
+  pname = "pdf2svg";
   version = "0.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix
index 8428480ca03..7e022936318 100644
--- a/pkgs/tools/graphics/pdftag/default.nix
+++ b/pkgs/tools/graphics/pdftag/default.nix
@@ -3,7 +3,6 @@
 
 stdenv.mkDerivation rec {
   pname = "pdftag";
-  name = "${pname}-${version}";
   version = "1.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix
index d394a816a49..dc5acc9433f 100644
--- a/pkgs/tools/graphics/perceptualdiff/default.nix
+++ b/pkgs/tools/graphics/perceptualdiff/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "perceptualdiff";
-  name = "${pname}-${version}";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 77edcd34578..08c5f308f5c 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -4,12 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "pfstools";
   version = "2.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${version}/${name}.tgz";
+    url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tgz";
     sha256 = "04rlb705gmdiphcybf9dyr0d5lla2cfs3c308zz37x0vwi445six";
   };
 
diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix
index 4e7d1e361f9..b519733f964 100644
--- a/pkgs/tools/graphics/pngquant/default.nix
+++ b/pkgs/tools/graphics/pngquant/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }:
 
 stdenv.mkDerivation rec {
-  name = "pngquant-${version}";
+  pname = "pngquant";
   version = "2.12.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index dc9d9630ae5..d2042540d71 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "povray-${version}";
+  pname = "povray";
   version = "3.7.0.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix
index 44444e6148a..eec8c5158b4 100644
--- a/pkgs/tools/graphics/qrcode/default.nix
+++ b/pkgs/tools/graphics/qrcode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "qrcode-git-${version}";
+  pname = "qrcode-git";
   version = "20160804";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix
index c27eacaec8a..8628b72bbae 100644
--- a/pkgs/tools/graphics/rocket/default.nix
+++ b/pkgs/tools/graphics/rocket/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "rocket-${version}";
+  pname = "rocket";
   version = "2018-06-09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix
index fd538eec573..e7d3b8151a4 100644
--- a/pkgs/tools/graphics/s2png/default.nix
+++ b/pkgs/tools/graphics/s2png/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "s2png-${version}";
+  pname = "s2png";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix
index 5dbbd20cd82..fd26869d298 100644
--- a/pkgs/tools/graphics/scanbd/default.nix
+++ b/pkgs/tools/graphics/scanbd/default.nix
@@ -2,12 +2,12 @@
 , dbus, libconfuse, libjpeg, sane-backends, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "scanbd-${version}";
+  pname = "scanbd";
   version = "1.5.1";
 
   src = fetchurl {
     sha256 = "0pvy4qirfjdfm8aj6x5rkbgl7hk3jfa2s21qkk8ic5dqfjjab75n";
-    url = "mirror://sourceforge/scanbd/${name}.tgz";
+    url = "mirror://sourceforge/scanbd/${pname}-${version}.tgz";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix
index 182ab5806d7..c7d2f49406b 100644
--- a/pkgs/tools/graphics/sng/default.nix
+++ b/pkgs/tools/graphics/sng/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpng, netpbm }:
 
 stdenv.mkDerivation rec {
-  name = "sng-${version}";
+  pname = "sng";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix
index c1e6c2afecc..a3497aefe10 100644
--- a/pkgs/tools/graphics/structure-synth/default.nix
+++ b/pkgs/tools/graphics/structure-synth/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "structure-synth-${version}";
+  pname = "structure-synth";
   version = "v1.5";
 
   src = fetchurl {
diff --git a/pkgs/tools/graphics/swfdec/default.nix b/pkgs/tools/graphics/swfdec/default.nix
index 1c3c0f3b451..8a64e25d879 100644
--- a/pkgs/tools/graphics/swfdec/default.nix
+++ b/pkgs/tools/graphics/swfdec/default.nix
@@ -4,7 +4,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "swfdec";
   version = "0.8.4";
 
diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix
index 0862293830d..693f116a6e8 100644
--- a/pkgs/tools/graphics/syntex/default.nix
+++ b/pkgs/tools/graphics/syntex/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, mono}:
 stdenv.mkDerivation rec {
-  name = "syntex-${version}";
+  pname = "syntex";
   version = "0.0pre20160915";
   src = fetchFromGitHub {
     owner = "mxgmn";
diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix
index b58114a61a5..44a86e961ec 100644
--- a/pkgs/tools/graphics/unpaper/default.nix
+++ b/pkgs/tools/graphics/unpaper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libav, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "unpaper-${version}";
+  pname = "unpaper";
   version = "6.1";
 
   src = fetchurl {
-    url = "https://www.flameeyes.eu/files/${name}.tar.xz";
+    url = "https://www.flameeyes.eu/files/${pname}-${version}.tar.xz";
     sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13";
   };
 
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index db06c2a1588..ad352c04ad9 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -9,7 +9,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vips-${version}";
+  pname = "vips";
   version = "8.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index 320b4eed14c..75b5722b141 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -2,7 +2,7 @@
   glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
 
 stdenv.mkDerivation rec {
-  name = "vulkan-tools-${version}";
+  pname = "vulkan-tools";
   version = "1.1.106.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix
index 56fd5350244..ba1044e3bb4 100644
--- a/pkgs/tools/graphics/wallutils/default.nix
+++ b/pkgs/tools/graphics/wallutils/default.nix
@@ -3,7 +3,7 @@
 }:
 
 buildGoModule rec {
-  name = "wallutils-${version}";
+  pname = "wallutils";
   version = "5.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix
index 20d07e52f6c..65fe38937df 100644
--- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix
+++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, mono}:
 stdenv.mkDerivation rec {
-  name = "wavefunctioncollapse-${version}";
+  pname = "wavefunctioncollapse";
   version = "0.0pre20170130";
   src = fetchFromGitHub {
     owner = "mxgmn";
diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix
index 2882ae960de..be4ba53319a 100644
--- a/pkgs/tools/graphics/welkin/default.nix
+++ b/pkgs/tools/graphics/welkin/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "welkin-${version}";
+  pname = "welkin";
   version = "1.1";
 
   src = fetchsvn {
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index 237c9bb398b..c173d00221d 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.12.5";
-  name = "wkhtmltopdf-${version}";
+  pname = "wkhtmltopdf";
 
   src = fetchFromGitHub {
     owner  = "wkhtmltopdf";
diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix
index 7321128a6b5..6dd0b206878 100644
--- a/pkgs/tools/graphics/yafaray-core/default.nix
+++ b/pkgs/tools/graphics/yafaray-core/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
 
-    name = "yafaray-core-${version}";
+    pname = "yafaray-core";
     version = "3.3.0";
 
     src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix
index 8fbc09a6d82..094ec2d5bc4 100644
--- a/pkgs/tools/graphics/yaxg/default.nix
+++ b/pkgs/tools/graphics/yaxg/default.nix
@@ -2,7 +2,7 @@
   maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }:
 
 stdenv.mkDerivation rec {
-  name = "yaxg-${version}";
+  pname = "yaxg";
   version = "unstable-2018-05-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix
index 3efb68e60d2..97bbeb4d2d4 100644
--- a/pkgs/tools/graphics/zxing/default.nix
+++ b/pkgs/tools/graphics/zxing/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, jre }:
 stdenv.mkDerivation rec {
-  name = "zxing-${version}";
+  pname = "zxing";
   version = "3.1.0";
   # Maven builds are hard to get right
   core_jar = fetchurl {
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
index a3f12d648d5..d1e7f85f75f 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-anthy-${version}";
+  pname = "fcitx-anthy";
   version = "0.2.3";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-anthy/${pname}-${version}.tar.xz";
     sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
index e2d58c56498..d9b202f7ef1 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-chewing-${version}";
+  pname = "fcitx-chewing";
   version = "0.2.3";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-chewing/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-chewing/${pname}-${version}.tar.xz";
     sha256 = "1w5smp5zvjx681cp1znjypyr9sw5x6v0wnsk8a7ncwxi9q9wf4xk";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
index f7bb7126bef..4c0a7f0b410 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, curl }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-cloudpinyin-${version}";
+  pname = "fcitx-cloudpinyin";
   version = "0.3.6";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${pname}-${version}.tar.xz";
     sha256 = "1f3ryx817bxb8g942l50ng4xg0gp50rb7pv2p6zf98r2z804dcvf";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
index 32c9ecff9bd..c9a40b84a6d 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-hangul-${version}";
+  pname = "fcitx-hangul";
   version = "0.3.1";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-hangul/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-hangul/${pname}-${version}.tar.xz";
     sha256 = "0ds4071ljq620w7vnprm2jl8zqqkw7qsxvzbjapqak4jarczvmbd";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
index 5b55e0f0478..9e0ef551d82 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-libpinyin-${version}";
+  pname = "fcitx-libpinyin";
   version = "0.5.3";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-libpinyin/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-libpinyin/${pname}-${version}.tar.xz";
     sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
index 292d2dbb57f..8b25b2846ff 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-m17n-${version}";
+  pname = "fcitx-m17n";
   version = "0.2.4";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-m17n/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-m17n/${pname}-${version}.tar.xz";
     sha256 = "15s52h979xz967f8lm0r0qkplig2w3wjck1ymndbg9kvj25ib0ng";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
index 2bd4bf1c878..095be7469cd 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-rime-${version}";
+  pname = "fcitx-rime";
   version = "0.3.2";
 
   src = fetchurl {
-    url = "https://download.fcitx-im.org/fcitx-rime/${name}.tar.xz";
+    url = "https://download.fcitx-im.org/fcitx-rime/${pname}-${version}.tar.xz";
     sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
index c2e8837f5d1..cf0a0f1fa17 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-skk-${version}";
+  pname = "fcitx-skk";
   version = "0.1.4";
   src = fetchFromGitHub {
     owner = "fcitx";
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
index 918edf0240a..833e417ae91 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-table-extra-${version}";
+  pname = "fcitx-table-extra";
   version = "0.3.8";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-table-extra/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-table-extra/${pname}-${version}.tar.xz";
     sha256 = "c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
index 929cdb30b91..ffee83875a1 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-table-other-${version}";
+  pname = "fcitx-table-other";
   version = "0.2.4";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-table-other/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-table-other/${pname}-${version}.tar.xz";
     sha256 = "1di60lr6l5k2sdwi3yrc0hl89j2k0yipayrsn803vd040w1fgfhq";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
index ddfa41dda31..1deff93e201 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-unikey-${version}";
+  pname = "fcitx-unikey";
   version = "0.2.5";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-unikey/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-unikey/${pname}-${version}.tar.xz";
     sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index b32368c93d3..34dd3ac3509 100644
--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
@@ -36,7 +36,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "fcitx-${version}";
+  pname = "fcitx";
   version = "4.2.9.6";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 77ec251ec88..d2f68fd5269 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-anthy-${version}";
+  pname = "ibus-anthy";
   version = "1.5.11";
 
   meta = with stdenv.lib; {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0";
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index daebceaf887..3b8b3489a1d 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-hangul-${version}";
+  pname = "ibus-hangul";
   version = "1.5.1";
 
   src = fetchurl {
-    url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
index 19d862e0308..589ddd09144 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
@@ -7,10 +7,9 @@
 stdenv.mkDerivation rec {
   pname = "ibus-kkc";
   version = "1.5.22";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz";
+    url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1kj74c9zy9yxkjx7pz96mzqc13cf10yfmlgprr8sfd4ay192bzi2";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 3bdb69391cc..fc4677e06b0 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-libpinyin-${version}";
+  pname = "ibus-libpinyin";
   version = "1.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index a0d50cf9479..01b227f6f1b 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-m17n-${version}";
+  pname = "ibus-m17n";
   version = "1.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
index 368de091777..c3ee5eafd7b 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
@@ -14,7 +14,7 @@ let
     sha256 = "0mx9jvxpiva9v2ffaqlyny48iqr073h84yw8ln43z2avv11ipr7n";
   };
 in stdenv.mkDerivation rec {
-  name = "ibus-table-chinese-${version}";
+  pname = "ibus-table-chinese";
   version = "1.8.2";
 
   srcs = [ src cmakeFedoraSrc ];
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index ff01c841926..5e839b354a3 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-table-others-${version}";
+  pname = "ibus-table-others";
   version = "1.3.9";
 
   src = fetchurl {
-    url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0270a9njyzb1f8nw5w9ghwxcl3m6f13d8p8a01fjm8rnjs04mcb3";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 3f2ab1fc96a..d0873d764aa 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -4,7 +4,7 @@
 , ibus, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-table-${version}";
+  pname = "ibus-table";
   version = "1.9.21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index e31d1ddfaa8..107c8c60271 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-uniemoji-${version}";
+  pname = "ibus-uniemoji";
   version = "0.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 07fa8d2beb5..d36697221a4 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -40,7 +40,7 @@ let
     '';
   };
   cldrEmojiAnnotation = stdenv.mkDerivation rec {
-    name = "cldr-emoji-annotation-${version}";
+    pname = "cldr-emoji-annotation";
     version = "31.90.0_1";
     src = fetchFromGitHub {
       owner = "fujiwarat";
@@ -80,7 +80,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ibus-${version}";
+  pname = "ibus";
   version = "1.5.20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix
index 8d02d4edde8..85fccc46de0 100644
--- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix
+++ b/pkgs/tools/inputmethods/ibus/ibus-qt.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-qt-${version}";
+  pname = "ibus-qt";
   version = "1.3.3";
 
   src = fetchurl {
-    url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${name}-Source.tar.gz";
+    url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${pname}-${version}-Source.tar.gz";
     sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g";
   };
 
diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix
index bb179e18e07..cd7d1cd8bbf 100644
--- a/pkgs/tools/inputmethods/keyfuzz/default.nix
+++ b/pkgs/tools/inputmethods/keyfuzz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "keyfuzz-${version}";
+  pname = "keyfuzz";
   version = "0.2";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix
index 75670dfe9df..f4b2f7e94e7 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/default.nix
+++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix
@@ -6,7 +6,6 @@
 stdenv.mkDerivation rec {
   pname = "libinput-gestures";
   version = "2.39";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "bulletmark";
diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix
index 33de43b6f5e..68889d45df0 100644
--- a/pkgs/tools/inputmethods/libkkc/default.nix
+++ b/pkgs/tools/inputmethods/libkkc/default.nix
@@ -7,10 +7,9 @@
 stdenv.mkDerivation rec {
   pname = "libkkc";
   version = "0.3.5";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz";
+    url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef";
   };
 
diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
index cecacd4af95..cf32e8d51ca 100644
--- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
+++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
@@ -28,7 +28,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "skk-dicts-unstable-${version}";
+  pname = "skk-dicts-unstable";
   version = "2017-10-26";
   srcs = [ small medium large edict assoc ];
   nativeBuildInputs = [ skktools ];
diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix
index 8661da66b92..d4ef2e2422e 100644
--- a/pkgs/tools/inputmethods/skk/skktools/default.nix
+++ b/pkgs/tools/inputmethods/skk/skktools/default.nix
@@ -9,7 +9,7 @@
 # - We for the moment do not package them to keep the dependencies slim.
 #   Probably, shall package the newer tools as skktools-extra in the future.
 stdenv.mkDerivation rec {
-  name = "skktools-${version}";
+  pname = "skktools";
   version = "1.3.3";
   src = fetchFromGitHub {
     owner = "skk-dev";
diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
index 55cf0945582..02993b248ab 100644
--- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
+++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "tegaki-zinnia-japanese-${version}";
+  pname = "tegaki-zinnia-japanese";
   version = "0.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix
index 82dd387f536..ff14a13da04 100644
--- a/pkgs/tools/inputmethods/touchegg/default.nix
+++ b/pkgs/tools/inputmethods/touchegg/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, xorg, xorgserver, qt4, libGLU_combined, geis, qmake4Hook }:
 
 stdenv.mkDerivation rec {
-  name = "touchegg-${version}";
+  pname = "touchegg";
   version = "1.1.1";
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${pname}-${version}.tar.gz";
     sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038";
   };
 
diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix
index ec8ac884559..a9e106f2c72 100644
--- a/pkgs/tools/inputmethods/triggerhappy/default.nix
+++ b/pkgs/tools/inputmethods/triggerhappy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, perl, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "triggerhappy-${version}";
+  pname = "triggerhappy";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 984eecf9e9d..7fe00bd4dfc 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -39,7 +39,7 @@ assert withMisc -> libeb != null;
 
 stdenv.mkDerivation rec {
   version = "1.8.8";
-  name = "uim-${version}";
+  pname = "uim";
 
   src = fetchFromGitHub {
     owner = "uim";
diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix
index 60f3a0feb55..ce87e1a7141 100644
--- a/pkgs/tools/inputmethods/zinnia/default.nix
+++ b/pkgs/tools/inputmethods/zinnia/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "zinnia-${version}";
+  pname = "zinnia";
   version = "2016-08-28";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix
index ad129503de3..a349a3f2fc0 100644
--- a/pkgs/tools/misc/0x0/default.nix
+++ b/pkgs/tools/misc/0x0/default.nix
@@ -1,7 +1,7 @@
 { stdenv, xsel, curl, fetchFromGitLab, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "0x0-${version}";
+  pname = "0x0";
   version = "2018-06-24";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index 3c529f31f66..75d8d71b895 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.14";
-  name = "aescrypt-${version}";
+  pname = "aescrypt";
 
   src = fetchurl {
-    url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz";
+    url = "https://www.aescrypt.com/download/v3/linux/${pname}-${version}.tgz";
     sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah";
   };
 
diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix
index 8ee363ed91d..7b869d66d1c 100644
--- a/pkgs/tools/misc/alarm-clock-applet/default.nix
+++ b/pkgs/tools/misc/alarm-clock-applet/default.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.4";
-  name = "alarm-clock-applet-${version}";
+  pname = "alarm-clock-applet";
 
   src = fetchFromGitHub {
     owner = "joh";
diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index 62d46bba5b0..6ff0c7cd0d7 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }:
 
 mkDerivation rec {
-  name = "antimicro-${version}";
+  pname = "antimicro";
   version = "2.23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix
index 6b1512e854b..8b2a2a4b215 100644
--- a/pkgs/tools/misc/argtable/default.nix
+++ b/pkgs/tools/misc/argtable/default.nix
@@ -2,7 +2,7 @@
 , fetchgit
 }:
 stdenv.mkDerivation rec {
-  name = "argtable-${version}";
+  pname = "argtable";
   version = "3.0.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix
index dc51d04e4b5..4f50e0f556b 100644
--- a/pkgs/tools/misc/arp-scan/default.nix
+++ b/pkgs/tools/misc/arp-scan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libpcap, makeWrapper, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "arp-scan-${version}";
+  pname = "arp-scan";
   version = "1.9.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index 859112d29bc..b58f603ce59 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.9.4";
-  name = "aspcud-${version}";
+  pname = "aspcud";
 
   src = fetchzip {
     url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index ca4dde7a450..8294e92d13f 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python, bash }:
 
 stdenv.mkDerivation rec {
-  name = "autojump-${version}";
+  pname = "autojump";
   version = "22.5.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix
index 3fd52051357..3bfb2d656d9 100644
--- a/pkgs/tools/misc/automirror/default.nix
+++ b/pkgs/tools/misc/automirror/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchFromGitHub, git, ronn}:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "automirror";
   version = "49";
 
diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix
index 75c7b258a44..ee07221b755 100644
--- a/pkgs/tools/misc/autorevision/default.nix
+++ b/pkgs/tools/misc/autorevision/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "autorevision-${version}";
+  pname = "autorevision";
   version = "1.21";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix
index 5ead0e1020c..6f2afc888e8 100644
--- a/pkgs/tools/misc/azure-vhd-utils/default.nix
+++ b/pkgs/tools/misc/azure-vhd-utils/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "azure-vhd-utils-${version}";
+  pname = "azure-vhd-utils";
   version = "20160614-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
 
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 4f90c0f03e9..3b5e72c89f7 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -10,11 +10,11 @@ let
     else throw "Unknown architecture";
 in
 stdenv.mkDerivation rec {
-  name = "bandwidth-${version}";
+  pname = "bandwidth";
   version = "1.5.1";
 
   src = fetchurl {
-    url = "https://zsmith.co/archives/${name}.tar.gz";
+    url = "https://zsmith.co/archives/${pname}-${version}.tar.gz";
     sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib";
   };
 
diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/tools/misc/bbe/default.nix
index ecff2459ef2..b0af13160d2 100644
--- a/pkgs/tools/misc/bbe/default.nix
+++ b/pkgs/tools/misc/bbe/default.nix
@@ -1,6 +1,6 @@
 { stdenv , fetchurl, autoreconfHook }:
 stdenv.mkDerivation rec {
-  name = "bbe-${version}";
+  pname = "bbe";
   version = "0.2.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
index 89d68461431..c7a9af4abd1 100644
--- a/pkgs/tools/misc/bibtex2html/default.nix
+++ b/pkgs/tools/misc/bibtex2html/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "bibtex2html-${version}";
+  pname = "bibtex2html";
   version = "1.99";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix
index 5e8a8c56b0a..7664b96563b 100644
--- a/pkgs/tools/misc/bibtool/default.nix
+++ b/pkgs/tools/misc/bibtool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "bibtool-${version}";
+  pname = "bibtool";
   version = "2.67";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index d7cca2a77bd..d84c6ebaabc 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "bibutils-${version}";
+  pname = "bibutils";
   version = "6.7";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix
index 4248dd6bd93..8d587e34af4 100644
--- a/pkgs/tools/misc/blink1-tool/default.nix
+++ b/pkgs/tools/misc/blink1-tool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libusb1, pkgconfig, ... }:
 
 stdenv.mkDerivation rec {
-  name = "blink1-${version}";
+  pname = "blink1";
   version = "1.98a";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix
index 8e3e08fb5e5..655fd44c039 100644
--- a/pkgs/tools/misc/blsd/default.nix
+++ b/pkgs/tools/misc/blsd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }:
 
 buildGoPackage rec {
-  name = "blsd-${version}";
+  pname = "blsd";
   version = "2017-07-27";
 
   goPackagePath = "github.com/junegunn/blsd";
diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
index fc10538bbbb..e4664e34b96 100644
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -2,7 +2,7 @@
 , libnl }:
 
 stdenv.mkDerivation rec {
-  name = "bmon-${version}";
+  pname = "bmon";
   version = "4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index 8a269e3eb4b..070b7a7699c 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -5,13 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "calamares";
   version = "3.2.8";
 
   # release including submodule
   src = fetchurl {
-    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1ymyl12fzxc5jjfbw4pfmgzp036w0dai76f7anilw2bnwfzq5g62";
   };
 
diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix
index a3b30423aa8..377297ee479 100644
--- a/pkgs/tools/misc/capture/default.nix
+++ b/pkgs/tools/misc/capture/default.nix
@@ -1,7 +1,7 @@
 { stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "capture-unstable-${version}";
+  pname = "capture-unstable";
   version = "2019-03-10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/tools/misc/chelf/default.nix
index 4c54ab239d2..f9740f22375 100644
--- a/pkgs/tools/misc/chelf/default.nix
+++ b/pkgs/tools/misc/chelf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "chelf-${version}";
+  pname = "chelf";
   version = "0.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index f15dfc2adba..a5500d65c51 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "chezmoi-${version}";
+  pname = "chezmoi";
   version = "1.3.0";
 
   goPackagePath = "github.com/twpayne/chezmoi";
diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix
index 48ce782536f..a1b1b4eac2d 100644
--- a/pkgs/tools/misc/cht.sh/default.nix
+++ b/pkgs/tools/misc/cht.sh/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cht.sh-${version}";
+  pname = "cht.sh";
   version = "unstable-2019-08-06";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix
index fdb0f008a6c..9d2126db9ff 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/pkgs/tools/misc/ckb-next/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.2";
-  name = "ckb-next-${version}";
+  pname = "ckb-next";
 
   src = fetchFromGitHub {
     owner = "ckb-next";
diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix
index e4b3fab818b..f71faf6ab74 100644
--- a/pkgs/tools/misc/clac/default.nix
+++ b/pkgs/tools/misc/clac/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchFromGitHub}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "clac";
   version = "0.0.0.20170503";
 
diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix
index 54a6fac17a3..d5fd4e97df1 100644
--- a/pkgs/tools/misc/clex/default.nix
+++ b/pkgs/tools/misc/clex/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "clex-${version}";
+  pname = "clex";
   version = "4.6.patch9";
 
   src = fetchurl {
     sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc";
-    url = "${meta.homepage}/download/${name}.tar.gz";
+    url = "${meta.homepage}/download/${pname}-${version}.tar.gz";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/tools/misc/clipnotify/default.nix
index 6bd0f8be2fa..91c428def28 100644
--- a/pkgs/tools/misc/clipnotify/default.nix
+++ b/pkgs/tools/misc/clipnotify/default.nix
@@ -1,6 +1,6 @@
 { libX11, libXfixes, stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "clipnotify-${version}";
+  pname = "clipnotify";
   version = "git-2018-02-20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index ed0239256cd..d12f9f6c1f4 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -2,7 +2,7 @@
  gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation  rec {
-  name = "clipster-${version}";
+  pname = "clipster";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 38041f0b32d..987d694a0a4 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "cloc-${version}";
+  pname = "cloc";
   version = "1.82";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix
index b9046bf19ca..bc23958b581 100644
--- a/pkgs/tools/misc/cloud-sql-proxy/default.nix
+++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "cloud-sql-proxy-${version}";
+  pname = "cloud-sql-proxy";
   version = "1.13";
 
   goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy";
diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index bda8ebcf3b0..5408c39920b 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   # NOTICE: if you bump this, make sure to run
   # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
   # growpart is needed in initrd in nixos/system/boot/grow-partition.nix
-  name = "cloud-utils-${version}";
+  pname = "cloud-utils";
   version = "0.30";
   src = fetchurl {
     url = "https://launchpad.net/cloud-utils/trunk/0.3/+download/cloud-utils-${version}.tar.gz";
diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix
index 12821cf864c..41c80146e68 100644
--- a/pkgs/tools/misc/colord-kde/default.nix
+++ b/pkgs/tools/misc/colord-kde/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "colord-kde-${version}";
+  pname = "colord-kde";
   version = "0.5.0";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz";
+    url = "http://download.kde.org/stable/colord-kde/${version}/src/${pname}-${version}.tar.xz";
     sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
   };
 
diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix
index a7d230d8e89..1b3c5f16969 100644
--- a/pkgs/tools/misc/contacts/default.nix
+++ b/pkgs/tools/misc/contacts/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1a-3";
-  name = "contacts-${version}";
+  pname = "contacts";
 
   src = fetchurl {
     url = "https://github.com/dhess/contacts/archive/4092a3c6615d7a22852a3bafc44e4aeeb698aa8f.tar.gz";
diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix
index 6b5c9c51394..fb44b051b7e 100644
--- a/pkgs/tools/misc/cowsay/default.nix
+++ b/pkgs/tools/misc/cowsay/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec{
   version = "3.03+dfsg2";
-  name = "cowsay-${version}";
+  pname = "cowsay";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/c/cowsay/cowsay_${version}.orig.tar.gz";
diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix
index 9a764c12941..547e2a1f059 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/pkgs/tools/misc/cpulimit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "cpulimit-${version}";
+  pname = "cpulimit";
   version = "2.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/limitcpu/${name}.tar.gz";
+    url = "mirror://sourceforge/limitcpu/${pname}-${version}.tar.gz";
     sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g";
   };
 
diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix
index b4abb3097b9..db0ab75d916 100644
--- a/pkgs/tools/misc/cpuminer/default.nix
+++ b/pkgs/tools/misc/cpuminer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, curl, jansson, perl }:
 
 stdenv.mkDerivation rec {
-  name = "cpuminer-${version}";
+  pname = "cpuminer";
   version = "2.5.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz";
+    url = "mirror://sourceforge/cpuminer/pooler-${pname}-${version}.tar.gz";
     sha256 = "1xalrfrk5hvh1jh9kbqhib2an82ypd46vl9glaxhz3rbjld7c5pa";
   };
 
diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/tools/misc/crex/default.nix
index 696fbe86383..a00f8d6654f 100644
--- a/pkgs/tools/misc/crex/default.nix
+++ b/pkgs/tools/misc/crex/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "crex";
   version = "0.2.5";
 
diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix
index 6bbf049d244..f1930c925ff 100644
--- a/pkgs/tools/misc/cunit/default.nix
+++ b/pkgs/tools/misc/cunit/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}:
 
 stdenv.mkDerivation rec {
-  name = "CUnit-${version}";
+  pname = "CUnit";
   version = "2.1-3";
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [autoconf automake libtool];
 
   src = fetchurl {
-    url = "mirror://sourceforge/cunit/CUnit/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/cunit/CUnit/${version}/${pname}-${version}.tar.bz2";
     sha256 = "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm";
   };
 
diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix
index 94f36adcf9b..83010477c50 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/tools/misc/cutecom/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qtbase, qtserialport, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "cutecom-${version}";
+  pname = "cutecom";
   version = "0.50.0";
   src = fetchFromGitHub {
     owner = "neundorf";
diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix
index 5a82c766089..f45889e78d8 100644
--- a/pkgs/tools/misc/dashing/default.nix
+++ b/pkgs/tools/misc/dashing/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "dashing-unstable-${version}";
+  pname = "dashing-unstable";
   version = "2018-02-15";
   rev = "0e0519d76ed6bbbe02b00ee1d1ac24697d349f49";
 
diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index 230a97da5e4..efeb760e560 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "datamash-${version}";
+  pname = "datamash";
   version = "1.4";
 
   src = fetchurl {
-    url = "mirror://gnu/datamash/${name}.tar.gz";
+    url = "mirror://gnu/datamash/${pname}-${version}.tar.gz";
     sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a";
   };
 
diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 05a312bb8bc..b440808833f 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.6";
-  name = "dateutils-${version}";
+  pname = "dateutils";
 
   src = fetchurl {
-    url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
+    url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz";
     sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816";
   };
 
diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix
index 8dcaecf9851..ab52d73ac27 100644
--- a/pkgs/tools/misc/dbus-map/default.nix
+++ b/pkgs/tools/misc/dbus-map/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-map-${version}";
+  pname = "dbus-map";
   version = "2015-05-28";
   src = fetchFromGitHub {
     owner = "taviso";
diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index 3a607b4ec75..0ddceb76ffe 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -2,7 +2,7 @@
 , glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "ddcutil-${version}";
+  pname = "ddcutil";
   version = "0.9.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 3ed284aa3e1..35db9ef7db3 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -9,7 +9,7 @@ let
   inherit (python3Packages) python setuptools;
 in stdenv.mkDerivation rec {
   version = "2.16.8";
-  name = "debian-devscripts-${version}";
+  pname = "debian-devscripts";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix
index 61c8a8370d7..e99e9289b67 100644
--- a/pkgs/tools/misc/ding-libs/default.nix
+++ b/pkgs/tools/misc/ding-libs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, check }:
 
 stdenv.mkDerivation rec {
-  name = "ding-libs-${version}";
+  pname = "ding-libs";
   version = "0.6.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index e71971ccb09..22c0721d79d 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage, bash }:
 
 buildGoPackage rec {
-  name = "direnv-${version}";
+  pname = "direnv";
   version = "2.20.1";
   goPackagePath = "github.com/direnv/direnv";
 
diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix
index 7b97e58fdf9..193a631ccdc 100644
--- a/pkgs/tools/misc/diskscan/default.nix
+++ b/pkgs/tools/misc/diskscan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, ncurses, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "diskscan-${version}";
+  pname = "diskscan";
   version = "0.20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix
index affcd310bea..efe65683e07 100644
--- a/pkgs/tools/misc/docbook2mdoc/default.nix
+++ b/pkgs/tools/misc/docbook2mdoc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, expat }:
 
 stdenv.mkDerivation rec {
-  name = "docbook2mdoc-${version}";
+  pname = "docbook2mdoc";
   version = "0.0.9";
 
   src = fetchurl {
-    url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${name}.tgz";
+    url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${pname}-${version}.tgz";
     sha256 = "07il80sg89xf6ym4bry6hxdacfzqgbwkxzyf7bjaihmw5jj0lclk";
   };
 
diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix
index f6bc091c14a..c1baf8e82f5 100644
--- a/pkgs/tools/misc/docker-ls/default.nix
+++ b/pkgs/tools/misc/docker-ls/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub, stdenv, docker }:
 
 buildGoPackage rec {
-  name = "docker-ls-${version}";
+  pname = "docker-ls";
   version = "0.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix
index 979b3be0493..74ce8c102c6 100644
--- a/pkgs/tools/misc/docui/default.nix
+++ b/pkgs/tools/misc/docui/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "docui-${version}";
+  pname = "docui";
   version = "1.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix
index c50e3adb6ab..7d85decbb84 100644
--- a/pkgs/tools/misc/dtach/default.nix
+++ b/pkgs/tools/misc/dtach/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dtach-${version}";
+  pname = "dtach";
   version = "0.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/dtach/dtach/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/dtach/dtach/${version}/${pname}-${version}.tar.gz";
     sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j";
   };
 
diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix
index 82b29bb67f6..77ad7cd8ccd 100644
--- a/pkgs/tools/misc/duc/default.nix
+++ b/pkgs/tools/misc/duc/default.nix
@@ -7,7 +7,7 @@
 assert enableCairo -> cairo != null && pango != null;
 
 stdenv.mkDerivation rec {
-  name = "duc-${version}";
+  pname = "duc";
   version = "1.4.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix
index 892287fa2d7..1b9a6c9bbea 100644
--- a/pkgs/tools/misc/dumptorrent/default.nix
+++ b/pkgs/tools/misc/dumptorrent/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-    name = "dumptorrent-${version}";
+    pname = "dumptorrent";
     version = "1.2";
     
     src = fetchurl {
diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix
index e2f2f51ccfb..799236a5804 100644
--- a/pkgs/tools/misc/dynamic-colors/default.nix
+++ b/pkgs/tools/misc/dynamic-colors/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "dynamic-colors-${version}";
+  pname = "dynamic-colors";
   version = "0.2.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix
index 6f491ac9349..160c3982cc1 100644
--- a/pkgs/tools/misc/emv/default.nix
+++ b/pkgs/tools/misc/emv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "emv-${version}";
+  pname = "emv";
   version = "1.95";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index 19bcd77923b..954b570c79d 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, coreutils, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "entr-${version}";
+  pname = "entr";
   version = "4.2";
 
   src = fetchurl {
-    url = "http://entrproject.org/code/${name}.tar.gz";
+    url = "http://entrproject.org/code/${pname}-${version}.tar.gz";
     sha256 = "0w2xkf77jikcjh15fp9g7661ss30pz3jbnh261vqpaqavwah4c17";
   };
 
diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix
index ea08608da01..db31df982cf 100644
--- a/pkgs/tools/misc/envdir-go/default.nix
+++ b/pkgs/tools/misc/envdir-go/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   version = "1.0.0";
-  name = "envdir-${version}";
+  pname = "envdir";
 
   goPackagePath = "github.com/d10n/envdir";
 
diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix
index 86f78af2560..9b2153d17cb 100644
--- a/pkgs/tools/misc/envsubst/default.nix
+++ b/pkgs/tools/misc/envsubst/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "envsubst-${version}";
+  pname = "envsubst";
   version = "1.1.0";
 
   goPackagePath = "github.com/a8m/envsubst";
diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix
index b9efead2798..8d65aee9e7a 100644
--- a/pkgs/tools/misc/eot-utilities/default.nix
+++ b/pkgs/tools/misc/eot-utilities/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "eot_utilities";
   version = "1.1";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://www.w3.org/Tools/eot-utils/eot-utilities-${version}.tar.gz";
diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix
index 9d3b796c879..52b56f10ea9 100644
--- a/pkgs/tools/misc/esptool-ck/default.nix
+++ b/pkgs/tools/misc/esptool-ck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "esptool-ck-${version}";
+  pname = "esptool-ck";
   version = "0.4.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index a6afa03a3f1..8fa1eccadf0 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ethtool-${version}";
+  pname = "ethtool";
   version = "5.2";
 
   src = fetchurl {
-    url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
+    url = "mirror://kernel/software/network/ethtool/${pname}-${version}.tar.xz";
     sha256 = "01bq2g7amycfp4syzcswz52pgphdgswklziqfjwnq3c6844dfpv6";
   };
 
diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index bb701f187fa..fe18a506560 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.45.4";
-  name = "expect-${version}";
+  pname = "expect";
 
   src = fetchurl {
     url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz";
diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix
index 84b61f9aae9..25179c36c01 100644
--- a/pkgs/tools/misc/fdupes/default.nix
+++ b/pkgs/tools/misc/fdupes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "fdupes-${version}";
+  pname = "fdupes";
   version = "1.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 14858428ee9..b3ed85ca228 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, file, zlib, libgnurx }:
 
 stdenv.mkDerivation rec {
-  name = "file-${version}";
+  pname = "file";
   version = "5.37";
 
   src = fetchurl {
     urls = [
-      "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
-      "https://distfiles.macports.org/file/${name}.tar.gz"
+      "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz"
+      "https://distfiles.macports.org/file/${pname}-${version}.tar.gz"
     ];
     sha256 = "0zz0p9bqnswfx0c16j8k62ivjq1m16x10xqv4hy9lcyxyxkkkhg9";
   };
diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/tools/misc/filebench/default.nix
index e934da76e6e..a16695cf7c3 100644
--- a/pkgs/tools/misc/filebench/default.nix
+++ b/pkgs/tools/misc/filebench/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "filebench-${version}";
+  pname = "filebench";
   version = "1.4.9.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/filebench/${name}.tar.gz";
+    url = "mirror://sourceforge/filebench/${pname}-${version}.tar.gz";
     sha256 = "13hmx67lsz367sn8lrvz1780mfczlbiz8v80gig9kpkpf009yksc";
   };
 
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index a7ca7700c71..18914a304f3 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
 
 stdenv.mkDerivation rec {
-  name = "flashrom-${version}";
+  pname = "flashrom";
   version = "1.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix
index a72279b90b6..692f7daa9cf 100644
--- a/pkgs/tools/misc/fltrdr/default.nix
+++ b/pkgs/tools/misc/fltrdr/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fltrdr-${version}";
+  pname = "fltrdr";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix
index e31da3bfd21..33efd2bd614 100644
--- a/pkgs/tools/misc/fondu/default.nix
+++ b/pkgs/tools/misc/fondu/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "060102";
-  name = "fondu-${version}";
+  pname = "fondu";
 
   src = fetchurl {
     url = "http://fondu.sourceforge.net/fondu_src-${version}.tgz";
diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix
index f75dfec5e56..563152cc10d 100644
--- a/pkgs/tools/misc/fpart/default.nix
+++ b/pkgs/tools/misc/fpart/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "fpart-${version}";
+  pname = "fpart";
   version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "martymac";
     repo = "fpart";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0h3mqc1xj5j2z8s8g3pvvpbjs6x74dj8niyh3p2ymla35kbzskf4";
   };
 
diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix
index 6271eb599b5..bfaf30f3f37 100644
--- a/pkgs/tools/misc/fpp/default.nix
+++ b/pkgs/tools/misc/fpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python27 }:
 
 stdenv.mkDerivation rec {
-  name = "fpp-${version}";
+  pname = "fpp";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/tools/misc/fsmark/default.nix
index 0e821ce7f1f..ac56d948bda 100644
--- a/pkgs/tools/misc/fsmark/default.nix
+++ b/pkgs/tools/misc/fsmark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fsmark-${version}";
+  pname = "fsmark";
   version = "3.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix
index f9e40b6b786..dde69778e5f 100644
--- a/pkgs/tools/misc/fsmon/default.nix
+++ b/pkgs/tools/misc/fsmon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "fsmon-${version}";
+  pname = "fsmon";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix
index e723db260eb..4e7db2dc484 100644
--- a/pkgs/tools/misc/fsql/default.nix
+++ b/pkgs/tools/misc/fsql/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "fsql-${version}";
+  pname = "fsql";
   version = "0.3.1";
 
   goPackagePath = "github.com/kshvmdn/fsql";
diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index a5baf4de5b8..a189e8c1dba 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -3,7 +3,7 @@
 , libarchive, darwin, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "fwup-${version}";
+  pname = "fwup";
   version = "1.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix
index 6a04213e21a..5b05ce534d7 100644
--- a/pkgs/tools/misc/fzy/default.nix
+++ b/pkgs/tools/misc/fzy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "fzy-${version}";
+  pname = "fzy";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix
index 011231692f3..ba0b76026a5 100644
--- a/pkgs/tools/misc/gams/default.nix
+++ b/pkgs/tools/misc/gams/default.nix
@@ -4,7 +4,7 @@ assert licenseFile != null;
 
 stdenv.mkDerivation rec {
   version = "25.0.2";
-  name = "gams-${version}";
+  pname = "gams";
   src = fetchurl {
     url = "https://d37drm4t2jghv5.cloudfront.net/distributions/${version}/linux/linux_x64_64_sfx.exe";
     sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297";
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index c187b09624a..002853abc1d 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -3,7 +3,7 @@
 with builtins;
 
 buildGoPackage rec {
-  name = "gawp-${version}";
+  pname = "gawp";
   version = "20160121-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
   
diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix
index 6307d012deb..9b41dba4e25 100644
--- a/pkgs/tools/misc/gbdfed/default.nix
+++ b/pkgs/tools/misc/gbdfed/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.6";
-  name = "gbdfed-${version}";
+  pname = "gbdfed";
 
   src = fetchurl {
-    url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${name}.tar.bz2";
+    url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${pname}-${version}.tar.bz2";
     sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx";
   };
 
diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
index fddb1c99634..33b884a5eb9 100644
--- a/pkgs/tools/misc/geekbench/default.nix
+++ b/pkgs/tools/misc/geekbench/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "geekbench-${version}";
+  pname = "geekbench";
   version = "4.4.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix
index b95c7179141..d6fbb623331 100644
--- a/pkgs/tools/misc/geteltorito/default.nix
+++ b/pkgs/tools/misc/geteltorito/default.nix
@@ -1,7 +1,7 @@
 { stdenv, perl, ronn, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "geteltorito-${version}";
+  pname = "geteltorito";
   version = "0.6";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix
index 5c8bacac162..a8e957ce484 100644
--- a/pkgs/tools/misc/gibo/default.nix
+++ b/pkgs/tools/misc/gibo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, coreutils, findutils, git }:
 
 stdenv.mkDerivation rec {
-  name = "gibo-${version}";
+  pname = "gibo";
   version = "1.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix
index afcf9cf4c78..5438f71930d 100644
--- a/pkgs/tools/misc/git-town/default.nix
+++ b/pkgs/tools/misc/git-town/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }: 
 
   buildGoPackage rec {
-    name = "git-town-${version}";
+    pname = "git-town";
     version = "7.2.0";
 
     goPackagePath = "github.com/Originate/git-town";
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index be4de738c1c..581a1f84fc7 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -2,12 +2,12 @@
 , readline, pcsclite, libical, gtk2, glib, libXpm }:
 
 stdenv.mkDerivation rec {
-  name = "gnokii-${version}";
+  pname = "gnokii";
   version = "0.6.31";
 
   src = fetchurl {
     sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
-    url = "https://www.gnokii.org/download/gnokii/${name}.tar.gz";
+    url = "https://www.gnokii.org/download/gnokii/${pname}-${version}.tar.gz";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index 0430f010e97..6fad9829d79 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3";
-  name = "goaccess-${version}";
+  pname = "goaccess";
 
   src = fetchurl {
     url = "https://tar.goaccess.io/goaccess-${version}.tar.gz";
diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix
index d7c10220f4b..bd53529a5d2 100644
--- a/pkgs/tools/misc/gosu/default.nix
+++ b/pkgs/tools/misc/gosu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gosu-${version}";
+  pname = "gosu";
   version = "2017-05-09";
   rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
 
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index bdb919006fd..f951e6cba70 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.2";
-  name = "graylog-${version}";
+  pname = "graylog";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 451828b0f47..fde08702f67 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python3Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name    = "grc-${version}";
+  pname = "grc";
   version = "1.11.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index ec77f396527..edb9508df31 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -5,7 +5,7 @@ let arch =
   else if stdenv.isx86_64 then "x86_64"
   else throw "Unknown architecture";
 in stdenv.mkDerivation rec {
-  name = "grub4dos-${version}";
+  pname = "grub4dos";
   version = "0.4.6a-2019-05-12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix
index f7cdf5ca608..78a678f0714 100644
--- a/pkgs/tools/misc/gsmartcontrol/default.nix
+++ b/pkgs/tools/misc/gsmartcontrol/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version="1.1.3";
-  name = "gsmartcontrol-${version}";
+  pname = "gsmartcontrol";
 
   src = fetchurl {
     url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix
index a66b32c789c..bca481cade4 100644
--- a/pkgs/tools/misc/gti/default.nix
+++ b/pkgs/tools/misc/gti/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gti-${version}";
+  pname = "gti";
   version = "1.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix
index db18cae77b1..9fe26777110 100644
--- a/pkgs/tools/misc/h5utils/default.nix
+++ b/pkgs/tools/misc/h5utils/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.13.1";
-  name = "h5utils-${version}";
+  pname = "h5utils";
 
   # fetchurl is used instead of fetchFromGitHub because the git repo version requires
   # additional tools to build compared to the tarball release; see the README for details.
diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix
index be5e1371cd4..8c2e7dc7451 100644
--- a/pkgs/tools/misc/hakuneko/default.nix
+++ b/pkgs/tools/misc/hakuneko/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, wxGTK30, openssl, curl }:
 
 stdenv.mkDerivation rec {
-  name = "hakuneko-${version}";
+  pname = "hakuneko";
   version = "1.4.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix
index bd3bebc881e..e765e923474 100644
--- a/pkgs/tools/misc/hdf4/default.nix
+++ b/pkgs/tools/misc/hdf4/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "hdf-${version}";
+  pname = "hdf";
   version = "4.2.14";
   src = fetchurl {
     url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2";
diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix
index 17b48ad8741..d27f6fc01bc 100644
--- a/pkgs/tools/misc/hdf5/1_8.nix
+++ b/pkgs/tools/misc/hdf5/1_8.nix
@@ -24,9 +24,9 @@ let inherit (stdenv.lib) optional optionals; in
 
 stdenv.mkDerivation rec {
   version = "1.8.19";
-  name = "hdf5-${version}";
+  pname = "hdf5";
   src = fetchurl {
-    url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${name}/src/${name}.tar.bz2";
+    url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${pname}-${version}/src/${pname}-${version}.tar.bz2";
     sha256 = "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r" ;
  };
 
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index e6402322d35..336010718dd 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -17,9 +17,9 @@ let inherit (stdenv.lib) optional optionals; in
 
 stdenv.mkDerivation rec {
   version = "1.10.5";
-  name = "hdf5-${version}";
+  pname = "hdf5";
   src = fetchurl {
-    url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2";
+    url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${pname}-${version}/src/${pname}-${version}.tar.bz2";
     sha256 = "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8";
   };
 
diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix
index 0fe72425d79..6087a76e6bd 100644
--- a/pkgs/tools/misc/hdfjava/default.nix
+++ b/pkgs/tools/misc/hdfjava/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, javac }:
 
 stdenv.mkDerivation rec {
-  name = "hdf-java-${version}";
+  pname = "hdf-java";
   version = "3.3.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix
index 82801da322c..fb6914c01d0 100644
--- a/pkgs/tools/misc/hdfview/default.nix
+++ b/pkgs/tools/misc/hdfview/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ant, javac, hdf_java }:
 
 stdenv.mkDerivation rec {
-  name = "hdfview-${version}";
+  pname = "hdfview";
   version = "2.14";
 
   src = fetchurl {
-    url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz";
+    url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${pname}-${version}.tar.gz";
     sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p";
   };
 
diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix
index 55542b4c7fc..39678abeba4 100644
--- a/pkgs/tools/misc/hebcal/default.nix
+++ b/pkgs/tools/misc/hebcal/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.18";
-  name = "hebcal-${version}";
+  pname = "hebcal";
 
   src = fetchFromGitHub {
     owner = "hebcal";
diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix
index b080e23b265..eabb7838e8a 100644
--- a/pkgs/tools/misc/hexd/default.nix
+++ b/pkgs/tools/misc/hexd/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "hexd-${version}";
+  pname = "hexd";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix
index b4ee1f2f5c0..4b1b0d0c762 100644
--- a/pkgs/tools/misc/hhpc/default.nix
+++ b/pkgs/tools/misc/hhpc/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, xorg, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "hhpc-${version}";
+  pname = "hhpc";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix
index a0fcc6074dc..61832a5d326 100644
--- a/pkgs/tools/misc/hostsblock/default.nix
+++ b/pkgs/tools/misc/hostsblock/default.nix
@@ -20,7 +20,7 @@
 ] }:
 
 stdenv.mkDerivation rec {
-  name = "hostsblock-${version}";
+  pname = "hostsblock";
   version = "20161213";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix
index d9aaefb46d9..16bc0393f23 100644
--- a/pkgs/tools/misc/hpl/default.nix
+++ b/pkgs/tools/misc/hpl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openblasCompat, mpi } :
 
 stdenv.mkDerivation rec {
-  name = "hpl-${version}";
+  pname = "hpl";
   version = "2.3";
 
   src = fetchurl {
-    url = "http://www.netlib.org/benchmark/hpl/${name}.tar.gz";
+    url = "http://www.netlib.org/benchmark/hpl/${pname}-${version}.tar.gz";
     sha256 = "0c18c7fzlqxifz1bf3izil0bczv3a7nsv0dn6winy3ik49yw3i9j";
   };
 
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
index 7035f2ecedf..bc934c424f3 100644
--- a/pkgs/tools/misc/i3cat/default.nix
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "i3cat-${version}";
+  pname = "i3cat";
   version = "20150321-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
 
diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index 898ecd9df4a..372eebb59f6 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "i3minator-${version}";
+  pname = "i3minator";
   version = "0.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix
index 141fc968a2d..872de2c702b 100644
--- a/pkgs/tools/misc/ical2org/default.nix
+++ b/pkgs/tools/misc/ical2org/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage}:
 
 buildGoPackage rec {
-  name = "ical2org-${version}";
+  pname = "ical2org";
   version="1.1.5";
 
   goPackagePath = "github.com/rjhorniii/ical2org";
diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix
index 15af413a999..98b039e3f8a 100644
--- a/pkgs/tools/misc/ideviceinstaller/default.nix
+++ b/pkgs/tools/misc/ideviceinstaller/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
   pname = "ideviceinstaller";
   version = "2018-10-01";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
diff --git a/pkgs/tools/misc/ifdtool/default.nix b/pkgs/tools/misc/ifdtool/default.nix
index 7d15825c27e..7fe4ad86b8e 100644
--- a/pkgs/tools/misc/ifdtool/default.nix
+++ b/pkgs/tools/misc/ifdtool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ifdtool-${version}";
+  pname = "ifdtool";
   version = "4.9";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/intelmetool/default.nix b/pkgs/tools/misc/intelmetool/default.nix
index 66378e457a2..87aa7df8d6d 100644
--- a/pkgs/tools/misc/intelmetool/default.nix
+++ b/pkgs/tools/misc/intelmetool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, zlib, pciutils }:
 
 stdenv.mkDerivation rec {
-  name = "intelmetool-${version}";
+  pname = "intelmetool";
   version = "4.8.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix
index caefcb835a3..981d9f2dc6c 100644
--- a/pkgs/tools/misc/ipad_charge/default.nix
+++ b/pkgs/tools/misc/ipad_charge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "ipad_charge-${version}";
+  pname = "ipad_charge";
   version = "2015-02-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix
index a87d199d9bd..3529324b30a 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/pkgs/tools/misc/ised/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ised-${version}";
+  pname = "ised";
   version = "2.7.1";
   src = fetchurl {
-    url = "mirror://sourceforge/project/ised/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/ised/${pname}-${version}.tar.bz2";
     sha256 = "0fhha61whkkqranqdxg792g0f5kgp5m3m6z1iqcvjh2c34rczbmb";
   };
 
diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index d82347fef8f..bf1501155d9 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "jdupes-${version}";
+  pname = "jdupes";
   version = "1.13.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index 208c04ff039..c19ed50ece2 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -2,7 +2,7 @@
 , perl, procps, gnugrep, gawk, findutils, gnused }:
 
 stdenv.mkDerivation rec {
-  name = "keychain-${version}";
+  pname = "keychain";
   version = "2.8.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix
index be0ceda511c..c272584e2c0 100644
--- a/pkgs/tools/misc/kt/default.nix
+++ b/pkgs/tools/misc/kt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "kt-${version}";
+  pname = "kt";
   version = "12.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix
index b7963c3ed81..2ca99eb61e8 100644
--- a/pkgs/tools/misc/latex2html/default.nix
+++ b/pkgs/tools/misc/latex2html/default.nix
@@ -6,7 +6,7 @@
 # https://github.com/Homebrew/homebrew-core/blob/21834573f690407d34b0bbf4250b82ec38dda4d6/Formula/latex2html.rb
 
 stdenv.mkDerivation rec {
-  name = "latex2html-${version}";
+  pname = "latex2html";
   version = "2018";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix
index 72c9cecf540..5955c1104d3 100644
--- a/pkgs/tools/misc/ldapvi/default.nix
+++ b/pkgs/tools/misc/ldapvi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "ldapvi-${version}";
+  pname = "ldapvi";
   version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg";
 
   # use latest git, it includes some important patches since 2007 release
diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix
index c6b544f9e0a..b59c46a8477 100644
--- a/pkgs/tools/misc/ldmtool/default.nix
+++ b/pkgs/tools/misc/ldmtool/default.nix
@@ -2,7 +2,7 @@
   libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-   name = "ldmtool-${version}";
+   pname = "ldmtool";
    version = "0.2.4";
 
    src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 95f88654425..61e115e71eb 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name = "lf-${version}";
+  pname = "lf";
   version = "13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix
index 8c9db5b8a77..e31112a74d8 100644
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/pkgs/tools/misc/libcpuid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libcpuid-${version}";
+  pname = "libcpuid";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix
index d489a5188f1..9bc7c372d93 100644
--- a/pkgs/tools/misc/linuxquota/default.nix
+++ b/pkgs/tools/misc/linuxquota/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.05";
-  name = "quota-${version}";
+  pname = "quota";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz";
diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix
index 7834bc96bef..2545dd1e6bc 100644
--- a/pkgs/tools/misc/logstash/5.x.nix
+++ b/pkgs/tools/misc/logstash/5.x.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = elk5Version;
-  name = "logstash-${version}";
+  pname = "logstash";
 
   src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
+    url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz";
     sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0";
   };
 
diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix
index dc33d2ece54..b580d559868 100644
--- a/pkgs/tools/misc/logstash/contrib.nix
+++ b/pkgs/tools/misc/logstash/contrib.nix
@@ -4,7 +4,7 @@
 #   $path/logstash/{inputs,codecs,filters,outputs}/*.rb 
 stdenv.mkDerivation rec {
   version = "1.4.2";
-  name = "logstash-contrib-${version}";
+  pname = "logstash-contrib";
 
   src = fetchzip {
    url = "https://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz";
diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix
index cb594391e2a..4521f8b407a 100644
--- a/pkgs/tools/misc/ltunify/default.nix
+++ b/pkgs/tools/misc/ltunify/default.nix
@@ -4,7 +4,7 @@
 # adding this to services.udev.packages on NixOS
 
 stdenv.mkDerivation rec {
-  name = "ltunify-${version}";
+  pname = "ltunify";
   version = "unstable-20180330";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix
index 9ddd9218801..828e2358236 100644
--- a/pkgs/tools/misc/mandoc/default.nix
+++ b/pkgs/tools/misc/mandoc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "mandoc-${version}";
+  pname = "mandoc";
   version = "1.14.5";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix
index e2ff4868c9e..6d198a35605 100644
--- a/pkgs/tools/misc/massren/default.nix
+++ b/pkgs/tools/misc/massren/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "massren-${version}";
+  pname = "massren";
   version = "1.5.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index 59ed474e9bc..44b00adf5c1 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "20190725";
-  name = "mbuffer-${version}";
+  pname = "mbuffer";
 
   src = fetchurl {
     url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 7f0cdac1dbf..b2711903ead 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -2,11 +2,11 @@
 , libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "mc-${version}";
+  pname = "mc";
   version = "4.8.23";
 
   src = fetchurl {
-    url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";
+    url = "http://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz";
     sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx";
   };
 
diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix
index 52c96fda197..bc520c57a33 100644
--- a/pkgs/tools/misc/mcrypt/default.nix
+++ b/pkgs/tools/misc/mcrypt/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.6.8";
-  name = "mcrypt-${version}";
+  pname = "mcrypt";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${pname}-${version}.tar.gz";
     sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098";
   };
 
diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix
index bbd78feaaf8..5121491625f 100644
--- a/pkgs/tools/misc/megacli/default.nix
+++ b/pkgs/tools/misc/megacli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, rpmextract, ncurses5, patchelf, requireFile, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "megacli-${version}";
+  pname = "megacli";
   version = "8.07.14";
 
   src =
diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix
index 4f6c4bad97c..e382db0b92c 100644
--- a/pkgs/tools/misc/mht2htm/default.nix
+++ b/pkgs/tools/misc/mht2htm/default.nix
@@ -4,7 +4,7 @@ let
   date = "07.apr.2016";
 
 in stdenv.mkDerivation rec {
-  name = "mht2mht-${version}";
+  pname = "mht2mht";
   version = "1.8.1.35";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index 3c2ed135225..3e23e2bddcc 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -2,7 +2,7 @@
 , lrzsz, ncurses, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "minicom-${version}";
+  pname = "minicom";
   version = "2.7.1";
 
   # The repository isn't tagged properly, so we need to use commit refs
diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix
index 7b9549a80fe..7b8b8a82b72 100644
--- a/pkgs/tools/misc/ministat/default.nix
+++ b/pkgs/tools/misc/ministat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "ministat-${version}";
+  pname = "ministat";
   version = "20150715-1";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix
index da1e8be7cf4..b2f7fdf2a90 100644
--- a/pkgs/tools/misc/mktorrent/default.nix
+++ b/pkgs/tools/misc/mktorrent/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "mktorrent-${version}";
+  pname = "mktorrent";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix
index baf418ac9f0..f8fb253af47 100644
--- a/pkgs/tools/misc/mlocate/default.nix
+++ b/pkgs/tools/misc/mlocate/default.nix
@@ -3,11 +3,11 @@
 let
   dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config;
 in stdenv.mkDerivation rec {
-  name = "mlocate-${version}";
+  pname = "mlocate";
   version = "0.26";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/mlocate/${name}.tar.xz";
+    url = "https://releases.pagure.org/mlocate/${pname}-${version}.tar.xz";
     sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
   };
 
diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix
index 1d3a355dd95..a791cbe5d48 100644
--- a/pkgs/tools/misc/mmake/default.nix
+++ b/pkgs/tools/misc/mmake/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mmake-${version}";
+  pname = "mmake";
   version = "1.2.0";
 
   goPackagePath = "github.com/tj/mmake";
diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix
index 602c9c26c78..6129f15c734 100644
--- a/pkgs/tools/misc/mmv/default.nix
+++ b/pkgs/tools/misc/mmv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mmv-${version}";
+  pname = "mmv";
   version = "1.01b";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
index a728450d76e..dc7a64bdcf7 100644
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -10,7 +10,7 @@ in
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "mongo-tools-${version}";
+  pname = "mongo-tools";
   version = "3.7.2";
   rev = "r${version}";
 
diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 00cbc8b4629..336d673f7ec 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "moreutils-${version}";
+  pname = "moreutils";
   version = "0.63";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix
index 5be323a6f4b..df84084fc9c 100644
--- a/pkgs/tools/misc/mpdscribble/default.nix
+++ b/pkgs/tools/misc/mpdscribble/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "mpdscribble-${version}";
+  pname = "mpdscribble";
   version = "0.22";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix
index 778671f0b54..363e90ab5f2 100644
--- a/pkgs/tools/misc/mprime/default.nix
+++ b/pkgs/tools/misc/mprime/default.nix
@@ -15,7 +15,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "mprime-${version}";
+  pname = "mprime";
   version = "29.4b7";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix
index 26fcea669c2..922592a256d 100644
--- a/pkgs/tools/misc/mrtg/default.nix
+++ b/pkgs/tools/misc/mrtg/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
 
   version = "2.17.7";
-  name = "mrtg-${version}";
+  pname = "mrtg";
 
   src = fetchurl {
-    url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz";
+    url = "https://oss.oetiker.ch/mrtg/pub/${pname}-${version}.tar.gz";
     sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v";
   };
 
diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix
index 04271b61069..2607cf6f300 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/pkgs/tools/misc/ms-sys/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "ms-sys-${version}";
+  pname = "ms-sys";
   version = "2.6.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
+    url = "mirror://sourceforge/ms-sys/${pname}-${version}.tar.gz";
     sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz";
   };
 
diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix
index 07561d390cd..3037b672498 100644
--- a/pkgs/tools/misc/multitail/default.nix
+++ b/pkgs/tools/misc/multitail/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "6.4.2";
-  name = "multitail-${version}";
+  pname = "multitail";
 
   src = fetchurl {
-    url = "https://www.vanheusden.com/multitail/${name}.tgz";
+    url = "https://www.vanheusden.com/multitail/${pname}-${version}.tgz";
     sha256 = "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg";
   };
 
diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix
index 9c483fe3b8f..183871c39a7 100644
--- a/pkgs/tools/misc/mysqltuner/default.nix
+++ b/pkgs/tools/misc/mysqltuner/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mysqltuner-${version}";
+  pname = "mysqltuner";
   version = "1.7.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix
index 57036acb58e..525c16b6024 100644
--- a/pkgs/tools/misc/nagstamon/default.nix
+++ b/pkgs/tools/misc/nagstamon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "nagstamon-${version}";
+  pname = "nagstamon";
   version = "3.2.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix
index 2312ce236ab..a1a6347642b 100644
--- a/pkgs/tools/misc/nbench/default.nix
+++ b/pkgs/tools/misc/nbench/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nbench-byte-${version}";
+  pname = "nbench-byte";
   version = "2.2.3";
 
   src = fetchurl {
-    url = "http://www.math.utah.edu/~mayer/linux/${name}.tar.gz";
+    url = "http://www.math.utah.edu/~mayer/linux/${pname}-${version}.tar.gz";
     sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj";
   };
 
diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index bb792451564..97842f82ae9 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ncdu-${version}";
+  pname = "ncdu";
   version = "1.14";
 
   src = fetchurl {
-    url = "https://dev.yorhel.nl/download/${name}.tar.gz";
+    url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
     sha256 = "0i4cap2z3037xx2rdzhrlazl2igk3xy4ncddp9j7xqi1mcx7i566";
   };
 
diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index 18ae88547a0..9d1357f5d2c 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "neofetch-${version}";
+  pname = "neofetch";
   version = "6.0.0";
   src = fetchFromGitHub {
     owner = "dylanaraps";
diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix
index e19eac1c51e..91dd56c9b0f 100644
--- a/pkgs/tools/misc/nginx-config-formatter/default.nix
+++ b/pkgs/tools/misc/nginx-config-formatter/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2019-02-13";
-  name = "nginx-config-formatter-${version}";
+  pname = "nginx-config-formatter";
 
   src = fetchFromGitHub {
     owner = "1connect";
diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/tools/misc/nms/default.nix
index 3037262322f..0005ffe824b 100644
--- a/pkgs/tools/misc/nms/default.nix
+++ b/pkgs/tools/misc/nms/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "nms-${version}";
+  pname = "nms";
   version = "0.3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix
index 77c84ab4511..b197e9bc5d2 100644
--- a/pkgs/tools/misc/noteshrink/default.nix
+++ b/pkgs/tools/misc/noteshrink/default.nix
@@ -3,7 +3,7 @@
 with python3.pkgs;
 
 buildPythonApplication rec {
-  name = "noteshrink-${version}";
+  pname = "noteshrink";
   version = "0.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix
index 23646abe787..bfe674d2f5c 100644
--- a/pkgs/tools/misc/noti/default.nix
+++ b/pkgs/tools/misc/noti/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, Cocoa }:
 
 buildGoPackage rec {
-  name = "noti-${version}";
+  pname = "noti";
   version = "3.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix
index 93c0f5e346b..307a08bbdf9 100644
--- a/pkgs/tools/misc/notify-desktop/default.nix
+++ b/pkgs/tools/misc/notify-desktop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, dbus, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "notify-desktop-${version}";
+  pname = "notify-desktop";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/nvramtool/default.nix b/pkgs/tools/misc/nvramtool/default.nix
index fdce7076661..ecff547e951 100644
--- a/pkgs/tools/misc/nvramtool/default.nix
+++ b/pkgs/tools/misc/nvramtool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, iasl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "nvramtool-${version}";
+  pname = "nvramtool";
   version = "4.8.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/pkgs/tools/misc/oci-image-tool/default.nix
index 6d508a48901..3b45b7b0644 100644
--- a/pkgs/tools/misc/oci-image-tool/default.nix
+++ b/pkgs/tools/misc/oci-image-tool/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "oci-image-tool-${version}";
+  pname = "oci-image-tool";
   version = "1.0.0-rc1";
 
   goPackagePath = "github.com/opencontainers/image-tools";
diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix
index 9ffb89aca6b..4317c46190d 100644
--- a/pkgs/tools/misc/ocz-ssd-guru/default.nix
+++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix
@@ -4,7 +4,7 @@ let
   system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32";
 in
 stdenv.mkDerivation rec {
-  name = "ocz-ssd-guru-${version}";
+  pname = "ocz-ssd-guru";
   version = "1.0.1170";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index f6aea4a92ab..2a0846dd511 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "opentsdb-${version}";
+  pname = "opentsdb";
   version = "2.3.1";
 
   src = fetchurl {
-    url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1lf1gynr11silla4bsrkwqv023dxirsb88ncs2qmc2ng35593fjd";
   };
 
diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index 59a60e356b8..78426329975 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -10,7 +10,7 @@ ntfs3g      # ntfs3g
 
 stdenv.mkDerivation rec {
   version = "1.76";
-  name = "os-prober-${version}";
+  pname = "os-prober";
   src = fetchurl {
     url = "https://salsa.debian.org/philh/os-prober/-/archive/${version}/os-prober-${version}.tar.bz2";
     sha256 = "07rw3092pckh21vx6y4hzqcn3wn4cqmwxaaiq100lncnhmszg11g";
diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix
index f14fb526997..370d1924711 100644
--- a/pkgs/tools/misc/osm2pgsql/default.nix
+++ b/pkgs/tools/misc/osm2pgsql/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}:
 
 stdenv.mkDerivation rec {
-  name = "osm2pgsql-${version}";
+  pname = "osm2pgsql";
   version = "0.96.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix
index 96e5e6a1d94..4b28a7c45e5 100644
--- a/pkgs/tools/misc/otfcc/default.nix
+++ b/pkgs/tools/misc/otfcc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, premake5 }:
 
 stdenv.mkDerivation rec {
-  name = "otfcc-${version}";
+  pname = "otfcc";
   version = "0.9.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix
index 1e747961499..5313b69933b 100644
--- a/pkgs/tools/misc/parcellite/default.nix
+++ b/pkgs/tools/misc/parcellite/default.nix
@@ -3,7 +3,7 @@
 , which, wrapGAppsHook, xdotool }:
 
 stdenv.mkDerivation rec {
-  name = "parcellite-${version}";
+  pname = "parcellite";
   version = "1.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix
index a5e45dc259b..c2c8e2b8573 100644
--- a/pkgs/tools/misc/pastebinit/default.nix
+++ b/pkgs/tools/misc/pastebinit/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.5";
-  name = "pastebinit-${version}";
+  pname = "pastebinit";
 
   src = fetchurl {
-    url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2";
+    url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${pname}-${version}.tar.bz2";
     sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2";
   };
 
diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix
index fe1d848ee50..858422b8532 100644
--- a/pkgs/tools/misc/pb_cli/default.nix
+++ b/pkgs/tools/misc/pb_cli/default.nix
@@ -6,7 +6,7 @@ assert video -> capture != null;
 assert clipboard -> xclip != null;
 
 stdenv.mkDerivation rec {
-  name = "pb_cli-unstable-${version}";
+  pname = "pb_cli-unstable";
   version = "2019-03-10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index c16106f4637..6c1bc5fcf04 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc }:
 
 stdenv.mkDerivation rec {
-  name = "phoronix-test-suite-${version}";
+  pname = "phoronix-test-suite";
   version = "8.8.1";
 
   src = fetchurl {
-    url = "https://phoronix-test-suite.com/releases/${name}.tar.gz";
+    url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
     sha256 = "1l5wnj5d652dg02j7iy7n9ab7qrpclmgvyxnh1s6cdnnnspyxznn";
   };
 
diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix
index 74d24db574f..dd07fee3405 100644
--- a/pkgs/tools/misc/phraseapp-client/default.nix
+++ b/pkgs/tools/misc/phraseapp-client/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "phraseapp-client-${version}";
+  pname = "phraseapp-client";
   version = "1.11.0";
 
   goPackagePath = "github.com/phrase/phraseapp-client";
diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix
index 45b0da6f8db..ceb2bace7db 100644
--- a/pkgs/tools/misc/pick/default.nix
+++ b/pkgs/tools/misc/pick/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "pick-${version}";
+  pname = "pick";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix
index c49695fd9ad..1ad21940368 100644
--- a/pkgs/tools/misc/picocom/default.nix
+++ b/pkgs/tools/misc/picocom/default.nix
@@ -5,7 +5,7 @@ assert stdenv.isDarwin -> IOKit != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "picocom-${version}";
+  pname = "picocom";
   version = "3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index abbd64cb62f..5bd1e347082 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
 
   version = "0.2.8.2";
 
-  name = "pipelight-${version}";
+  pname = "pipelight";
 
   src = fetchurl {
     url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz";
diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/tools/misc/pixd/default.nix
index ececef39850..a16333f6e44 100644
--- a/pkgs/tools/misc/pixd/default.nix
+++ b/pkgs/tools/misc/pixd/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "pixd-${version}";
+  pname = "pixd";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 1cf64362e6d..eb2881b29f7 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2019.8";
-  name = "plantuml-${version}";
+  pname = "plantuml";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix
index 41913f96653..d2a7f3f37ea 100644
--- a/pkgs/tools/misc/plotinus/default.nix
+++ b/pkgs/tools/misc/plotinus/default.nix
@@ -10,7 +10,7 @@
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "plotinus-${version}";
+  pname = "plotinus";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index 191f8980d83..1d3e8c6c33d 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "plowshare-${version}";
+  pname = "plowshare";
   version = "2.1.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix
index 0bd61c0fcdf..5712e02e8ea 100644
--- a/pkgs/tools/misc/pod2mdoc/default.nix
+++ b/pkgs/tools/misc/pod2mdoc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pod2mdoc-${version}";
+  pname = "pod2mdoc";
   version = "0.0.10";
 
   src = fetchurl {
-    url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${name}.tgz";
+    url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${pname}-${version}.tgz";
     sha256 = "0nwa9zv9gmfi5ysz1wfm60kahc7nv0133n3dfc2vh2y3gj8mxr4f";
   };
 
diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix
index 2c9ed7be039..5c1b1be2db3 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/pkgs/tools/misc/powerline-go/default.nix
@@ -3,7 +3,6 @@
 buildGoModule rec {
   pname = "powerline-go";
   version = "1.13.0";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "justjanne";
diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix
index 2a34224c126..0c9d3a0ea79 100644
--- a/pkgs/tools/misc/profile-cleaner/default.nix
+++ b/pkgs/tools/misc/profile-cleaner/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.37";
-  name = "profile-cleaner-${version}";
+  pname = "profile-cleaner";
 
   src = fetchFromGitHub {
     owner = "graysky2";
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index ac98df58784..989a2d3f22b 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.34";
-  name = "profile-sync-daemon-${version}";
+  pname = "profile-sync-daemon";
 
   src = fetchurl {
     url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix
index b29d0eafcc9..3edca413f3a 100644
--- a/pkgs/tools/misc/progress/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, ncurses, which }:
 
 stdenv.mkDerivation rec {
-  name = "progress-${version}";
+  pname = "progress";
   version = "0.14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 1aaed4feafe..ca3016d1187 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline }:
 
 stdenv.mkDerivation rec {
-  name = "pspg-${version}";
+  pname = "pspg";
   version = "1.6.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index 6af33691a07..613ad263ed3 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "radeon-profile-${version}";
+  pname = "radeon-profile";
   version = "20170714";
 
   nativeBuildInputs = [ qmake ];
diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix
index 11ac0fc1419..3d97874df7d 100644
--- a/pkgs/tools/misc/rcm/default.nix
+++ b/pkgs/tools/misc/rcm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "rcm-${version}";
+  pname = "rcm";
   version = "1.3.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix
index 484bb765c0d..88aff4f3c08 100644
--- a/pkgs/tools/misc/recoverjpeg/default.nix
+++ b/pkgs/tools/misc/recoverjpeg/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, python2, exif, imagemagick }:
 
 stdenv.mkDerivation rec {
-  name = "recoverjpeg-${version}";
+  pname = "recoverjpeg";
   version = "2.6.3";
 
   src = fetchurl {
-    url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz";
+    url = "https://www.rfc1149.net/download/recoverjpeg/${pname}-${version}.tar.gz";
     sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv";
   };
 
diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix
index ee7b2623b1d..627758e9c5e 100644
--- a/pkgs/tools/misc/rig/default.nix
+++ b/pkgs/tools/misc/rig/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.11";
-  name = "rig-${version}";
+  pname = "rig";
 
   src = fetchurl {
     url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz";
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix
index bd60e786036..af5bfedf203 100644
--- a/pkgs/tools/misc/rlwrap/default.nix
+++ b/pkgs/tools/misc/rlwrap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "rlwrap-${version}";
+  pname = "rlwrap";
   version = "0.43";
 
   src = fetchurl {
-    url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf";
   };
 
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 320edd83021..7b7fa9ce705 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "rmlint-${version}";
+  pname = "rmlint";
   version = "2.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index 925bb199b27..232949b7dac 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -5,7 +5,7 @@
 let inherit (stdenv.lib) getDev; in
 
 stdenv.mkDerivation  rec {
-  name = "rockbox-utility-${version}";
+  pname = "rockbox-utility";
   version = "1.4.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/tools/misc/roundup/default.nix
index e24b1fce06e..7eebc194300 100644
--- a/pkgs/tools/misc/roundup/default.nix
+++ b/pkgs/tools/misc/roundup/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ronn, shocco }:
 
 stdenv.mkDerivation rec {
-  name = "roundup-${version}";
+  pname = "roundup";
   version = "0.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix
index 650ac9f660a..d852818b315 100644
--- a/pkgs/tools/misc/routino/default.nix
+++ b/pkgs/tools/misc/routino/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "routino-${version}";
+  pname = "routino";
   version = "3.2";
 
   src = fetchurl {
-    url = "https://routino.org/download/${name}.tgz";
+    url = "https://routino.org/download/${pname}-${version}.tgz";
     sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972";
   };
 
diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix
index 345f26852dc..b6e53e46536 100644
--- a/pkgs/tools/misc/rw/default.nix
+++ b/pkgs/tools/misc/rw/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "rw-${version}";
+  pname = "rw";
   version = "1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix
index 2d1db4eb64c..acab41e8ff5 100644
--- a/pkgs/tools/misc/sam-ba/default.nix
+++ b/pkgs/tools/misc/sam-ba/default.nix
@@ -11,7 +11,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "2.16";
-  name = "sam-ba-${version}";
+  pname = "sam-ba";
 
   src = fetchzip {
     url = "http://www.atmel.com/dyn/resources/prod_documents/sam-ba_${version}_linux.zip";
diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix
index bd760adecf7..65b7b47256a 100644
--- a/pkgs/tools/misc/scanmem/default.nix
+++ b/pkgs/tools/misc/scanmem/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.17";
-  name = "scanmem-${version}";
+  pname = "scanmem";
 
   src = fetchFromGitHub {
     owner  = "scanmem";
diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix
index 1b7afdfbe9d..2ba3224a5f8 100644
--- a/pkgs/tools/misc/scfbuild/default.nix
+++ b/pkgs/tools/misc/scfbuild/default.nix
@@ -1,7 +1,7 @@
 { lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }:
 
 buildPythonApplication rec {
-  name = "scfbuild-${version}";
+  pname = "scfbuild";
   version = "1.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index df1fcd89ac7..beeeb84aac9 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }:
 
 stdenv.mkDerivation rec {
-  name = "screen-${version}";
+  pname = "screen";
   version = "4.6.2";
 
   src = fetchurl {
-    url = "mirror://gnu/screen/${name}.tar.gz";
+    url = "mirror://gnu/screen/${pname}-${version}.tar.gz";
     sha256 = "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v";
   };
 
diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index a9cd9d75de8..883c2edd80a 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -19,7 +19,7 @@ let
   ]));
 
 in stdenv.mkDerivation rec {
-  name = "screenFetch-${version}";
+  pname = "screenFetch";
   version = "3.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix
index 23dccc0273d..742b25601c0 100644
--- a/pkgs/tools/misc/sdate/default.nix
+++ b/pkgs/tools/misc/sdate/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, autoreconfHook }:
 stdenv.mkDerivation rec {
-  name = "sdate-${version}";
+  pname = "sdate";
   version = "0.5";
   src = fetchurl {
     url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz";
diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix
index 6a2ed3bcb91..e821d5e4332 100644
--- a/pkgs/tools/misc/sdl-jstest/default.nix
+++ b/pkgs/tools/misc/sdl-jstest/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }:
 
 stdenv.mkDerivation rec {
-  name = "sdl-jstest-${version}";
+  pname = "sdl-jstest";
   version = "2018-06-15";
 
   # Submodules
diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix
index b45304a43c4..bb7586ee379 100644
--- a/pkgs/tools/misc/sl/default.nix
+++ b/pkgs/tools/misc/sl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "sl-${version}";
+  pname = "sl";
   version = "5.04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
index 6f7c9d3506b..65031c2a1fe 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/pkgs/tools/misc/slop/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "slop-${version}";
+  pname = "slop";
   version = "7.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix
index f5e1fd7b1b4..c6661ee62e4 100644
--- a/pkgs/tools/misc/smenu/default.nix
+++ b/pkgs/tools/misc/smenu/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.15";
-  name = "smenu-${version}";
+  pname = "smenu";
 
   src = fetchFromGitHub {
     owner  = "p-gen";
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index ac0b950a1da..5eba12285de 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -4,7 +4,7 @@
 , lvm2, pam, python, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "snapper-${version}";
+  pname = "snapper";
   version = "0.8.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sonota/default.nix b/pkgs/tools/misc/sonota/default.nix
index de9366d1d0f..d111e0b2b71 100644
--- a/pkgs/tools/misc/sonota/default.nix
+++ b/pkgs/tools/misc/sonota/default.nix
@@ -12,7 +12,7 @@ let
   };
 
 in buildPythonApplication rec {
-  name = "sonota-unstable-${version}";
+  pname = "sonota-unstable";
   version = "2018-10-07";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index 794c06b8044..e4e1adf2001 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -10,7 +10,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "2.8.1";
-  name = "staruml-${version}";
+  pname = "staruml";
 
   src =
     if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix
index e5cc5ad4198..e54dc3b3f2b 100644
--- a/pkgs/tools/misc/subberthehut/default.nix
+++ b/pkgs/tools/misc/subberthehut/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }:
 stdenv.mkDerivation rec {
-  name = "subberthehut-${version}";
+  pname = "subberthehut";
   version = "20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix
index c96ac41fb26..8d42d2d823f 100644
--- a/pkgs/tools/misc/sutils/default.nix
+++ b/pkgs/tools/misc/sutils/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
    version = "0.2";
-   name = "sutils-${version}";
+   pname = "sutils";
 
    src = fetchFromGitHub {
      owner = "baskerville";
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 5502f2542f1..e7759199fb9 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -4,7 +4,7 @@
 let
   inherit (python3Packages) python nose pycrypto pyyaml requests mock;
 in stdenv.mkDerivation rec {
-  name = "svtplay-dl-${version}";
+  pname = "svtplay-dl";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix
index fd0a766f54e..0d1ebd70041 100644
--- a/pkgs/tools/misc/sweep-visualizer/default.nix
+++ b/pkgs/tools/misc/sweep-visualizer/default.nix
@@ -6,7 +6,7 @@
   libudev0-shim
 }:
   stdenv.mkDerivation rec {
-    name = "sweep-visualizer-${version}";
+    pname = "sweep-visualizer";
     version = "0.15.0";
 
     src = fetchurl {
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 6750bbe8ae6..35259dada3d 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -7,11 +7,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "system-config-printer-${version}";
+  pname = "system-config-printer";
   version = "1.5.11";
 
   src = fetchurl {
-    url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q";
   };
 
diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix
index 73e144d93aa..dd48156d456 100644
--- a/pkgs/tools/misc/systrayhelper/default.nix
+++ b/pkgs/tools/misc/systrayhelper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "systrayhelper-${version}";
+  pname = "systrayhelper";
   version = "0.0.4";
   rev = "ded1f2ed4d30f6ca2c89a13db0bd3046c6d6d0f9";
 
diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix
index 2d3eb91250a..4cac9befe16 100644
--- a/pkgs/tools/misc/teleconsole/default.nix
+++ b/pkgs/tools/misc/teleconsole/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "teleconsole-${version}";
+  pname = "teleconsole";
   version = "0.4.0";
 
   goPackagePath = "github.com/gravitational/teleconsole";
diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix
index 2d713ae3821..d875b098ab5 100644
--- a/pkgs/tools/misc/tewisay/default.nix
+++ b/pkgs/tools/misc/tewisay/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }:
 
 buildGoPackage rec {
-  name = "tewisay-unstable-${version}";
+  pname = "tewisay-unstable";
   version = "2017-04-14";
 
   goPackagePath = "github.com/lucy/tewisay";
diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix
index 47216838476..abc25db2fa7 100644
--- a/pkgs/tools/misc/texi2mdoc/default.nix
+++ b/pkgs/tools/misc/texi2mdoc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "texi2mdoc-${version}";
+  pname = "texi2mdoc";
   version = "0.1.2";
 
   src = fetchurl {
-    url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${name}.tgz";
+    url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${pname}-${version}.tgz";
     sha256 = "1zjb61ymwfkw6z5g0aqmsn6qpw895zdxv7fv3059gj3wqa3zsibs";
   };
 
diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 9b587c27154..2ca5dfb7758 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }:
 
 stdenv.mkDerivation rec {
-  name = "thin-provisioning-tools-${version}";
+  pname = "thin-provisioning-tools";
   version = "0.7.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix
index 8f297542a3c..bb6276f7065 100644
--- a/pkgs/tools/misc/time/default.nix
+++ b/pkgs/tools/misc/time/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "time-${version}";
+  pname = "time";
   version = "1.9";
 
   src = fetchurl {
-    url = "mirror://gnu/time/${name}.tar.gz";
+    url = "mirror://gnu/time/${pname}-${version}.tar.gz";
     sha256 = "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v";
   };
 
diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix
index ed26895fba6..3a8388280d6 100644
--- a/pkgs/tools/misc/tio/default.nix
+++ b/pkgs/tools/misc/tio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "tio-${version}";
+  pname = "tio";
   version = "1.32";
 
   src = fetchzip {
diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix
index fcd556c5596..d4ff9d8c844 100644
--- a/pkgs/tools/misc/tldr/default.nix
+++ b/pkgs/tools/misc/tldr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, curl, libzip, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "tldr-${version}";
+  pname = "tldr";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 6e431fdc98e..e5932d9e946 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -14,7 +14,7 @@ let
           );
 
 in stdenv.mkDerivation rec {
-  name = "tlp-${version}";
+  pname = "tlp";
   version = "1.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index c87fe8bf446..420692c070c 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -2,7 +2,7 @@
 , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }:
 
 stdenv.mkDerivation rec {
-  name = "tmate-${version}";
+  pname = "tmate";
   version = "2.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix
index 968ead6131b..fa024e58fa8 100644
--- a/pkgs/tools/misc/togglesg-download/default.nix
+++ b/pkgs/tools/misc/togglesg-download/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonApplication rec {
 
-  name = "togglesg-download-git-${version}";
+  pname = "togglesg-download-git";
   version = "2017-12-07";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix
index 2729f6f8859..abc6933a777 100644
--- a/pkgs/tools/misc/toilet/default.nix
+++ b/pkgs/tools/misc/toilet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libcaca }:
 
 stdenv.mkDerivation rec {
-  name = "toilet-${version}";
+  pname = "toilet";
   version = "0.3";
 
   src = fetchurl {
-    url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${name}.tar.gz";
+    url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${pname}-${version}.tar.gz";
     sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49";
   };
 
diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix
index 4591c5ac5b5..be0c33fb6e5 100644
--- a/pkgs/tools/misc/toybox/default.nix
+++ b/pkgs/tools/misc/toybox/default.nix
@@ -6,7 +6,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "toybox";
   version = "0.8.1";
 
diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix
index eed527da416..bfb97c22b1d 100644
--- a/pkgs/tools/misc/ttfautohint/default.nix
+++ b/pkgs/tools/misc/ttfautohint/default.nix
@@ -6,10 +6,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.8.3";
-  name = "ttfautohint-${version}";
+  pname = "ttfautohint";
 
   src = fetchurl {
-    url = "mirror://savannah/freetype/${name}.tar.gz";
+    url = "mirror://savannah/freetype/${pname}-${version}.tar.gz";
     sha256 = "0zpqgihn3yh3v51ynxwr8asqrijvs4gv686clwv7bm8sawr4kfw7";
   };
 
diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix
index 5663bcc35fd..59091bcd2bd 100644
--- a/pkgs/tools/misc/ttwatch/default.nix
+++ b/pkgs/tools/misc/ttwatch/default.nix
@@ -2,7 +2,7 @@
 , enableUnsafe ? false }:
 
 stdenv.mkDerivation rec {
-  name = "ttwatch-${version}";
+  pname = "ttwatch";
   version = "2018-12-04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix
index 113359a8bce..edaa9b662e7 100644
--- a/pkgs/tools/misc/tty-clock/default.nix
+++ b/pkgs/tools/misc/tty-clock/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "tty-clock-${version}";
+  pname = "tty-clock";
   version = "2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix
index fda9dc506e2..70856fba731 100644
--- a/pkgs/tools/misc/ttylog/default.nix
+++ b/pkgs/tools/misc/ttylog/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "ttylog-${version}";
+  pname = "ttylog";
   version = "0.31";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix
index 78aeab00a50..45aa9ea5c0b 100644
--- a/pkgs/tools/misc/ttyplot/default.nix
+++ b/pkgs/tools/misc/ttyplot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ttyplot-${version}";
+  pname = "ttyplot";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix
index ca665171811..56ec9afea43 100644
--- a/pkgs/tools/misc/ttyrec/default.nix
+++ b/pkgs/tools/misc/ttyrec/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ttyrec-${version}";
+  pname = "ttyrec";
   version = "1.0.8";
 
   src = fetchurl {
-    url = "http://0xcc.net/ttyrec/${name}.tar.gz";
+    url = "http://0xcc.net/ttyrec/${pname}-${version}.tar.gz";
     sha256 = "ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec";
   };
 
diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix
index f37892a231a..90f9559e6b7 100644
--- a/pkgs/tools/misc/txt2man/default.nix
+++ b/pkgs/tools/misc/txt2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, coreutils, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "txt2man-${version}";
+  pname = "txt2man";
   version = "1.6.0";
 
   src = fetchurl {
-    url = "https://github.com/mvertes/txt2man/archive/${name}.tar.gz";
+    url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz";
     sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn";
   };
 
diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/tools/misc/txtw/default.nix
index 90a9e0fa66f..b642fb6ec5c 100644
--- a/pkgs/tools/misc/txtw/default.nix
+++ b/pkgs/tools/misc/txtw/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4";
-  name = "txtw-${version}";
+  pname = "txtw";
 
   src = fetchFromGitHub {
     owner = "baskerville";
diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
index 195a31b63e5..d80af088342 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -7,7 +7,7 @@
 # https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed
 
 stdenv.mkDerivation rec {
-  name = "ultrastar-creator-${version}";
+  pname = "ultrastar-creator";
   version = "2019-04-23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix
index 9ac60ca8b13..2b70848cbb8 100644
--- a/pkgs/tools/misc/umlet/default.nix
+++ b/pkgs/tools/misc/umlet/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   major = "14";
   minor = "3";
   version = "${major}.${minor}.0";
-  name = "umlet-${version}";
+  pname = "umlet";
 
   src = fetchurl {
     url = "http://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip";
diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index 374e1b9eaf6..8f66f566aa7 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "units-${version}";
+  pname = "units";
   version = "2.19";
 
   src = fetchurl {
-    url = "mirror://gnu/units/${name}.tar.gz";
+    url = "mirror://gnu/units/${pname}-${version}.tar.gz";
     sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2";
   };
 
diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix
index 01b62eed56c..b3937175604 100644
--- a/pkgs/tools/misc/up/default.nix
+++ b/pkgs/tools/misc/up/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "up-${version}";
+  pname = "up";
   version = "0.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
index 7751e03df19..607cb47ed4e 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -7,7 +7,7 @@
 #   (sleep 3; exec ${pkgs.yeshup}/bin/yeshup ${pkgs.go-upower-notify}/bin/upower-notify) &
 # '';
 buildGoPackage rec {
-  name = "upower-notify-${version}";
+  pname = "upower-notify";
   version = "20160310-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
   
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 545d7c554ac..fe89e74cb69 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.10";
-  name = "urjtag-${version}";
+  pname = "urjtag";
 
   src = fetchsvn {
     url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag";
diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix
index 83b91f6203e..48bd2b140b7 100644
--- a/pkgs/tools/misc/vfdecrypt/default.nix
+++ b/pkgs/tools/misc/vfdecrypt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "vfdecrypt-${version}";
+  pname = "vfdecrypt";
   version = "unstable-2010-08-13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix
index a655aa9502e..7f81774aebe 100644
--- a/pkgs/tools/misc/vimer/default.nix
+++ b/pkgs/tools/misc/vimer/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.0";
-  name = "vimer-${version}";
+  pname = "vimer";
 
   src = fetchFromGitHub {
     owner = "susam";
diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix
index e9733c7ef79..858cbe9e317 100644
--- a/pkgs/tools/misc/vimpager/build.nix
+++ b/pkgs/tools/misc/vimpager/build.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   inherit version;
-  name = "vimpager-${version}";
+  pname = "vimpager";
 
   src = fetchFromGitHub {
     inherit sha256;
diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 4f1ca8f89ce..06280b49fbf 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -2,7 +2,7 @@
 
 with python3Packages;
 buildPythonApplication rec {
-  name = "wakatime-${version}";
+  pname = "wakatime";
   version = "10.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix
index 00e26d762a4..de3a19c3f51 100644
--- a/pkgs/tools/misc/wl-clipboard/default.nix
+++ b/pkgs/tools/misc/wl-clipboard/default.nix
@@ -2,7 +2,7 @@
 , wayland, wayland-protocols }:
 
 stdenv.mkDerivation rec {
-  name = "wl-clipboard-${version}";
+  pname = "wl-clipboard";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index 12a97a2e8e4..f25034dd8cd 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.3.0";
-  name = "woeusb-${version}";
+  pname = "woeusb";
 
   src = fetchFromGitHub {
     owner = "slacka";
diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix
index 35da2e0a4e9..fa3ab747f64 100644
--- a/pkgs/tools/misc/woof/default.nix
+++ b/pkgs/tools/misc/woof/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2012-05-31";
-  name = "woof-${version}";
+  pname = "woof";
 
   src = fetchurl {
     url = "http://www.home.unix-ag.org/simon/woof-${version}.py";
diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix
index f19d448e5fc..78affe34b58 100644
--- a/pkgs/tools/misc/wv/default.nix
+++ b/pkgs/tools/misc/wv/default.nix
@@ -4,10 +4,9 @@
 stdenv.mkDerivation rec {
   pname = "wv";
   version = "1.2.9";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
+    url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
     sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc";
   };
 
diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix
index 1029dbb29d8..ec516555273 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/pkgs/tools/misc/wyrd/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.6";
-  name = "wyrd-${version}";
+  pname = "wyrd";
 
   src = fetchurl {
     url = "http://pessimization.com/software/wyrd/wyrd-${version}.tar.gz";
diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix
index 79565af8e92..69009b86af8 100644
--- a/pkgs/tools/misc/xclip/default.nix
+++ b/pkgs/tools/misc/xclip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libXmu }:
 
 stdenv.mkDerivation rec {
-  name = "xclip-${version}";
+  pname = "xclip";
   version = "0.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 8260d7921ec..28268052826 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, xorgproto, libXt, libICE, libSM, libXext }:
 
 stdenv.mkDerivation rec {
-  name = "xdaliclock-${version}";
+  pname = "xdaliclock";
   version = "2.44";
 
   src = fetchurl {
-    url="https://www.jwz.org/xdaliclock/${name}.tar.gz";
+    url="https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz";
     sha256 = "1gsgnsm6ql0mcg9zpdkhws3g23r3a92bc3rpg4qbgbmd02nvj3c0";
   };
 
diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix
index c33e01fa0e7..f042b9e209f 100644
--- a/pkgs/tools/misc/xdo/default.nix
+++ b/pkgs/tools/misc/xdo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm }:
 
 stdenv.mkDerivation rec {
-   name = "xdo-${version}";
+   pname = "xdo";
    version = "0.5.7";
 
    src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix
index d8959687945..f3f80143c57 100644
--- a/pkgs/tools/misc/xflux/gui.nix
+++ b/pkgs/tools/misc/xflux/gui.nix
@@ -3,7 +3,7 @@
 , libappindicator-gtk2, xflux, librsvg, wrapGAppsHook
 }:
 pythonPackages.buildPythonApplication rec {
-  name = "xflux-gui-${version}";
+  pname = "xflux-gui";
   version = "1.1.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix
index f51746e312e..43a67406970 100644
--- a/pkgs/tools/misc/xiccd/default.nix
+++ b/pkgs/tools/misc/xiccd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }:
 
 stdenv.mkDerivation rec {
-  name = "xiccd-${version}";
+  pname = "xiccd";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix
index 7a092e59562..ad5086f2f59 100644
--- a/pkgs/tools/misc/xmonad-log/default.nix
+++ b/pkgs/tools/misc/xmonad-log/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "xmonad-log-${version}";
+  pname = "xmonad-log";
   version = "0.1.0";
 
   goPackagePath = "github.com/xintron/xmonad-log";
diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix
index 0ec7d58598f..cd4d709fb76 100644
--- a/pkgs/tools/misc/xsel/default.nix
+++ b/pkgs/tools/misc/xsel/default.nix
@@ -1,7 +1,7 @@
 {stdenv, lib, fetchFromGitHub, libX11, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "xsel-unstable-${version}";
+  pname = "xsel-unstable";
 
   version = "2018-01-10";
 
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 303722aac0b..d369bb4fed7 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "yle-dl-${version}";
+  pname = "yle-dl";
   version = "2.31";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index 8308d5eebcd..c20fe68b7b2 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }:
 
 stdenv.mkDerivation rec {
-  name = "yubikey-personalization-${version}";
+  pname = "yubikey-personalization";
   version = "1.20.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix
index a8b621e32ac..d2157388512 100644
--- a/pkgs/tools/misc/zabbix-cli/default.nix
+++ b/pkgs/tools/misc/zabbix-cli/default.nix
@@ -3,7 +3,7 @@ let
   pythonPackages = python2Packages;
 
 in pythonPackages.buildPythonApplication rec {
-  name = "zabbix-cli-${version}";
+  pname = "zabbix-cli";
   version = "2.1.1";
 
   propagatedBuildInputs = with pythonPackages; [ ipaddr requests ];
diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix
index 61945266e13..657d93a3ca0 100644
--- a/pkgs/tools/misc/zsh-autoenv/default.nix
+++ b/pkgs/tools/misc/zsh-autoenv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "zsh-autoenv-${version}";
+  pname = "zsh-autoenv";
   version = "2017-12-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix
index 108071edb64..be64ff47e6b 100644
--- a/pkgs/tools/misc/zsh-navigation-tools/default.nix
+++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "zsh-navigation-tools-${version}";
+  pname = "zsh-navigation-tools";
   version = "2.2.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix
index 1e10529082f..60b3b6df69a 100644
--- a/pkgs/tools/networking/acme-client/default.nix
+++ b/pkgs/tools/networking/acme-client/default.nix
@@ -11,7 +11,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "acme-client-${version}";
+  pname = "acme-client";
   version = "0.1.16";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix
index dccab1796fb..08db7b4f58d 100644
--- a/pkgs/tools/networking/argus-clients/default.nix
+++ b/pkgs/tools/networking/argus-clients/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "argus-clients";
   version = "3.0.8.2";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://qosient.com/argus/src/${name}.tar.gz";
+    url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz";
     sha256 = "1c9vj6ma00gqq9h92fg71sxcsjzz912166sdg90ahvnmvmh3l1rj";
   };
 
diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix
index 8b9d1e3b704..72c0a78a447 100644
--- a/pkgs/tools/networking/argus/default.nix
+++ b/pkgs/tools/networking/argus/default.nix
@@ -4,10 +4,9 @@
 stdenv.mkDerivation rec {
   pname = "argus";
   version = "3.0.8.2";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://qosient.com/argus/src/${name}.tar.gz";
+    url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz";
     sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna";
   };
 
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 8d9ec928811..e086105e19e 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aria2-${version}";
+  pname = "aria2";
   version = "1.34.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix
index 4358d22142d..2d68affacc1 100644
--- a/pkgs/tools/networking/arping/default.nix
+++ b/pkgs/tools/networking/arping/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.19";
-  name = "arping-${version}";
+  pname = "arping";
 
   buildInputs = [ libnet libpcap ];
 
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index 7904ffb0d04..bfb1abaeaf2 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }:
 
 buildGoPackage rec {
-  name = "assh-${version}";
+  pname = "assh";
   version = "2.7.0";
 
   goPackagePath = "github.com/moul/advanced-ssh-config";
diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix
index de8bcc8e7ff..4d069a7e6d7 100644
--- a/pkgs/tools/networking/asynk/default.nix
+++ b/pkgs/tools/networking/asynk/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
-  name = "ASynK-${version}";
+  pname = "ASynK";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz";
     sha256 = "1bp30437mnls0kzm0525p3bg5nw9alpqrqhw186f6zp9i4y5znp1";
   };
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index e6d5abc1761..7fcd677044f 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }:
 
 stdenv.mkDerivation rec {
-  name = "atftp-${version}";
+  pname = "atftp";
   version = "0.7.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/atftp/${name}.tar.gz";
+    url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz";
     sha256 = "0hah3fhzl6vfs381883vbvf4d13cdhsyf0x7ncbl55wz9rkq1l0s";
   };
 
diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix
index 93a98a10daa..7cd7254518a 100644
--- a/pkgs/tools/networking/biosdevname/default.nix
+++ b/pkgs/tools/networking/biosdevname/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, zlib, pciutils }:
 
 stdenv.mkDerivation rec {
-  name = "biosdevname-${version}";
+  pname = "biosdevname";
   version = "0.7.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index 386642614bc..2c5e1a2f8f4 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchgit, python, gyp, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "bud-${version}";
+  pname = "bud";
 
   version = "0.34.1";
 
diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix
index 81dd294d786..46bac3d5b5b 100644
--- a/pkgs/tools/networking/bully/default.nix
+++ b/pkgs/tools/networking/bully/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "bully-${version}";
+  pname = "bully";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index 6fac4a282d0..2c78b20138a 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "6.1.8";
   seafileVersion = "6.1.8";
-  name = "ccnet-${version}";
+  pname = "ccnet";
 
   src = fetchurl {
     url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 33f004190e4..740c6c998fe 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -4,12 +4,12 @@
 assert stdenv.isLinux -> libcap != null;
 
 stdenv.mkDerivation rec {
-  name = "chrony-${version}";
+  pname = "chrony";
 
   version = "3.5";
 
   src = fetchurl {
-    url = "https://download.tuxfamily.org/chrony/${name}.tar.gz";
+    url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";
     sha256 = "1d9r2dhslll4kzdmxrj0qfgwq1b30d4l3s5cwr8yr93029dpj0jf";
   };
 
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index cc88153bab9..63aec7cfb92 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, qmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "cmst-${version}";
+  pname = "cmst";
   version = "2019.01.13";
 
   src = fetchFromGitHub {
     repo = "cmst";
     owner = "andrew-bibb";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "13739f0ddld34dcqlfhylzn1zqz5a7jbp4a4id7gj7pcxjx1lafh";
   };
 
diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix
index 6267e3a7790..9b8a1f0e790 100644
--- a/pkgs/tools/networking/cntlm/default.nix
+++ b/pkgs/tools/networking/cntlm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, which}:
 
 stdenv.mkDerivation rec {
-  name = "cntlm-${version}";
+  pname = "cntlm";
   version = "0.92.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cntlm/${name}.tar.gz";
+    url = "mirror://sourceforge/cntlm/${pname}-${version}.tar.gz";
     sha256 = "1632szz849wasvh5sm6rm1zbvbrkq35k7kcyvx474gyl4h4x2flw";
   };
 
diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix
index 3d63340adb0..17923081dfd 100644
--- a/pkgs/tools/networking/connect/default.nix
+++ b/pkgs/tools/networking/connect/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "connect-${version}";
+  pname = "connect";
   version ="1.105";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix
index d5688354a76..a3c774a62b1 100644
--- a/pkgs/tools/networking/connman/connman-gtk/default.nix
+++ b/pkgs/tools/networking/connman/connman-gtk/default.nix
@@ -2,7 +2,7 @@
 gtk3, connman, openconnect, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "connman-gtk-${version}";
+  pname = "connman-gtk";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix
index 8c4d4fa8486..dd636173cb7 100644
--- a/pkgs/tools/networking/connman/connman-ncurses/default.nix
+++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }:
 
 stdenv.mkDerivation rec {
-  name = "connman-ncurses-${version}";
+  pname = "connman-ncurses";
   version = "2015-07-21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix
index 42b0c37411c..3b30935d6cf 100644
--- a/pkgs/tools/networking/connman/connman-notify/default.nix
+++ b/pkgs/tools/networking/connman/connman-notify/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "connman-notify-${version}";
+  pname = "connman-notify";
   version = "2014-06-23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix
index c39c82df634..0d91dabaaeb 100644
--- a/pkgs/tools/networking/connman/connman_dmenu/default.nix
+++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, connman, dmenu }:
 
 stdenv.mkDerivation rec {
-  name = "connman_dmenu-${version}";
+  pname = "connman_dmenu";
   version = "git-29-9-2015";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix
index 7c42cc965a0..17e8551fdda 100644
--- a/pkgs/tools/networking/connman/connmanui/default.nix
+++ b/pkgs/tools/networking/connman/connmanui/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }:
 
 stdenv.mkDerivation rec {
-  name = "connmanui-${version}";
+  pname = "connmanui";
   rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516";
   version = "22062015-${rev}";
 
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index a4e8c17a545..56b0347e17f 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -3,10 +3,10 @@
   wpa_supplicant, readline6, pptp, ppp }:
 
 stdenv.mkDerivation rec {
-  name = "connman-${version}";
+  pname = "connman";
   version = "1.37";
   src = fetchurl {
-    url = "mirror://kernel/linux/network/connman/${name}.tar.xz";
+    url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
     sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc";
   };
 
diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix
index 4ec23862522..6509c9c3106 100644
--- a/pkgs/tools/networking/darkstat/default.nix
+++ b/pkgs/tools/networking/darkstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.719";
-  name = "darkstat-${version}";
+  pname = "darkstat";
 
   src = fetchurl {
-    url = "${meta.homepage}/${name}.tar.bz2";
+    url = "${meta.homepage}/${pname}-${version}.tar.bz2";
     sha256 = "1mzddlim6dhd7jhr4smh0n2fa511nvyjhlx76b03vx7phnar1bxf";
   };
 
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index 4b16eb406e3..ff4d0d64c20 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.4";
-  name = "davix-${version}";
+  pname = "davix";
   nativeBuildInputs = [ cmake pkgconfig python3 ];
   buildInputs = [ openssl libxml2 boost libuuid ];
 
diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix
index 02bdb3e2a46..98902e9809b 100644
--- a/pkgs/tools/networking/dd-agent/5.nix
+++ b/pkgs/tools/networking/dd-agent/5.nix
@@ -40,7 +40,7 @@ let
 
 in stdenv.mkDerivation rec {
   version = "5.11.2";
-  name = "dd-agent-${version}";
+  pname = "dd-agent";
 
   src = fetchFromGitHub {
     owner  = "datadog";
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index d2ae24c8a71..32fbed7eb9f 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -6,7 +6,7 @@ let
   python = pythonPackages.python;
 
 in buildGoPackage rec {
-  name = "datadog-agent-${version}";
+  pname = "datadog-agent";
   version = "6.11.2";
   owner   = "DataDog";
   repo    = "datadog-agent";
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
index 25ce4bcd68e..340bf4d863c 100644
--- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage  }:
 
 buildGoPackage rec {
-  name = "datadog-process-agent-${version}";
+  pname = "datadog-process-agent";
   version = "6.11.1";
   owner   = "DataDog";
   repo    = "datadog-process-agent";
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 6987bc553a5..24e23e6e0d3 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dhcp-${version}";
+  pname = "dhcp";
   version = "4.4.1";
 
   src = fetchurl {
-    url = "https://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
+    url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz";
     sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia";
   };
 
diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix
index d557c0ab9ad..a6cb05b3865 100644
--- a/pkgs/tools/networking/dhcping/default.nix
+++ b/pkgs/tools/networking/dhcping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dhcping-${version}";
+  pname = "dhcping";
   version = "1.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix
index fd306a0bcca..43c9455712d 100644
--- a/pkgs/tools/networking/dibbler/default.nix
+++ b/pkgs/tools/networking/dibbler/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dibbler-${version}";
+  pname = "dibbler";
   version = "1.0.1";
 
   src = fetchurl {
-    url = "http://www.klub.com.pl/dhcpv6/dibbler/${name}.tar.gz";
+    url = "http://www.klub.com.pl/dhcpv6/dibbler/${pname}-${version}.tar.gz";
     sha256 = "18bnwkvax02scjdg5z8gvrkvy1lhssfnlpsaqb5kkh30w1vri1i7";
   };
 
diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix
index d4837d28c82..fe845f3cae8 100644
--- a/pkgs/tools/networking/dirb/default.nix
+++ b/pkgs/tools/networking/dirb/default.nix
@@ -4,7 +4,7 @@ let
   major = "2";
   minor = "22";
 in stdenv.mkDerivation rec {
-  name = "dirb-${version}";
+  pname = "dirb";
   version = "${major}.${minor}";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
index c0b2c795a40..fc4e40929c9 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "dnscrypt-proxy-${version}";
+  pname = "dnscrypt-proxy";
   version = "1.9.5";
 
   src = fetchurl {
-    url = "https://launchpad.net/ubuntu/+archive/primary/+files/${name}.orig.tar.gz";
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}-${version}.orig.tar.gz";
     sha256 = "1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8";
   };
 
diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index a43900ea4a5..94d52b953d4 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libsodium, libevent }:
 
 stdenv.mkDerivation rec {
-  name = "dnscrypt-wrapper-${version}";
+  pname = "dnscrypt-wrapper";
   version = "0.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix
index ed46b49d8c7..63e19e924fc 100644
--- a/pkgs/tools/networking/dnsperf/default.nix
+++ b/pkgs/tools/networking/dnsperf/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dnsperf-${version}";
+  pname = "dnsperf";
   version = "2.3.1";
 
   # The same as the initial commit of the new GitHub repo (only readme changed).
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index fd932617c93..566579555d3 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -5,7 +5,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "driftnet-${version}";
+  pname = "driftnet";
   version = "1.1.5";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index 12d9da87b39..f5dfff62a96 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, tcl }:
 
 stdenv.mkDerivation rec {
-  name = "eggdrop-${version}";
+  pname = "eggdrop";
   version = "1.6.21-nix1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix
index 83af542b8ad..2800139f8fa 100644
--- a/pkgs/tools/networking/envoy/default.nix
+++ b/pkgs/tools/networking/envoy/default.nix
@@ -215,7 +215,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "envoy-${version}";
+  pname = "envoy";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 607b11aaffb..ffd7d25a0dc 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, ninja, gflags, libsodium, protobuf }:
 
 stdenv.mkDerivation rec {
-  name = "eternal-terminal-${version}";
+  pname = "eternal-terminal";
   version = "5.1.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix
index 9737108e6ac..d5190331d33 100644
--- a/pkgs/tools/networking/fakeroute/default.nix
+++ b/pkgs/tools/networking/fakeroute/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fakeroute-${version}";
+  pname = "fakeroute";
   version = "0.3";
 
   src = fetchurl {
-    url = "https://moxie.org/software/fakeroute/${name}.tar.gz";
+    url = "https://moxie.org/software/fakeroute/${pname}-${version}.tar.gz";
     sha256 = "1sp342rxgm1gz4mvi5vvz1knz7kn9px9s39ii3jdjp4ks7lr5c8f";
   };
 
diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix
index ef356935c56..43efe2090f2 100644
--- a/pkgs/tools/networking/fastd/default.nix
+++ b/pkgs/tools/networking/fastd/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "18";
-  name = "fastd-${version}";
+  pname = "fastd";
 
   src = fetchgit {
     url = "git://git.universe-factory.net/fastd";
diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix
index a0b298f3f4e..2cf111e8ccf 100644
--- a/pkgs/tools/networking/ferm/default.nix
+++ b/pkgs/tools/networking/ferm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.4.1";
-  name = "ferm-${version}";
+  pname = "ferm";
 
   src = fetchurl {
     url = "http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.xz";
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index 259225e0b7c..f16fcc7048c 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "flannel-${version}";
+  pname = "flannel";
   version = "0.11.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix
index 3f89323de36..4ac979cc4a6 100644
--- a/pkgs/tools/networking/freebind/default.nix
+++ b/pkgs/tools/networking/freebind/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libnetfilter_queue, libnfnetlink }:
 
 stdenv.mkDerivation rec {
-  name = "freebind-${version}";
+  pname = "freebind";
   version = "2017-12-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
index e94c3e4330f..aab5b77351c 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   version = "1.9.1";
-  name = "gmvault-${version}";
+  pname = "gmvault";
 
   src = fetchurl {
     url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz";
-    name = "${name}.tar.bz";
+    name = "${pname}-${version}.tar.bz";
     sha256 = "0ffp8df3gdf6lf3pj75hzsmxmvmscppb6bjda58my1n4ppxp1rji";
   };
 
diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix
index 88a6b74686c..c260b47a633 100644
--- a/pkgs/tools/networking/goklp/default.nix
+++ b/pkgs/tools/networking/goklp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "goklp-${version}";
+  pname = "goklp";
   version = "1.6";
 
   goPackagePath = "github.com/AppliedTrust/goklp";
diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix
index 10100b933d4..12f285c2a60 100644
--- a/pkgs/tools/networking/grpcurl/default.nix
+++ b/pkgs/tools/networking/grpcurl/default.nix
@@ -3,7 +3,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "grpcurl-${version}";
+  pname = "grpcurl";
   version = "1.0.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix
index bcc68a2a19f..ba59870a6b8 100644
--- a/pkgs/tools/networking/gvpe/default.nix
+++ b/pkgs/tools/networking/gvpe/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }:
 
 stdenv.mkDerivation rec {
-  name = "gvpe-${version}";
+  pname = "gvpe";
   version = "3.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix
index 6fd4ab36163..ccc598b0692 100644
--- a/pkgs/tools/networking/hans/default.nix
+++ b/pkgs/tools/networking/hans/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, nettools }:
 
 stdenv.mkDerivation rec {
-  name = "hans-${version}";
+  pname = "hans";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 62ac791252d..d8711d516dc 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -10,10 +10,9 @@ assert usePcre -> pcre != null;
 stdenv.mkDerivation rec {
   pname = "haproxy";
   version = "1.9.8";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";
+    url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
     sha256 = "1via9k84ycrdr8qh4qchcbqgpv0gynm3ra23nwsvqwfqvc0376id";
   };
 
diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix
index ba76c37a4bb..96fb342e27f 100644
--- a/pkgs/tools/networking/horst/default.nix
+++ b/pkgs/tools/networking/horst/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, pkgconfig, ncurses, libnl }:
 
 stdenv.mkDerivation rec {
-  name = "horst-${version}";
+  pname = "horst";
   version = "5.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix
index 3fdebbf4966..6e00a6e9afa 100644
--- a/pkgs/tools/networking/hping/default.nix
+++ b/pkgs/tools/networking/hping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpcap, tcl }:
 
 stdenv.mkDerivation rec {
-  name = "hping-${version}";
+  pname = "hping";
   version = "20051105";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix
index a4c6e517a75..4a350d237d0 100644
--- a/pkgs/tools/networking/htpdate/default.nix
+++ b/pkgs/tools/networking/htpdate/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.1";
-  name = "htpdate-${version}";
+  pname = "htpdate";
 
   src = fetchurl {
-    url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz";
+    url = "http://www.vervest.org/htp/archive/c/${pname}-${version}.tar.xz";
     sha256 = "1gqw3lg4wwkn8snf4pf21s3qidhb4h791f2ci7i7i0d6kd86jv0q";
   };
 
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index 78dc52905d8..5200a751be4 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -3,7 +3,6 @@
 pythonPackages.buildPythonApplication rec {
   pname = "http-prompt";
   version = "1.0.0";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     rev = "v${version}";
diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix
index fa8bbb91c5b..271be9c2352 100644
--- a/pkgs/tools/networking/httperf/default.nix
+++ b/pkgs/tools/networking/httperf/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "httperf";
-  name = "${pname}-${version}";
   version = "0.9.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix
index abde3f2a380..05d4f180ef7 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -2,11 +2,11 @@
 , fftw ? null }:
 
 stdenv.mkDerivation rec {
-  name = "httping-${version}";
+  pname = "httping";
   version = "2.5";
 
   src = fetchurl {
-    url = "https://vanheusden.com/httping/${name}.tgz";
+    url = "https://vanheusden.com/httping/${pname}-${version}.tgz";
     sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y";
   };
 
diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix
index 8ec0ce2847d..a7b157d3ebc 100644
--- a/pkgs/tools/networking/httplab/default.nix
+++ b/pkgs/tools/networking/httplab/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "httplab-${version}";
+  pname = "httplab";
   version = "0.3.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix
index 5a29657bd5b..1649ebfb3ce 100644
--- a/pkgs/tools/networking/httpstat/default.nix
+++ b/pkgs/tools/networking/httpstat/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
-    name = "${pname}-${version}";
     pname = "httpstat";
     version = "1.2.1";
     src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix
index c47dd03cb9d..df62f90ad0b 100644
--- a/pkgs/tools/networking/httptunnel/default.nix
+++ b/pkgs/tools/networking/httptunnel/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.3";
-  name    = "httptunnel-${version}";
+  pname = "httptunnel";
 
   src = fetchurl {
-    url    = "http://www.nocrew.org/software/httptunnel/${name}.tar.gz";
+    url    = "http://www.nocrew.org/software/httptunnel/${pname}-${version}.tar.gz";
     sha256 = "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql";
   };
 
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 7d709df75b6..0b0860126b5 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,7 +1,7 @@
 { stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
 let wrapper = stdenv.mkDerivation rec {
-  name = "wrapper-${version}";
+  pname = "wrapper";
   version = "3.5.35";
   src = fetchurl {
     url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 050f1c9cd4a..97dbb1bdb8f 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -8,8 +8,6 @@
 assert upnpSupport -> miniupnpc != null;
 
 stdenv.mkDerivation rec {
-
-  name = pname + "-" + version;
   pname = "i2pd";
   version = "2.26.0";
 
diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix
index 8b7f4e1c2a0..756e77f1157 100644
--- a/pkgs/tools/networking/ifstat-legacy/default.nix
+++ b/pkgs/tools/networking/ifstat-legacy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, net_snmp }:
 
 stdenv.mkDerivation rec {
-  name = "ifstat-legacy-${version}";
+  pname = "ifstat-legacy";
   version = "1.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 47352d21c4a..20169121cd9 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -2,7 +2,7 @@
 , gnutls, libite, libconfuse }:
 
 stdenv.mkDerivation rec {
-  name = "inadyn-${version}";
+  pname = "inadyn";
   version = "2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/iouyap/default.nix b/pkgs/tools/networking/iouyap/default.nix
index c37b409cdfb..b49b34d6dc7 100644
--- a/pkgs/tools/networking/iouyap/default.nix
+++ b/pkgs/tools/networking/iouyap/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "iouyap";
   version = "0.97";
 
diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix
index 3c2e7f53bee..c3304c385e7 100644
--- a/pkgs/tools/networking/ip2location/default.nix
+++ b/pkgs/tools/networking/ip2location/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ip2location-${version}";
+  pname = "ip2location";
   version = "7.0.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix
index 549461fe5d0..ab09399cd8e 100644
--- a/pkgs/tools/networking/ip2unix/default.nix
+++ b/pkgs/tools/networking/ip2unix/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ip2unix-${version}";
+  pname = "ip2unix";
   version = "2.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix
index 26c8d89b5d4..2727175f041 100644
--- a/pkgs/tools/networking/ipcalc/default.nix
+++ b/pkgs/tools/networking/ipcalc/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, perl}:
 stdenv.mkDerivation rec {
-  name = "ipcalc-${version}";
+  pname = "ipcalc";
   version = "0.41";
   src = fetchurl {
-    url = "http://jodies.de/ipcalc-archive/${name}.tar.gz";
+    url = "http://jodies.de/ipcalc-archive/${pname}-${version}.tar.gz";
     sha256 = "dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a";
   };
   buildInputs = [perl];
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index 9b4edd76305..169fea6c447 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -2,11 +2,11 @@
 , geoip ? null, geolite-legacy ? null }:
 
 stdenv.mkDerivation rec {
-  name = "ipv6calc-${version}";
+  pname = "ipv6calc";
   version = "1.1.0";
 
   src = fetchurl {
-    url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
+    url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz";
     sha256 = "1q74ikg780v5hllbq08wdfvxr2lf0fc7i41hclqrh1ajc6dqybbq";
   };
 
diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix
index 7877200116d..931cfa3a74d 100644
--- a/pkgs/tools/networking/kail/default.nix
+++ b/pkgs/tools/networking/kail/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "kail-${version}";
+  pname = "kail";
   version = "0.8.0";
 
   goPackagePath = "github.com/boz/kail";
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index a1c156475fb..17a0e32efbd 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -2,12 +2,11 @@
 , boost, python3, postgresql, mysql, gmp, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "kea";
   version = "1.5.0";
 
   src = fetchurl {
-    url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz";
+    url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
     sha256 = "1v5a3prgrplw6dp9124f9gpy0kz0jrjwhnvzrw3zcynad2mlzkpd";
   };
 
diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 43d0944a415..9ae981e0369 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "keepalived-${version}";
+  pname = "keepalived";
   version = "1.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index b4886f58cbb..13bdbe17ff8 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-${version}";
+  pname = "lftp";
   version = "4.8.4";
 
   src = fetchurl {
     urls = [
-      "https://lftp.tech/ftp/${name}.tar.xz"
-      "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz"
-      "https://lftp.yar.ru/ftp/${name}.tar.xz"
+      "https://lftp.tech/ftp/${pname}-${version}.tar.xz"
+      "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz"
+      "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz"
       ];
     sha256 = "0qks22357xv9y6ripmf5j2n5svh8j5z0yniphfk89sjwkqg2gg2f";
   };
diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index a8e4f2dc83f..b8ba1357f5f 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lldpd-${version}";
+  pname = "lldpd";
   version = "1.0.4";
 
   src = fetchurl {
-    url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz";
+    url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
     sha256 = "0kvj49y6slnldi9dha81nzxvpwd7d8kq1qlibn6h1wdb5w1vq6ak";
   };
 
diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix
index c5c7e18ba6d..52b2a9a94dc 100644
--- a/pkgs/tools/networking/logmein-hamachi/default.nix
+++ b/pkgs/tools/networking/logmein-hamachi/default.nix
@@ -15,11 +15,11 @@ let
   libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
 
 in stdenv.mkDerivation rec {
-  name = "logmein-hamachi-${version}";
+  pname = "logmein-hamachi";
   version = "2.1.0.198";
 
   src = fetchurl {
-    url = "https://www.vpn.net/installers/${name}-${arch}.tgz";
+    url = "https://www.vpn.net/installers/${pname}-${version}-${arch}.tgz";
     inherit sha256;
   };
 
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix
index a7648fd59c3..32f6b11d77c 100644
--- a/pkgs/tools/networking/maxscale/default.nix
+++ b/pkgs/tools/networking/maxscale/default.nix
@@ -5,13 +5,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "maxscale-${version}";
+  pname = "maxscale";
   version = "2.1.17";
 
   src = fetchFromGitHub {
     owner = "mariadb-corporation";
     repo = "MaxScale";
-    rev = "${name}";
+    rev = "${pname}-${version}";
     sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6";
   };
 
diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix
index 38b2aa531e6..e902f24ca0e 100644
--- a/pkgs/tools/networking/mcrcon/default.nix
+++ b/pkgs/tools/networking/mcrcon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "mcrcon-${version}";
+  pname = "mcrcon";
   version = "0.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index c995eea7b14..5a6fb5e5104 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -2,7 +2,7 @@
 , asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "megatools-${version}";
+  pname = "megatools";
   version = "1.10.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix
index ae8d3d96483..6d29ac29701 100644
--- a/pkgs/tools/networking/memtier-benchmark/default.nix
+++ b/pkgs/tools/networking/memtier-benchmark/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "memtier-benchmark-${version}";
+  pname = "memtier-benchmark";
   version = "1.2.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 3a3ca03f18a..ebd6e7c5799 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "minio-client-${version}";
+  pname = "minio-client";
 
   version = "2019-01-30T19-57-22Z";
 
diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix
index 9809b330fab..1277a17f9ba 100644
--- a/pkgs/tools/networking/minissdpd/default.nix
+++ b/pkgs/tools/networking/minissdpd/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libnfnetlink }:
 
 stdenv.mkDerivation rec {
-  name = "minissdpd-${version}";
+  pname = "minissdpd";
   version = "1.5.20180223";
 
   src = fetchurl {
     sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv";
-    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    name = "${name}.tar.gz";
+    url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
   };
 
   buildInputs = [ libnfnetlink ];
diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix
index babfcf1db21..26f6c2498e1 100644
--- a/pkgs/tools/networking/miredo/default.nix
+++ b/pkgs/tools/networking/miredo/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.6";
-  name = "miredo-${version}";
+  pname = "miredo";
 
   buildInputs = [ judy ];
 
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 75462659699..bd035e8f03c 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -4,7 +4,7 @@
 , withMug ? false }:
 
 stdenv.mkDerivation rec {
-  name = "mu-${version}";
+  pname = "mu";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix
index a352596eed0..a4dcfb4a40f 100644
--- a/pkgs/tools/networking/nat-traverse/default.nix
+++ b/pkgs/tools/networking/nat-traverse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "nat-traverse-${version}";
+  pname = "nat-traverse";
   version = "0.7";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix
index 90ac44aa375..acd9a0e27f8 100644
--- a/pkgs/tools/networking/ncftp/default.nix
+++ b/pkgs/tools/networking/ncftp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "ncftp-${version}";
+  pname = "ncftp";
   version = "3.2.6";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix
index 255d430a3a5..77f797fc7c7 100644
--- a/pkgs/tools/networking/ndjbdns/default.nix
+++ b/pkgs/tools/networking/ndjbdns/default.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "1.06";
-  name = "ndjbdns-${version}";
+  pname = "ndjbdns";
 
   src = fetchFromGitHub {
     owner = "pjps";
diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix
index 8f8cf929e9d..940a37ab86f 100644
--- a/pkgs/tools/networking/netalyzr/default.nix
+++ b/pkgs/tools/networking/netalyzr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "netalyzr-${version}";
+  pname = "netalyzr";
   version = "57861";
 
   # unfortunately there is not a version specific download URL
diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix
index eac95a32008..a85d4d7ad10 100644
--- a/pkgs/tools/networking/nethogs/default.nix
+++ b/pkgs/tools/networking/nethogs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "nethogs-${version}";
+  pname = "nethogs";
   version = "0.8.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix
index e9704c4babe..864838bdd39 100644
--- a/pkgs/tools/networking/netmask/default.nix
+++ b/pkgs/tools/networking/netmask/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "netmask-${version}";
+  pname = "netmask";
   version = "2.4.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix
index d10125e09a6..dfd355237dc 100644
--- a/pkgs/tools/networking/netrw/default.nix
+++ b/pkgs/tools/networking/netrw/default.nix
@@ -8,7 +8,7 @@ assert checksumType == "mhash" -> libmhash != null;
 assert checksumType == "openssl" -> openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "netrw-${version}";
+  pname = "netrw";
   version = "1.3.2";
 
   configureFlags = [
diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix
index 702fee86922..c40f43c214f 100644
--- a/pkgs/tools/networking/netselect/default.nix
+++ b/pkgs/tools/networking/netselect/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "netselect-${version}";
+  pname = "netselect";
   version = "0.4";
 
   src = fetchFromGitHub {
     owner = "apenwarr";
     repo = "netselect";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1zncyvjzllrjbdvz7c50d1xjyhs9mwqfy92ndpfc5b3mxqslw4kx";
   };
 
diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix
index c5613341aab..131ec675115 100644
--- a/pkgs/tools/networking/network-manager/0.9.8/default.nix
+++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix
@@ -3,7 +3,7 @@
 , libgcrypt, perl, libgudev, avahi, ppp, kmod }:
 
 stdenv.mkDerivation rec {
-  name = "network-manager-${version}";
+  pname = "network-manager";
   version = "0.9.8.10";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index c0e29c6538b..28ba97d70c5 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -10,7 +10,7 @@ let
   pname = "NetworkManager";
   pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
 in stdenv.mkDerivation rec {
-  name = "network-manager-${version}";
+  pname = "network-manager";
   version = "1.18.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu.nix
index 665db4cc287..93a169a3fb0 100644
--- a/pkgs/tools/networking/network-manager/dmenu.nix
+++ b/pkgs/tools/networking/network-manager/dmenu.nix
@@ -3,7 +3,7 @@
 
 let inherit (python3Packages) python pygobject3;
 in stdenv.mkDerivation rec {
-  name = "networkmanager_dmenu-${version}";
+  pname = "networkmanager_dmenu";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index 6b69b97552a..60c344e8eb4 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -2,12 +2,11 @@
 , gtk3, gnome3, libsecret }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "NetworkManager-strongswan";
   version = "1.4.5";
 
   src = fetchurl {
-    url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2";
+    url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2";
     sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl";
   };
 
diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix
index 9cddc5bbd87..ab8da6236cf 100644
--- a/pkgs/tools/networking/ngrep/default.nix
+++ b/pkgs/tools/networking/ngrep/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "ngrep-${version}";
+  pname = "ngrep";
   version = "1.47";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix
index d0aec7889ef..463227741fb 100644
--- a/pkgs/tools/networking/ngrok-1/default.nix
+++ b/pkgs/tools/networking/ngrok-1/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, go-bindata, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "ngrok-${version}";
+  pname = "ngrok";
   version = "1.7.1";
   rev = "${version}";
 
diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index b199d850f97..dc921dc495a 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nss-pam-ldapd-${version}";
+  pname = "nss-pam-ldapd";
   version = "0.9.10";
 
   src = fetchurl {
-    url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz";
+    url = "https://arthurdejong.org/nss-pam-ldapd/${pname}-${version}.tar.gz";
     sha256 = "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0";
   };
 
diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix
index 2ed9c330181..f01d5ccada1 100644
--- a/pkgs/tools/networking/nuttcp/default.nix
+++ b/pkgs/tools/networking/nuttcp/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nuttcp-${version}";
+  pname = "nuttcp";
   version = "8.1.4";
 
   src = fetchurl {
     urls = [
-      "http://nuttcp.net/nuttcp/latest/${name}.c"
-      "http://nuttcp.net/nuttcp/${name}/${name}.c"
-      "http://nuttcp.net/nuttcp/beta/${name}.c"
+      "http://nuttcp.net/nuttcp/latest/${pname}-${version}.c"
+      "http://nuttcp.net/nuttcp/${pname}-${version}/${pname}-${version}.c"
+      "http://nuttcp.net/nuttcp/beta/${pname}-${version}.c"
     ];
     sha256 = "1mygfhwxfi6xg0iycivx98ckak2abc3vwndq74278kpd8g0yyqyh";
   };
 
   man = fetchurl {
-    url = "http://nuttcp.net/nuttcp/${name}/nuttcp.8";
+    url = "http://nuttcp.net/nuttcp/${pname}-${version}/nuttcp.8";
     sha256 = "1yang94mcdqg362qbi85b63746hk6gczxrk619hyj91v5763n4vx";
   };
 
diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index af7c4401dae..b3c77f5b797 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -2,7 +2,7 @@
 , gnutls, libgcrypt, zlib, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "nzbget-${version}";
+  pname = "nzbget";
   version = "21.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/tools/networking/ocproxy/default.nix
index c93e94e2f28..729f5b31998 100644
--- a/pkgs/tools/networking/ocproxy/default.nix
+++ b/pkgs/tools/networking/ocproxy/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.60";
-  name = "ocproxy-${version}";
+  pname = "ocproxy";
 
   src = fetchFromGitHub {
     owner = "cernekee";
diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix
index 094bebe628f..e695c460422 100644
--- a/pkgs/tools/networking/ocserv/default.nix
+++ b/pkgs/tools/networking/ocserv/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ocserv-${version}";
+  pname = "ocserv";
   version = "0.12.4";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix
index 8fa30a5c221..cff4b7e9713 100644
--- a/pkgs/tools/networking/olsrd/default.nix
+++ b/pkgs/tools/networking/olsrd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "olsrd-${version}";
+  pname = "olsrd";
   version = "0.9.6.1";
 
   src = fetchurl {
-    url = "http://www.olsr.org/releases/0.9/${name}.tar.bz2";
+    url = "http://www.olsr.org/releases/0.9/${pname}-${version}.tar.bz2";
     sha256 = "9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612";
   };
 
diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix
index d261e571705..ba8fc6694d1 100644
--- a/pkgs/tools/networking/openconnect_pa/default.nix
+++ b/pkgs/tools/networking/openconnect_pa/default.nix
@@ -4,7 +4,7 @@ assert (openssl != null) == (gnutls == null);
 
 stdenv.mkDerivation rec {
   version = "unstable-2018-10-08";
-  name = "openconnect_pa-${version}";
+  pname = "openconnect_pa";
   
   outputs = [ "out" "dev" ];
 
diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix
index 019806fcd57..9ef8c75b728 100644
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "openntpd-${version}";
+  pname = "openntpd";
   version = "6.2p3";
 
   src = fetchurl {
-    url = "mirror://openbsd/OpenNTPD/${name}.tar.gz";
+    url = "mirror://openbsd/OpenNTPD/${pname}-${version}.tar.gz";
     sha256 = "0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv";
   };
 
diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index 302e08617af..73cb98060a0 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "openresolv-${version}";
+  pname = "openresolv";
   version = "3.9.1";
 
   src = fetchurl {
-    url = "mirror://roy/openresolv/${name}.tar.xz";
+    url = "mirror://roy/openresolv/${pname}-${version}.tar.xz";
     sha256 = "1wlzi88837rf4ygswmzpbcmgkbbjhn5n322n9q6ir6x367hygf1q";
   };
 
diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix
index d52cc9d8def..592c24b81fd 100644
--- a/pkgs/tools/networking/opensm/default.nix
+++ b/pkgs/tools/networking/opensm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }:
 
 stdenv.mkDerivation rec {
-  name = "opensm-${version}";
+  pname = "opensm";
   version = "3.3.22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 24adb554bc1..bb51e3153e1 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -21,7 +21,7 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssh-${version}";
+  pname = "openssh";
   version = if hpnSupport then "7.8p1" else "7.9p1";
 
   src = if hpnSupport then
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       }
     else
       fetchurl {
-        url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
+        url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
         sha256 = "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb";
       };
 
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 732687ecfa1..c8aa2c1f5c5 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -18,11 +18,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "openvpn-${version}";
+  pname = "openvpn";
   version = "2.4.7";
 
   src = fetchurl {
-    url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz";
+    url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz";
     sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4";
   };
 
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 8c043294143..a5305acdf59 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -7,7 +7,7 @@
 
 pythonPackages.buildPythonApplication rec {
   version = "1.13.0";
-  name = "tahoe-lafs-${version}";
+  pname = "tahoe-lafs";
   namePrefix = "";
 
   src = fetchurl {
@@ -65,8 +65,8 @@ pythonPackages.buildPythonApplication rec {
       cd docs
 
       make singlehtml
-      mkdir -p "$doc/share/doc/${name}"
-      cp -rv _build/singlehtml/* "$doc/share/doc/${name}"
+      mkdir -p "$doc/share/doc/${pname}-${version}"
+      cp -rv _build/singlehtml/* "$doc/share/doc/${pname}-${version}"
 
       make info
       mkdir -p "$info/share/info"
diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix
index d770a51dc82..13aa8fcbd00 100644
--- a/pkgs/tools/networking/packetdrill/default.nix
+++ b/pkgs/tools/networking/packetdrill/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, bison, flex }:
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "packetdrill-${version}";
+  pname = "packetdrill";
   src = fetchFromGitHub {
     owner = "google";
     repo = "packetdrill";
diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix
index fbb17308f90..211256ea72b 100644
--- a/pkgs/tools/networking/pacparser/default.nix
+++ b/pkgs/tools/networking/pacparser/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pacparser-${version}";
+  pname = "pacparser";
   version = "1.3.7";
 
   src = fetchurl {
-    url = "https://github.com/manugarg/pacparser/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/manugarg/pacparser/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0jfjm8lqyhdy9ny8a8icyd4rhclhfn608cr1i15jml82q8pyqj7b";
   };
 
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index f2c92d689f3..9bc4c178665 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name    = "par2cmdline-${version}";
+  pname = "par2cmdline";
   version = "0.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix
index 71d1e6fa6d6..663e04db460 100644
--- a/pkgs/tools/networking/pcapc/default.nix
+++ b/pkgs/tools/networking/pcapc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libpcap, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "pcapc-${version}";
+  pname = "pcapc";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix
index 5dff64e27c5..c8b44116846 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/pkgs/tools/networking/philter/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "philter-${version}";
+  pname = "philter";
   version = "1.1";
   src = fetchurl {
-    url = "mirror://sourceforge/philter/${name}.tar.gz";
+    url = "mirror://sourceforge/philter/${pname}-${version}.tar.gz";
     sha256 = "177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l";
   };
 
diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix
index 2d13515d83d..d791f6b91d9 100644
--- a/pkgs/tools/networking/pingtcp/default.nix
+++ b/pkgs/tools/networking/pingtcp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "pingtcp-${version}";
+  pname = "pingtcp";
   version = "0.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix
index b082a981ae7..8bbf589f3b3 100644
--- a/pkgs/tools/networking/pixiewps/default.nix
+++ b/pkgs/tools/networking/pixiewps/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "pixiewps-${version}";
+  pname = "pixiewps";
   version = "1.2.2";
   src = fetchFromGitHub {
     owner = "wiire";
diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix
index 2a70218f287..cf963068d1c 100644
--- a/pkgs/tools/networking/polysh/default.nix
+++ b/pkgs/tools/networking/polysh/default.nix
@@ -4,10 +4,10 @@ let
   inherit (python2Packages) buildPythonApplication;
 in
 buildPythonApplication rec {
-  name = "polysh-${version}";
+  pname = "polysh";
   version = "0.4";
   src = fetchurl {
-          url = "http://guichaz.free.fr/polysh/files/${name}.tar.bz2";
+          url = "http://guichaz.free.fr/polysh/files/${pname}-${version}.tar.bz2";
           sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4";
         };
 
diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 26dc71b7d61..b072ed21318 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.4.7";
-  name = "ppp-${version}";
+  pname = "ppp";
 
   src = fetchurl {
-    url = "mirror://samba/ppp/${name}.tar.gz";
+    url = "mirror://samba/ppp/${pname}-${version}.tar.gz";
     sha256 = "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02";
   };
 
diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix
index 4c29cd949ee..f373f594df8 100644
--- a/pkgs/tools/networking/pptpd/default.nix
+++ b/pkgs/tools/networking/pptpd/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, ppp }:
 
 stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
   pname   = "pptpd";
   version = "1.4.0";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/poptop/${pname}/${name}/${name}.tar.gz";
+    url    = "mirror://sourceforge/poptop/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "1h06gyxj51ba6kbbnf6hyivwjia0i6gsmjz8kyggaany8a58pkcg";
   };
 
diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index 56bd46427d8..848a99f7771 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec{
 
-  name = "privoxy-${version}";
+  pname = "privoxy";
   version = "3.0.28";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${name}-stable-src.tar.gz";
+    url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz";
     sha256 = "0jl2yav1qzqnaqnnx8i6i53ayckkimcrs3l6ryvv7bda6v08rmxm";
   };
 
diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix
index 36d0150a49b..52ef43838c2 100644
--- a/pkgs/tools/networking/proxychains/default.nix
+++ b/pkgs/tools/networking/proxychains/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub } :
 stdenv.mkDerivation rec {
-  name = "proxychains-${version}";
+  pname = "proxychains";
   version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "haad";
     repo = "proxychains";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "015skh3z1jmm8kxbm3nkqv1w56kcvabdmcbmpwzywxr4xnh3x3pc";
   };
 
diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix
index 22c35962050..43e465e05b6 100644
--- a/pkgs/tools/networking/pssh/default.nix
+++ b/pkgs/tools/networking/pssh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "pssh-${version}";
+  pname = "pssh";
   version = "2.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix
index 15ac5bceea3..57cd093e1cd 100644
--- a/pkgs/tools/networking/pykms/default.nix
+++ b/pkgs/tools/networking/pykms/default.nix
@@ -30,7 +30,7 @@ let
   '');
 
 in buildPythonApplication rec {
-  name = "pykms-${version}";
+  pname = "pykms";
   version = "20180208";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix
index 581405f63c0..b1d972a733b 100644
--- a/pkgs/tools/networking/qr-filetransfer/default.nix
+++ b/pkgs/tools/networking/qr-filetransfer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "qr-filetransfer-unstable-${version}";
+  pname = "qr-filetransfer-unstable";
   version = "2018-10-22";
 
   goPackagePath = "github.com/claudiodangelis/qr-filetransfer";
diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
index 3d7dc68e357..12e07386516 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "quicktun-${version}";
+  pname = "quicktun";
   version = "2.2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix
index 0ed1150159d..a0644061c5f 100644
--- a/pkgs/tools/networking/radsecproxy/default.nix
+++ b/pkgs/tools/networking/radsecproxy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "radsecproxy-${version}";
+  pname = "radsecproxy";
   version = "1.6.9";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index 98466a800a3..30e706d6673 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }:
 
 stdenv.mkDerivation rec {
-  name = "radvd-${version}";
+  pname = "radvd";
   version = "2.18";
 
   src = fetchurl {
-    url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
+    url = "http://www.litech.org/radvd/dist/${pname}-${version}.tar.xz";
     sha256 = "1p2wlv3djvla0r84hdncc3wfa530xigs7z9ssc2v5r1pcpzgxgz1";
   };
 
diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix
index 5e18ee80f99..cf8c370c522 100644
--- a/pkgs/tools/networking/ratools/default.nix
+++ b/pkgs/tools/networking/ratools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "ratools-${version}";
+  pname = "ratools";
   version = "0.6.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix
index ed48feabb85..864a7fb5e61 100644
--- a/pkgs/tools/networking/reaver-wps/default.nix
+++ b/pkgs/tools/networking/reaver-wps/default.nix
@@ -2,8 +2,8 @@
 
 stdenv.mkDerivation rec {
   version = "1.4";
-  name = "reaver-wps-${version}";
-  confdir = "/var/db/${name}"; # the sqlite database is at "${confdir}/reaver/reaver.db"
+  pname = "reaver-wps";
+  confdir = "/var/db/${pname}-${version}"; # the sqlite database is at "${confdir}/reaver/reaver.db"
 
   src = fetchurl {
     url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/reaver-wps/reaver-${version}.tar.gz";
diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix
index e584354952a..2ea5a86a231 100644
--- a/pkgs/tools/networking/redir/default.nix
+++ b/pkgs/tools/networking/redir/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "redir-${version}";
+  pname = "redir";
   version = "3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix
index 37f542319da..ae84d9662aa 100644
--- a/pkgs/tools/networking/ripmime/default.nix
+++ b/pkgs/tools/networking/ripmime/default.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "ripmime";
   version = "1.4.0.10";
   src = fetchurl {
-    url = "http://www.pldaniels.com/${pname}/${name}.tar.gz";
+    url = "http://www.pldaniels.com/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9";
   };
 
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix
index 3814af60112..d53d60333ba 100644
--- a/pkgs/tools/networking/s3gof3r/default.nix
+++ b/pkgs/tools/networking/s3gof3r/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "s3gof3r-${version}";
+  pname = "s3gof3r";
   version = "20151109-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445";
   
diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix
index 5cb65b78ee8..d8167b8a48f 100644
--- a/pkgs/tools/networking/samplicator/default.nix
+++ b/pkgs/tools/networking/samplicator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "samplicator-${version}";
+  pname = "samplicator";
   version = "1.3.8rc1";
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/tools/networking/shncpd/default.nix
index be2bc6a75a1..211758f692b 100644
--- a/pkgs/tools/networking/shncpd/default.nix
+++ b/pkgs/tools/networking/shncpd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "shncpd-${version}";
+  pname = "shncpd";
   version = "2016-06-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix
index 476e7dc229d..f94e177a858 100644
--- a/pkgs/tools/networking/simpleproxy/default.nix
+++ b/pkgs/tools/networking/simpleproxy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "simpleproxy-${version}";
+  pname = "simpleproxy";
   version = "3.5";
   rev = "v.${version}";
 
diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix
index 5b046c6eeab..adab157720c 100644
--- a/pkgs/tools/networking/sipcalc/default.nix
+++ b/pkgs/tools/networking/sipcalc/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  name = "sipcalc-${version}";
+  pname = "sipcalc";
   version = "1.1.6";
   src = fetchurl {
-    url = "http://www.routemeister.net/projects/sipcalc/files/${name}.tar.gz";
+    url = "http://www.routemeister.net/projects/sipcalc/files/${pname}-${version}.tar.gz";
     sha256 = "cfd476c667f7a119e49eb5fe8adcfb9d2339bc2e0d4d01a1d64b7c229be56357";
   };
   meta = {
diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix
index 908e4b05009..c1a2451328d 100644
--- a/pkgs/tools/networking/sipsak/default.nix
+++ b/pkgs/tools/networking/sipsak/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "sipsak-${version}";
+  pname = "sipsak";
   version = "4.1.2.1";
 
   buildInputs = [
diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix
index e7214793744..722deaff655 100644
--- a/pkgs/tools/networking/skydive/default.nix
+++ b/pkgs/tools/networking/skydive/default.nix
@@ -2,7 +2,7 @@
 , go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }:
 
 buildGoPackage rec {
-  name = "skydive-${version}";
+  pname = "skydive";
   version = "0.17.0";
   goPackagePath = "github.com/skydive-project/skydive";
 
diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix
index 91b868a017f..bdd650494b1 100644
--- a/pkgs/tools/networking/slack-cli/default.nix
+++ b/pkgs/tools/networking/slack-cli/default.nix
@@ -8,7 +8,7 @@
 { stdenv, lib, fetchFromGitHub, curl, jq, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "slack-cli-${version}";
+  pname = "slack-cli";
   version = "0.18.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix
index 0f7c035b4c0..b64cf5cdd9b 100644
--- a/pkgs/tools/networking/slirp4netns/default.nix
+++ b/pkgs/tools/networking/slirp4netns/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "slirp4netns-${version}";
+  pname = "slirp4netns";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix
index 08b5e6a211b..0c9079240d0 100644
--- a/pkgs/tools/networking/smokeping/default.nix
+++ b/pkgs/tools/networking/smokeping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fping, rrdtool, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "smokeping-${version}";
+  pname = "smokeping";
   version = "2.6.11";
   src = fetchurl {
     url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz";
diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix
index cdf14f5af33..ba05ee8e8b5 100644
--- a/pkgs/tools/networking/snabb/default.nix
+++ b/pkgs/tools/networking/snabb/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "snabb-${version}";
+  pname = "snabb";
   version = "2018.01.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index ad2d88e4a98..9cc3370c0a1 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, coreutils }:
 
 stdenv.mkDerivation rec {
-  name    = "spiped-${version}";
+  pname = "spiped";
   version = "1.5.0";
 
   src = fetchurl {
-    url    = "https://www.tarsnap.com/spiped/${name}.tgz";
+    url    = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz";
     sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj";
   };
 
diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix
index faeec8523aa..2b5aa2b7cbf 100644
--- a/pkgs/tools/networking/spoofer/default.nix
+++ b/pkgs/tools/networking/spoofer/default.nix
@@ -7,10 +7,9 @@ in
 stdenv.mkDerivation rec {
   pname = "spoofer";
   version = "1.4.5";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz";
+    url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz";
     sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z";
   };
 
diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix
index 01903171e9c..0264da5c817 100644
--- a/pkgs/tools/networking/ssh-ident/default.nix
+++ b/pkgs/tools/networking/ssh-ident/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, python }:
 
 stdenv.mkDerivation rec {
-  name = "ssh-ident-${version}";
+  pname = "ssh-ident";
   version = "2016-04-21";
   src = fetchFromGitHub  {
     owner = "ccontavalli";
diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix
index 94221a359c1..3765e6aa08f 100644
--- a/pkgs/tools/networking/sshpass/default.nix
+++ b/pkgs/tools/networking/sshpass/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "sshpass-${version}";
+  pname = "sshpass";
   version = "1.06";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix
index adda38c184d..ad8f9830264 100644
--- a/pkgs/tools/networking/ssldump/default.nix
+++ b/pkgs/tools/networking/ssldump/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "ssldump-${version}";
+  pname = "ssldump";
   version = "0.9b3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix
index 7bbc872c98e..de65298d648 100644
--- a/pkgs/tools/networking/sstp/default.nix
+++ b/pkgs/tools/networking/sstp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "sstp-client-${version}";
+  pname = "sstp-client";
   version = "1.0.12";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 1bd864d859c..869e568d369 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -16,11 +16,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "strongswan-${version}";
+  pname = "strongswan";
   version = "5.8.0"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
 
   src = fetchurl {
-    url = "https://download.strongswan.org/${name}.tar.bz2";
+    url = "https://download.strongswan.org/${pname}-${version}.tar.bz2";
     sha256 = "0cq9m86ydd2i0awxkv4a256f4926p2f9pzlisyskl9fngl6f3c8m";
   };
 
diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix
index 89af381d0d6..9b1ee7a9f79 100644
--- a/pkgs/tools/networking/stubby/default.nix
+++ b/pkgs/tools/networking/stubby/default.nix
@@ -3,7 +3,6 @@
 
 stdenv.mkDerivation rec {
   pname = "stubby";
-  name = "${pname}-${version}";
   version = "0.2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix
index 7ba4a0d8936..9960e6f0030 100644
--- a/pkgs/tools/networking/stun/default.nix
+++ b/pkgs/tools/networking/stun/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
   pname   = "stun";
   version = "0.97";
 
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 66a6c28d92a..792e6f68294 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name    = "stunnel-${version}";
+  pname = "stunnel";
   version = "5.55";
 
   src = fetchurl {
-    url    = "https://www.stunnel.org/downloads/${name}.tar.gz";
+    url    = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
     sha256 = "0qjc0wkjf6bqz29fvwwsn9hnjhm6alsm10jcwx4jad2q3ks6kplh";
     # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
     # not the output of `nix-prefetch-url`
diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix
index 2a4cf3506df..b05ab3eeb88 100644
--- a/pkgs/tools/networking/subfinder/default.nix
+++ b/pkgs/tools/networking/subfinder/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "subfinder-git-${version}";
+  pname = "subfinder-git";
   version = "2018-07-15";
 
   goPackagePath = "github.com/subfinder/subfinder";
diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix
index 4fc456523f7..91f15573914 100644
--- a/pkgs/tools/networking/swagger-codegen/default.nix
+++ b/pkgs/tools/networking/swagger-codegen/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   version = "2.3.1";
   pname = "swagger-codegen";
-  name = "${pname}-${version}";
 
   jarfilename = "${pname}-cli-${version}.jar";
 
diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix
index 2abdab773dd..cfed0ca3728 100644
--- a/pkgs/tools/networking/swaks/default.nix
+++ b/pkgs/tools/networking/swaks/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "swaks-${version}";
+  pname = "swaks";
   version = "20181104.0";
 
   src = fetchurl {
-    url = "https://www.jetmore.org/john/code/swaks/files/${name}.tar.gz";
+    url = "https://www.jetmore.org/john/code/swaks/files/${pname}-${version}.tar.gz";
     sha256 = "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2";
   };
 
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 8a4722aa521..016d8f6a6a6 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpcap, perl }:
 
 stdenv.mkDerivation rec {
-  name = "tcpdump-${version}";
+  pname = "tcpdump";
   version = "4.9.2";
 
   # leaked embargoed security update
diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix
index 53af27b4deb..032adbff74f 100644
--- a/pkgs/tools/networking/tcpreplay/default.nix
+++ b/pkgs/tools/networking/tcpreplay/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpcap, tcpdump }:
 
 stdenv.mkDerivation rec {
-  name = "tcpreplay-${version}";
+  pname = "tcpreplay";
   version = "4.3.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix
index bc97d5d8d6e..edd2abdd13e 100644
--- a/pkgs/tools/networking/tftp-hpa/default.nix
+++ b/pkgs/tools/networking/tftp-hpa/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tftp-hpa-${version}";
+  pname = "tftp-hpa";
   version="5.2";
   src = fetchurl {
-    url = "mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz";
+    url = "mirror://kernel/software/network/tftp/tftp-hpa/${pname}-${version}.tar.xz";
     sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg";
   };
 
diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index a17f382557a..cf4a2bad78b 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.35";
-  name = "tinc-${version}";
+  pname = "tinc";
 
   src = fetchurl {
     url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index df9eb9bdad2..85cdd19702f 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tinc-${version}";
+  pname = "tinc";
   version = "1.1pre17";
 
   src = fetchgit {
diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix
index c9a6599708c..84ecc44c183 100644
--- a/pkgs/tools/networking/tinyproxy/default.nix
+++ b/pkgs/tools/networking/tinyproxy/default.nix
@@ -2,7 +2,7 @@
   libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec{
-  name = "tinyproxy-${version}";
+  pname = "tinyproxy";
   version = "1.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix
index c3abdd49e13..4062fc0fd58 100644
--- a/pkgs/tools/networking/tracebox/default.nix
+++ b/pkgs/tools/networking/tracebox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }:
 
 stdenv.mkDerivation rec {
-  name = "tracebox-${version}";
+  pname = "tracebox";
   version = "0.2";
 
   src = fetchzip {
diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix
index 3d3be5d4532..af8f5cafb89 100644
--- a/pkgs/tools/networking/traceroute/default.nix
+++ b/pkgs/tools/networking/traceroute/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "traceroute-${version}";
+  pname = "traceroute";
   version = "2.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/traceroute/${name}.tar.gz";
+    url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz";
     sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6";
   };
 
diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix
index 6170718b618..fe75b35eea2 100644
--- a/pkgs/tools/networking/twa/default.nix
+++ b/pkgs/tools/networking/twa/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "twa-${version}";
+  pname = "twa";
   version = "1.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix
index 0cb8ad5a437..ddd0bab5d61 100644
--- a/pkgs/tools/networking/ua/default.nix
+++ b/pkgs/tools/networking/ua/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "ua-unstable-${version}";
+  pname = "ua-unstable";
   version = "2017-02-24";
   rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
 
diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix
index f6afddaba38..42839a8ba2f 100644
--- a/pkgs/tools/networking/ubridge/default.nix
+++ b/pkgs/tools/networking/ubridge/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ubridge-${version}";
+  pname = "ubridge";
   version = "0.9.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix
index cc93da7f253..68f457c2a63 100644
--- a/pkgs/tools/networking/uget-integrator/default.nix
+++ b/pkgs/tools/networking/uget-integrator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, uget, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "uget-integrator-${version}";
+  pname = "uget-integrator";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index b35c3e8c883..6b9d0bfa5dd 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "uget-${version}";
+  pname = "uget";
   version = "2.2.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/urlget/${name}.tar.gz";
+    url = "mirror://sourceforge/urlget/${pname}-${version}.tar.gz";
     sha256 = "1hmzk907blgzc1z6wv4zbzqrwad06zfm1rqc3svh5garxw8z7xsw";
   };
 
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 861a61c8f38..c0d358f2c9f 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }:
 
 stdenv.mkDerivation rec {
-  name = "unbound-${version}";
+  pname = "unbound";
   version = "1.9.2";
 
   src = fetchurl {
-    url = "https://unbound.net/downloads/${name}.tar.gz";
+    url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
     sha256 = "15bbrczibap30db8a1pmqhvjbmkxms39hwiivby7f4j5rz2wwykg";
   };
 
diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix
index f41aa35df90..f6b5852a675 100644
--- a/pkgs/tools/networking/unbound/python.nix
+++ b/pkgs/tools/networking/unbound/python.nix
@@ -4,7 +4,6 @@ let
   inherit (pythonPackages) python;
 in stdenv.mkDerivation rec {
   pname = "pyunbound";
-  name = "${pname}-${version}";
   version = "1.9.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/tools/networking/wbox/default.nix
index 0c97f20ee65..b1fb6ae8d90 100644
--- a/pkgs/tools/networking/wbox/default.nix
+++ b/pkgs/tools/networking/wbox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wbox-${version}";
+  pname = "wbox";
   version = "5";
 
   installPhase = ''
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "http://www.hping.org/wbox/${name}.tar.gz";
+    url = "http://www.hping.org/wbox/${pname}-${version}.tar.gz";
     sha256 = "06daxwbysppvbh1mwprw8fgsp6mbd3kqj7a978w7ivn8hdgdi28m";
   };
 
diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix
index 1e93948be68..5615c249de9 100644
--- a/pkgs/tools/networking/weighttp/default.nix
+++ b/pkgs/tools/networking/weighttp/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, python, libev, wafHook }:
 stdenv.mkDerivation rec {
-  name = "weighttp-${version}";
+  pname = "weighttp";
   version = "0.4";
 
   src = fetchgit {
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 38a24eddc28..b7486ded4c8 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -5,11 +5,11 @@
 , openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-${version}";
+  pname = "wget";
   version = "1.20.3";
 
   src = fetchurl {
-    url = "mirror://gnu/wget/${name}.tar.lz";
+    url = "mirror://gnu/wget/${pname}-${version}.tar.lz";
     sha256 = "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39";
   };
 
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index ddac709e577..45e1440c849 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.5.0";
-  name = "whois-${version}";
+  pname = "whois";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 9f67dd4e2c3..2f95876c2f3 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -5,11 +5,11 @@
 let
   inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo;
 in stdenv.mkDerivation rec {
-  name = "wicd-${version}";
+  pname = "wicd";
   version = "1.7.2.4";
   
   src = fetchurl {
-    url = "https://launchpad.net/wicd/1.7/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/wicd/1.7/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
   };
 
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index a537e4dfb26..dfda88cb867 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchzip }:
 
 buildGoPackage rec {
-  name = "wireguard-go-${version}";
+  pname = "wireguard-go";
   version = "0.0.20190517";
 
   goPackagePath = "git.zx2c4.com/wireguard-go";
diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix
index 05bf8d5dd11..555c04a0089 100644
--- a/pkgs/tools/networking/wolfebin/default.nix
+++ b/pkgs/tools/networking/wolfebin/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.4";
-  name = "wolfebin-${version}";
+  pname = "wolfebin";
   
   src = fetchFromGitHub {
     owner = "thejoshwolfe";
diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix
index 5dd2f3b74fd..9c8f46bef07 100644
--- a/pkgs/tools/networking/wrk/default.nix
+++ b/pkgs/tools/networking/wrk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, luajit, openssl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "wrk-${version}";
+  pname = "wrk";
   version = "4.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix
index e2e638ad485..7908143bdab 100644
--- a/pkgs/tools/networking/wrk2/default.nix
+++ b/pkgs/tools/networking/wrk2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, luajit, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "wrk2-${version}";
+  pname = "wrk2";
   version = "4.0.0-${builtins.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix
index b13e5dee18c..e84a97525f1 100644
--- a/pkgs/tools/networking/wuzz/default.nix
+++ b/pkgs/tools/networking/wuzz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "wuzz-${version}";
+  pname = "wuzz";
   version = "0.2.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix
index 7cac5a45570..7afd5e07717 100644
--- a/pkgs/tools/networking/zap/default.nix
+++ b/pkgs/tools/networking/zap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, jdk, ant, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "zap-${version}";
+  pname = "zap";
   version = "2.7.0";
   src = fetchFromGitHub {
     owner = "zaproxy";
diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix
index 3742d22c021..664e55125b5 100644
--- a/pkgs/tools/nix/nix-script/default.nix
+++ b/pkgs/tools/nix/nix-script/default.nix
@@ -1,7 +1,7 @@
 { stdenv, haskellPackages, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "nix-script-${version}";
+  pname = "nix-script";
   version = "2015-09-22";
 
   src  = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix
index bcf96a50d36..f161591c8f1 100644
--- a/pkgs/tools/package-management/apt-dater/default.nix
+++ b/pkgs/tools/package-management/apt-dater/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "apt-dater-${version}";
+  pname = "apt-dater";
   version = "1.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix
index 46da85d9748..cbb4ad4591e 100644
--- a/pkgs/tools/package-management/apt/default.nix
+++ b/pkgs/tools/package-management/apt/default.nix
@@ -14,7 +14,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "apt-${version}";
+  pname = "apt";
 
   version = "1.4.6";
 
diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix
index 0f45084f3c0..938a762ba30 100644
--- a/pkgs/tools/package-management/bunny/default.nix
+++ b/pkgs/tools/package-management/bunny/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab }:
 
 stdenv.mkDerivation rec {
-  name = "bunny-${version}";
+  pname = "bunny";
   version = "1.3";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix
index e45906688ad..5354fbb5e5e 100644
--- a/pkgs/tools/package-management/cde/default.nix
+++ b/pkgs/tools/package-management/cde/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "cde-${version}";
+  pname = "cde";
   version = "0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index 158db426c61..60c77db44d8 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.8.1";
-  name = "clib-${version}";
+  pname = "clib";
 
   src = fetchFromGitHub {
     rev    = version;
diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix
index 0a0cae32dcf..15a64ffd25e 100644
--- a/pkgs/tools/package-management/createrepo_c/default.nix
+++ b/pkgs/tools/package-management/createrepo_c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }:
 
 stdenv.mkDerivation rec {
-  name = "createrepo_c-${version}";
+  pname = "createrepo_c";
   version = "0.11.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index f13256d33bf..11672e6d456 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "dpkg-${version}";
+  pname = "dpkg";
   version = "1.19.7";
 
   src = fetchurl {
diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix
index 4c03fc35dea..8e8d30e4fcc 100644
--- a/pkgs/tools/package-management/gx/default.nix
+++ b/pkgs/tools/package-management/gx/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gx-${version}";
+  pname = "gx";
   version = "0.14.1";
   rev = "refs/tags/v${version}";
 
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix
index 0ae0b8a1983..0a0793130d1 100644
--- a/pkgs/tools/package-management/gx/go/default.nix
+++ b/pkgs/tools/package-management/gx/go/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "gx-go-${version}";
+  pname = "gx-go";
   version = "1.9.0";
   rev = "refs/tags/v${version}";
 
diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index ffa9f427dc2..5049a90c7a7 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "home-manager-${version}";
+  pname = "home-manager";
   version = "2019-06-25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index c35550597a3..0c53c1bbbc9 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.9.2";
-  name = "librepo-${version}";
+  pname = "librepo";
 
   src = fetchFromGitHub {
     owner  = "rpm-software-management";
diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix
index 51a963497fa..9804c0fa185 100644
--- a/pkgs/tools/package-management/morph/default.nix
+++ b/pkgs/tools/package-management/morph/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub, go-bindata, lib }:
 
 buildGoPackage rec {
-  name = "morph-${version}";
+  pname = "morph";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix
index 41471b2c8a7..3f307d38f02 100644
--- a/pkgs/tools/package-management/mynewt-newt/default.nix
+++ b/pkgs/tools/package-management/mynewt-newt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mynewt-newt-${version}";
+  pname = "mynewt-newt";
   version = "1.3.0";
 
   goPackagePath = "mynewt.apache.org/newt";
diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix
index 7c02d2d9a63..cd90e50d70e 100644
--- a/pkgs/tools/package-management/nix-bundle/default.nix
+++ b/pkgs/tools/package-management/nix-bundle/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "nix-bundle";
-  name = "${pname}-${version}";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index efedb8b67da..f5dfacf319b 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper
 , runtimeShell }:
 let self = stdenv.mkDerivation rec {
-  name = "nix-pin-${version}";
+  pname = "nix-pin";
   version = "0.4.0";
   src = fetchFromGitHub {
     owner = "timbertson";
diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix
index 96a283a8ea8..f88820ffad9 100644
--- a/pkgs/tools/package-management/nix-prefetch/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch/default.nix
@@ -5,7 +5,6 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "nix-prefetch";
   version = "0.1.0";
 
diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix
index cd3a8507be1..1d2cad2e39e 100644
--- a/pkgs/tools/package-management/nix-top/default.nix
+++ b/pkgs/tools/package-management/nix-top/default.nix
@@ -15,7 +15,7 @@ let
   additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ];
 in
 stdenv.mkDerivation rec {
-  name = "nix-top-${version}";
+  pname = "nix-top";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix
index ce31de9f65d..f63fe868e01 100644
--- a/pkgs/tools/package-management/nixops/nixops-dns.nix
+++ b/pkgs/tools/package-management/nixops/nixops-dns.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "nixops-dns-${version}";
+  pname = "nixops-dns";
   version = "1.0";
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
index 804bbbdf8d7..b495577ef66 100644
--- a/pkgs/tools/package-management/nixui/default.nix
+++ b/pkgs/tools/package-management/nixui/default.nix
@@ -25,7 +25,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "nixui-${version}";
+  pname = "nixui";
   inherit version src;
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix
index e02c0a2c66f..05f43cf29b1 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/pkgs/tools/package-management/opkg/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.1";
-  name = "opkg-${version}";
+  pname = "opkg";
   src = fetchurl {
     url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
     sha256 = "0hqa4lqxs3w9fmn9idzfscjkm23jw5asby43v0szcxrqgl1ixb25";
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 2e9f93177e4..a82f4400891 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -8,7 +8,7 @@
 , enableSystemd ? stdenv.isLinux, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "packagekit-${version}";
+  pname = "packagekit";
   version = "1.1.12";
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index f0f05a4c858..987c834f505 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -2,7 +2,7 @@
 , qttools, packagekit }:
 
 stdenv.mkDerivation rec {
-  name = "packagekit-qt-${version}";
+  pname = "packagekit-qt";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index d756b679bf3..81e8152769b 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -2,7 +2,7 @@
 zlib, bzip2, lzma }:
 
 stdenv.mkDerivation rec {
-  name = "pacman-${version}";
+  pname = "pacman";
   version = "5.1.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 55171e6d38f..ae0259e65fc 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rpm-${version}";
+  pname = "rpm";
   version = "4.14.2.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix
index 68b9194015b..c4ba7b67dc7 100644
--- a/pkgs/tools/security/2fa/default.nix
+++ b/pkgs/tools/security/2fa/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "1.1.0";
-  name = "2fa-${version}";
+  pname = "2fa";
 
   goPackagePath = "rsc.io/2fa";
 
diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix
index 246a2c5d991..5a771917311 100644
--- a/pkgs/tools/security/acsccid/default.nix
+++ b/pkgs/tools/security/acsccid/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.6";
-  name = "acsccid-${version}";
+  pname = "acsccid";
 
   src = fetchFromGitHub {
     owner = "acshk";
diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix
index c67c758b933..22fb8848eb9 100644
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "aespipe-${version}";
+  pname = "aespipe";
   version = "2.4e";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 2ee0c478212..05866792af6 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -8,11 +8,11 @@ let
     else if stdenv.hostPlatform.system == "i686-linux" then "qemu-i386"
     else throw "afl: no support for ${stdenv.hostPlatform.system}!";
   afl = stdenv.mkDerivation rec {
-    name    = "afl-${version}";
+    pname = "afl";
     version = "2.52b";
 
     src = fetchurl {
-      url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
+      url    = "http://lcamtuf.coredump.cx/afl/releases/${pname}-${version}.tgz";
       sha256 = "0ig0ij4n1pwry5dw1hk4q88801jzzy2cric6y2gd6560j55lnqa3";
     };
     enableParallelBuilding = true;
diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix
index c5844702ef3..58b25e6d3ee 100644
--- a/pkgs/tools/security/afl/libdislocator.nix
+++ b/pkgs/tools/security/afl/libdislocator.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = (builtins.parseDrvName afl.name).version;
-  name = "libdislocator-${version}";
+  pname = "libdislocator";
 
   src = afl.src;
   sourceRoot = "${afl.name}/libdislocator";
diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix
index 1513ae58a0b..ea14d89c45c 100644
--- a/pkgs/tools/security/aide/default.nix
+++ b/pkgs/tools/security/aide/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "aide-${version}";
+  pname = "aide";
   version = "0.16.2";
 
   src = fetchurl {
-    url = "https://github.com/aide/aide/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p";
   };
 
diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
index ca2ea67e788..19c9acc0a45 100644
--- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
+++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
@@ -5,7 +5,7 @@
 assert testQR -> zbar != false;
 
 stdenv.mkDerivation rec {
-  name = "asc-key-to-qr-code-gif-${version}";
+  pname = "asc-key-to-qr-code-gif";
   version = "20180613";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix
index 36b6a5767a1..9067e6a4dbf 100644
--- a/pkgs/tools/security/aws-okta/default.nix
+++ b/pkgs/tools/security/aws-okta/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, stdenv }:
 
 buildGoPackage rec {
-  name = "aws-okta-${version}";
+  pname = "aws-okta";
   version = "0.20.1";
 
   goPackagePath = "github.com/segmentio/aws-okta";
diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
index 16811d8f889..2fa50f91111 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "b2sum-${version}";
+  pname = "b2sum";
   version = "unstable-2018-06-11";
 
   src = fetchzip {
diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix
index 59be6ed0ec2..c6d2cbd53c9 100644
--- a/pkgs/tools/security/bash-supergenpass/default.nix
+++ b/pkgs/tools/security/bash-supergenpass/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }:
 
 stdenv.mkDerivation rec {
-  name = "bash-supergenpass-unstable-${version}";
+  pname = "bash-supergenpass-unstable";
   version = "2018-04-18";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix
index 9faedf0c7ef..47851fbfa05 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/pkgs/tools/security/bmrsa/11.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "bmrsa-${version}";
+  pname = "bmrsa";
   version = "11";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix
index 69444d1612e..0c650781bda 100644
--- a/pkgs/tools/security/bruteforce-luks/default.nix
+++ b/pkgs/tools/security/bruteforce-luks/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, cryptsetup }:
 
 stdenv.mkDerivation rec {
-  name = "bruteforce-luks-${version}";
+  pname = "bruteforce-luks";
   version = "1.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 6fbcffdae29..dd1772d4931 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.30";
-  name = "ccid-${version}";
+  pname = "ccid";
 
   src = fetchurl {
-    url = "https://ccid.apdu.fr/files/${name}.tar.bz2";
+    url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2";
     sha256 = "0z7zafdg75fr1adlv2x0zz34s07gljcjg2lsz76s1048w1xhh5xc";
   };
 
diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix
index a025c69b738..4f48522e613 100644
--- a/pkgs/tools/security/certmgr/default.nix
+++ b/pkgs/tools/security/certmgr/default.nix
@@ -4,7 +4,7 @@ let
   generic = { patches ? [] }:
     buildGoPackage rec {
       version = "1.6.4";
-      name = "certmgr-${version}";
+      pname = "certmgr";
 
       goPackagePath = "github.com/cloudflare/certmgr/";
 
diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix
index e0935f0f760..fb3c00e48f9 100644
--- a/pkgs/tools/security/certstrap/default.nix
+++ b/pkgs/tools/security/certstrap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "certstrap-${version}";
+  pname = "certstrap";
   version = "1.1.1";
 
   goPackagePath = "github.com/square/certstrap";
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index 750539b3ace..8d8497f6cb9 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
-  name = "cfssl-${version}";
+  pname = "cfssl";
   version = "1.3.2";
 
   goPackagePath = "github.com/cloudflare/cfssl";
diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix
index 602c0d60a5f..5a037090801 100644
--- a/pkgs/tools/security/chntpw/default.nix
+++ b/pkgs/tools/security/chntpw/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "chntpw-${version}";
+  pname = "chntpw";
 
   version = "140201";
 
diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix
index 2dc9336bb32..5e304f86b4e 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/pkgs/tools/security/chrome-token-signing/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }:
 
 stdenv.mkDerivation rec {
-  name = "chrome-token-signing-${version}";
+  pname = "chrome-token-signing";
   version = "1.0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix
index a4afa772d10..eae5a5256df 100644
--- a/pkgs/tools/security/cipherscan/default.nix
+++ b/pkgs/tools/security/cipherscan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "cipherscan-${version}";
+  pname = "cipherscan";
   version = "2016-08-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 4d9beb654ec..b5212249547 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "clamav-${version}";
+  pname = "clamav";
   version = "0.101.2";
 
   src = fetchurl {
-    url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
+    url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
     sha256 = "0d3n4y8i5q594h4cjglmvpk4jd73r9ajpp1bvq5lr9zpdzgyn4ha";
   };
 
diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/tools/security/cowpatty/default.nix
index c5ace5d2e8c..0fb9ed58997 100644
--- a/pkgs/tools/security/cowpatty/default.nix
+++ b/pkgs/tools/security/cowpatty/default.nix
@@ -4,13 +4,13 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "cowpatty-${version}";
+  pname = "cowpatty";
   version = "4.6";
 
   buildInputs = [ openssl libpcap ];
 
   src = fetchurl {
-    url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${name}.tgz";
+    url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${pname}-${version}.tgz";
     sha256 = "1hivh3bq2maxvqzwfw06fr7h8bbpvxzah6mpibh3wb85wl9w2gyd";
   };
 
diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix
index 2a88e4462b6..04b7b5695b5 100644
--- a/pkgs/tools/security/crackxls/default.nix
+++ b/pkgs/tools/security/crackxls/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "crackxls-${version}";
+  pname = "crackxls";
   version = "0.4";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix
index 3e94d52fc5f..57943a31406 100644
--- a/pkgs/tools/security/crunch/default.nix
+++ b/pkgs/tools/security/crunch/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, which }:
 
 stdenv.mkDerivation  rec {
-  name = "crunch-${version}";
+  pname = "crunch";
   version = "3.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/crunch-wordlist/${name}.tgz";
+    url = "mirror://sourceforge/crunch-wordlist/${pname}-${version}.tgz";
     sha256 = "0mgy6ghjvzr26yrhj1bn73qzw6v9qsniskc5wqq1kk0hfhy6r3va";
   };
 
diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix
index 1e061841221..104a615542b 100644
--- a/pkgs/tools/security/ctmg/default.nix
+++ b/pkgs/tools/security/ctmg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "ctmg-${version}";
+  pname = "ctmg";
   version = "1.2";
 
   src = fetchzip {
diff --git a/pkgs/tools/security/default.nix b/pkgs/tools/security/default.nix
index c5987d37889..cee198c1b3b 100644
--- a/pkgs/tools/security/default.nix
+++ b/pkgs/tools/security/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.0.1";
-  name = "ecdsatool-${version}";
+  pname = "ecdsatool";
 
   src = pkgs.fetchFromGitHub {
     owner = "kaniini";
diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix
index 55335927b36..ce8b5825647 100644
--- a/pkgs/tools/security/doas/default.nix
+++ b/pkgs/tools/security/doas/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, bison, pam }:
 
 stdenv.mkDerivation rec {
-  name = "doas-${version}";
+  pname = "doas";
 
   version = "6.0";
 
diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix
index 10e2138494e..49ceacadcb7 100644
--- a/pkgs/tools/security/duo-unix/default.nix
+++ b/pkgs/tools/security/duo-unix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pam, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "duo-unix-${version}";
+  pname = "duo-unix";
   version = "1.11.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix
index 48a713287b8..00dac6e9429 100644
--- a/pkgs/tools/security/ecdsautils/default.nix
+++ b/pkgs/tools/security/ecdsautils/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.0";
-  name = "ecdsautils-${version}";
+  pname = "ecdsautils";
 
   src = pkgs.fetchFromGitHub {
     owner = "freifunk-gluon";
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index d0d01761c24..9fd8c3ac7a2 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -2,7 +2,7 @@
 , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
 
 stdenv.mkDerivation rec {
-  name = "ecryptfs-${version}";
+  pname = "ecryptfs";
   version = "111";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix
index 40a728f6cb1..4acef56a2c5 100644
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ b/pkgs/tools/security/ecryptfs/helper.nix
@@ -5,7 +5,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = pname + "-" + version;
   pname   = "ecryptfs-helper";
   version = "20160722";
 
diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/tools/security/efitools/default.nix
index 1d983cb8599..8a64a019fef 100644
--- a/pkgs/tools/security/efitools/default.nix
+++ b/pkgs/tools/security/efitools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, gnu-efi, openssl, sbsigntool, perl, perlPackages,
 help2man, fetchgit }:
 stdenv.mkDerivation rec {
-  name = "efitools-${version}";
+  pname = "efitools";
   version = "1.9.2";
 
   buildInputs = [
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 155c63c87e1..13ab56aaa9a 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -7,7 +7,7 @@
 , substituteAll }:
 
 stdenv.mkDerivation rec {
-  name = "eid-mw-${version}";
+  pname = "eid-mw";
   version = "4.4.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/tools/security/enchive/default.nix
index 8d4cc6ec3ca..baada40a6cb 100644
--- a/pkgs/tools/security/enchive/default.nix
+++ b/pkgs/tools/security/enchive/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "enchive-${version}";
+  pname = "enchive";
   version = "3.4";
   src = fetchFromGitHub {
     owner = "skeeto";
diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix
index 6f79be83be5..01855ee3e5b 100644
--- a/pkgs/tools/security/encryptr/default.nix
+++ b/pkgs/tools/security/encryptr/default.nix
@@ -14,7 +14,7 @@ let
     else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!";
 
 in stdenv.mkDerivation rec {
-  name = "encryptr-${version}";
+  pname = "encryptr";
   version = "2.0.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix
index c33e433448f..8ba80c46457 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@@ -42,7 +42,7 @@ let
   package = stdenv.mkDerivation rec {
 
     inherit (data) version;
-    name = "enpass-${version}";
+    pname = "enpass";
 
     src = fetchurl {
       inherit (data) sha256;
diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/tools/security/eschalot/default.nix
index d628a28023a..28df3a28442 100644
--- a/pkgs/tools/security/eschalot/default.nix
+++ b/pkgs/tools/security/eschalot/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "eschalot";
   version = "2018-01-19";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "ReclaimYourPrivacy";
diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/tools/security/fcrackzip/default.nix
index 5d2e515c327..d923e81ae82 100644
--- a/pkgs/tools/security/fcrackzip/default.nix
+++ b/pkgs/tools/security/fcrackzip/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "fcrackzip-${version}";
+  pname = "fcrackzip";
   version = "1.0";
   src = fetchurl {
-    url = "http://oldhome.schmorp.de/marc/data/${name}.tar.gz";
+    url = "http://oldhome.schmorp.de/marc/data/${pname}-${version}.tar.gz";
     sha256 = "0l1qsk949vnz18k4vjf3ppq8p497966x4c7f2yx18x8pk35whn2a";
   };
 
diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix
index 66a50e268a5..b6669358f7f 100644
--- a/pkgs/tools/security/fpm2/default.nix
+++ b/pkgs/tools/security/fpm2/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "fpm2-${version}";
+  pname = "fpm2";
   version = "0.79";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix
index 14a4c985d50..59d126c5e2c 100644
--- a/pkgs/tools/security/fprot/default.nix
+++ b/pkgs/tools/security/fprot/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "f-prot-${version}";
+  pname = "f-prot";
   version = "6.2.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix
index 812c032230c..4579136add2 100644
--- a/pkgs/tools/security/fwknop/default.nix
+++ b/pkgs/tools/security/fwknop/default.nix
@@ -7,7 +7,6 @@
 , buildClient ? true }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fwknop";
   version = "2.6.10";
 
diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix
index ca7793281ef..89900d27bd2 100644
--- a/pkgs/tools/security/gen-oath-safe/default.nix
+++ b/pkgs/tools/security/gen-oath-safe/default.nix
@@ -1,7 +1,7 @@
 { coreutils, fetchFromGitHub, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }:
 
 stdenv.mkDerivation rec {
-  name = "gen-oath-safe-${version}";
+  pname = "gen-oath-safe";
   version = "0.11.0";
   src = fetchFromGitHub {
     owner = "mcepl";
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 27bdc51c768..63d1bab89d7 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.8.19";
-  name = "gnome-encfs-manager-${version}";
+  pname = "gnome-encfs-manager";
 
   src = fetchurl {
     url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz";
diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix
index 2139b7c84af..940a5b9a053 100644
--- a/pkgs/tools/security/gnu-pw-mgr/default.nix
+++ b/pkgs/tools/security/gnu-pw-mgr/default.nix
@@ -1,10 +1,10 @@
 { stdenv, lib, fetchurl, gnulib }:
 
 stdenv.mkDerivation rec {
-  name = "gnu-pw-mgr-${version}";
+  pname = "gnu-pw-mgr";
   version = "2.4.2";
   src = fetchurl {
-    url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz";
+    url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${pname}-${version}.tar.xz";
     sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17";
   };
 
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 6ae2bbc436e..6336d319997 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 assert guiSupport -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-${version}";
+  pname = "gnupg";
   version = "2.0.30";
 
   src = fetchurl {
-    url = "mirror://gnupg/gnupg/${name}.tar.bz2";
+    url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
     sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3";
   };
 
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 7a8fb5a3244..90bd55f55a2 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -14,12 +14,12 @@ with stdenv.lib;
 assert guiSupport -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-${version}";
+  pname = "gnupg";
 
   version = "2.2.17";
 
   src = fetchurl {
-    url = "mirror://gnupg/gnupg/${name}.tar.bz2";
+    url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
     sha256 = "056mgy09lvsi03531a437qj58la1j2x1y1scvfi53diris3658mg";
   };
 
diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix
index 152ff40e7a2..1ba650f5af7 100644
--- a/pkgs/tools/security/gorilla-bin/default.nix
+++ b/pkgs/tools/security/gorilla-bin/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }:
 
 stdenv.mkDerivation rec {
-  name = "gorilla-bin-${version}";
+  pname = "gorilla-bin";
   version = "1.5.3.7";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix
index c095b77129c..34e8c7bd679 100644
--- a/pkgs/tools/security/gpgstats/default.nix
+++ b/pkgs/tools/security/gpgstats/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, gpgme }:
 
 stdenv.mkDerivation rec {
-  name = "gpgstats-${version}";
+  pname = "gpgstats";
   version = "0.5";
 
   src = fetchurl {
-    url = "https://www.vanheusden.com/gpgstats/${name}.tgz";
+    url = "https://www.vanheusden.com/gpgstats/${pname}-${version}.tgz";
     sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy";
   };
 
diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix
index 385a201d88b..577fe02cb2e 100644
--- a/pkgs/tools/security/hash-slinger/default.nix
+++ b/pkgs/tools/security/hash-slinger/default.nix
@@ -4,7 +4,6 @@ let
   inherit (pythonPackages) python;
 in stdenv.mkDerivation rec {
   pname    = "hash-slinger";
-  name    = "${pname}-${version}";
   version = "2.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix
index 0c5691a1e10..9efa7e2afa2 100644
--- a/pkgs/tools/security/hash_extender/default.nix
+++ b/pkgs/tools/security/hash_extender/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "hash_extender-${version}";
+  pname = "hash_extender";
   version = "2017-04-10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix
index 81f627179a2..c47331f1bcb 100644
--- a/pkgs/tools/security/haveged/default.nix
+++ b/pkgs/tools/security/haveged/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "haveged-${version}";
+  pname = "haveged";
   version = "1.9.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix
index 5731f3ef8bb..8f30b5885e4 100644
--- a/pkgs/tools/security/ifdnfc/default.nix
+++ b/pkgs/tools/security/ifdnfc/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ifdnfc-${version}";
+  pname = "ifdnfc";
   version = "2016-03-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index d4db02cc9ed..dd3a93be995 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "john-${version}";
+  pname = "john";
   version = "1.9.0-jumbo-1";
 
   src = fetchurl {
-    url = "http://www.openwall.com/john/k/${name}.tar.xz";
+    url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz";
     sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm";
   };
 
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 18e3836c99d..884480b73a5 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "keybase-${version}";
+  pname = "keybase";
   version = "4.1.0";
 
   goPackagePath = "github.com/keybase/client";
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index afe2d457a7f..56e1daf2043 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "keybase-gui-${version}";
+  pname = "keybase-gui";
   version = "4.1.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
 
   src = fetchurl {
diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix
index 350d0e66dc7..8decdd13b0f 100644
--- a/pkgs/tools/security/kpcli/default.nix
+++ b/pkgs/tools/security/kpcli/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.2";
-  name = "kpcli-${version}";
+  pname = "kpcli";
 
   src = fetchurl {
-    url = "mirror://sourceforge/kpcli/${name}.pl";
+    url = "mirror://sourceforge/kpcli/${pname}-${version}.pl";
     sha256 = "11z6zbnsmqgjw73ai4nrq4idr83flrib22d8fqh1637d36p1nnk1";
   };
 
diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix
index d858ed3fd6d..4af6e3de3cf 100644
--- a/pkgs/tools/security/libacr38u/default.nix
+++ b/pkgs/tools/security/libacr38u/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.7.11";
-  name = "libacr38u-${version}";
+  pname = "libacr38u";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/a/acr38/acr38_1.7.11.orig.tar.bz2";
diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix
index b3dc1270fb9..17861ac2da6 100644
--- a/pkgs/tools/security/libmodsecurity/default.nix
+++ b/pkgs/tools/security/libmodsecurity/default.nix
@@ -3,7 +3,7 @@
 , curl, geoip, libxml2, lmdb, lua, pcre, yajl }:
 
 stdenv.mkDerivation rec {
-  name = "libmodsecurity-${version}";
+  pname = "libmodsecurity";
   version = "3.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix
index 8a73d056b1e..a325c47ca0d 100644
--- a/pkgs/tools/security/logkeys/default.nix
+++ b/pkgs/tools/security/logkeys/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }:
 
 stdenv.mkDerivation rec {
-  name = "logkeys-${version}";
+  pname = "logkeys";
   version = "2018-01-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 7579636cfbf..923c96719fe 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "lynis";
   version = "2.7.5";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix
index e33681c45e0..94f0a3adfb8 100644
--- a/pkgs/tools/security/masscan/default.nix
+++ b/pkgs/tools/security/masscan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "masscan-${version}";
+  pname = "masscan";
   version = "1.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 37796fef174..50341e873fa 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -16,7 +16,7 @@ let
     gemdir = ./.;
   };
 in stdenv.mkDerivation rec {
-  name = "metasploit-framework-${version}";
+  pname = "metasploit-framework";
   version = "4.16.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix
index 3d4bdd2edf1..9098457cec1 100644
--- a/pkgs/tools/security/mfcuk/default.nix
+++ b/pkgs/tools/security/mfcuk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libnfc }:
 
 stdenv.mkDerivation rec {
-  name = "mfcuk-${version}";
+  pname = "mfcuk";
   version = "0.3.8";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix
index f5bc7a60839..15ee2446922 100644
--- a/pkgs/tools/security/minisign/default.nix
+++ b/pkgs/tools/security/minisign/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "minisign-${version}";
+  pname = "minisign";
   version = "0.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix
index 0c927b7501b..a4aae480ae1 100644
--- a/pkgs/tools/security/mkp224o/default.nix
+++ b/pkgs/tools/security/mkp224o/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, autoreconfHook, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "mkp224o-${version}";
+  pname = "mkp224o";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix
index 6ec90cd15a8..2a9e41ac0fa 100644
--- a/pkgs/tools/security/modsecurity/default.nix
+++ b/pkgs/tools/security/modsecurity/default.nix
@@ -10,11 +10,11 @@ let luaValue = if luaSupport then lua5 else "no";
 in
 
 stdenv.mkDerivation rec {
-  name = "modsecurity-${version}";
+  pname = "modsecurity";
   version = "2.9.3";
 
   src = fetchurl {
-    url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz";
+    url = "https://www.modsecurity.org/tarball/${version}/${pname}-${version}.tar.gz";
     sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1";
   };
 
diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index e1a134ec5d1..b4d5ddb267d 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -13,7 +13,7 @@ let
     patches = oldAttrs.patches ++ [ ./openssh-nixos-sandbox.patch ];
   });
 in stdenv.mkDerivation rec {
-  name = "monkeysphere-${version}";
+  pname = "monkeysphere";
   version = "0.44";
 
   # The patched OpenSSH binary MUST NOT be used (except in the check phase):
diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix
index 84b738a2109..d45861cf50e 100644
--- a/pkgs/tools/security/nasty/default.nix
+++ b/pkgs/tools/security/nasty/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gpgme }:
 
 stdenv.mkDerivation rec {
-  name = "nasty-${version}";
+  pname = "nasty";
   version = "0.6";
 
   src = fetchurl {
-    url = "https://www.vanheusden.com/nasty/${name}.tgz";
+    url = "https://www.vanheusden.com/nasty/${pname}-${version}.tgz";
     sha256 = "1dznlxr728k1pgy1kwmlm7ivyl3j3rlvkmq34qpwbwbj8rnja1vn";
   };
 
diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix
index 88494e8dbdf..5e26bcf6759 100644
--- a/pkgs/tools/security/neopg/default.nix
+++ b/pkgs/tools/security/neopg/default.nix
@@ -11,7 +11,7 @@
 , gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "neopg-${version}";
+  pname = "neopg";
   version = "0.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 1b18f0e1e11..33a873f73da 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -2,7 +2,7 @@
 , qtbase, qttranslations, qtsvg, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "nitrokey-app-${version}";
+  pname = "nitrokey-app";
   version = "1.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix
index c0b7a72d18e..f873c475bbf 100644
--- a/pkgs/tools/security/nmap/qt.nix
+++ b/pkgs/tools/security/nmap/qt.nix
@@ -3,7 +3,7 @@
 , qtbase, qtscript, qtwebengine }:
 
 stdenv.mkDerivation rec {
-  name = "nmapsi4-${version}";
+  pname = "nmapsi4";
   version = "0.4.80-20180430";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index 221817b004d..17473b63988 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage, libtool }:
 
 buildGoPackage rec {
-  name = "notary-${version}";
+  pname = "notary";
   version = "0.6.1";
   gitcommit = "d6e1431f";
 
diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
index f88156285ca..3f04d276489 100644
--- a/pkgs/tools/security/nsjail/default.nix
+++ b/pkgs/tools/security/nsjail/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsjail-${version}";
+  pname = "nsjail";
   version = "2.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix
index a27ed7bad1a..caaa5eba86a 100644
--- a/pkgs/tools/security/nwipe/default.nix
+++ b/pkgs/tools/security/nwipe/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.25";
-  name = "nwipe-${version}";
+  pname = "nwipe";
   src = fetchFromGitHub {
     owner = "martijnvanbrummelen";
     repo = "nwipe";
diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix
index 91df7f3fbb0..baea02402d9 100644
--- a/pkgs/tools/security/omapd/default.nix
+++ b/pkgs/tools/security/omapd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qt4, gdb, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "omapd-${version}";
+  pname = "omapd";
   version = "0.9.2";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${name}.tgz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${pname}-${version}.tgz";
     sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc";
   };
 
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix
index 898bfb599a3..5a9f1012748 100644
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/pkgs/tools/security/onioncircuits/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "onioncircuits-${version}";
+  pname = "onioncircuits";
   version = "0.5";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix
index eff2211a71c..1d506928a52 100644
--- a/pkgs/tools/security/opencryptoki/default.nix
+++ b/pkgs/tools/security/opencryptoki/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "opencryptoki-${version}";
+  pname = "opencryptoki";
   version = "3.8.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index 769b87fa8d3..e5611f8b267 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensc-${version}";
+  pname = "opensc";
   version = "0.19.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix
index 11e1f14baf9..1e618cdce1a 100644
--- a/pkgs/tools/security/p0f/default.nix
+++ b/pkgs/tools/security/p0f/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, bash }:
 
 stdenv.mkDerivation rec {
-  name    = "p0f-${version}";
+  pname = "p0f";
   version = "3.09b";
 
   src = fetchurl {
-    url    = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz";
+    url    = "http://lcamtuf.coredump.cx/p0f3/releases/${pname}-${version}.tgz";
     sha256 = "0zqfq3gdnha29ckvlqmyp36c0jhj7f69bhqqx31yb6vkirinhfsl";
   };
 
diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix
index d7d1f1c40d4..dc3582b7369 100644
--- a/pkgs/tools/security/paperkey/default.nix
+++ b/pkgs/tools/security/paperkey/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "paperkey-${version}";
+  pname = "paperkey";
   version = "1.6";
 
   src = fetchurl {
-    url = "https://www.jabberwocky.com/software/paperkey/${name}.tar.gz";
+    url = "https://www.jabberwocky.com/software/paperkey/${pname}-${version}.tar.gz";
     sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2";
   };
 
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 8ddbd60a38d..2e482dfcffc 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -30,10 +30,10 @@ let
 
   generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec {
     version = "1.7.3";
-    name    = "password-store-${version}";
+    pname = "password-store";
 
     src = fetchurl {
-      url    = "https://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
+      url    = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz";
       sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b";
     };
 
diff --git a/pkgs/tools/security/pass/extensions/audit.nix b/pkgs/tools/security/pass/extensions/audit.nix
index 79dd1fadb01..ca5ca855337 100644
--- a/pkgs/tools/security/pass/extensions/audit.nix
+++ b/pkgs/tools/security/pass/extensions/audit.nix
@@ -4,7 +4,7 @@ let
   pythonEnv = pythonPackages.python.withPackages (p: [ p.requests ]);
 
 in stdenv.mkDerivation rec {
-  name = "pass-audit-${version}";
+  pname = "pass-audit";
   version = "0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix
index ba3f821e88c..c34fae083cd 100644
--- a/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "pass-genphrase-${version}";
+  pname = "pass-genphrase";
   version = "0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix
index 0ee775bfbe8..9d9d36fd0d9 100644
--- a/pkgs/tools/security/pass/extensions/import.nix
+++ b/pkgs/tools/security/pass/extensions/import.nix
@@ -4,7 +4,7 @@ let
   pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]);
 
 in stdenv.mkDerivation rec {
-  name = "pass-import-${version}";
+  pname = "pass-import";
   version = "2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix
index 6d35c4aa837..ab8bc7fe856 100644
--- a/pkgs/tools/security/pass/extensions/otp.nix
+++ b/pkgs/tools/security/pass/extensions/otp.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, oathToolkit }:
 
 stdenv.mkDerivation rec {
-  name = "pass-otp-${version}";
+  pname = "pass-otp";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix
index b9f458cd4e1..ccb558c9b85 100644
--- a/pkgs/tools/security/pass/extensions/tomb.nix
+++ b/pkgs/tools/security/pass/extensions/tomb.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, tomb }:
 
 stdenv.mkDerivation rec {
-  name = "pass-tomb-${version}";
+  pname = "pass-tomb";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix
index dd145b06972..b712557ab3e 100644
--- a/pkgs/tools/security/pass/extensions/update.nix
+++ b/pkgs/tools/security/pass/extensions/update.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "pass-update-${version}";
+  pname = "pass-update";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index 6140159dcb5..b188b411517 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rofi-pass-${version}";
+  pname = "rofi-pass";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix
index 23a744f8e23..8aadb685aa8 100644
--- a/pkgs/tools/security/pcsc-cyberjack/default.nix
+++ b/pkgs/tools/security/pcsc-cyberjack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libusb, pcsclite }:
 
 stdenv.mkDerivation rec {
-  name = "pcsc-cyberjack-${version}";
+  pname = "pcsc-cyberjack";
   version = "3.99.5_SP12";
 
   src = with stdenv.lib; let
diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix
index 88ca8a3d1b1..0302fc6fc67 100644
--- a/pkgs/tools/security/pcsc-scm-scl011/default.nix
+++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix
@@ -6,7 +6,7 @@ let
   else throw "Unsupported system: ${stdenv.hostPlatform.system}";
 in
 stdenv.mkDerivation rec {
-  name = "pcsc-scm-scl-${version}";
+  pname = "pcsc-scm-scl";
   version = "2.09";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 5c40ccdef58..eed462ef0d0 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -2,7 +2,7 @@
 , IOKit ? null }:
 
 stdenv.mkDerivation rec {
-  name = "pcsclite-${version}";
+  pname = "pcsclite";
   version = "1.8.25";
 
   outputs = [ "bin" "out" "dev" "doc" "man" ];
diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix
index 55d2505ed1c..c235c98b971 100644
--- a/pkgs/tools/security/pdfcrack/default.nix
+++ b/pkgs/tools/security/pdfcrack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pdfcrack-${version}";
+  pname = "pdfcrack";
   version = "0.17";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix
index 9c8f47cd275..8bf440d2b07 100644
--- a/pkgs/tools/security/pgpdump/default.nix
+++ b/pkgs/tools/security/pgpdump/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pgpdump-${version}";
+  pname = "pgpdump";
   version = "0.33";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix
index b24af50ee7c..2c03183fa96 100644
--- a/pkgs/tools/security/prey/default.nix
+++ b/pkgs/tools/security/prey/default.nix
@@ -13,7 +13,7 @@ let
     sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30";
   };
 in stdenv.mkDerivation rec {
-  name = "prey-bash-client-${version}";
+  pname = "prey-bash-client";
   version = "0.6.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
index 17bbf982255..7fc6ed20966 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -2,7 +2,7 @@
 , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }:
 
 stdenv.mkDerivation rec {
-  name = "qdigidoc-${version}";
+  pname = "qdigidoc";
   version = "4.1.0";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
index f8b110ce221..5ce5672eb25 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "2018-08-21";
-  name = "qesteidutil-${version}";
+  pname = "qesteidutil";
 
   src = fetchFromGitHub {
     owner = "open-eid";
diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix
index 3491feccc45..0227268cf43 100644
--- a/pkgs/tools/security/rarcrack/default.nix
+++ b/pkgs/tools/security/rarcrack/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "rarcrack-${version}";
+  pname = "rarcrack";
   version = "0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 5e622cf68f3..ad606af9562 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.8";
-  name = "rhash-${version}";
+  pname = "rhash";
 
   src = fetchFromGitHub {
     owner = "rhash";
diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix
index 1091b366781..aaac975bb81 100644
--- a/pkgs/tools/security/sbsigntool/default.nix
+++ b/pkgs/tools/security/sbsigntool/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sbsigntool-${version}";
+  pname = "sbsigntool";
   version = "0.9.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix
index 75ea92a786c..e419232641b 100644
--- a/pkgs/tools/security/scallion/default.nix
+++ b/pkgs/tools/security/scallion/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.1";
-  name = "scallion-${version}";
+  pname = "scallion";
 
   src = fetchFromGitHub {
     owner = "lachesis";
diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 352a81b2727..2ca4c1df18c 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "scrypt-${version}";
+  pname = "scrypt";
   version = "1.2.1";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/scrypt/${name}.tgz";
+    url = "https://www.tarsnap.com/scrypt/${pname}-${version}.tgz";
     sha256 = "0xy5yhrwwv13skv9im9vm76rybh9f29j2dh4hlh2x01gvbkza8a6";
   };
 
diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix
index a2ec48d4d27..686ef36f863 100644
--- a/pkgs/tools/security/seccure/default.nix
+++ b/pkgs/tools/security/seccure/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "seccure-${version}";
+  pname = "seccure";
   version = "0.5";
   
   src = fetchurl {
-    url = "http://point-at-infinity.org/seccure/${name}.tar.gz";
+    url = "http://point-at-infinity.org/seccure/${pname}-${version}.tar.gz";
     sha256 = "0nwnk3hfhgvf5xr0xipbh6smfnya22wphc5rj0vgi5d0zr5cwrk5";
   };
 
diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix
index fd03e6bebab..c9ba2a8ac6d 100644
--- a/pkgs/tools/security/secp256k1/default.nix
+++ b/pkgs/tools/security/secp256k1/default.nix
@@ -16,7 +16,7 @@
 let inherit (stdenv.lib) optionals; in
 
 stdenv.mkDerivation rec {
-  name = "secp256k1-${version}";
+  pname = "secp256k1";
 
   # I can't find any version numbers, so we're just using the date of the
   # last commit.
diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/tools/security/sedutil/default.nix
index 343992a6322..9edd9745326 100644
--- a/pkgs/tools/security/sedutil/default.nix
+++ b/pkgs/tools/security/sedutil/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "sedutil-${version}";
+  pname = "sedutil";
   version = "1.15.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/tools/security/sha1collisiondetection/default.nix
index 38da1448414..8c6a026a612 100644
--- a/pkgs/tools/security/sha1collisiondetection/default.nix
+++ b/pkgs/tools/security/sha1collisiondetection/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libtool, which }:
 
 stdenv.mkDerivation  rec {
-  name = "sha1collisiondetection-${version}";
+  pname = "sha1collisiondetection";
   version = "1.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix
index 3d3bd4eef84..cd93c55001e 100644
--- a/pkgs/tools/security/shc/default.nix
+++ b/pkgs/tools/security/shc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "shc-${version}";
+  pname = "shc";
   version = "4.0.3";
   rev = "${version}";
 
diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix
index a642a12b0bd..22604a3f70b 100644
--- a/pkgs/tools/security/signify/default.nix
+++ b/pkgs/tools/security/signify/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libbsd, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "signify-${version}";
+  pname = "signify";
   version = "25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index 8148692327e..ea487fed2a1 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -14,7 +14,6 @@ let
 in stdenv.mkDerivation rec {
   pname = "signing-party";
   version = "2.10";
-  name = "${pname}-${version}";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix
index 96565ec84b5..16056f9a59e 100644
--- a/pkgs/tools/security/simple-tpm-pk11/default.nix
+++ b/pkgs/tools/security/simple-tpm-pk11/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, trousers, openssl, opencryptoki, autoreconfHook, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "simple-tpm-pk11-${version}";
+  pname = "simple-tpm-pk11";
   version = "0.06";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index ec5eea52a6f..94642700c33 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "softhsm-${version}";
+  pname = "softhsm";
   version = "2.5.0";
 
   src = fetchurl {
-    url = "https://dist.opendnssec.org/source/${name}.tar.gz";
+    url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz";
     sha256 = "1cijq78jr3mzg7jj11r0krawijp99p253f4qdqr94n728p7mdalj";
   };
 
diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix
index a1844668af6..3ece05926cc 100644
--- a/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, coreutils, binutils-unwrapped }:
 
 stdenv.mkDerivation rec {
-  name = "spectre-meltdown-checker-${version}";
+  pname = "spectre-meltdown-checker";
   version = "0.42";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index 1ff9c73d8b5..33ab4c373bc 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name    = "ssdeep-${version}";
+  pname = "ssdeep";
   version = "2.14.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix
index 18f010ee1ec..a196fe9ca47 100644
--- a/pkgs/tools/security/sshguard/default.nix
+++ b/pkgs/tools/security/sshguard/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.4.0";
-  name = "sshguard-${version}";
+  pname = "sshguard";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sshguard/${name}.tar.gz";
+    url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz";
     sha256 = "1h6n2xyh58bshplbdqlr9rbnf3lz7nydnq5m2hkq15is3c4s8p06";
   };
 
diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index d3a8f35d914..15ac376d72a 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "sslscan-${version}";
+  pname = "sslscan";
   version = "1.11.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix
index c8be366066b..7a759c3c333 100644
--- a/pkgs/tools/security/steghide/default.nix
+++ b/pkgs/tools/security/steghide/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ];
   version = "0.5.1";
-  name = "steghide-${version}";
+  pname = "steghide";
 
   src = fetchurl {
     url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ;
diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
index d28260ffb8b..38fc884de48 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/pkgs/tools/security/stoken/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   pname = "stoken";
   version = "0.92";
-  name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "cernekee";
     repo = pname;
diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix
index ecc34ede556..28c462cbb0a 100644
--- a/pkgs/tools/security/stricat/default.nix
+++ b/pkgs/tools/security/stricat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "stricat-${version}";
+  pname = "stricat";
   version = "20140609100300";
 
   src = fetchurl {
-    url    = "http://www.stribob.com/dist/${name}.tgz";
+    url    = "http://www.stribob.com/dist/${pname}-${version}.tgz";
     sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r";
   };
 
diff --git a/pkgs/tools/security/su-exec/default.nix b/pkgs/tools/security/su-exec/default.nix
index 56e40d514bb..8ff33ee1ec9 100644
--- a/pkgs/tools/security/su-exec/default.nix
+++ b/pkgs/tools/security/su-exec/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "su-exec-${version}";
+  pname = "su-exec";
   version = "0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix
index 15f76741589..97db4a28c45 100644
--- a/pkgs/tools/security/sudolikeaboss/default.nix
+++ b/pkgs/tools/security/sudolikeaboss/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }:
 
 buildGoPackage rec {
-  name = "sudolikeaboss-unstable-${version}";
+  pname = "sudolikeaboss-unstable";
   version = "20161127-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "2d9afe19f872c9f433d476e57ee86169781b164c";
 
diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix
index f159dd27c42..f5184b98562 100644
--- a/pkgs/tools/security/tboot/default.nix
+++ b/pkgs/tools/security/tboot/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, trousers, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "tboot-${version}";
+  pname = "tboot";
   version = "1.9.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tboot/${name}.tar.gz";
+    url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz";
     sha256 = "06f0ggl6vrb5ghklblvh2ixgmmjv31rkp1vfj9qm497iqwq9ac00";
   };
 
diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix
index 4d0feef72c9..86a65a06028 100644
--- a/pkgs/tools/security/tcpcrypt/default.nix
+++ b/pkgs/tools/security/tcpcrypt/default.nix
@@ -6,7 +6,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "tcpcrypt-${version}";
+  pname = "tcpcrypt";
   version = "0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 9a7a245b813..252d73b479b 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -5,7 +5,7 @@ let
   makeDirs = output: subDir: pkgs: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) pkgs);
 
 in stdenv.mkDerivation rec {
-  name = "thc-hydra-${version}";
+  pname = "thc-hydra";
   version = "8.5";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix
index 170d5c4ff7a..896ab50562d 100644
--- a/pkgs/tools/security/tor/tor-arm.nix
+++ b/pkgs/tools/security/tor/tor-arm.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-arm-${version}";
+  pname = "tor-arm";
   version = "1.4.5.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index 686d03b7c3f..8681d80c2ed 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "torsocks-${version}";
+  pname = "torsocks";
   version = "2.3.0";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix
index 7d0ff797336..1799d5d154a 100644
--- a/pkgs/tools/security/tpm-luks/default.nix
+++ b/pkgs/tools/security/tpm-luks/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tpm-luks-${version}";
+  pname = "tpm-luks";
   version = "git-2015-07-11";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix
index 1541575aed7..5d54758cc7c 100644
--- a/pkgs/tools/security/tpm-quote-tools/default.nix
+++ b/pkgs/tools/security/tpm-quote-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, trousers, openssl }:
 
 stdenv.mkDerivation rec { 
-  name = "tpm-quote-tools-${version}";
+  pname = "tpm-quote-tools";
   version = "1.0.4";
 
   src = fetchurl { 
-    url = "mirror://sourceforge/project/tpmquotetools/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/tpmquotetools/${version}/${pname}-${version}.tar.gz";
     sha256 = "1qjs83xb4np4yn1bhbjfhvkiika410v8icwnjix5ad96w2nlxp0h";
   };
 
diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix
index 8309390d013..6f7fed20c89 100644
--- a/pkgs/tools/security/trousers/default.nix
+++ b/pkgs/tools/security/trousers/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "trousers-${version}";
+  pname = "trousers";
   version = "0.3.13";
 
   src = fetchurl {
-    url = "mirror://sourceforge/trousers/trousers/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz";
     sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v";
   };
 
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 3f366a58320..45879ce1f30 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, go, gox, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  name = "vault-${version}";
+  pname = "vault";
   version = "1.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix
index e3b7fb643a2..bc8f1ce52c1 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/pkgs/tools/security/volatility/default.nix
@@ -2,10 +2,10 @@
 
 pythonPackages.buildPythonApplication rec {
   version = "2.6";
-  name = "volatility-${version}";
+  pname = "volatility";
 
   src = fetchurl {
-    url = "https://downloads.volatilityfoundation.org/releases/${version}/${name}.zip";
+    url = "https://downloads.volatilityfoundation.org/releases/${version}/${pname}-${version}.zip";
     sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv";
   };
 
diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix
index a7c337dc122..25c7921d34c 100644
--- a/pkgs/tools/security/wipe/default.nix
+++ b/pkgs/tools/security/wipe/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wipe-${version}";
+  pname = "wipe";
   version = "2.3.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/wipe/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/wipe/${version}/${pname}-${version}.tar.bz2";
     sha256 = "180snqvh6k6il6prb19fncflf2jcvkihlb4w84sbndcv1wvicfa6";
   };
 
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix
index 7fcb9fc10bd..ccebb2dbab4 100644
--- a/pkgs/tools/security/yara/default.nix
+++ b/pkgs/tools/security/yara/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.10.0";
-  name = "yara-${version}";
+  pname = "yara";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix
index a31fdd08c60..7e92fc06b2d 100644
--- a/pkgs/tools/system/amtterm/default.nix
+++ b/pkgs/tools/system/amtterm/default.nix
@@ -2,14 +2,14 @@
 
 
 stdenv.mkDerivation rec {
-  name = "amtterm-${version}";
+  pname = "amtterm";
   version = "1.6-1";
 
   buildInputs = with perlPackages; [ perl SOAPLite ];
   nativeBuildInputs = [ makeWrapper ];
 
   src = fetchurl {
-    url = "https://www.kraxel.org/cgit/amtterm/snapshot/${name}.tar.gz";
+    url = "https://www.kraxel.org/cgit/amtterm/snapshot/${pname}-${version}.tar.gz";
     sha256 = "1jxcsqkag2bxmrnr4m6g88sln1j2d9liqlna57fj8kkc85316vlc";
   };
 
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 142d33d359d..fded1da861d 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "at-${version}";
+  pname = "at";
   version = "3.1.23";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix
index a8fca06c361..a99df36beb6 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, readline, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "augeas-${version}";
+  pname = "augeas";
   version = "1.12.0";
 
   src = fetchurl {
-    url = "http://download.augeas.net/${name}.tar.gz";
+    url = "http://download.augeas.net/${pname}-${version}.tar.gz";
     sha256 = "11ybhb13wkkilsn7b416a1dn61m1xrq0lbdpkhp5w61jrk4l469j";
   };
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 9c6f21009ee..8443314cf71 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libcap, acl }:
 
 stdenv.mkDerivation rec {
-  name = "bfs-${version}";
+  pname = "bfs";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix
index 9842bd85783..d3f692b70e7 100644
--- a/pkgs/tools/system/bootchart/default.nix
+++ b/pkgs/tools/system/bootchart/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.14.8";
-  name = "bootchart-${version}";
+  pname = "bootchart";
 
   src = fetchFromGitHub {
     owner = "mmeeks";
diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix
index 6dcaeed325a..6c48d3341ec 100644
--- a/pkgs/tools/system/chase/default.nix
+++ b/pkgs/tools/system/chase/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }:
 
 stdenv.mkDerivation rec {
-  name = "chase-${version}";
+  pname = "chase";
   version = "0.5.2";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix
index cb8c4cc7d02..0874aa7410c 100644
--- a/pkgs/tools/system/collectd/data.nix
+++ b/pkgs/tools/system/collectd/data.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   inherit (collectd) meta version;
 
-  name = "collectd-data-${version}";
+  pname = "collectd-data";
 
   phases = [ "installPhase" ];
 
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index d71fa0c4e58..1df73e08d1e 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -42,10 +42,10 @@
 }:
 stdenv.mkDerivation rec {
   version = "5.8.1";
-  name = "collectd-${version}";
+  pname = "collectd";
 
   src = fetchurl {
-    url = "https://collectd.org/files/${name}.tar.bz2";
+    url = "https://collectd.org/files/${pname}-${version}.tar.bz2";
     sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7";
   };
 
diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix
index 3dc2a5caeb9..e7a5dc86578 100644
--- a/pkgs/tools/system/confd/default.nix
+++ b/pkgs/tools/system/confd/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "confd-${version}";
+  pname = "confd";
   version = "0.9.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index 35c57dd8ea9..ad120dd6481 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "consul-template-${version}";
+  pname = "consul-template";
   version = "0.19.4";
   rev = "v${version}";
 
diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix
index 1067e524788..205b693dd92 100644
--- a/pkgs/tools/system/daemonize/default.nix
+++ b/pkgs/tools/system/daemonize/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "daemonize-${version}";
+  pname = "daemonize";
   version = "1.7.8";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix
index bcea40b1193..c8f7e77b156 100644
--- a/pkgs/tools/system/das_watchdog/default.nix
+++ b/pkgs/tools/system/das_watchdog/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "das_watchdog-${version}";
+  pname = "das_watchdog";
   version = "git-2015-09-12";
 
   src = fetchgit {
diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix
index ca389a8e1b4..4018801f249 100644
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/pkgs/tools/system/datefudge/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "datefudge";
   version = "1.22";
-  name = "${pname}-${version}";
 
   src = fetchgit {
     url = "https://salsa.debian.org/debian/datefudge.git";
diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index e0d11769fd9..9962337de07 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   version = "1.99.8";
-  name = "dd_rescue-${version}";
+  pname = "dd_rescue";
 
   src = fetchurl {
     sha256 = "1gbxm8gr9sx5g1q9dycs21hkxikcy97q09lp1lvs59pnd9qpdnwh";
-    url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2";
+    url="http://www.garloff.de/kurt/linux/ddrescue/${pname}-${version}.tar.bz2";
   };
 
   dd_rhelp_src = fetchurl {
diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix
index f8a6dac8197..54bf6fbaf42 100644
--- a/pkgs/tools/system/ddrutility/default.nix
+++ b/pkgs/tools/system/ddrutility/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ddrutility-${version}";
+  pname = "ddrutility";
   version = "2.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ddrutility/${name}.tar.gz";
+    url = "mirror://sourceforge/ddrutility/${pname}-${version}.tar.gz";
     sha256 = "023g7f2sfv5cqk3iyss4awrw3b913sy5423mn5zvlyrri5hi2cac";
   };
 
diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix
index 9a255c1b0ea..8575d971898 100644
--- a/pkgs/tools/system/dfc/default.nix
+++ b/pkgs/tools/system/dfc/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, gettext}:
 
 stdenv.mkDerivation rec {
-  name = "dfc-${version}";
+  pname = "dfc";
   version = "3.1.1";
 
   src = fetchurl {
-    url = "https://projects.gw-computing.net/attachments/download/615/${name}.tar.gz";
+    url = "https://projects.gw-computing.net/attachments/download/615/${pname}-${version}.tar.gz";
     sha256 = "0m1fd7l85ckb7bq4c5c3g257bkjglm8gq7x42pkmpp87fkknc94n";
   };
 
diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index 7d366dc9bd7..9d56b8488e5 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "di-${version}";
+  pname = "di";
   version = "4.47.1";
 
   src = fetchurl {
-    url = "http://gentoo.com/di/${name}.tar.gz";
+    url = "http://gentoo.com/di/${pname}-${version}.tar.gz";
     sha256 = "1bdbl9k3gqf4h6g21difqc0w17pjid6r587y19wi37vx36aava7f";
   };
 
diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
index 638b018fd41..272809e486c 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }:
 
 stdenv.mkDerivation rec {
-  name = "efibootmgr-${version}";
+  pname = "efibootmgr";
   version = "17";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 5c9b0292e5c..365cfeab058 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }:
 
 stdenv.mkDerivation rec {
-  name = "efivar-${version}";
+  pname = "efivar";
   version = "37";
 
   outputs = [ "bin" "out" "dev" "man" ];
diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix
index 5f013157e32..c2f5556cec6 100644
--- a/pkgs/tools/system/envconsul/default.nix
+++ b/pkgs/tools/system/envconsul/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "envconsul-${version}";
+  pname = "envconsul";
   version = "0.7.3";
   rev = "v${version}";
 
diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix
index 5a902914b37..1ba2b78e860 100644
--- a/pkgs/tools/system/evemu/default.nix
+++ b/pkgs/tools/system/evemu/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "evemu-${version}";
+  pname = "evemu";
   version = "2.6.0";
 
   # We could have downloaded a release tarball from cgit, but it changes hash
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 38ca06a6f32..6b84f7d69a5 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "facter-${version}";
+  pname = "facter";
   version = "3.13.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index 1a16a8a34c7..c31e7337dd5 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.23";
-  name = "fakeroot-${version}";
+  pname = "fakeroot";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.xz";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     ;
 
   postUnpack = ''
-    sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${name}/scripts/fakeroot.in
+    sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in
   '';
 
   meta = {
diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix
index 2bcab1c36b2..6ef39a647f7 100644
--- a/pkgs/tools/system/fcron/default.nix
+++ b/pkgs/tools/system/fcron/default.nix
@@ -4,11 +4,11 @@
 { stdenv, fetchurl, perl, busybox, vim }:
 
 stdenv.mkDerivation rec {
-  name = "fcron-${version}";
+  pname = "fcron";
   version = "3.3.0";
 
   src = fetchurl {
-    url = "http://fcron.free.fr/archives/${name}.src.tar.gz";
+    url = "http://fcron.free.fr/archives/${pname}-${version}.src.tar.gz";
     sha256 = "0q5b1fdq1rpsd4lj7v717x47pmn62hhm13394g0yxqi614xd7sls";
   };
 
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 694a71d8ec1..5a690b28845 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -3,7 +3,7 @@
 , withGnuplot ? false, gnuplot ? null }:
 
 stdenv.mkDerivation rec {
-  name = "fio-${version}";
+  pname = "fio";
   version = "3.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix
index b3048f2fcb7..be33f45ca9d 100644
--- a/pkgs/tools/system/foremost/default.nix
+++ b/pkgs/tools/system/foremost/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "foremost-${version}";
+  pname = "foremost";
   version = "1.5.7";
 
   src = fetchurl {
     sha256 = "0d2zxw0ijg8cd3ksgm8cf8jg128zr5x7z779jar90g9f47pm882h";
-    url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz";
+    url = "http://foremost.sourceforge.net/pkg/${pname}-${version}.tar.gz";
   };
 
   patches = [ ./makefile.patch ];
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 079494bb599..9933a956b99 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.3";
-  name = "freeipmi-${version}";
+  pname = "freeipmi";
 
   src = fetchurl {
-    url = "mirror://gnu/freeipmi/${name}.tar.gz";
+    url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz";
     sha256 = "1sg12ycig2g5yv9l3vx25wsjmz7ybnrsvji0vs51yjmclwsygm5a";
   };
 
diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix
index 9eef3b064a0..c0dd2c89d2f 100644
--- a/pkgs/tools/system/gohai/default.nix
+++ b/pkgs/tools/system/gohai/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gohai-${version}";
+  pname = "gohai";
   version = "2018-05-23";
   rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1";
 
diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/tools/system/goreman/default.nix
index d58d19fd6ed..22918f14145 100644
--- a/pkgs/tools/system/goreman/default.nix
+++ b/pkgs/tools/system/goreman/default.nix
@@ -1,6 +1,6 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
-  name = "goreman-${version}";
+  pname = "goreman";
   version = "0.2.1";
 
   goPackagePath = "github.com/mattn/goreman";
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 25d60ffca5d..71f82bfc386 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, libuuid, popt, icu, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "gptfdisk-${version}";
+  pname = "gptfdisk";
   version = "1.0.4";
 
   src = fetchurl {
     # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
     # page clearly implies a preference for using SourceForge's bandwidth:
-    url = "mirror://sourceforge/gptfdisk/${name}.tar.gz";
+    url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz";
     sha256 = "13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn";
   };
 
diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix
index 63a72aac79f..a2e342f85b7 100644
--- a/pkgs/tools/system/hardinfo/default.nix
+++ b/pkgs/tools/system/hardinfo/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "hardinfo-${version}";
+  pname = "hardinfo";
   version = "0.5.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix
index c9a21db7101..187c046875f 100644
--- a/pkgs/tools/system/hardlink/default.nix
+++ b/pkgs/tools/system/hardlink/default.nix
@@ -2,7 +2,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "hardlink-${version}";
+  pname = "hardlink";
   version = "1.3-4";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index 68c6ef3c3ef..12e54b1b22e 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -2,11 +2,11 @@
 IOKit, python }:
 
 stdenv.mkDerivation rec {
-  name = "htop-${version}";
+  pname = "htop";
   version = "2.2.0";
 
   src = fetchurl {
-    url = "https://hisham.hm/htop/releases/${version}/${name}.tar.gz";
+    url = "https://hisham.hm/htop/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr";
   };
 
diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index eba8c8f41b4..4306f7e9093 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libx86emu, flex, perl, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "hwinfo-${version}";
+  pname = "hwinfo";
   version = "21.67";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix
index 03373300a94..9d89e0714c4 100644
--- a/pkgs/tools/system/illum/default.nix
+++ b/pkgs/tools/system/illum/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4";
-  name = "illum-${version}";
+  pname = "illum";
 
   src = fetchgit {
     url = "https://github.com/jmesmon/illum.git";
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index c869c4b11a5..52d091073c0 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/pkgs/tools/system/inxi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "inxi-${version}";
+  pname = "inxi";
   version = "3.0.35-1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 22dd9289bfd..274e65bb41d 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "ioping-${version}";
+  pname = "ioping";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix
index d7c1f89a786..7e6854afe62 100644
--- a/pkgs/tools/system/iops/default.nix
+++ b/pkgs/tools/system/iops/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "iops-${version}";
+  pname = "iops";
   version = "0.1";
 
   src = fetchurl {
-    url = "https://www.vanheusden.com/iops/${name}.tgz";
+    url = "https://www.vanheusden.com/iops/${pname}-${version}.tgz";
     sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz";
   };
 
diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix
index 35a00650543..0a04581264e 100644
--- a/pkgs/tools/system/journalbeat/default.nix
+++ b/pkgs/tools/system/journalbeat/default.nix
@@ -1,7 +1,7 @@
 { lib, systemd, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "journalbeat-${version}";
+  pname = "journalbeat";
   version = "5.6.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index 4ec34a68122..064071a5ca4 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lockfileProgs, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "logcheck-${version}";
+  pname = "logcheck";
   version = "1.3.20";
   _name    = "logcheck_${version}";
 
diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix
index e01636f2944..cee092f755f 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/pkgs/tools/system/logrotate/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "logrotate-${version}";
+  pname = "logrotate";
   version = "3.15.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
index 0ab8d226f3a..a7adefb74f8 100644
--- a/pkgs/tools/system/lr/default.nix
+++ b/pkgs/tools/system/lr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "lr-${version}";
+  pname = "lr";
   version = "1.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix
index d34fb939822..ff6ccb534fb 100644
--- a/pkgs/tools/system/memtester/default.nix
+++ b/pkgs/tools/system/memtester/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "memtester-${version}";
+  pname = "memtester";
   version = "4.3.0";
 
   preConfigure = ''
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 5455728a10c..dc169ee23b4 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "1.16.0";
-  name = "netdata-${version}";
+  pname = "netdata";
 
   src = fetchurl {
     url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz";
diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix
index 5044e5c9a96..1d8eeff209e 100644
--- a/pkgs/tools/system/nq/default.nix
+++ b/pkgs/tools/system/nq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "nq-${version}";
+  pname = "nq";
   version = "0.3.1";
   src = fetchFromGitHub {
     owner = "chneukirchen";
diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix
index 19581c82c78..0e7a5d4a311 100644
--- a/pkgs/tools/system/nvtop/default.nix
+++ b/pkgs/tools/system/nvtop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "nvtop-${version}";
+  pname = "nvtop";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix
index b673c0f929a..b5842ad37c3 100644
--- a/pkgs/tools/system/pcstat/default.nix
+++ b/pkgs/tools/system/pcstat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "pcstat-unstable-${version}";
+  pname = "pcstat-unstable";
   version = "2017-05-28";
 
   goPackagePath = "github.com/tobert/pcstat";
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index b3909a79d94..4c011a0b212 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -8,7 +8,6 @@
 stdenv.mkDerivation rec {
   pname = "plan9port";
   version = "2019-02-25";
-  name = "${pname}-${version}";
 
   src =  fetchFromGitHub {
     owner = "9fans";
diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix
index 234aacbbfde..83d281642bd 100644
--- a/pkgs/tools/system/psensor/default.nix
+++ b/pkgs/tools/system/psensor/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "psensor-${version}";
+  pname = "psensor";
 
   version = "1.2.0";
 
diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix
index 178e08938fe..4d413e60c77 100644
--- a/pkgs/tools/system/psstop/default.nix
+++ b/pkgs/tools/system/psstop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "psstop-${version}";
+  pname = "psstop";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix
index ee7626d2712..73c1b488155 100644
--- a/pkgs/tools/system/rofi-systemd/default.nix
+++ b/pkgs/tools/system/rofi-systemd/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rofi-systemd-${version}";
+  pname = "rofi-systemd";
   version = "0.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 4d5de56fbf0..8a1f6c4b885 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "runit-${version}";
+  pname = "runit";
   version = "2.1.2";
 
   src = fetchurl {
-    url = "http://smarden.org/runit/${name}.tar.gz";
+    url = "http://smarden.org/runit/${pname}-${version}.tar.gz";
     sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "man" ];
 
-  sourceRoot = "admin/${name}";
+  sourceRoot = "admin/${pname}-${version}";
 
   doCheck = true;
 
diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix
index 5d4ed355ba9..063a338f6e8 100644
--- a/pkgs/tools/system/s-tui/default.nix
+++ b/pkgs/tools/system/s-tui/default.nix
@@ -1,7 +1,6 @@
 { stdenv, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "s-tui";
   version = "0.8.3";
 
diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix
index ed4fe7a6848..571f70e0756 100644
--- a/pkgs/tools/system/safe-rm/default.nix
+++ b/pkgs/tools/system/safe-rm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, perl, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "safe-rm-${version}";
+  pname = "safe-rm";
   version = "0.12";
 
   src = fetchgit {
     url = "https://gitorious.org/safe-rm/mainline.git";
-    rev = "refs/tags/${name}";
+    rev = "refs/tags/${pname}-${version}";
     sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq";
   };
 
diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix
index d6e8f4f1bb9..036e3a83cf2 100644
--- a/pkgs/tools/system/setserial/default.nix
+++ b/pkgs/tools/system/setserial/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, groff }:
 
 stdenv.mkDerivation rec {
-  name = "setserial-${version}";
+  pname = "setserial";
   version = "2.17";
 
   src = fetchurl {
-    url = "mirror://sourceforge/setserial/${name}.tar.gz";
+    url = "mirror://sourceforge/setserial/${pname}-${version}.tar.gz";
     sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y";
   };
 
diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index d35f56e2519..7c90d41da18 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   version = "4.6.5";
-  name = "sleuthkit-${version}";
+  pname = "sleuthkit";
 
   src = fetchFromGitHub {
     owner = "sleuthkit";
     repo = "sleuthkit";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1q1cdixnfv9v4qlzza8xwdsyvq1vdw6gjgkd41yc1d57ldp1qm0c";
   };
 
diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix
index 15a18a453f0..9f2cc225747 100644
--- a/pkgs/tools/system/socklog/default.nix
+++ b/pkgs/tools/system/socklog/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "socklog-${version}";
+  pname = "socklog";
   version = "2.1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix
index f407be7c585..9697748e056 100644
--- a/pkgs/tools/system/suid-chroot/default.nix
+++ b/pkgs/tools/system/suid-chroot/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "suid-chroot-${version}";
+  pname = "suid-chroot";
   version = "1.0.2";
 
   src = fetchurl {
     sha256 = "1a9xqhck0ikn8kfjk338h9v1yjn113gd83q0c50k78xa68xrnxjx";
-    url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${name}.tar.bz2";
+    url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${pname}-${version}.tar.bz2";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix
index 81e3a2b8792..3834b3762f0 100644
--- a/pkgs/tools/system/supervise/default.nix
+++ b/pkgs/tools/system/supervise/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "supervise-${version}";
+  pname = "supervise";
   version = "1.4.0";
 
   src = fetchzip {
diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/tools/system/symlinks/default.nix
index 240ad9de19d..93a6bbf0c75 100644
--- a/pkgs/tools/system/symlinks/default.nix
+++ b/pkgs/tools/system/symlinks/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "symlinks-${version}";
+  pname = "symlinks";
   version = "1.4.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix
index a57cafb54e2..3c793a05300 100644
--- a/pkgs/tools/system/syslog-ng-incubator/default.nix
+++ b/pkgs/tools/system/syslog-ng-incubator/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "syslog-ng-incubator-${version}";
+  pname = "syslog-ng-incubator";
   version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "balabit";
     repo = "syslog-ng-incubator";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s";
   };
 
diff --git a/pkgs/tools/system/testdisk-photorec/default.nix b/pkgs/tools/system/testdisk-photorec/default.nix
index 5342cf857ac..06f6751213b 100644
--- a/pkgs/tools/system/testdisk-photorec/default.nix
+++ b/pkgs/tools/system/testdisk-photorec/default.nix
@@ -9,7 +9,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "testdisk-photorec-${version}";
+  pname = "testdisk-photorec";
   version = "7.0";
   src = fetchurl {
     url = "https://www.cgsecurity.org/testdisk-${version}.tar.bz2";
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 818c76712c7..6ef96bdab5c 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, dbus, dbus-glib, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "thermald-${version}";
+  pname = "thermald";
   version = "1.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index dc63b97056a..8c803400584 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -2,7 +2,7 @@
 , smartSupport ? false, libatasmart }:
 
 stdenv.mkDerivation rec {
-  name = "thinkfan-${version}";
+  pname = "thinkfan";
   version = "0.9.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
index 849baa7159a..71a5726759c 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "uptimed-${version}";
+  pname = "uptimed";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix
index 32cf56a1d74..06ae2862662 100644
--- a/pkgs/tools/system/vbetool/default.nix
+++ b/pkgs/tools/system/vbetool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pciutils, libx86, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "vbetool-${version}";
+  pname = "vbetool";
   version = "1.1";
 
   src = fetchurl {
-    url = "https://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz";
+    url = "https://www.codon.org.uk/~mjg59/vbetool/download/${pname}-${version}.tar.gz";
     sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
   };
 
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index b252b74a0bd..85baa3d3f30 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   version = "20180311";
   checkout = "4c84e077858c809ee80a9a6f9b38185cf7dcded7";
 
-  name = "vboot_reference-${version}";
+  pname = "vboot_reference";
 
   src = fetchgit {
     url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference;
diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix
index ca35dae5827..da502946781 100644
--- a/pkgs/tools/system/wsmancli/default.nix
+++ b/pkgs/tools/system/wsmancli/default.nix
@@ -2,7 +2,7 @@
 , openssl, openwsman }:
 
 stdenv.mkDerivation rec {
-  name = "wsmancli-${version}";
+  pname = "wsmancli";
   version = "2.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix
index 519cae03c5a..02d90472440 100644
--- a/pkgs/tools/system/xe/default.nix
+++ b/pkgs/tools/system/xe/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "xe-${version}";
+  pname = "xe";
   version = "0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix
index 10d3a47cc85..a37531572d7 100644
--- a/pkgs/tools/text/agrep/default.nix
+++ b/pkgs/tools/text/agrep/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "agrep-${version}";
+  pname = "agrep";
   version = "3.41.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix
index f53a649cd77..7dc07664fce 100644
--- a/pkgs/tools/text/aha/default.nix
+++ b/pkgs/tools/text/aha/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "aha-${version}";
+  pname = "aha";
   version = "0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix
index 2ad91a3071e..b9a4f678207 100644
--- a/pkgs/tools/text/ansifilter/default.nix
+++ b/pkgs/tools/text/ansifilter/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, boost, lua }:
 
 stdenv.mkDerivation rec {
-  name = "ansifilter-${version}";
+  pname = "ansifilter";
   version = "2.14";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix
index 20777f990e2..b01ce7773e3 100644
--- a/pkgs/tools/text/ascii/default.nix
+++ b/pkgs/tools/text/ascii/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ascii-${version}";
+  pname = "ascii";
   version = "3.18";
 
   src = fetchurl {
-    url = "http://www.catb.org/~esr/ascii/${name}.tar.gz";
+    url = "http://www.catb.org/~esr/ascii/${pname}-${version}.tar.gz";
     sha256 = "0b87vy06s8s3a8q70pqavsbk4m4ff034sdml2xxa6qfsykaj513j";
   };
 
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix
index 8a8eb3117f0..16d5b9995c2 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/pkgs/tools/text/catdoc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "catdoc-${version}";
+  pname = "catdoc";
   version = "0.95";
 
   src = fetchurl {
-    url = "http://ftp.wagner.pp.ru/pub/catdoc/${name}.tar.gz";
+    url = "http://ftp.wagner.pp.ru/pub/catdoc/${pname}-${version}.tar.gz";
     sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796";
   };
 
diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix
index 56a8133bd3a..521b4c5b284 100644
--- a/pkgs/tools/text/codesearch/default.nix
+++ b/pkgs/tools/text/codesearch/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "codesearch-${version}";
+  pname = "codesearch";
   version = "20150717-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
 
diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/tools/text/copyright-update/default.nix
index 604097fbe77..9a405674dc7 100644
--- a/pkgs/tools/text/copyright-update/default.nix
+++ b/pkgs/tools/text/copyright-update/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "copyright-update-${version}";
+  pname = "copyright-update";
   version = "2016.1018";
 
   src = fetchFromGitHub {
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     owner = "jaalto";
     repo = "project--copyright-update";
     rev = "release/${version}";
diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix
index 7404c887a46..5f6b0a8a605 100644
--- a/pkgs/tools/text/dadadodo/default.nix
+++ b/pkgs/tools/text/dadadodo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dadadodo-${version}";
+  pname = "dadadodo";
   version = "1.04";
 
   src = fetchurl {
-    url = "https://www.jwz.org/dadadodo/${name}.tar.gz";
+    url = "https://www.jwz.org/dadadodo/${pname}-${version}.tar.gz";
     sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if";
   };
 
diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix
index cfb627d7042..f43cd94a83e 100644
--- a/pkgs/tools/text/diction/default.nix
+++ b/pkgs/tools/text/diction/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "diction-${version}";
+  pname = "diction";
   version = "1.13";
 
   src = fetchurl {
-    url = "http://www.moria.de/~michael/diction/${name}.tar.gz";
+    url = "http://www.moria.de/~michael/diction/${pname}-${version}.tar.gz";
     sha256 = "08fi971b8qa4xycxbgb42i6b5ms3qx9zpp5hwpbxy2vypfs0wph9";
   };
 
diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index dd0d1bbc941..bd72ec94714 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "dos2unix-${version}";
+  pname = "dos2unix";
   version = "7.4.0";
 
   src = fetchurl {
-    url = "https://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz";
+    url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz";
     sha256 = "12h4c61g376bhq03y5g2xszkrkrj5hwd928rly3xsp6rvfmnbixs";
   };
 
diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix
index 098eee7cf72..6cfb4721066 100644
--- a/pkgs/tools/text/enca/default.nix
+++ b/pkgs/tools/text/enca/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv, recode }:
 
 stdenv.mkDerivation rec {
-  name = "enca-${version}";
+  pname = "enca";
   version = "1.19";
 
   src = fetchurl {
-    url = "https://dl.cihar.com/enca/${name}.tar.xz";
+    url = "https://dl.cihar.com/enca/${pname}-${version}.tar.xz";
     sha256 = "1f78jmrggv3jymql8imm5m9yc8nqjw5l99mpwki2245l8357wj1s";
   };
 
diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix
index b4418e04f03..231a16bdc1b 100644
--- a/pkgs/tools/text/esh/default.nix
+++ b/pkgs/tools/text/esh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "esh-${version}";
+  pname = "esh";
   version = "0.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix
index d61a7d184ea..6e9ff5170f2 100644
--- a/pkgs/tools/text/glogg/default.nix
+++ b/pkgs/tools/text/glogg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "glogg-${version}";
+  pname = "glogg";
   version = "1.1.4";
 
   src = fetchurl {
-    url = "https://glogg.bonnefon.org/files/${name}.tar.gz";
+    url = "https://glogg.bonnefon.org/files/${pname}-${version}.tar.gz";
     sha256 = "0nwnfk9bcz2k7rf08w2cb6qipzdhwmxznik44jxmn9gwxdrdq78c";
   };
 
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 8a44e434d4c..3d73bfba657 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "gnused-${version}";
+  pname = "gnused";
   version = "4.7";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 082c61635ba..a3df9617567 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "groff-${version}";
+  pname = "groff";
   version = "1.22.3";
 
   src = fetchurl {
-    url = "mirror://gnu/groff/${name}.tar.gz";
+    url = "mirror://gnu/groff/${pname}-${version}.tar.gz";
     sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s";
   };
 
diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix
index a04a2c65e7c..58f1768bfa1 100644
--- a/pkgs/tools/text/gucci/default.nix
+++ b/pkgs/tools/text/gucci/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gucci-${version}";
+  pname = "gucci";
   version = "0.1.0";
 
   goPackagePath = "github.com/noqcks/gucci";
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 46fe9ab1cd7..eb86bc79d5c 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "highlight-${version}";
+  pname = "highlight";
   version = "3.53";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index 1974c0aa4f3..e31db437850 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "html-tidy-${version}";
+  pname = "html-tidy";
   version = "5.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix
index aec238cb4cc..dfbe6e7b6dc 100644
--- a/pkgs/tools/text/icdiff/default.nix
+++ b/pkgs/tools/text/icdiff/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "icdiff-${version}";
+  pname = "icdiff";
   version = "1.9.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix
index 46d290b79ff..18336fcf059 100644
--- a/pkgs/tools/text/jsawk/default.nix
+++ b/pkgs/tools/text/jsawk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, spidermonkey }:
 
 stdenv.mkDerivation rec {
-  name = "jsawk-${version}";
+  pname = "jsawk";
   version = "1.5-pre";
   src = fetchFromGitHub {
     owner = "micha";
diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix
index 5eea33d13a4..6be7106f2b9 100644
--- a/pkgs/tools/text/jumanpp/default.nix
+++ b/pkgs/tools/text/jumanpp/default.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl, cmake, protobuf }:
 stdenv.mkDerivation rec {
   pname = "jumanpp";
-  name = "${pname}-${version}";
   version = "2.0.0-rc2";
 
   src = fetchurl {
-    url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${name}.tar.xz";
+    url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
     sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp";
   };
   buildInputs = [ cmake protobuf ];
diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix
index 7254660cb1a..600907311ef 100644
--- a/pkgs/tools/text/kytea/default.nix
+++ b/pkgs/tools/text/kytea/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name    = "kytea-${version}";
+  pname = "kytea";
   version = "0.4.7";
 
   src = fetchurl {
-    url    = "http://www.phontron.com/kytea/download/${name}.tar.gz";
+    url    = "http://www.phontron.com/kytea/download/${pname}-${version}.tar.gz";
     sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk";
   };
 
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 1ccba80cb3e..f75099e630d 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "LanguageTool-${version}";
+  pname = "LanguageTool";
   version = "4.6";
 
   src = fetchzip {
-    url = "https://www.languagetool.org/download/${name}.zip";
+    url = "https://www.languagetool.org/download/${pname}-${version}.zip";
     sha256 = "1z3i6kz1dz7dw2ykyk1yamrv8h5h330sfyl037hhyy9hw6p30rhg";
   };
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix
index 32aeed7499f..bca0a5e3857 100644
--- a/pkgs/tools/text/link-grammar/default.nix
+++ b/pkgs/tools/text/link-grammar/default.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   version = "5.6.2";
   pname = "link-grammar";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
   src = fetchurl {
-    url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
+    url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
     sha256 = "1jc6j5kxdv3y4mm82q0rrjvlak8p26fqh92dzw5bkwxnvjmjjg1k";
   };
 
diff --git a/pkgs/tools/text/mb2md/default.nix b/pkgs/tools/text/mb2md/default.nix
index ddc7f96ec26..91c958cf067 100644
--- a/pkgs/tools/text/mb2md/default.nix
+++ b/pkgs/tools/text/mb2md/default.nix
@@ -5,7 +5,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "3.20";
-  name = "mb2md-${version}";
+  pname = "mb2md";
 
   src = fetchurl {
     url = "http://batleth.sapienti-sat.org/projects/mb2md/mb2md-${version}.pl.gz";
diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix
index 9896b365a6a..991d0735bab 100644
--- a/pkgs/tools/text/mecab/ipadic.nix
+++ b/pkgs/tools/text/mecab/ipadic.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mecab-nodic }:
 
 stdenv.mkDerivation rec {
-  name = "mecab-ipadic-${version}";
+  pname = "mecab-ipadic";
   version = "2.7.0-20070801";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix
index 3e0bee3b9b9..9de7efa3a81 100644
--- a/pkgs/tools/text/miller/default.nix
+++ b/pkgs/tools/text/miller/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "miller-${version}";
+  pname = "miller";
 
   version = "5.4.0";
 
diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/tools/text/mir-qualia/default.nix
index 4e3be9e17e0..0a9b3777783 100644
--- a/pkgs/tools/text/mir-qualia/default.nix
+++ b/pkgs/tools/text/mir-qualia/default.nix
@@ -1,7 +1,7 @@
 { lib, pythonPackages, fetchurl }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mir.qualia-${version}";
+  pname = "mir.qualia";
   version = "2.0.0";
   doCheck = false; # 2.0.0-released pytests are broken
 
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index 1320f824fdf..415ff0b31b7 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -2,7 +2,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "numdiff-${version}";
+  pname = "numdiff";
   version = "5.9.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix
index 48abee01830..69277d0412d 100644
--- a/pkgs/tools/text/odt2txt/default.nix
+++ b/pkgs/tools/text/odt2txt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "odt2txt-${version}";
+  pname = "odt2txt";
   version = "0.5";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix
index b51f811644d..9407e68ed16 100644
--- a/pkgs/tools/text/peco/default.nix
+++ b/pkgs/tools/text/peco/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "peco-${version}";
+  pname = "peco";
   version = "0.5.3";
 
   goPackagePath = "github.com/peco/peco";
diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix
index 4b30387f7ac..342377b85ae 100644
--- a/pkgs/tools/text/platinum-searcher/default.nix
+++ b/pkgs/tools/text/platinum-searcher/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "the_platinum_searcher-${version}";
+  pname = "the_platinum_searcher";
   version = "2.1.5";
   rev = "v${version}";
 
diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix
index ccfeabaa73b..efe19a1b5ce 100644
--- a/pkgs/tools/text/podiff/default.nix
+++ b/pkgs/tools/text/podiff/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "podiff-${version}";
+  pname = "podiff";
   version = "1.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index a5864fbc051..e1ac2248d22 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -3,7 +3,7 @@
   nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "poedit-${version}";
+  pname = "poedit";
   version = "2.2.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix
index c536cbbaaad..27e9c80bc7d 100644
--- a/pkgs/tools/text/proselint/default.nix
+++ b/pkgs/tools/text/proselint/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, buildPythonApplication, click, future, six }:
 
 buildPythonApplication rec {
-  name = "proselint-${version}";
+  pname = "proselint";
   version = "0.10.2";
 
   doCheck = false; # fails to pass because it tries to run in home directory
 
   src = fetchurl {
-    url = "mirror://pypi/p/proselint/${name}.tar.gz";
+    url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz";
     sha256 = "017risn0j1bjy9ygzfgphjnyjl4gk7wbrr4qv1vvrlan60wyp1rs";
   };
 
diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix
index e3970c05902..9cf9349badb 100644
--- a/pkgs/tools/text/qshowdiff/default.nix
+++ b/pkgs/tools/text/qshowdiff/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, qt4, perl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qshowdiff-${version}";
+  pname = "qshowdiff";
   version = "1.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
index 9e3e4d5b41d..25e9c07f351 100644
--- a/pkgs/tools/text/reckon/default.nix
+++ b/pkgs/tools/text/reckon/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "reckon-${version}";
+  pname = "reckon";
   version = (import ./gemset.nix).reckon.version;
 
   env = bundlerEnv {
-    name = "${name}-gems";
+    name = "${pname}-${version}-gems";
 
     gemdir = ./.;
   };
diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix
index bdbc9712443..7ac3790f8a9 100644
--- a/pkgs/tools/text/rpl/default.nix
+++ b/pkgs/tools/text/rpl/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "rpl";
   version = "1.5.7";
 
diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix
index 8aadbb0b806..83ac2d4d766 100644
--- a/pkgs/tools/text/rst2html5/default.nix
+++ b/pkgs/tools/text/rst2html5/default.nix
@@ -1,13 +1,11 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-
-  name = "${pname}-${version}";
   pname = "rst2html5";
   version = "1.9.4";
 
   src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
     sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73";
   };
 
diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix
index 2df6cbb27a2..5df4e90ff1a 100644
--- a/pkgs/tools/text/schema2ldif/default.nix
+++ b/pkgs/tools/text/schema2ldif/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec {
-  name = "schema2ldif-${version}";
+  pname = "schema2ldif";
   version = "1.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 12b57cb82df..6f29cbc18f2 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "shfmt-${version}";
+  pname = "shfmt";
   version = "2.6.4";
 
   goPackagePath = "mvdan.cc/sh";
diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/tools/text/shocco/default.nix
index 97c677a7f70..f657df5b780 100644
--- a/pkgs/tools/text/shocco/default.nix
+++ b/pkgs/tools/text/shocco/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perlPackages, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "shocco-${version}";
+  pname = "shocco";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix
index 421715f7c33..c2a4cf22ea6 100644
--- a/pkgs/tools/text/sift/default.nix
+++ b/pkgs/tools/text/sift/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "sift-${version}";
+  pname = "sift";
   version = "0.9.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index 72dfa684160..b37dbbf6836 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
 
 stdenv.mkDerivation rec {
-  name = "silver-searcher-${version}";
+  pname = "silver-searcher";
   version = "2.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix
index 592f9b8f188..100124043ed 100644
--- a/pkgs/tools/text/txt2tags/default.nix
+++ b/pkgs/tools/text/txt2tags/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.6";
-  name = "txt2tags-${version}";
+  pname = "txt2tags";
 
   dontBuild = true;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "http://txt2tags.googlecode.com/files/${name}.tgz";
+    url = "http://txt2tags.googlecode.com/files/${pname}-${version}.tgz";
     sha256 = "0p5hql559pk8v5dlzgm75yrcxwvz4z30f1q590yzng0ghvbnf530";
   };
 
diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix
index 361b6782526..93611ec5531 100644
--- a/pkgs/tools/text/unrtf/default.nix
+++ b/pkgs/tools/text/unrtf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "unrtf-${version}";
+  pname = "unrtf";
   version = "0.21.9";
 
   src = fetchurl {
-    url = "https://www.gnu.org/software/unrtf/${name}.tar.gz";
+    url = "https://www.gnu.org/software/unrtf/${pname}-${version}.tar.gz";
     sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2";
   };
 
diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix
index b1671ad38b5..923adf8571d 100644
--- a/pkgs/tools/text/untex/default.nix
+++ b/pkgs/tools/text/untex/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "untex-${version}";
+  pname = "untex";
   version = "1.3";
 
   src = fetchurl {
-    url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${name}.tar.gz";
+    url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${pname}-${version}.tar.gz";
     sha256 = "1jww43pl9qvg6kwh4h8imp966fzd62dk99pb4s93786lmp3kgdjv";
   };
 
diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index 3e436b80be8..583ffd01db9 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "vale-${version}";
+  pname = "vale";
   version = "1.4.3";
 
   goPackagePath = "github.com/errata-ai/vale";
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 20cd5066e80..7b08cffe42d 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.29";
-  name = "wgetpaste-${version}";
+  pname = "wgetpaste";
 
   src = fetchurl {
-    url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
+    url = "http://wgetpaste.zlin.dk/${pname}-${version}.tar.bz2";
     sha256 = "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22";
   };
   # currently zsh-autocompletion support is not installed
diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix
index 66dfa1c6b34..92ad2e00588 100644
--- a/pkgs/tools/text/xidel/default.nix
+++ b/pkgs/tools/text/xidel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, dpkg }:
 
 stdenv.mkDerivation rec {
-  name = "xidel-${version}";
+  pname = "xidel";
   version = "0.9.6";
 
   ## Source archive lacks file (manageUtils.sh), using pre-built package for now.
diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix
index 0650270bb6a..c373f068961 100644
--- a/pkgs/tools/text/xml/basex/default.nix
+++ b/pkgs/tools/text/xml/basex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "basex-${version}";
+  pname = "basex";
   version = "8.6.6";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index 8851b8a2725..ed19e114469 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, curl, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "html-xml-utils-${version}";
+  pname = "html-xml-utils";
   version = "7.7";
 
   src = fetchurl {
-    url = "https://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";
+    url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz";
     sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr";
   };
 
diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix
index f764a2fac07..388dcc6b583 100644
--- a/pkgs/tools/text/xml/jing-trang/default.nix
+++ b/pkgs/tools/text/xml/jing-trang/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }:
 
 stdenv.mkDerivation rec {
-  name = "jing-trang-${version}";
+  pname = "jing-trang";
   version = "20151127";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/tools/text/xml/rnv/default.nix
index fef8b9db2ff..21869cef4ee 100644
--- a/pkgs/tools/text/xml/rnv/default.nix
+++ b/pkgs/tools/text/xml/rnv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, expat }:
 
 stdenv.mkDerivation rec {
-  name = "rnv-${version}";
+  pname = "rnv";
   version = "1.7.11";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix
index fc11e210c3c..093f1b0aec7 100644
--- a/pkgs/tools/text/xml/rxp/default.nix
+++ b/pkgs/tools/text/xml/rxp/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl} :
 
 stdenv.mkDerivation rec {
-  name = "rxp-${version}";
+  pname = "rxp";
   version = "1.5.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/tools/text/xml/xmlformat/default.nix
index 5982aa3828e..8dfec26e811 100644
--- a/pkgs/tools/text/xml/xmlformat/default.nix
+++ b/pkgs/tools/text/xml/xmlformat/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl }:
 stdenv.mkDerivation rec {
-  name = "xmlformat-${version}";
+  pname = "xmlformat";
   version = "1.04";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix
index 55619b41632..6e66090d88f 100644
--- a/pkgs/tools/text/xurls/default.nix
+++ b/pkgs/tools/text/xurls/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "2.0.0";
-  name = "xurls-${version}";
+  pname = "xurls";
 
   src = fetchFromGitHub {
     owner = "mvdan";
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index c9a6b7b3d79..27334bf09b4 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -16,13 +16,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "zimwriterfs-${version}";
+  pname = "zimwriterfs";
   version = "1.0";
 
   src = fetchFromGitHub {
     owner = "wikimedia";
     repo = "openzim";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1vkrrq929a8s3m5rri1lg0l2vd0mc9n2fsb2z1g88k4n4j2l6f19";
   };
 
diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix
index fd2cf133c0a..cb667e6b121 100644
--- a/pkgs/tools/typesetting/djvu2pdf/default.nix
+++ b/pkgs/tools/typesetting/djvu2pdf/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.2";
-  name = "djvu2pdf-${version}";
+  pname = "djvu2pdf";
 
   src = fetchurl {
     url = "http://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${version}.tar.gz";
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix
index 9240926ab5b..a72ca698077 100644
--- a/pkgs/tools/typesetting/fop/default.nix
+++ b/pkgs/tools/typesetting/fop/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ant, jdk, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "fop-${version}";
+  pname = "fop";
   version = "2.1";
 
   src = fetchurl {
-    url = "mirror://apache/xmlgraphics/fop/source/${name}-src.tar.gz";
+    url = "mirror://apache/xmlgraphics/fop/source/${pname}-${version}-src.tar.gz";
     sha256 = "165rx13q47l6qc29ppr7sg1z26vw830s3rkklj5ap7wgvy0ivbz5";
   };
 
diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix
index a255779c08a..c214bd3cac7 100644
--- a/pkgs/tools/typesetting/git-latexdiff/default.nix
+++ b/pkgs/tools/typesetting/git-latexdiff/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.0";
-  name = "git-latexdiff-${version}";
+  pname = "git-latexdiff";
 
   src = fetchFromGitLab {
     sha256 = "05fnhr1pqvj8l25vi9hdccwfk4mv2f0pfhn05whbdvf66gyl4fs9";
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix
index d6c4fedc143..7fca57ab9d2 100644
--- a/pkgs/tools/typesetting/htmldoc/default.nix
+++ b/pkgs/tools/typesetting/htmldoc/default.nix
@@ -8,7 +8,7 @@ assert stdenv.isDarwin -> SystemConfiguration != null
 
 stdenv.mkDerivation rec {
   version = "1.8.29";
-  name = "htmldoc-${version}";
+  pname = "htmldoc";
   src = fetchurl {
     url = "https://github.com/michaelrsweet/htmldoc/releases/download"
       + "/release-${version}/htmldoc-${version}-source.tar.gz";
diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix
index 2b7a6f3ffb4..064e75ecbdc 100644
--- a/pkgs/tools/typesetting/mmark/default.nix
+++ b/pkgs/tools/typesetting/mmark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mmark-${version}";
+  pname = "mmark";
   version = "1.3.6";
   rev = "v${version}";
 
diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix
index 3a7d7be006a..cd78f63ef78 100644
--- a/pkgs/tools/typesetting/multimarkdown/default.nix
+++ b/pkgs/tools/typesetting/multimarkdown/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, perl }:
 
 stdenv.mkDerivation rec {
-  name = "multimarkdown-${version}";
+  pname = "multimarkdown";
   version = "4.7.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix
index c53e8573c90..9f62671a4fa 100644
--- a/pkgs/tools/typesetting/odpdown/default.nix
+++ b/pkgs/tools/typesetting/odpdown/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonApplication rec {
 
-  name = "odpdown-${version}";
+  pname = "odpdown";
   version = "0.4.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index 42f984b8cc6..a6f38ad0bc2 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.13";
-  name = "pdf2djvu-${version}";
+  pname = "pdf2djvu";
 
   src = fetchurl {
-    url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "0qscmfii1pvnb8g7kbl1rdiqyic6ybfiw4kwvy35qqi967c1daz0";
   };
 
diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix
index 3e40c9caf28..c8e27fb5a6e 100644
--- a/pkgs/tools/typesetting/pdf2odt/default.nix
+++ b/pkgs/tools/typesetting/pdf2odt/default.nix
@@ -14,7 +14,7 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "pdf2odt-${version}";
+  pname = "pdf2odt";
   version = "20170207";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix
index 38382689edc..20da90961dd 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/pkgs/tools/typesetting/pdfgrep/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }:
 
 stdenv.mkDerivation rec {
-  name = "pdfgrep-${version}";
+  pname = "pdfgrep";
   version = "2.1.2";
 
   src = fetchurl {
-    url = "https://pdfgrep.org/download/${name}.tar.gz";
+    url = "https://pdfgrep.org/download/${pname}-${version}.tar.gz";
     sha256 = "1fia10djcxxl7n9jw2prargw4yzbykk6izig2443ycj9syhxrwqf";
   };
 
diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
index 0a0f593eaa3..6a2ebb089d2 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -29,7 +29,7 @@ let
   });
 in
   stdenv.mkDerivation rec {
-    name = "satysfi-${version}";
+    pname = "satysfi";
     version = "0.0.3";
     src = fetchFromGitHub {
       owner = "gfngfn";
diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index f2a48e5db04..af1e8711f22 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "scdoc-${version}";
+  pname = "scdoc";
   version = "1.9.6";
 
   src = fetchurl {
diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 966d657ae7d..3b6ec809869 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -12,11 +12,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "sile-${version}";
+  pname = "sile";
   version = "0.9.5.1";
 
   src = fetchurl {
-    url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2";
+    url = "https://github.com/simoncozens/sile/releases/download/v${version}/${pname}-${version}.tar.bz2";
     sha256 = "0fh0jbpsyqyq0hzq4midn7yw2z11hqdgqb9mmgz766cp152wrkb0";
   };
 
diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix
index 355d7a055e8..b06b2e25fcc 100644
--- a/pkgs/tools/typesetting/skribilo/default.nix
+++ b/pkgs/tools/typesetting/skribilo/default.nix
@@ -10,11 +10,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "skribilo-${version}";
+  pname = "skribilo";
   version = "0.9.4";
 
   src = fetchurl {
-    url = "http://download.savannah.nongnu.org/releases/skribilo/${name}.tar.gz";
+    url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz";
     sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf";
   };
 
diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix
index 1cb7b9ce975..e1bd3922ff3 100644
--- a/pkgs/tools/typesetting/sshlatex/default.nix
+++ b/pkgs/tools/typesetting/sshlatex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "sshlatex-${version}";
+  pname = "sshlatex";
   version = "0.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix
index b60cbcf22ad..a03432b729a 100644
--- a/pkgs/tools/typesetting/ted/default.nix
+++ b/pkgs/tools/typesetting/ted/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "ted";
   version = "2.23";
 
   src = fetchurl {
-    url = "http://ftp.nluug.nl/pub/editors/${pname}/${name}.src.tar.gz";
+    url = "http://ftp.nluug.nl/pub/editors/${pname}/${pname}-${version}.src.tar.gz";
     sha256 = "0v1ipynyjklb3chd1vq26a21sjjg66sir57gi2kkrbwnpk195a9z";
   };
 
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index 5444914f7a4..2513d48796e 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -2,7 +2,6 @@
  
 let auctex = stdenv.mkDerivation ( rec {
   version = "12.1";
-  name = "${pname}-${version}";
 
   # Make this a valid tex(live-new) package;
   # the pkgs attribute is provided with a hack below.
@@ -13,7 +12,7 @@ let auctex = stdenv.mkDerivation ( rec {
   outputs = [ "out" "tex" ];
 
   src = fetchurl {
-    url = "mirror://gnu/${pname}/${name}.tar.gz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1d2x59jw42hr81fma195bniqyhvp5ig5q0xmywbkcy59f16wlp69";
   };
 
diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix
index 906d9be0f1e..a08f32ce9c2 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/pkgs/tools/typesetting/tikzit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "tikzit-${version}";
+  pname = "tikzit";
   version = "2.1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix
index 523a34c0b56..df9a607d4f2 100644
--- a/pkgs/tools/typesetting/xmlroff/default.nix
+++ b/pkgs/tools/typesetting/xmlroff/default.nix
@@ -2,7 +2,7 @@
 , glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "xmlroff-${version}";
+  pname = "xmlroff";
   version = "0.6.2";
 
   src = fetchurl {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace "docs" ""
   '';
 
-  sourceRoot = "${name}/xmlroff/";
+  sourceRoot = "${pname}-${version}/xmlroff/";
 
   patches = [./xmlroff.patch];
 
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index 711a3c00a12..b136e9c5ab7 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchhg, autoreconfHook, zlib, Cocoa }:
 
 stdenv.mkDerivation rec {
-  name = "atomicparsley-${version}";
+  pname = "atomicparsley";
   version = "0.9.6";
 
   src = fetchhg {
diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix
index 4f5a348b144..5594143bfbc 100644
--- a/pkgs/tools/video/bento4/default.nix
+++ b/pkgs/tools/video/bento4/default.nix
@@ -2,7 +2,7 @@
 , cmake
 }:
 stdenv.mkDerivation rec {
-  name = "bento4-${version}";
+  pname = "bento4";
   version = "1.5.1-628";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index 8be02873037..af56ba3e7eb 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -10,7 +10,7 @@ assert opensslSupport -> openssl != null && !gnutlsSupport;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "rtmpdump-${version}";
+  pname = "rtmpdump";
   version = "2015-12-30";
 
   src = fetchgit {
diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix
index a50c7539fe0..d75405ab309 100644
--- a/pkgs/tools/video/swftools/default.nix
+++ b/pkgs/tools/video/swftools/default.nix
@@ -2,11 +2,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "swftools-${version}";
+  pname = "swftools";
   version = "0.9.2";
 
   src = fetchurl {
-    url = "http://www.swftools.org/${name}.tar.gz";
+    url = "http://www.swftools.org/${pname}-${version}.tar.gz";
     sha256 = "1w81dyi81019a6jmnm5z7fzarswng27lg1d4k4d5llxzqszr2s5z";
   };
 
diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix
index c51c23d62f0..a87015ecf96 100644
--- a/pkgs/tools/video/untrunc/default.nix
+++ b/pkgs/tools/video/untrunc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, gcc, libav_12, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "untrunc-${version}";
+  pname = "untrunc";
   version = "2018.01.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix
index e995f9e3a4f..8fca318529f 100644
--- a/pkgs/tools/video/yamdi/default.nix
+++ b/pkgs/tools/video/yamdi/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "yamdi-${version}";
+  pname = "yamdi";
   version = "1.9";
 
   # Source repo is also available here:
diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
index 6ed545deb67..e7c391806aa 100644
--- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
+++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "amazon-ecs-cli-${version}";
+  pname = "amazon-ecs-cli";
   version = "1.15.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix
index 37c3248b83e..57a68b86809 100644
--- a/pkgs/tools/virtualization/awless/default.nix
+++ b/pkgs/tools/virtualization/awless/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "awless-${version}";
+  pname = "awless";
   version = "0.1.11";
 
   goPackagePath = "github.com/wallix/awless";
diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix
index 57742671211..1c7613b4893 100644
--- a/pkgs/tools/virtualization/cloudmonkey/default.nix
+++ b/pkgs/tools/virtualization/cloudmonkey/default.nix
@@ -3,8 +3,6 @@
 with python2Packages;
 
 buildPythonApplication rec {
-
-  name = "${pname}-${version}";
   pname = "cloudmonkey";
   version = "5.3.3";
 
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index c79c2e7cb35..a781f3a4424 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -7,7 +7,7 @@ let binPath = stdenv.lib.makeBinPath [
 ];
 in
 buildGoPackage rec {
-  name = "distrobuilder-${version}";
+  pname = "distrobuilder";
   version = "2019_10_07";
   rev = "d686c88c21838f5505c3ec14711b2413604d7f5c";
 
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index 674673f260c..e8172066800 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "ec2-ami-tools-${version}";
+  pname = "ec2-ami-tools";
 
   version = "1.5.7";
 
   buildInputs = [ unzip makeWrapper ];
 
   src = fetchurl {
-    url = "https://s3.amazonaws.com/ec2-downloads/${name}.zip";
+    url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip";
     sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias";
   };
 
diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
index 7251b418d4e..0daa01f85bb 100644
--- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "google-compute-engine-oslogin-${version}";
+  pname = "google-compute-engine-oslogin";
   version = "1.5.3";
   # from packages/google-compute-engine-oslogin/packaging/debian/changelog
 
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 0db43ccfcfd..5abdcc23a74 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -11,7 +11,7 @@
 }:
 
 buildPythonApplication rec {
-  name = "google-compute-engine-${version}";
+  pname = "google-compute-engine";
   version = "20190124";
   namePrefix = "";
 
diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix
index f2fdbcc670d..0d239547752 100644
--- a/pkgs/tools/virtualization/govc/default.nix
+++ b/pkgs/tools/virtualization/govc/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
   
 buildGoPackage rec {
-  name = "govc-${version}";
+  pname = "govc";
   version = "0.20.0";
 
   goPackagePath = "github.com/vmware/govmomi";
diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix
index 66618e59122..8dbeecc5605 100644
--- a/pkgs/tools/virtualization/marathonctl/default.nix
+++ b/pkgs/tools/virtualization/marathonctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "marathonctl-unstable-${version}";
+  pname = "marathonctl-unstable";
   version = "2017-03-06";
 
   goPackagePath = "github.com/shoenig/marathonctl";
diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix
index 2699a7a1f36..79dd4e4551a 100644
--- a/pkgs/tools/virtualization/rootlesskit/default.nix
+++ b/pkgs/tools/virtualization/rootlesskit/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "rootlesskit-${version}";
+  pname = "rootlesskit";
   version = "0.3.0-alpha.2";
   goPackagePath = "github.com/rootless-containers/rootlesskit";
 
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
index dfb1467b54d..4a81e8fe48b 100644
--- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix
+++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation (rec {
   pname = "xe-guest-utilities";
-  name = "${pname}-${version}";
   version = "6.2.0";
   meta = {
     description = "Citrix XenServer Tools";
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 87c9bd3bacf..2d34bdaabc0 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -132,7 +132,7 @@ with self; {
   };
 
   vicious = toLuaModule(stdenv.mkDerivation rec {
-    name = "vicious-${version}";
+    pname = "vicious";
     version = "2.3.1";
 
     src = fetchFromGitHub {

From 8e4b08105279e63b89a9e8c552b2bfaee0f763a8 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Thu, 15 Aug 2019 16:58:56 +0200
Subject: [PATCH 049/794] ix: init at 20190815

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

diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix
new file mode 100644
index 00000000000..fdbd7611dce
--- /dev/null
+++ b/pkgs/tools/misc/ix/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, makeWrapper, curl }:
+
+stdenv.mkDerivation rec {
+  pname = "ix";
+  version = "20190815";
+
+  src = fetchurl {
+    url = "http://ix.io/client";
+    sha256 =  "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phases = [ "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    install -Dm +x $src $out/bin/ix
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/ix --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://ix.io";
+    description = "Command line pastebin";
+    maintainers = with maintainers; [ asymmetric ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24253c9225d..28e2a11906b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3970,6 +3970,8 @@ in
 
   isync = callPackage ../tools/networking/isync { };
 
+  ix = callPackage ../tools/misc/ix { };
+
   jaaa = callPackage ../applications/audio/jaaa { };
 
   jackett = callPackage ../servers/jackett { };

From 696e1b055b119ecb13b6a7e820c1306575827755 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Tue, 13 Aug 2019 12:22:55 -0600
Subject: [PATCH 050/794] vapoursynth: R46 -> R47.2

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

diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 65132806d88..53d70f4d369 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth";
-  version = "R46";
+  version = "R47.2";
 
   src = fetchFromGitHub {
     owner  = "vapoursynth";
     repo   = "vapoursynth";
     rev    = version;
-    sha256 = "1xbwva12l68awplardf47ydlx904wifw468npaxa9cx9dvd5mv13";
+    sha256 = "004h0vvih7dlhkcz6l2786pf7s04qhiv0bii4gjx23cxyklglh9i";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook nasm makeWrapper ];

From 136f528bbb67d69d4c660685236640c344808360 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 15 Aug 2019 22:38:20 -0400
Subject: [PATCH 051/794] perlPackages.FCGI: fix cross build

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9ff9045600b..193becfc634 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6196,6 +6196,9 @@ let
       url = mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.78.tar.gz;
       sha256 = "1cxavhzg4gyw4gl9kirpbdimjr8gk1rjc3pqs3xrnh1gjybld5xa";
     };
+    postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+      sed -i '/use IO::File/d' Makefile.PL
+    '';
   };
 
   FCGIClient = buildPerlModule {

From 082e90d1cc5186b0d6097a1cf7fa6eff0d7c6e0c Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 29 Jul 2019 14:05:08 +0200
Subject: [PATCH 052/794] kdeFrameworks: 5.58 -> 5.60

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 632 +++++++++---------
 2 files changed, 317 insertions(+), 317 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index afab8a4e9a4..1b23a9da6e7 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.58/ )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.60/ )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 17473db9eeb..63819cda658 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,635 +3,635 @@
 
 {
   attica = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/attica-5.58.0.tar.xz";
-      sha256 = "edba3f94705f904edb0bddd5bab491575bb15ee8f278b92b41272d6f566cad2a";
-      name = "attica-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/attica-5.60.0.tar.xz";
+      sha256 = "6658a886950ab87d779991b4c39beeff250f5aff64c71ee98b5c472a219ac6de";
+      name = "attica-5.60.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/baloo-5.58.0.tar.xz";
-      sha256 = "a1e9340f1046f2df1568da6cd07b26bac9361725cd32b46fd69c370aab0c7227";
-      name = "baloo-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/baloo-5.60.0.tar.xz";
+      sha256 = "d96a19ff94caf3e3b10e8d5f165e276829a42a1c70fb8451d70cb3764f06671e";
+      name = "baloo-5.60.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/bluez-qt-5.58.0.tar.xz";
-      sha256 = "530dc2f89ca26cda23a6383ccfdb00584083d2fbee3b437e5337a77f51513da0";
-      name = "bluez-qt-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/bluez-qt-5.60.0.tar.xz";
+      sha256 = "328aba853ec0c034e777261d9e3ac3202ad941ffde844392e196afaed04be0d4";
+      name = "bluez-qt-5.60.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/breeze-icons-5.58.0.tar.xz";
-      sha256 = "536d2790a143bf0d8cc9ee4de74dea0924eb7d3ac4888fece7bf7c7038066491";
-      name = "breeze-icons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/breeze-icons-5.60.0.tar.xz";
+      sha256 = "99d0cbda6a38766079166633a06493929222c6443e8718c1a2db4aeb5b5f20b7";
+      name = "breeze-icons-5.60.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/extra-cmake-modules-5.58.0.tar.xz";
-      sha256 = "514011c12eeb2ac99d3118975832a279af2c2eea5e8b36b49c81962930b2ecc7";
-      name = "extra-cmake-modules-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/extra-cmake-modules-5.60.0.tar.xz";
+      sha256 = "2bd9da815de98d5908d3371815df963d305c828f90ba1a076f38543876690248";
+      name = "extra-cmake-modules-5.60.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.58.1";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/frameworkintegration-5.58.1.tar.xz";
-      sha256 = "30a9e6c4bde295a031f94ea622ce2324b8a98536f51f0a008b148ea11c44a274";
-      name = "frameworkintegration-5.58.1.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/frameworkintegration-5.60.0.tar.xz";
+      sha256 = "c82600be42b1db398acf4059bde92b3449bb6e52fd0180e66b41060e185e4872";
+      name = "frameworkintegration-5.60.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kactivities-5.58.0.tar.xz";
-      sha256 = "5295cfdc392a8146ca9c3822f1250ceaf5b54990d69c2e3dec4b072519a5ce5b";
-      name = "kactivities-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kactivities-5.60.0.tar.xz";
+      sha256 = "7703b894c25a576a87c201d41899e793c3c2f89eaa57c1ab71266ae950091883";
+      name = "kactivities-5.60.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kactivities-stats-5.58.0.tar.xz";
-      sha256 = "5f3bde50ffe0c23ad5f28c7327d375f223535f139ff014c5d53aef2f41e80611";
-      name = "kactivities-stats-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kactivities-stats-5.60.0.tar.xz";
+      sha256 = "f7374d1d2fe94bae935796193a62e46ee1963a39e11b183cc0a40baedb973788";
+      name = "kactivities-stats-5.60.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kapidox-5.58.0.tar.xz";
-      sha256 = "8635b09f7d0daa8554f228d471bbb1147cf412b779e3a8ab7c2bf7c24ec85165";
-      name = "kapidox-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kapidox-5.60.0.tar.xz";
+      sha256 = "88cb8b8637e1c6e93d908d3384253d8d99efaa28ef7ba9c7a3089544e1f114dc";
+      name = "kapidox-5.60.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/karchive-5.58.0.tar.xz";
-      sha256 = "cd5a42101e5cc50f026f48002dc8125e0c898b148fea5fba4451023ec1e181ad";
-      name = "karchive-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/karchive-5.60.0.tar.xz";
+      sha256 = "4e3d2a6ba551c6ada44a6517150e031df92691919119bc3b5eb4efc741ff7564";
+      name = "karchive-5.60.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kauth-5.58.0.tar.xz";
-      sha256 = "8c004199f1e7aa14f9244299bb8b288f6d077e5c2557f089a530d0c1cd072f4f";
-      name = "kauth-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kauth-5.60.0.tar.xz";
+      sha256 = "50a2a2eb90d7529bb6fc4ddd77e37ef5b25c612b18487cc63d8d086d5ec28916";
+      name = "kauth-5.60.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kbookmarks-5.58.0.tar.xz";
-      sha256 = "9b34f49703101e4d9f6338b66edded7b2c1b7826938a81025ede85a7edc71b02";
-      name = "kbookmarks-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kbookmarks-5.60.0.tar.xz";
+      sha256 = "a2b77f0b084211badce2eb90c19e00caf078ab59512c326ed1c90f4a58de0d9f";
+      name = "kbookmarks-5.60.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kcmutils-5.58.0.tar.xz";
-      sha256 = "2eec73ffca93eb5fc9975a96e072c565a4907b05c161f49877684f4ab252fd9d";
-      name = "kcmutils-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kcmutils-5.60.0.tar.xz";
+      sha256 = "22226ca10caedc6021b966a26a45096f30837ca9eedcc97479e30f950abc7b8c";
+      name = "kcmutils-5.60.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kcodecs-5.58.0.tar.xz";
-      sha256 = "6e5b3c2083c840947e255d58b338128a5e498a4176969f6ac724d56ca3cae8ef";
-      name = "kcodecs-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kcodecs-5.60.0.tar.xz";
+      sha256 = "cf8d5e5d47cbee31ea45faa1ca4d6043d3f8d9cbff2e5d40ce749a0b2cec50df";
+      name = "kcodecs-5.60.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kcompletion-5.58.0.tar.xz";
-      sha256 = "4f5be9d3a70183e0580126c6395d34e3e4141d6e6f852f5f0bb578b20205f5dd";
-      name = "kcompletion-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kcompletion-5.60.0.tar.xz";
+      sha256 = "d5afb075661dfe2da5e300bd73dee89f92736f39859be711f186310bed245f7c";
+      name = "kcompletion-5.60.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kconfig-5.58.0.tar.xz";
-      sha256 = "6f464a63079f43f11deb7f1661dadaa12539b8a8c75e3fa7476dae8ab6886a5e";
-      name = "kconfig-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kconfig-5.60.0.tar.xz";
+      sha256 = "541acceead9ca516e3562109e7e94351ce378c234bea968c8dfde78f00559233";
+      name = "kconfig-5.60.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kconfigwidgets-5.58.0.tar.xz";
-      sha256 = "8d68cf5618b7123a39e62a8ee52a01af7f95325b1d7b7bcac097c0d723c054c0";
-      name = "kconfigwidgets-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kconfigwidgets-5.60.0.tar.xz";
+      sha256 = "74ad4cf5b2858955e7966bb27f7b7ec38c6ddc7c95aa10ba356ef5775afeede3";
+      name = "kconfigwidgets-5.60.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kcoreaddons-5.58.0.tar.xz";
-      sha256 = "f01f3d8b8086085e034a530821a929e56943e33002091d29ab45e0772b6f8e5e";
-      name = "kcoreaddons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kcoreaddons-5.60.0.tar.xz";
+      sha256 = "c78e41596e65fec08b1f7b212dd584cb61b5a9fe89c1bb312e06238fac3e137d";
+      name = "kcoreaddons-5.60.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kcrash-5.58.0.tar.xz";
-      sha256 = "cf921f0ced115107a57a4f15e95ea2d0478b56baf23102abc2470ecd6b8e3c44";
-      name = "kcrash-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kcrash-5.60.0.tar.xz";
+      sha256 = "4f45a5ac0620a0fbf4b983ac3d3e68053a3a0f94bae86076f3bc3ec82ecac299";
+      name = "kcrash-5.60.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdbusaddons-5.58.0.tar.xz";
-      sha256 = "42f176b737f81e120d2fa78c20891b3b7e3f182c6e144ec9c99935a32d63f9b1";
-      name = "kdbusaddons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kdbusaddons-5.60.0.tar.xz";
+      sha256 = "996a9c41d6290e9520dfaa88a97a476f29b2992a135024ab0ad2bc707b0df881";
+      name = "kdbusaddons-5.60.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdeclarative-5.58.0.tar.xz";
-      sha256 = "267d1dbe55ca65c74289e56200b51de95bcbc231b2d4a2867cb6735d04783bec";
-      name = "kdeclarative-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kdeclarative-5.60.0.tar.xz";
+      sha256 = "bbfd1438752866352e4fc7cb69b616c7413eb0b765f73777aa52d5063e2eefb4";
+      name = "kdeclarative-5.60.0.tar.xz";
     };
   };
   kded = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kded-5.58.0.tar.xz";
-      sha256 = "c8ca04174ff9997ccedb382fce7bc4573670ac5dabc69c0d6594589098ab6dc1";
-      name = "kded-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kded-5.60.0.tar.xz";
+      sha256 = "cd472a852dcb3206b219a46660558ee24b09356d7342ce39b89ab54ea160c388";
+      name = "kded-5.60.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/kdelibs4support-5.58.0.tar.xz";
-      sha256 = "c86db5d334c022d804cd9473f893b462904e336aad1ce2c350a1c87039d9473a";
-      name = "kdelibs4support-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/portingAids/kdelibs4support-5.60.0.tar.xz";
+      sha256 = "91b207b3d46c6bc5e97b9b89717db1ef7c4359c65bc4595794143ba78ce92a60";
+      name = "kdelibs4support-5.60.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdesignerplugin-5.58.0.tar.xz";
-      sha256 = "c80a88a525c25fb699412e5c4a4a142ae388ab056aa826a9f5433e78da9c6e6b";
-      name = "kdesignerplugin-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kdesignerplugin-5.60.0.tar.xz";
+      sha256 = "9472332c5a8f7c27d6c581a4f0f4f837d82e2780c1f9b25f2f034afd1d250607";
+      name = "kdesignerplugin-5.60.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdesu-5.58.0.tar.xz";
-      sha256 = "9121dd13a37e0fe5d5d42bbc164d4e20228f85a9ed745829393d3292f7c8183b";
-      name = "kdesu-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kdesu-5.60.0.tar.xz";
+      sha256 = "3a040ae9825738d9b4953086d6c262009dcff877a4ed7e6925e3a34086007687";
+      name = "kdesu-5.60.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdewebkit-5.58.0.tar.xz";
-      sha256 = "9f0629902e60717ee455f0a3e1201c735794f9c60e2fb6ec55b5983f532a2cbc";
-      name = "kdewebkit-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/portingAids/kdewebkit-5.60.0.tar.xz";
+      sha256 = "bf16bf33dfdecc5e4e50bacc5ce142774c5c1522639d3d0042779734767f12fb";
+      name = "kdewebkit-5.60.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdnssd-5.58.0.tar.xz";
-      sha256 = "d3b6ee64f4ed491120351732abf99712e64d43deb1b796d4b701e28df9efad05";
-      name = "kdnssd-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kdnssd-5.60.0.tar.xz";
+      sha256 = "8313b1a418559032a110f07b8816afd676770e0897d72d1d8cc353349a281964";
+      name = "kdnssd-5.60.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdoctools-5.58.0.tar.xz";
-      sha256 = "5c0b915d0f054098b47c5c1ef6ee0d174a9a607405f23c3921276189cefd48f4";
-      name = "kdoctools-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kdoctools-5.60.0.tar.xz";
+      sha256 = "b231ea9857c5c1335fbf1a63907311a136651d93af4a4143e0b4caad833ae834";
+      name = "kdoctools-5.60.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kemoticons-5.58.0.tar.xz";
-      sha256 = "a34159566511f4c012186c52ae203c033d0cb81eef349fd89dbdc225f89b98bd";
-      name = "kemoticons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kemoticons-5.60.0.tar.xz";
+      sha256 = "60e2f227ed7094a0d4d973f7968d4d70b7c9d176dadb45c540541a3d448a5125";
+      name = "kemoticons-5.60.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kfilemetadata-5.58.0.tar.xz";
-      sha256 = "76665ba8ba6ab90cc0e8d682a5c5421fde7c436f5521c614d0b63c5277fabf9c";
-      name = "kfilemetadata-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kfilemetadata-5.60.0.tar.xz";
+      sha256 = "6d2ddfe0b16d73a139573dd02766825b21b958af16f51682c1f4cb816b3929f8";
+      name = "kfilemetadata-5.60.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kglobalaccel-5.58.0.tar.xz";
-      sha256 = "4fd49052697d4659f793b8f7d678a9333a850ed6cf17472eaba9c023430b5bbf";
-      name = "kglobalaccel-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kglobalaccel-5.60.0.tar.xz";
+      sha256 = "660f2b930fd2ea4ad935f37d4e26253a7537ff30cf665ac57a41087dd4c2e805";
+      name = "kglobalaccel-5.60.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kguiaddons-5.58.0.tar.xz";
-      sha256 = "d6d5884f31072fe93804ecad72c8f612fa03d6841318211ad8f6ebf1f5f020f3";
-      name = "kguiaddons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kguiaddons-5.60.0.tar.xz";
+      sha256 = "228dc1715a35979072381658ca244795e989ea941e703559de398fdea793c548";
+      name = "kguiaddons-5.60.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kholidays-5.58.0.tar.xz";
-      sha256 = "ec05faf5290a83d2450be6e1a68c086e4d2da934b3aaf61d578e3cda72295eef";
-      name = "kholidays-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kholidays-5.60.0.tar.xz";
+      sha256 = "af1954758e946b62e387e2197f128e7ae53b6054717f35bcabc674bec19b2d14";
+      name = "kholidays-5.60.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/khtml-5.58.0.tar.xz";
-      sha256 = "f75635e4d0ad9816953bbd0f8c18aea7cd470dc130a6294fa1d32c37bd66dcff";
-      name = "khtml-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/portingAids/khtml-5.60.0.tar.xz";
+      sha256 = "c18a5fa51cbf9f9a0a0f104e2fc0581abdb99a5bd36f8426ef129ea848414037";
+      name = "khtml-5.60.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/ki18n-5.58.0.tar.xz";
-      sha256 = "ea0181b15ff47b34ae7dd7a3a419c461cf05554f9014886d8b8b2ab2ec243977";
-      name = "ki18n-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/ki18n-5.60.0.tar.xz";
+      sha256 = "b94598e6cb40019c9db403cb392b647d798692899467883f2f9419e1de5782c3";
+      name = "ki18n-5.60.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kiconthemes-5.58.0.tar.xz";
-      sha256 = "ec12602159b7115c91b30373321ab631f75b12f814769166b4ee2e3abd83c480";
-      name = "kiconthemes-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kiconthemes-5.60.0.tar.xz";
+      sha256 = "054bfdb9129ae8610cad742198e2ad047f3960f810b8153dc28ead76687d9e79";
+      name = "kiconthemes-5.60.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kidletime-5.58.0.tar.xz";
-      sha256 = "86d8c4ff13b864c07f98d0475683838708c43e4ba6275e05f21766e2a79cfd90";
-      name = "kidletime-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kidletime-5.60.0.tar.xz";
+      sha256 = "e7c4ca5ca3e847c37add4c81b3d430f4c4bf0214433a234a32d766c9199adb27";
+      name = "kidletime-5.60.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kimageformats-5.58.0.tar.xz";
-      sha256 = "deb5b18c8289e2ce1988769f6b87dd7ad57dde6c15e51a474e51eef76568a9d9";
-      name = "kimageformats-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kimageformats-5.60.0.tar.xz";
+      sha256 = "4e2fd48a2c5b7ee3af0b82bce9aaa0847e840b881bbb307c049bb8c881302635";
+      name = "kimageformats-5.60.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kinit-5.58.0.tar.xz";
-      sha256 = "22c2adb9b1b52d0f90db9c36bd0313250d986a207f781c0582e85c4805297e53";
-      name = "kinit-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kinit-5.60.0.tar.xz";
+      sha256 = "c8c109e220e8eb812a09d3474439b0f6f6af4d25861322a9494fc206da51afdc";
+      name = "kinit-5.60.0.tar.xz";
     };
   };
   kio = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kio-5.58.0.tar.xz";
-      sha256 = "14c74959824a288d7fae17acbd2786eee1f0a2545cb9bf39c43bbd862ec55069";
-      name = "kio-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kio-5.60.0.tar.xz";
+      sha256 = "be433fcf665679671a2e320556c39b708ed0789271e76ebb6142df058260238d";
+      name = "kio-5.60.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kirigami2-5.58.0.tar.xz";
-      sha256 = "ad54e15c03807181313e29013057cf89cb70113f74a26ab7aec6420cdc18d9b3";
-      name = "kirigami2-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kirigami2-5.60.0.tar.xz";
+      sha256 = "f016481d393041513dda11345e9ee84723587fa4be9f17391ed1a5868477e153";
+      name = "kirigami2-5.60.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kitemmodels-5.58.0.tar.xz";
-      sha256 = "f861844a6d24ecdddd7b2b29d47dc03bccbd5dc2c8053f5c3a839a5ff59cd491";
-      name = "kitemmodels-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kitemmodels-5.60.0.tar.xz";
+      sha256 = "364799922efa153d5bd6c326a8c3311d7170356807be1e67eb4d5135ec62f5ff";
+      name = "kitemmodels-5.60.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kitemviews-5.58.0.tar.xz";
-      sha256 = "bb073f96236102a953a2298039d0c380458c0a2393d7dc7bb657ee4e2ea9b6e6";
-      name = "kitemviews-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kitemviews-5.60.0.tar.xz";
+      sha256 = "e43c1479bd5a8c90ba8e396a34299e0a96143ad6cdfd1edef0be5839fb95437f";
+      name = "kitemviews-5.60.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kjobwidgets-5.58.0.tar.xz";
-      sha256 = "d43ea4eede2d88edd1753f4d1b6808bf04bf1e67ab58f00ef70b6a20b9607133";
-      name = "kjobwidgets-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kjobwidgets-5.60.0.tar.xz";
+      sha256 = "b9d2a044a17eff6ced2cf6c4bd06661a0d64cbeea2b18248cdac4f969ea69353";
+      name = "kjobwidgets-5.60.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/kjs-5.58.0.tar.xz";
-      sha256 = "9e95cb54f4323f31f88e3fb5946b4f990d8a5f1ba8fecf166844af672037a60c";
-      name = "kjs-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/portingAids/kjs-5.60.0.tar.xz";
+      sha256 = "9f4beaf9d773afbd73de5a9adf1f481c9b95fb02cc7cfe8ec050625c13811355";
+      name = "kjs-5.60.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/kjsembed-5.58.0.tar.xz";
-      sha256 = "ffbcd9de767d62497db146acd7bcaeaa59b3f6b418616d4562d1a2269048131d";
-      name = "kjsembed-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/portingAids/kjsembed-5.60.0.tar.xz";
+      sha256 = "91c8767a533ee414cd0b4789270881495a8e06482d68bda988cc5fdeb987c421";
+      name = "kjsembed-5.60.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/kmediaplayer-5.58.0.tar.xz";
-      sha256 = "1cc831eae5f0e71375118c01b72e7961d42888fca0726800ce8c42bf4e1f21ea";
-      name = "kmediaplayer-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/portingAids/kmediaplayer-5.60.0.tar.xz";
+      sha256 = "c27ab1227276a65b1c98796b5bae5e62f0e5c45a904760d94f5624bd3a46949e";
+      name = "kmediaplayer-5.60.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/knewstuff-5.58.0.tar.xz";
-      sha256 = "06d3ee09652f166ad66e003523bafe43741a99d2cd5dca3268ac7a13498cefbd";
-      name = "knewstuff-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/knewstuff-5.60.0.tar.xz";
+      sha256 = "64744c6775c839d9d8216c4a81161df5544e113570b4cee8533b5a9b4c7b36f2";
+      name = "knewstuff-5.60.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/knotifications-5.58.0.tar.xz";
-      sha256 = "5a388e05ae3416a5120c268e48fa505e6666403772e8f03fe4670ab1d0bb0469";
-      name = "knotifications-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/knotifications-5.60.0.tar.xz";
+      sha256 = "fbed417c689b8abf08e1f29df5094cab55b193ce03483658dfb8cdbea3f2d928";
+      name = "knotifications-5.60.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/knotifyconfig-5.58.0.tar.xz";
-      sha256 = "a40555d9645c4ed283e61a9e5718d5476359124e23d52a838e30fca7e089dc01";
-      name = "knotifyconfig-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/knotifyconfig-5.60.0.tar.xz";
+      sha256 = "77e78f15226334ffaaa0469c06052cca60a9c18063140f38b9cd6dbf8de8f099";
+      name = "knotifyconfig-5.60.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kpackage-5.58.0.tar.xz";
-      sha256 = "41deff40eb17b3f667fd03f4a30dcf734ca060ebd7e2320eb38ff36ed6a9ce90";
-      name = "kpackage-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kpackage-5.60.0.tar.xz";
+      sha256 = "18d951c2ae16cfe2765dfec3ff42ce88f4b716b242294690efe8ff727395406d";
+      name = "kpackage-5.60.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kparts-5.58.0.tar.xz";
-      sha256 = "6fe1ca552f14dd262cf33e60d0c85536ca04617757e39f91dbfe061abf624bb4";
-      name = "kparts-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kparts-5.60.0.tar.xz";
+      sha256 = "6df0c2bf4481716e68d57b0e2040e9c2f0ee66e81309ba594d868026ea9f5ac6";
+      name = "kparts-5.60.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kpeople-5.58.0.tar.xz";
-      sha256 = "2588f7a4df4c03fe756d9e766120e35b0f991df5c8e5f75c3a507cc5739ded32";
-      name = "kpeople-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kpeople-5.60.0.tar.xz";
+      sha256 = "ec72c0a0b8e5ee9541eb3d0dedfffc78aee39d54fec91d78adb33243a8b3bd1d";
+      name = "kpeople-5.60.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kplotting-5.58.0.tar.xz";
-      sha256 = "4d46b4c78abcaf171132f4a17f35d28f7bd89b346fbe7b2e494f5212ee2cc81b";
-      name = "kplotting-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kplotting-5.60.0.tar.xz";
+      sha256 = "75e8c21c2417a65cb423d11e4abd28a93a9cf9e3b2f01695cdedf9ee4b2fa7a0";
+      name = "kplotting-5.60.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kpty-5.58.0.tar.xz";
-      sha256 = "808a9f159e3d34630ae16d13c3ed6310c07fc9a38737110190892dcc903d5017";
-      name = "kpty-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kpty-5.60.0.tar.xz";
+      sha256 = "757daec3b77395cdf390b35419972641b2ca18c986b39b98ccf8fb3384547338";
+      name = "kpty-5.60.0.tar.xz";
     };
   };
   kross = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/kross-5.58.0.tar.xz";
-      sha256 = "b71c521718acd9829124264e97990222c458eca4a2e0be471a853db55b07d872";
-      name = "kross-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/portingAids/kross-5.60.0.tar.xz";
+      sha256 = "e83f3388ca8e89057e272b3b98233f294528ed0dcb62a6edb6cf37b7a1891f45";
+      name = "kross-5.60.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/krunner-5.58.0.tar.xz";
-      sha256 = "d83220210980117459e49a44b2173063faa70ea5524c744cde4ca3dc031a6c8c";
-      name = "krunner-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/krunner-5.60.0.tar.xz";
+      sha256 = "e0fce95407c52d1769a38a2f95f80637bbedb039b0df702b71c5b191795fdce3";
+      name = "krunner-5.60.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kservice-5.58.0.tar.xz";
-      sha256 = "03e1d69b1558c4d38946e1ffdec4249e58d8a0f15575ce984c751d93b3ff1395";
-      name = "kservice-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kservice-5.60.0.tar.xz";
+      sha256 = "2d891e2781da5a562515ae09f5fb9ebd85ce397631cb217de11cb998e79516f8";
+      name = "kservice-5.60.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/ktexteditor-5.58.0.tar.xz";
-      sha256 = "dc28916db7eb8a24f89b6570358d576b73e1ca60f7364871a0ef67f9fd62db8e";
-      name = "ktexteditor-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/ktexteditor-5.60.0.tar.xz";
+      sha256 = "7484dfaa4df868c8193e15cc760b3ce7e8e0948daaa4a1b3ca6b96550041385d";
+      name = "ktexteditor-5.60.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/ktextwidgets-5.58.0.tar.xz";
-      sha256 = "056601d7c1aa412a9628fae8eb6ca6cf51d0f0fab03345bb4be8e7072827fed7";
-      name = "ktextwidgets-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/ktextwidgets-5.60.0.tar.xz";
+      sha256 = "8149a999ca6d2dda523d6047956ca62fd283d71356b84dfd7db6fd1582b5d43e";
+      name = "ktextwidgets-5.60.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kunitconversion-5.58.0.tar.xz";
-      sha256 = "5716474c4d031d9b5fdb3fe460957d4ceecd1d9c4e441df81a42bfbb993232fa";
-      name = "kunitconversion-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kunitconversion-5.60.0.tar.xz";
+      sha256 = "0e377f67b6977787861aba971167aedfaa0e4c023609d505ea2d57357c082a79";
+      name = "kunitconversion-5.60.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kwallet-5.58.0.tar.xz";
-      sha256 = "5203765ba2061727d0280bf7e9cbbade462ba2c5e7389f4f8d78afc522ba2030";
-      name = "kwallet-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kwallet-5.60.0.tar.xz";
+      sha256 = "2ac2186dd7d004b6740cb14e7651ddcb7d74390acb382c9d55874f3a03a8111d";
+      name = "kwallet-5.60.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kwayland-5.58.0.tar.xz";
-      sha256 = "a273a64ac06698e7c7d297da05c3b4889893c8b4179b01aa7ae1c2fb8681a4f1";
-      name = "kwayland-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kwayland-5.60.0.tar.xz";
+      sha256 = "a0645594c2dc7c121b11eecf1c1d31448d110d13dab200caadddb7e1d836d905";
+      name = "kwayland-5.60.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kwidgetsaddons-5.58.0.tar.xz";
-      sha256 = "f4bcb1e22d8dfec214f4f55dbf4492229c4cb6ab63031f826ef68896c27ca6c0";
-      name = "kwidgetsaddons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kwidgetsaddons-5.60.0.tar.xz";
+      sha256 = "2e74d3897290c43871836a55ce0dbf4e6f3563f97016827d7ffccf0e5342a39d";
+      name = "kwidgetsaddons-5.60.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kwindowsystem-5.58.0.tar.xz";
-      sha256 = "0b25d55bc9be6329c5cf91328c4414b547f26496a1af83f9454c0e5d85a10129";
-      name = "kwindowsystem-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kwindowsystem-5.60.0.tar.xz";
+      sha256 = "3bdce23b75b4b1d1eea69fb2035ff5be94ea2c1b7bb3d4e529a9b1740b106315";
+      name = "kwindowsystem-5.60.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kxmlgui-5.58.0.tar.xz";
-      sha256 = "ab08ed118f6806154fe10414d81dace413ecf80df3a561811f41879b48b7179f";
-      name = "kxmlgui-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kxmlgui-5.60.0.tar.xz";
+      sha256 = "c81c2794610add13fd8019031fb40b0d002085d40ba358f6406c54f79581c149";
+      name = "kxmlgui-5.60.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kxmlrpcclient-5.58.0.tar.xz";
-      sha256 = "53f647bb8d9165ddf6326703486470c7e9fc4ef392991501319e5c69f25f0ea3";
-      name = "kxmlrpcclient-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/kxmlrpcclient-5.60.0.tar.xz";
+      sha256 = "e5f3bef626027b3cd84873362a5c6ee26692ee99a394ef9d944741670b1ca322";
+      name = "kxmlrpcclient-5.60.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/modemmanager-qt-5.58.0.tar.xz";
-      sha256 = "cec892b58603fd95656b2cac356e8076a65122d110e3f5175bbabfaa296b16cb";
-      name = "modemmanager-qt-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/modemmanager-qt-5.60.0.tar.xz";
+      sha256 = "461b99099376d1210dad7867627c67b2a64af908a4fca0aeed75fc36059cad4e";
+      name = "modemmanager-qt-5.60.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/networkmanager-qt-5.58.0.tar.xz";
-      sha256 = "113f48b1ed07b7541bc205220197e245f547e0a08382c3aeb29b0c02e6ec4abe";
-      name = "networkmanager-qt-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/networkmanager-qt-5.60.0.tar.xz";
+      sha256 = "fae1d2e36e0c79095cfa3d907c86c47272226a6952ab93139b750f29e9215a65";
+      name = "networkmanager-qt-5.60.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/oxygen-icons5-5.58.0.tar.xz";
-      sha256 = "0e6a6fd611893c870901b78f601caf8ae9afd2a666088a5a167f3cbf815bd3e7";
-      name = "oxygen-icons5-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/oxygen-icons5-5.60.0.tar.xz";
+      sha256 = "dca378431ec83106859736938dcc81156435b71ead564ff7ddfda85311b94e5f";
+      name = "oxygen-icons5-5.60.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/plasma-framework-5.58.0.tar.xz";
-      sha256 = "0b0826a2292612112e78198938d660e913756f8712d1f2c71eafbead42605cad";
-      name = "plasma-framework-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/plasma-framework-5.60.0.tar.xz";
+      sha256 = "96c93ea54d1ce29f930e707ab4b0eafc9e31d022f9939d2bd42b2d884e450141";
+      name = "plasma-framework-5.60.0.tar.xz";
     };
   };
   prison = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/prison-5.58.0.tar.xz";
-      sha256 = "2bd97bf19e70b67cac49eaefb89a0fe8bd506e710e10df41f9b7c65d9dc30b1d";
-      name = "prison-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/prison-5.60.0.tar.xz";
+      sha256 = "1b8149b8965c287f7fddfd91fb1d9cf95f150dda5b70b19480452c2e855945b5";
+      name = "prison-5.60.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/purpose-5.58.0.tar.xz";
-      sha256 = "8acbf11af0d9f149ca52c15d07a62107d83b02306102af9e37ee32aeaef831df";
-      name = "purpose-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/purpose-5.60.0.tar.xz";
+      sha256 = "830669315e15a3edbf91130711b604967d1dae2cabb1fa79e0d72866f05b9f0a";
+      name = "purpose-5.60.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/qqc2-desktop-style-5.58.0.tar.xz";
-      sha256 = "71b2c94aece8c0f4cda33170a84240d1f7ed9ec774dcf5bd292bda861bda46a3";
-      name = "qqc2-desktop-style-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/qqc2-desktop-style-5.60.0.tar.xz";
+      sha256 = "75e2cf793f1ba6af6592edf910412214a640366e08fea8487f20251a3e535140";
+      name = "qqc2-desktop-style-5.60.0.tar.xz";
     };
   };
   solid = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/solid-5.58.0.tar.xz";
-      sha256 = "7d7f2daaffe8536ee9373375b866c94b949e58f0365990dfe16f9cc05f98bd00";
-      name = "solid-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/solid-5.60.0.tar.xz";
+      sha256 = "bf3dbf22dc63946cf83cd69882f0d5fb8bf938c90252b85c849ef644caebac8a";
+      name = "solid-5.60.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/sonnet-5.58.0.tar.xz";
-      sha256 = "e67ffab7674175588883a9b444973e9edef2257e025f99657bb13d09e72bf823";
-      name = "sonnet-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/sonnet-5.60.0.tar.xz";
+      sha256 = "f6734ac4a8dcef69f159ce0810a66ebbc2bdb8f67aac58376e8af35eb7c3dfc3";
+      name = "sonnet-5.60.0.tar.xz";
     };
   };
   syndication = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/syndication-5.58.0.tar.xz";
-      sha256 = "48d321fdefd57ef9380492652c765ded047d4a54ba6aed5abb1434e30e327643";
-      name = "syndication-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/syndication-5.60.0.tar.xz";
+      sha256 = "67bf74432d362af7e7d21984f6915b047b596a8a0ac789cbf724ea7c4f8943d9";
+      name = "syndication-5.60.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/syntax-highlighting-5.58.0.tar.xz";
-      sha256 = "b97e58e9fe64bc21368d18c57b69dd5696328a0722c01ae2e113826e2e35ba76";
-      name = "syntax-highlighting-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/syntax-highlighting-5.60.0.tar.xz";
+      sha256 = "45ada4dca20641654a2d076ecb45b9ef78a4aa8032afe54ade33f140cdca504d";
+      name = "syntax-highlighting-5.60.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.58.0";
+    version = "5.60.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/threadweaver-5.58.0.tar.xz";
-      sha256 = "d9f95ed3a5ccedaa10ae086c82d8794a9ae9e82e094c352869bc6459ead8409d";
-      name = "threadweaver-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.60/threadweaver-5.60.0.tar.xz";
+      sha256 = "8bf6520e006dadacc82735242500c73810ff3ed4e3053c8352724c9d45f4a122";
+      name = "threadweaver-5.60.0.tar.xz";
     };
   };
 }

From e143cbd3d793b6ac43c58b27695ab339a886a1f1 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 29 Jul 2019 14:06:01 +0200
Subject: [PATCH 053/794] kde_applications: 19.04.1 -> 19.04.3

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 1720 ++++++++++++++++----------------
 2 files changed, 861 insertions(+), 861 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index bd96cb96693..6659865bc01 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/19.04.1/ )
+WGET_ARGS=( https://download.kde.org/stable/applications/19.04.3/ )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 43deb08c39f..a4cd9eb2b09 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1723 +3,1723 @@
 
 {
   akonadi = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-19.04.1.tar.xz";
-      sha256 = "b157c4199e3b913c4f684f56ed9d76bef67b3c120c319c88ae24bded6fc927bc";
-      name = "akonadi-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/akonadi-19.04.3.tar.xz";
+      sha256 = "7ac34dc7c3e2bf8e53ec9eebeecc8d96541c0b663dd71963e6bcd94e7ac41b07";
+      name = "akonadi-19.04.3.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-19.04.1.tar.xz";
-      sha256 = "6ef352dc20998416b8d379b085edfcfba5bcf6a5f448e11a4e51aca6b3241e48";
-      name = "akonadi-calendar-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/akonadi-calendar-19.04.3.tar.xz";
+      sha256 = "939691e3c31993e3708a74759cbab951a51d0b36239426fe09c9ee9ff9622013";
+      name = "akonadi-calendar-19.04.3.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-tools-19.04.1.tar.xz";
-      sha256 = "6a8eb905d0e5a1602ce59d5cf28322d844dc178c4daf98db1cf9e0c95eeb3531";
-      name = "akonadi-calendar-tools-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/akonadi-calendar-tools-19.04.3.tar.xz";
+      sha256 = "b7bf7c6a8df76f66d13209b3a2d1c47d703f0a3fff7936d2c880c11c2eb33d39";
+      name = "akonadi-calendar-tools-19.04.3.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadiconsole-19.04.1.tar.xz";
-      sha256 = "33846348b0308eaf4ca81e8d577ce0eb6c17d49632e034607506413e86531262";
-      name = "akonadiconsole-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/akonadiconsole-19.04.3.tar.xz";
+      sha256 = "25a302f3e582555cf003b48e28788d289a771e0c29c500afcd5d915e0bb34bda";
+      name = "akonadiconsole-19.04.3.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-contacts-19.04.1.tar.xz";
-      sha256 = "4c58a73db7924250e47fb030657dc768fe44405806ec2d94ee00a264b414febc";
-      name = "akonadi-contacts-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/akonadi-contacts-19.04.3.tar.xz";
+      sha256 = "9ecae008ccc77ff5982de5152dfc2be62eb1137f24a58aeb74a62291fc2fd93c";
+      name = "akonadi-contacts-19.04.3.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-import-wizard-19.04.1.tar.xz";
-      sha256 = "2699ca57ea6a04228875dd795255fd32a1120e2e5c4834290aea3270c43403e7";
-      name = "akonadi-import-wizard-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/akonadi-import-wizard-19.04.3.tar.xz";
+      sha256 = "5e4b74790927be8372939237336e3684d7560d0c0652a26b57cc3233109234c4";
+      name = "akonadi-import-wizard-19.04.3.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-mime-19.04.1.tar.xz";
-      sha256 = "4572aa7c953cc641a98ae3c2685dcdf259d621dcbbab1ccb7d11e2748c67b1a8";
-      name = "akonadi-mime-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/akonadi-mime-19.04.3.tar.xz";
+      sha256 = "ec4fbd594fb4fc57f1a7e11763b517721fc5e050ffa7bbc2bdddf5e76694d9f9";
+      name = "akonadi-mime-19.04.3.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-notes-19.04.1.tar.xz";
-      sha256 = "e503101e8806485ecf6ef22d1bafd8c299676ca75a388499e5418b8641604277";
-      name = "akonadi-notes-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/akonadi-notes-19.04.3.tar.xz";
+      sha256 = "c95f50c9ab0fc3587d3e1e78073038e3a044f3dc116068b354b2d148d6288dbf";
+      name = "akonadi-notes-19.04.3.tar.xz";
     };
   };
   akonadi-search = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-search-19.04.1.tar.xz";
-      sha256 = "8438876407e9fd8fa08afe6942ab8dd3677202bc2ff1eba4fd7a49dd926f26d6";
-      name = "akonadi-search-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/akonadi-search-19.04.3.tar.xz";
+      sha256 = "c5298a5b903373590e63039777c954720aa0bc46b25ec0c48e6409265b38d4ed";
+      name = "akonadi-search-19.04.3.tar.xz";
     };
   };
   akregator = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akregator-19.04.1.tar.xz";
-      sha256 = "b2e731a3eac0a68865a90b71f17307c3aea8db304bf6663b551bc95907a490f1";
-      name = "akregator-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/akregator-19.04.3.tar.xz";
+      sha256 = "5d883061c4a53374ff2351646711d2b6eb047187ffd0d620a038fb6509bb60c0";
+      name = "akregator-19.04.3.tar.xz";
     };
   };
   analitza = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/analitza-19.04.1.tar.xz";
-      sha256 = "b96da492805a48faff72e93e1b8b211c468b041fe217489eb097d554773d3381";
-      name = "analitza-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/analitza-19.04.3.tar.xz";
+      sha256 = "771cf26918ea09f1597ee95328bdfc1c65b28617b0b312ca609676a718fc2a9e";
+      name = "analitza-19.04.3.tar.xz";
     };
   };
   ark = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ark-19.04.1.tar.xz";
-      sha256 = "6d348b2b9566ce0b8a1ba1b56d0a8c5d434d4748c479c5a853fdcdecfec753e6";
-      name = "ark-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ark-19.04.3.tar.xz";
+      sha256 = "a06cc2937aa4ed41bab0a38344164f367b993a80bcd74011e4ab72643bfee8ee";
+      name = "ark-19.04.3.tar.xz";
     };
   };
   artikulate = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/artikulate-19.04.1.tar.xz";
-      sha256 = "11a54ef7abf001bd3debcaf46bc60764af55a2dbda6320c3c220461374f74432";
-      name = "artikulate-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/artikulate-19.04.3.tar.xz";
+      sha256 = "3f0b811017c59a05260ca43a7e298633a6ac9ef0f9cfb8ec62890da0f3ec1217";
+      name = "artikulate-19.04.3.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/audiocd-kio-19.04.1.tar.xz";
-      sha256 = "fad61ea586db7a4ce202fbb16854f69a20e8e16518dd60c27112447a904edb98";
-      name = "audiocd-kio-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/audiocd-kio-19.04.3.tar.xz";
+      sha256 = "4e684ab03fafd4ee37d7ef7d2c2edb883e76bb5a81e11415173317160997accf";
+      name = "audiocd-kio-19.04.3.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/baloo-widgets-19.04.1.tar.xz";
-      sha256 = "7f7f0b3ba1bbdb3a47cdfa85830295b4b91fa5ac6c87b41d1cf29c354d8a4cf6";
-      name = "baloo-widgets-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/baloo-widgets-19.04.3.tar.xz";
+      sha256 = "ee14c03ac8254a0d0680bce856178a2110f0339b9dd5021927c59ff2df90606f";
+      name = "baloo-widgets-19.04.3.tar.xz";
     };
   };
   blinken = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/blinken-19.04.1.tar.xz";
-      sha256 = "87fbf14568692885e7a496a8dae0c4f53a2837d1a824f9c7cf1038a7e8c861ca";
-      name = "blinken-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/blinken-19.04.3.tar.xz";
+      sha256 = "db0cb33ef117ad3c05f7f90a0d931106141431448d7fbb7c49f4832273313001";
+      name = "blinken-19.04.3.tar.xz";
     };
   };
   bomber = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/bomber-19.04.1.tar.xz";
-      sha256 = "1359ebcaab26acd2dfa738160f9dd7a86e5bfa3d3b2f8a86c656ee187ad6c3fe";
-      name = "bomber-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/bomber-19.04.3.tar.xz";
+      sha256 = "48214f30503d37343268b817c68b47042cb9855688cc7564bf9c6dd5d2a31dda";
+      name = "bomber-19.04.3.tar.xz";
     };
   };
   bovo = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/bovo-19.04.1.tar.xz";
-      sha256 = "46b5286349ba7765b81edf92f834c3e8e5c0ecd65466deb5fa593477e76f0763";
-      name = "bovo-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/bovo-19.04.3.tar.xz";
+      sha256 = "ee4b2480d51ba768e241faf70fcbe955656840c648e9d81c2a269ccc8558ea35";
+      name = "bovo-19.04.3.tar.xz";
     };
   };
   calendarsupport = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/calendarsupport-19.04.1.tar.xz";
-      sha256 = "9b44e868a24494c3ce595dc71e8981f97a8ce75dc4646e1417ebde973ee5f535";
-      name = "calendarsupport-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/calendarsupport-19.04.3.tar.xz";
+      sha256 = "789ae6f2cb75baf239079b11742fbe40353c55eac84b0a396f761f010bc9041c";
+      name = "calendarsupport-19.04.3.tar.xz";
     };
   };
   cantor = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/cantor-19.04.1.tar.xz";
-      sha256 = "95ce049f38182f9c0f7fb749c0940c24a51cc88053d218148ac82e925d9dfbb1";
-      name = "cantor-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/cantor-19.04.3.tar.xz";
+      sha256 = "6ac01cf576d6ee6292d9656bebe2fa6f1216814148f77d0b9971df6a92ff5a47";
+      name = "cantor-19.04.3.tar.xz";
     };
   };
   cervisia = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/cervisia-19.04.1.tar.xz";
-      sha256 = "fe72361330b055922e4ae66edb2e6958897b7c443ab3066ab7bbef1b8fd9d41b";
-      name = "cervisia-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/cervisia-19.04.3.tar.xz";
+      sha256 = "e0e04076ef5d43b18a571b5f3f8acb774a5c2fe03a901cd5fbf65621fc5e05eb";
+      name = "cervisia-19.04.3.tar.xz";
     };
   };
   dolphin = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/dolphin-19.04.1.tar.xz";
-      sha256 = "72cab4d9f49ac05d3e0e8e1ff67cf29c0cacbe2c3a43506eca4c849ea878370a";
-      name = "dolphin-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/dolphin-19.04.3.tar.xz";
+      sha256 = "67a2b283049591fa0f00304b4da6532e9d59d9dc9067916e0ffe8aa19d93f579";
+      name = "dolphin-19.04.3.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/dolphin-plugins-19.04.1.tar.xz";
-      sha256 = "dc528e93d3f7809b8480da5134ead3886205a172a85b25ffdd5720ec67892105";
-      name = "dolphin-plugins-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/dolphin-plugins-19.04.3.tar.xz";
+      sha256 = "a68e15b71fa35acb190952ef49b2611876317e3bb0420d65d5365bc03feb9542";
+      name = "dolphin-plugins-19.04.3.tar.xz";
     };
   };
   dragon = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/dragon-19.04.1.tar.xz";
-      sha256 = "f8acfc09aeec180850345f8881f963c19a3956cd7e07e42463bbe95ff2227ab8";
-      name = "dragon-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/dragon-19.04.3.tar.xz";
+      sha256 = "498bbcf3441a32a588568981ee3ad563b6c4fd88b226d1673d83da09901f117a";
+      name = "dragon-19.04.3.tar.xz";
     };
   };
   eventviews = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/eventviews-19.04.1.tar.xz";
-      sha256 = "1fae8263d17a802393e5b1ece80879b66303f4d5bc8cc040cf142d6d5e8cc763";
-      name = "eventviews-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/eventviews-19.04.3.tar.xz";
+      sha256 = "3f479f695756cea5d10ea2ab028dd6a954e677223a5c1ff9f7be208742952f22";
+      name = "eventviews-19.04.3.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ffmpegthumbs-19.04.1.tar.xz";
-      sha256 = "76f912f09c01698ed020bce2109f7cb893a9ca3ca7c014b118c0f97b4b4982ae";
-      name = "ffmpegthumbs-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ffmpegthumbs-19.04.3.tar.xz";
+      sha256 = "ddd6cb3388c1af96a14d611de9575f6f6c22c6acfe52e63e44b746709ac8024b";
+      name = "ffmpegthumbs-19.04.3.tar.xz";
     };
   };
   filelight = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/filelight-19.04.1.tar.xz";
-      sha256 = "7595efbff5cbbe59b3fc4f6af69b9557107bc8661f38951577947503ac7883bd";
-      name = "filelight-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/filelight-19.04.3.tar.xz";
+      sha256 = "4ad45db886f06afdff1e5c580261eea18f2c0cf3bcde92ecdc626583641d6c88";
+      name = "filelight-19.04.3.tar.xz";
     };
   };
   granatier = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/granatier-19.04.1.tar.xz";
-      sha256 = "372dd577805457425bb9c35b5f434089aa2bb7c1e6f54908b2be60d4dda2cb22";
-      name = "granatier-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/granatier-19.04.3.tar.xz";
+      sha256 = "996dafafc4a72cf49748c9e7046267980d5c9639b84c26e85266850dd1a9df21";
+      name = "granatier-19.04.3.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/grantlee-editor-19.04.1.tar.xz";
-      sha256 = "b07f3c3179010b1d9a9170bc6e2b85517c3dfbd277336316882f4503823e076a";
-      name = "grantlee-editor-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/grantlee-editor-19.04.3.tar.xz";
+      sha256 = "b244eef352ef776cbb0d3d5e51ffaa629d4ca3b6bd7fc86a8fda8d24e5090bca";
+      name = "grantlee-editor-19.04.3.tar.xz";
     };
   };
   grantleetheme = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/grantleetheme-19.04.1.tar.xz";
-      sha256 = "fdcf77c996123daea0559cc2ac4251b330e2c4388104ee95f814af770fc33d8b";
-      name = "grantleetheme-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/grantleetheme-19.04.3.tar.xz";
+      sha256 = "c5cf79f1daddde3bc5b9387546b10e1d3ae4512279d50e3545ad38982c7f9aaf";
+      name = "grantleetheme-19.04.3.tar.xz";
     };
   };
   gwenview = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/gwenview-19.04.1.tar.xz";
-      sha256 = "636498100284be86194d328c40ed70166cc96a5fc7665090e4a1ca9538b2f13c";
-      name = "gwenview-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/gwenview-19.04.3.tar.xz";
+      sha256 = "1e4c6881674dfcde52a196420eae2fab61dffb05b976125dfbd65c3bf2395035";
+      name = "gwenview-19.04.3.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/incidenceeditor-19.04.1.tar.xz";
-      sha256 = "f0f5191e4246068fb941fde10df87b76b5ca1d6f491d864e4b7e4acacebcae58";
-      name = "incidenceeditor-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/incidenceeditor-19.04.3.tar.xz";
+      sha256 = "b3a0ac35b04bc7851a32021552369ba5ac5b2e69969c29121d9cb2adfd5ccf70";
+      name = "incidenceeditor-19.04.3.tar.xz";
     };
   };
   juk = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/juk-19.04.1.tar.xz";
-      sha256 = "f141c0e33eccd931438a1b1fe37810951ab177b3fe853d6dd387f28f59382e51";
-      name = "juk-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/juk-19.04.3.tar.xz";
+      sha256 = "f4a272aa677ac7b5eb8c3f30234dea129e41863c5c78d812b27d30dde0f5d750";
+      name = "juk-19.04.3.tar.xz";
     };
   };
   k3b = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/k3b-19.04.1.tar.xz";
-      sha256 = "8de611bec14deee5b5c2b340fa4b32d22a7df93a72b657979118b510396f0942";
-      name = "k3b-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/k3b-19.04.3.tar.xz";
+      sha256 = "c92b7b811f47d31b107aa14fb1e21d01a8635c208c1503f4ddf183522501df61";
+      name = "k3b-19.04.3.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kaccounts-integration-19.04.1.tar.xz";
-      sha256 = "0e37dc9b7b1520ea16afc7209da3cbaab1d43c3909896eba2f0422fb23f15433";
-      name = "kaccounts-integration-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kaccounts-integration-19.04.3.tar.xz";
+      sha256 = "fea6cc555de2e345079ed576be0c957ff5c7177ff658f31ce3bcb23176174372";
+      name = "kaccounts-integration-19.04.3.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kaccounts-providers-19.04.1.tar.xz";
-      sha256 = "006ccdc20738b8f77155e849b83987b9c9eeb50acf4e88d2fb948060c5f51011";
-      name = "kaccounts-providers-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kaccounts-providers-19.04.3.tar.xz";
+      sha256 = "483b87dc74913d7ab3b569d64e890d4358d95e2544ec8027cd21232495457636";
+      name = "kaccounts-providers-19.04.3.tar.xz";
     };
   };
   kaddressbook = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kaddressbook-19.04.1.tar.xz";
-      sha256 = "15e84e6785e20e4f48020c093555e6c28930fcd946aa3421c56956564eba84fd";
-      name = "kaddressbook-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kaddressbook-19.04.3.tar.xz";
+      sha256 = "dc379c4a2d15a94fe5d7416e692301827377b503ba0880f3b508fe2c812d4349";
+      name = "kaddressbook-19.04.3.tar.xz";
     };
   };
   kajongg = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kajongg-19.04.1.tar.xz";
-      sha256 = "5139ec428d4951b8e3dca8d30134002bc06b186c5c63c69831b3a98b49198475";
-      name = "kajongg-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kajongg-19.04.3.tar.xz";
+      sha256 = "e367307310102b0f0b171718ae1bc6508e26b8200ba3d484dc0d7608f942ec2b";
+      name = "kajongg-19.04.3.tar.xz";
     };
   };
   kalarm = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kalarm-19.04.1.tar.xz";
-      sha256 = "e8a58584e765c1d98beb4b6bcac0ab835dcb1f1c1bab8cf1c01fa01a2a56bbfd";
-      name = "kalarm-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kalarm-19.04.3.tar.xz";
+      sha256 = "c686f5b768719e77e913ee616267f2980c9827ea71f3738099f18cb4d4178d84";
+      name = "kalarm-19.04.3.tar.xz";
     };
   };
   kalarmcal = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kalarmcal-19.04.1.tar.xz";
-      sha256 = "69a265ad7e82034974a47c795b81ee8768873dcb76018dc794a9905365111646";
-      name = "kalarmcal-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kalarmcal-19.04.3.tar.xz";
+      sha256 = "f0965229600ee962be3db85cfb94105e2734c8e066ff316e216c625c70dd25d7";
+      name = "kalarmcal-19.04.3.tar.xz";
     };
   };
   kalgebra = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kalgebra-19.04.1.tar.xz";
-      sha256 = "689d65f1a62623fc67d5de0a551aef03b241d85b105f31e91bd873d3b818c74f";
-      name = "kalgebra-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kalgebra-19.04.3.tar.xz";
+      sha256 = "b63904f2fc5609d8c62b18ae5e8b0f917785d9eaf46357a1045a9de89aa129ea";
+      name = "kalgebra-19.04.3.tar.xz";
     };
   };
   kalzium = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kalzium-19.04.1.tar.xz";
-      sha256 = "80798b3dca98cdd5ae24bbe7f077ecbe8def6bb96ad02a66ff69cb5312a459f5";
-      name = "kalzium-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kalzium-19.04.3.tar.xz";
+      sha256 = "2a7bf84021be5013aa1e2b14d0c97e6c80b1b7b9e2c78c8df50c0a94925699d1";
+      name = "kalzium-19.04.3.tar.xz";
     };
   };
   kamera = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kamera-19.04.1.tar.xz";
-      sha256 = "3d5f97ac4b454c1512762f4039003d5745372aafa4fda4f293bda885ee70984f";
-      name = "kamera-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kamera-19.04.3.tar.xz";
+      sha256 = "acf5ecf939fa8f4366d607742dc673a307fd72cfa05f4fedb04547f7d336be43";
+      name = "kamera-19.04.3.tar.xz";
     };
   };
   kamoso = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kamoso-19.04.1.tar.xz";
-      sha256 = "72f31d26319aed86daf200db7cc0bbe1e6ad77d891b644001ffd4c992a68e796";
-      name = "kamoso-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kamoso-19.04.3.tar.xz";
+      sha256 = "19168e5f45762b04254ebf598dfa7f066858ae243a9b7286d7e3e43385018ec6";
+      name = "kamoso-19.04.3.tar.xz";
     };
   };
   kanagram = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kanagram-19.04.1.tar.xz";
-      sha256 = "70b0f7b20f2ebd951e3a10097990f9232cd1e3e6c11441d93513d435a7cb7f38";
-      name = "kanagram-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kanagram-19.04.3.tar.xz";
+      sha256 = "945276e94ccc82d958400583af4377f40d473bdc566d37962f7137f47663a728";
+      name = "kanagram-19.04.3.tar.xz";
     };
   };
   kapman = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kapman-19.04.1.tar.xz";
-      sha256 = "7714a0cbd8e24f3ce46679d1f16d690c8bc62a988f0b3175095e0f0c23ce1400";
-      name = "kapman-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kapman-19.04.3.tar.xz";
+      sha256 = "6b1810bf946ff84b34b9fd6e913811d0e0a249cad5cb49b7990d742ec2832ca1";
+      name = "kapman-19.04.3.tar.xz";
     };
   };
   kapptemplate = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kapptemplate-19.04.1.tar.xz";
-      sha256 = "5985705081aa94d282d173277e5717eede6f923eef4ed2d99182c46fbd1c9fd3";
-      name = "kapptemplate-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kapptemplate-19.04.3.tar.xz";
+      sha256 = "023273adf6df75d68b3ee52d14924887e403b80dea23eb765a98242fddcd4f37";
+      name = "kapptemplate-19.04.3.tar.xz";
     };
   };
   kate = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kate-19.04.1.tar.xz";
-      sha256 = "af55513f00af1712a39631352e393dbd2f63ec6bd471831b44853a16d4bfbe8f";
-      name = "kate-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kate-19.04.3.tar.xz";
+      sha256 = "b1dcd45270c0494e97f32f435a943ca27b0bcb23065a9ad2a1fe37e4a81ad9a6";
+      name = "kate-19.04.3.tar.xz";
     };
   };
   katomic = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/katomic-19.04.1.tar.xz";
-      sha256 = "2addfb86ec0043ab81046d64862e8fbeb3b4dd3b8d18f618ac8c39d995a05ce5";
-      name = "katomic-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/katomic-19.04.3.tar.xz";
+      sha256 = "e4edc6a0058ed929204b64bb99af294752bc20b1693e5930c2616af45d0587c3";
+      name = "katomic-19.04.3.tar.xz";
     };
   };
   kbackup = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kbackup-19.04.1.tar.xz";
-      sha256 = "29bed4258ec218edf05702808d0cfbff757016b7f3a80eb99e18610ab398036f";
-      name = "kbackup-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kbackup-19.04.3.tar.xz";
+      sha256 = "421e05fbc7b6332cfdca08faa65e74def2c5fa40a6211e6623e03cc4ec568019";
+      name = "kbackup-19.04.3.tar.xz";
     };
   };
   kblackbox = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kblackbox-19.04.1.tar.xz";
-      sha256 = "9b5d57d0058c2458b7e24bd885d164cc1523d0c45827082e55af6ce669992431";
-      name = "kblackbox-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kblackbox-19.04.3.tar.xz";
+      sha256 = "45b8f5218c8817c38a13269ac5464c5abd2010d1ddb27ec255de1bf43ef2fe91";
+      name = "kblackbox-19.04.3.tar.xz";
     };
   };
   kblocks = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kblocks-19.04.1.tar.xz";
-      sha256 = "0ae62f1aa9aeaa58f6e5fd62d6281159ef8a2bbee28d84b9d7a2ab207ec95390";
-      name = "kblocks-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kblocks-19.04.3.tar.xz";
+      sha256 = "10b350f91978c221c224c42e2f50dc8c2e86e187de8e46258b10cf3799fb4b74";
+      name = "kblocks-19.04.3.tar.xz";
     };
   };
   kblog = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kblog-19.04.1.tar.xz";
-      sha256 = "6c162cd25a67c4fddbdc1063942fdfad1bbb239c714f205ae4f89585c2f65e93";
-      name = "kblog-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kblog-19.04.3.tar.xz";
+      sha256 = "5890ae54f85057e22807a7f47681004f521c3558c750ef75b90328118363a07d";
+      name = "kblog-19.04.3.tar.xz";
     };
   };
   kbounce = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kbounce-19.04.1.tar.xz";
-      sha256 = "729662f29e1b5b17b775bfa6895088cf3a7ee4ce3d4f2bc3db4f69ab0f07ca12";
-      name = "kbounce-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kbounce-19.04.3.tar.xz";
+      sha256 = "9a4ee5257becad72b359cc5985412ba2c4a15a81afe89022f812ec9eda7b5356";
+      name = "kbounce-19.04.3.tar.xz";
     };
   };
   kbreakout = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kbreakout-19.04.1.tar.xz";
-      sha256 = "9f40bb1c2d2e29a1098e371ffd0e97595d8e23cc7af2111fd143b67fac1393ad";
-      name = "kbreakout-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kbreakout-19.04.3.tar.xz";
+      sha256 = "7ef268806451e3b7ee813b921247257ff1a466ebd3c48b20bfc77ebebef10c9e";
+      name = "kbreakout-19.04.3.tar.xz";
     };
   };
   kbruch = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kbruch-19.04.1.tar.xz";
-      sha256 = "ab9033b6b8758803a87f046d05c9f6a5d247d1929bad147628cb6c2e5ba65b00";
-      name = "kbruch-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kbruch-19.04.3.tar.xz";
+      sha256 = "131455d024ead96cf2396cf6074a23584799c0793464b83eb3ecc2a455c5d355";
+      name = "kbruch-19.04.3.tar.xz";
     };
   };
   kcachegrind = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcachegrind-19.04.1.tar.xz";
-      sha256 = "4b862becaa415601dc33391814637d8f089f2e2732192111ec029beb89991ac2";
-      name = "kcachegrind-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kcachegrind-19.04.3.tar.xz";
+      sha256 = "856649529f0c19749a2b73125351400f401521664c9044fc33f92a09073d5270";
+      name = "kcachegrind-19.04.3.tar.xz";
     };
   };
   kcalc = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcalc-19.04.1.tar.xz";
-      sha256 = "46d992a9e746231b57398b9bcdbe3933f6601e3cee7e3932ccc2e312779a4c91";
-      name = "kcalc-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kcalc-19.04.3.tar.xz";
+      sha256 = "42da5439af4f59402d27f2c48d4ee9c68d4a84bfda8d16a5ab9d7ab6bdcc02d5";
+      name = "kcalc-19.04.3.tar.xz";
     };
   };
   kcalcore = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcalcore-19.04.1.tar.xz";
-      sha256 = "d14bf2f8270c0072e415cf8fe87c0fb8eefad1b95a8713e184bba3e3ae6002f9";
-      name = "kcalcore-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kcalcore-19.04.3.tar.xz";
+      sha256 = "335df0ae376b7abfc8274d46bb5a9956fb8ef438c1065d7f79a57db23005ca45";
+      name = "kcalcore-19.04.3.tar.xz";
     };
   };
   kcalutils = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcalutils-19.04.1.tar.xz";
-      sha256 = "8856a1e812f81848f1e2adc179182349acfac9e189b55f29afeb020c148909ec";
-      name = "kcalutils-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kcalutils-19.04.3.tar.xz";
+      sha256 = "de08972947008fd74fdeb7b2ddf642a356d84009b853a5aeec2ded98b399290e";
+      name = "kcalutils-19.04.3.tar.xz";
     };
   };
   kcharselect = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcharselect-19.04.1.tar.xz";
-      sha256 = "c54570a6f968b2ccbe42c0a8dbaecb1f263fbd392f67b2d735ade492553ff9ec";
-      name = "kcharselect-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kcharselect-19.04.3.tar.xz";
+      sha256 = "98ebcf13ec02f490bfeaa1001e46a397163939d75d73cf26cd4707e9aa2a4186";
+      name = "kcharselect-19.04.3.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcolorchooser-19.04.1.tar.xz";
-      sha256 = "bfc2cdafd709d8829e19367151f59725152af2f4a80c583df671a9df1378e57a";
-      name = "kcolorchooser-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kcolorchooser-19.04.3.tar.xz";
+      sha256 = "f60ee47baaca59b7df8ce58902ae09d44d2cb5b7f3f5ec7b9a401c7f7e3e5ab4";
+      name = "kcolorchooser-19.04.3.tar.xz";
     };
   };
   kcontacts = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcontacts-19.04.1.tar.xz";
-      sha256 = "1773a5ddcec46dbf72cef2bbcc8c3143a0ba18ce6fa462ba642011b36b9cc088";
-      name = "kcontacts-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kcontacts-19.04.3.tar.xz";
+      sha256 = "28f3c61b99f6f6b1264a8373ab9915e6844f4025c74652cd897b7b560067e241";
+      name = "kcontacts-19.04.3.tar.xz";
     };
   };
   kcron = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcron-19.04.1.tar.xz";
-      sha256 = "a58e8c99072e10a0b0a6acfecbbadef822c6f2818202bbaccdbee6b2a5b7e951";
-      name = "kcron-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kcron-19.04.3.tar.xz";
+      sha256 = "24f6f36d058c3e0587a7a70cc2d2df77eb593efa642833cfb17bc671e97c9cd6";
+      name = "kcron-19.04.3.tar.xz";
     };
   };
   kdav = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdav-19.04.1.tar.xz";
-      sha256 = "356e59f904f075521df60499b7f84d7868dbb78968b04fd15be6d359c154e737";
-      name = "kdav-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdav-19.04.3.tar.xz";
+      sha256 = "f182a3ad6e23ff9e8165d11c3d4964e470e5d4d3f0183207cbe380f5c111af85";
+      name = "kdav-19.04.3.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdebugsettings-19.04.1.tar.xz";
-      sha256 = "f04334f954d48fbd5a7bf41327563081966fb31950c131a943cf0a1a86281aa2";
-      name = "kdebugsettings-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdebugsettings-19.04.3.tar.xz";
+      sha256 = "0f3f2afafad0cfb312b51b15de6615359ba5ccd7bee6b35ce48a40e3a58368c5";
+      name = "kdebugsettings-19.04.3.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kde-dev-scripts-19.04.1.tar.xz";
-      sha256 = "aa039d08b0e151703b6be0571d254d3656589d0b8422214110c460bd1f2aa6c2";
-      name = "kde-dev-scripts-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kde-dev-scripts-19.04.3.tar.xz";
+      sha256 = "ef71c4891e9fe8bde99159a12a2539227b3994ad33ad46073a08074d61ec5b61";
+      name = "kde-dev-scripts-19.04.3.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kde-dev-utils-19.04.1.tar.xz";
-      sha256 = "9bca818e44f80ece758c0430aebcaf56252bbdffed6c8f65d04ccb4d019f2d9b";
-      name = "kde-dev-utils-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kde-dev-utils-19.04.3.tar.xz";
+      sha256 = "b8bde609a66482224d8c581692ecba0665894143ba64e816797a44eea7453a43";
+      name = "kde-dev-utils-19.04.3.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdeedu-data-19.04.1.tar.xz";
-      sha256 = "751ec4df18d4ec3e7498a279bb891d6eb9a835fd786c8dd77ee883c9b55a0c30";
-      name = "kdeedu-data-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdeedu-data-19.04.3.tar.xz";
+      sha256 = "03d8e219a3d7f82f92887f200e017eaeb2fc3f9316f0ea63d4caa271c62f7791";
+      name = "kdeedu-data-19.04.3.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-mobipocket-19.04.1.tar.xz";
-      sha256 = "345be42b0fb4f2040ce1430c872c0d20b0abaa266159a19beac1b067b2723821";
-      name = "kdegraphics-mobipocket-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdegraphics-mobipocket-19.04.3.tar.xz";
+      sha256 = "c073730b7f3d468f4e710a67bdb90d794b69bf0f2c149f7fac705b44b912fa94";
+      name = "kdegraphics-mobipocket-19.04.3.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-thumbnailers-19.04.1.tar.xz";
-      sha256 = "e82515177c1c465c1d499095ff51d71caf286505a0fd3b9bfd2f1cdc1744706e";
-      name = "kdegraphics-thumbnailers-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdegraphics-thumbnailers-19.04.3.tar.xz";
+      sha256 = "1cca91081a97e851156d187794037bdcbffe996f607a1eed59a2ea00049a9f78";
+      name = "kdegraphics-thumbnailers-19.04.3.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdenetwork-filesharing-19.04.1.tar.xz";
-      sha256 = "5f3ae681f58a9877c7133778ff44c7be2a96cf26afbff10465984dae033251bd";
-      name = "kdenetwork-filesharing-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdenetwork-filesharing-19.04.3.tar.xz";
+      sha256 = "bc3763ecf49b85e159503928692c9cb68083c6acc49f2dead27f538fca0e8ab5";
+      name = "kdenetwork-filesharing-19.04.3.tar.xz";
     };
   };
   kdenlive = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdenlive-19.04.1.tar.xz";
-      sha256 = "feb3202ee1aa0f47acc12ad7d6ca78977a4c9af0d705f8792ca2f8e3e6defbe5";
-      name = "kdenlive-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdenlive-19.04.3.tar.xz";
+      sha256 = "c981954ce9759da2878b4c76d97b9bb7aa92fc1f073a9f759142870e287d2a1e";
+      name = "kdenlive-19.04.3.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdepim-addons-19.04.1.tar.xz";
-      sha256 = "d4e36a6d0043ad0ed5e3c427559bfaa29523578f99b613c82c3aaef16b2a7882";
-      name = "kdepim-addons-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdepim-addons-19.04.3.tar.xz";
+      sha256 = "a748027568ed2f82f9178c24f6eba18f1d5af26f51d1cc1ddedea645e04190a6";
+      name = "kdepim-addons-19.04.3.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdepim-apps-libs-19.04.1.tar.xz";
-      sha256 = "c3530a810a1eddfa06a27f24b723f971e7e2e144bbb2dac7ff30e7dec948a15d";
-      name = "kdepim-apps-libs-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdepim-apps-libs-19.04.3.tar.xz";
+      sha256 = "a3ad12f4b7c58154aef49fc5d0ac388a6e9441972605aaa02e17dd6a0583eeb2";
+      name = "kdepim-apps-libs-19.04.3.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdepim-runtime-19.04.1.tar.xz";
-      sha256 = "1587eca5a206768917443bd5274c03d8cbb2cbc6dcbe60449110c326b1aa0744";
-      name = "kdepim-runtime-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdepim-runtime-19.04.3.tar.xz";
+      sha256 = "720945f803dc9027211eb46f281ef52b35da3fe4d990c1aeed6d57a89a45215a";
+      name = "kdepim-runtime-19.04.3.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdesdk-kioslaves-19.04.1.tar.xz";
-      sha256 = "80bbbdc91bc6a2b0c47a47044fdb2e107b89c63dd358b694c1c3f8e7cd1bbb16";
-      name = "kdesdk-kioslaves-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdesdk-kioslaves-19.04.3.tar.xz";
+      sha256 = "682e13382f41b76306e48ee9d75e993f84a4619be8de08023354653c6b350842";
+      name = "kdesdk-kioslaves-19.04.3.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdesdk-thumbnailers-19.04.1.tar.xz";
-      sha256 = "554d291605ac8827a2a4f6513a2230d9f9b0b8fcd6a37b0acd41c4db81fa3442";
-      name = "kdesdk-thumbnailers-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdesdk-thumbnailers-19.04.3.tar.xz";
+      sha256 = "771052d4f4482e88bb70a00a55b3b1755055088dce998e723948ff3de5c576fe";
+      name = "kdesdk-thumbnailers-19.04.3.tar.xz";
     };
   };
   kdf = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdf-19.04.1.tar.xz";
-      sha256 = "835881e8f829c3c64ca529019f599ce89b95139d502673d5e6fb560a98eedce5";
-      name = "kdf-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdf-19.04.3.tar.xz";
+      sha256 = "4d3d3218cee73238e9be73db131062f186ede393bbe0115e4df633c7d21f2572";
+      name = "kdf-19.04.3.tar.xz";
     };
   };
   kdialog = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdialog-19.04.1.tar.xz";
-      sha256 = "48e77dc4827af2445f8ac583bef319b7fd274f9b84a19635bf673801e96b259a";
-      name = "kdialog-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdialog-19.04.3.tar.xz";
+      sha256 = "647c5eac9d34f2cc8011f6214bc5a8ddc1eca8f0b381c66eaf20848eccdf9823";
+      name = "kdialog-19.04.3.tar.xz";
     };
   };
   kdiamond = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdiamond-19.04.1.tar.xz";
-      sha256 = "a7588f21e7151c1053787f75a17c1062a9c0b43611b824632ed1b8689f4996f3";
-      name = "kdiamond-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kdiamond-19.04.3.tar.xz";
+      sha256 = "22a567a63dd2bf9006d970e9aa5aeabff94c2ae9c98004bbd6cc35083a995536";
+      name = "kdiamond-19.04.3.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/keditbookmarks-19.04.1.tar.xz";
-      sha256 = "05788d55020f330b52bd8641e47990c90c7585871489993888ce0f40fa1686db";
-      name = "keditbookmarks-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/keditbookmarks-19.04.3.tar.xz";
+      sha256 = "b255d6f85d34abf635857f922b059c3311fd7859262039bec0c90b6538c5e92e";
+      name = "keditbookmarks-19.04.3.tar.xz";
     };
   };
   kfind = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kfind-19.04.1.tar.xz";
-      sha256 = "496dd642473bfaa881387d2fb3a3507a9bf8c84b8a6874525221b561a50ef9fd";
-      name = "kfind-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kfind-19.04.3.tar.xz";
+      sha256 = "2fcb5af039d976161ed09d87cb7c909bd2854647ea15688203b90dbebc54447f";
+      name = "kfind-19.04.3.tar.xz";
     };
   };
   kfloppy = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kfloppy-19.04.1.tar.xz";
-      sha256 = "bde5c16c679a34aa6c74844caeea5e1746629ac7d35dfac0493e9d8f7d78aa75";
-      name = "kfloppy-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kfloppy-19.04.3.tar.xz";
+      sha256 = "7f3a206b6f4cd03771d8fba94423bf749a2b8e6bb4dfd01f30502d1ab08f1d8e";
+      name = "kfloppy-19.04.3.tar.xz";
     };
   };
   kfourinline = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kfourinline-19.04.1.tar.xz";
-      sha256 = "9ba39703ccf64b76a0b9a2705d65b7c6c2067db795cfed298f0e3a2eac48b973";
-      name = "kfourinline-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kfourinline-19.04.3.tar.xz";
+      sha256 = "62a163f9c2034deba3daa93c4ac07c476895514ec9fefdd9a0792726a61d066f";
+      name = "kfourinline-19.04.3.tar.xz";
     };
   };
   kgeography = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kgeography-19.04.1.tar.xz";
-      sha256 = "44e7297243a2f5ebd6c8e18e3380b7c66b3d085f64952937abf1683ddcb9d502";
-      name = "kgeography-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kgeography-19.04.3.tar.xz";
+      sha256 = "a94742602100e989b4dbbfa37c8bde99054710f28a1679ad458ee65de0db8b7e";
+      name = "kgeography-19.04.3.tar.xz";
     };
   };
   kget = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kget-19.04.1.tar.xz";
-      sha256 = "a7dff0134d0ce6643fbde1ddfb73ce7d3300b927373a0907aec510f29d0d1629";
-      name = "kget-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kget-19.04.3.tar.xz";
+      sha256 = "9620ca07792e8a8d9bcb2069d36b665f2aa21d2428f109d825a663ccb6c12e25";
+      name = "kget-19.04.3.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kgoldrunner-19.04.1.tar.xz";
-      sha256 = "11db3aecf77b7097b7d3d626dba4a3b4bcd3d5ab02a1e04cf7f6932b0b73a760";
-      name = "kgoldrunner-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kgoldrunner-19.04.3.tar.xz";
+      sha256 = "f1325580ebd91dcac9a79e66f939b372e7ea8264ef8671098471055f297110a8";
+      name = "kgoldrunner-19.04.3.tar.xz";
     };
   };
   kgpg = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kgpg-19.04.1.tar.xz";
-      sha256 = "2c9c64491592db79397be3769413fae657ca991dd45d02690bbe533c1cba0ceb";
-      name = "kgpg-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kgpg-19.04.3.tar.xz";
+      sha256 = "740ad342cfa1edf1c7cbbe8d15789533d5003dda5bf3899687eb4182b582236d";
+      name = "kgpg-19.04.3.tar.xz";
     };
   };
   khangman = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/khangman-19.04.1.tar.xz";
-      sha256 = "5d35620bc048ecabd21b20cadfa8df07e72f195bdc5b9ad2c7e86e17d27afe27";
-      name = "khangman-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/khangman-19.04.3.tar.xz";
+      sha256 = "f2fd0d70c405ebd158f3e11a52cd1e268b1238fdada674b2f59b46324d2610a8";
+      name = "khangman-19.04.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/khelpcenter-19.04.1.tar.xz";
-      sha256 = "3436502f6fae659b930aa63e5ace088e0982804386cf1b24b042328796549114";
-      name = "khelpcenter-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/khelpcenter-19.04.3.tar.xz";
+      sha256 = "d18e0960859d72d9c2ebf187a9f5b1b65a8c78032e32df0d6eb0cce73921e972";
+      name = "khelpcenter-19.04.3.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kidentitymanagement-19.04.1.tar.xz";
-      sha256 = "5216d26aef0c483f3dff51564e8b1526821b25279d7c5e9c21c87a5d5e20822a";
-      name = "kidentitymanagement-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kidentitymanagement-19.04.3.tar.xz";
+      sha256 = "4bbe8bffe0624b516d102354197c508ff1a83b6280036f5ab100e7897b99e8da";
+      name = "kidentitymanagement-19.04.3.tar.xz";
     };
   };
   kig = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kig-19.04.1.tar.xz";
-      sha256 = "37684e2d1893c2f3a412add1edd73047d3ae8ff501b035943a9793b94d468a79";
-      name = "kig-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kig-19.04.3.tar.xz";
+      sha256 = "05566395ce58c6c049d797f579362d52b612ab1718b111f7a054e9e3ae229459";
+      name = "kig-19.04.3.tar.xz";
     };
   };
   kigo = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kigo-19.04.1.tar.xz";
-      sha256 = "5b5cae565a79309dc23b26acf2f596d36fd62950af58405094e4fa9a38e5e4ad";
-      name = "kigo-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kigo-19.04.3.tar.xz";
+      sha256 = "be91e9fa965505515c36733f260120e6c2ca7fe4856622f03bda07d7a0595ef0";
+      name = "kigo-19.04.3.tar.xz";
     };
   };
   killbots = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/killbots-19.04.1.tar.xz";
-      sha256 = "8829dba8a3af320b03e21cd356e53fef0e70c10831ffeb6a70b722dde9877938";
-      name = "killbots-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/killbots-19.04.3.tar.xz";
+      sha256 = "4295853c0ee137474a3a8c193d4b038f020504a37a6ab3daf81cf4d43ed5d656";
+      name = "killbots-19.04.3.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kimagemapeditor-19.04.1.tar.xz";
-      sha256 = "d85d2f3d043a29e56f4234ce24dd75545e06c2812d5fe45cafde4c3dbe280533";
-      name = "kimagemapeditor-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kimagemapeditor-19.04.3.tar.xz";
+      sha256 = "a7e5ba3d85c09c446e37baeac1c149395381b542fbbb1ab642645f631b5ab2de";
+      name = "kimagemapeditor-19.04.3.tar.xz";
     };
   };
   kimap = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kimap-19.04.1.tar.xz";
-      sha256 = "ff933fba7ce8412fd64439e5f4c5a7be3a06fd39c79f520acfc648923819aa1f";
-      name = "kimap-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kimap-19.04.3.tar.xz";
+      sha256 = "58ed8471dc7e9c43e7bdb61c791e3bb612b2473bf0fb8f67857cb6fa72ddcf35";
+      name = "kimap-19.04.3.tar.xz";
     };
   };
   kio-extras = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kio-extras-19.04.1.tar.xz";
-      sha256 = "ddf389a50142211566124ba902bb9f6b2988b1b94fefed7620a6ec421e3ff0bd";
-      name = "kio-extras-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kio-extras-19.04.3.tar.xz";
+      sha256 = "b65cb37a5965782a9eaae80840fdd7e06505aece33cc6774510c65e1fea3f55b";
+      name = "kio-extras-19.04.3.tar.xz";
     };
   };
   kirigami-gallery = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kirigami-gallery-19.04.1.tar.xz";
-      sha256 = "ed7390a015a77f8285b4db4185533fa327a142a191c27afa7c2ce963ae6ad7e2";
-      name = "kirigami-gallery-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kirigami-gallery-19.04.3.tar.xz";
+      sha256 = "cd5bba6cf50b820492b5df6606288b9944f640634bba03d2d4e40279d5c4d1a4";
+      name = "kirigami-gallery-19.04.3.tar.xz";
     };
   };
   kiriki = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kiriki-19.04.1.tar.xz";
-      sha256 = "131c6b5bd8f2b014a28bd5cb9985111f63991974b672dcfbc0266d32f069954b";
-      name = "kiriki-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kiriki-19.04.3.tar.xz";
+      sha256 = "ccb33616936c879aa61fdbaa87ae130c4f22c34b70cdd9b38b128bace850466e";
+      name = "kiriki-19.04.3.tar.xz";
     };
   };
   kiten = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kiten-19.04.1.tar.xz";
-      sha256 = "be904abd0386a9ac6d622178f37e55d5a05f5eaa31c6a5cd661959ee4b03d2d4";
-      name = "kiten-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kiten-19.04.3.tar.xz";
+      sha256 = "c2e7fc12e305eeddc031de02254295427117b3a3910b8d5bcfc6ff97855f8fbc";
+      name = "kiten-19.04.3.tar.xz";
     };
   };
   kitinerary = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kitinerary-19.04.1.tar.xz";
-      sha256 = "4053e16e847f0e234ffba2bb0533e947eae7b315304677a784279d03f13c0318";
-      name = "kitinerary-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kitinerary-19.04.3.tar.xz";
+      sha256 = "c2e9d1ae70797968382538da98bc8f9555e0d8d13faeb739bdadb5844c989227";
+      name = "kitinerary-19.04.3.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kjumpingcube-19.04.1.tar.xz";
-      sha256 = "13d6a138e09c9088ce38fe9a124bd600386dc097b929f6f85416bc1da0012ab1";
-      name = "kjumpingcube-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kjumpingcube-19.04.3.tar.xz";
+      sha256 = "03feb2c3e0f46f1ca4f4d24ce8fd350c607bfaf52f715abbf379709d8d0a6818";
+      name = "kjumpingcube-19.04.3.tar.xz";
     };
   };
   kldap = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kldap-19.04.1.tar.xz";
-      sha256 = "638e62d39fbe935b1df3c03f9617acbe5ade4ad617245bc590ca07b7fd0b723b";
-      name = "kldap-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kldap-19.04.3.tar.xz";
+      sha256 = "6b4bf8e69e6c372f60f746f2a6c453262283e25643a97192eef3c07c5c8d94df";
+      name = "kldap-19.04.3.tar.xz";
     };
   };
   kleopatra = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kleopatra-19.04.1.tar.xz";
-      sha256 = "bc8895a506164df0fa0f7fc317fe8b961cb75d8c67f04474e1c12e25be358c67";
-      name = "kleopatra-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kleopatra-19.04.3.tar.xz";
+      sha256 = "a6265e182d480a146464751bf34e3430804dfbc954c09ff85bac15273aa1c033";
+      name = "kleopatra-19.04.3.tar.xz";
     };
   };
   klettres = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/klettres-19.04.1.tar.xz";
-      sha256 = "d0db0773513fa35d1224e90cf5b09ac75b7b8f559d1080ee6026ba74df0f0847";
-      name = "klettres-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/klettres-19.04.3.tar.xz";
+      sha256 = "ba8498a28af8534083b2ea3eab5ada7b57deffe49673ef0e4ef278023e8b96af";
+      name = "klettres-19.04.3.tar.xz";
     };
   };
   klickety = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/klickety-19.04.1.tar.xz";
-      sha256 = "d4ae4d002f008200a6ce920f2aff6841d9ad58b22c392d7eefac7867b32340af";
-      name = "klickety-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/klickety-19.04.3.tar.xz";
+      sha256 = "27b05ed8522ff353b4327f79ec069c453fc4545d2a07ca11fc53e53647841fe9";
+      name = "klickety-19.04.3.tar.xz";
     };
   };
   klines = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/klines-19.04.1.tar.xz";
-      sha256 = "2ca4ad74fefa87bbf3a38ea90b55025ab8554bfdc47d7e4323e0906e9e1c8962";
-      name = "klines-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/klines-19.04.3.tar.xz";
+      sha256 = "a0d133a9a08e8f3953ae54b7da187c56cfbc518bfeadac4f32b82c9aa4f33c8b";
+      name = "klines-19.04.3.tar.xz";
     };
   };
   kmag = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmag-19.04.1.tar.xz";
-      sha256 = "aa5ec91dcffc1a2f1037332aeacb096ab55388624c844c7fa311ca38a5e40874";
-      name = "kmag-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmag-19.04.3.tar.xz";
+      sha256 = "4fad3d4414884fa8fb7dcfb27e7cc4207dfe219819ffda75355de5c1b4981e35";
+      name = "kmag-19.04.3.tar.xz";
     };
   };
   kmahjongg = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmahjongg-19.04.1.tar.xz";
-      sha256 = "75dbcfb5747530a3b69574fdc87b532067516415f962e7943feef97549237c99";
-      name = "kmahjongg-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmahjongg-19.04.3.tar.xz";
+      sha256 = "41bd533bf8d8b1e04451cb3c9165b08f9135603c0085d8b402d0e8e026b8ed00";
+      name = "kmahjongg-19.04.3.tar.xz";
     };
   };
   kmail = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmail-19.04.1.tar.xz";
-      sha256 = "62fcd78318d35848e5ae461f7ebd3b6f202c57c51008c71d7e2a1d1c3d58f2c5";
-      name = "kmail-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmail-19.04.3.tar.xz";
+      sha256 = "8e1d45741a9fab9848a659ab05497f82d79f7ffe3a42f121cb5136b1fcae833f";
+      name = "kmail-19.04.3.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmail-account-wizard-19.04.1.tar.xz";
-      sha256 = "c6714c425daa3d79dfb47b5d18cff26b10b1b087e4472f627738494f06d04ab8";
-      name = "kmail-account-wizard-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmail-account-wizard-19.04.3.tar.xz";
+      sha256 = "a8cc19b30198459cb0fd74fb0d789a012354b4a9952a14312508af7079f92291";
+      name = "kmail-account-wizard-19.04.3.tar.xz";
     };
   };
   kmailtransport = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmailtransport-19.04.1.tar.xz";
-      sha256 = "b8c0cf5cb8f7ad93bb3d1b2adab68fbc2470bc14160650fb45d1c4d40e8549fa";
-      name = "kmailtransport-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmailtransport-19.04.3.tar.xz";
+      sha256 = "2a3115a81f2c85c42345ee6380ea1c28129be5dd5a518270c6ec1062ea22abc5";
+      name = "kmailtransport-19.04.3.tar.xz";
     };
   };
   kmbox = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmbox-19.04.1.tar.xz";
-      sha256 = "701eda3a4831ed0daf9bd14a93ff845f42e4f93c6ca16d83ebda958c27021fc0";
-      name = "kmbox-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmbox-19.04.3.tar.xz";
+      sha256 = "4025f1ef0288f2c30e64d8eb02bde117f1ee482b760bef52aa71faedc500733f";
+      name = "kmbox-19.04.3.tar.xz";
     };
   };
   kmime = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmime-19.04.1.tar.xz";
-      sha256 = "25ee2e49ea62d32fcd09a710f971c6fcdc5434c6fdf711e93c19fc4baa325775";
-      name = "kmime-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmime-19.04.3.tar.xz";
+      sha256 = "a6fe422eddb15eb52fbacde97b45ec6752b60f46149657a3bb7f48dc899e1c02";
+      name = "kmime-19.04.3.tar.xz";
     };
   };
   kmines = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmines-19.04.1.tar.xz";
-      sha256 = "98a3860113a51e215a42791e3eb845978cda51fb5001b8e8bb41fe9182765d12";
-      name = "kmines-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmines-19.04.3.tar.xz";
+      sha256 = "34b23a66121183272a58f2cb38b798cab4f290d9f04546418ddb4b2b20e262a1";
+      name = "kmines-19.04.3.tar.xz";
     };
   };
   kmix = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmix-19.04.1.tar.xz";
-      sha256 = "ca02ed8db5e4a3a58622b10668efb4c4a828de584b9f57116fee802e136352ea";
-      name = "kmix-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmix-19.04.3.tar.xz";
+      sha256 = "d08a0d40fb9a7a3f032f8995dbd9260777119b249669323447fa2575e44e3bf9";
+      name = "kmix-19.04.3.tar.xz";
     };
   };
   kmousetool = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmousetool-19.04.1.tar.xz";
-      sha256 = "fd0fcebda4d7303a9c6f1117c08e091d96bfddf92a64e1cde2dc6b555daa0624";
-      name = "kmousetool-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmousetool-19.04.3.tar.xz";
+      sha256 = "15c4e02c02a993d2724320b6625e9a44d5658c47136dd9a9895897893305dbd0";
+      name = "kmousetool-19.04.3.tar.xz";
     };
   };
   kmouth = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmouth-19.04.1.tar.xz";
-      sha256 = "9a8d0f9b1f09f1363d38b2a942ffe515521ffc410f869ed1a875ff1059ef8068";
-      name = "kmouth-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmouth-19.04.3.tar.xz";
+      sha256 = "712e21cc8cb45880b02c9cf5aa3a1bb2d54f9a2e09d1bbd2667eb99beded64dc";
+      name = "kmouth-19.04.3.tar.xz";
     };
   };
   kmplot = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmplot-19.04.1.tar.xz";
-      sha256 = "c2e0855182d1ab0977b96669999976fb84c2f4b2645fcee0cb35b839bc1da206";
-      name = "kmplot-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kmplot-19.04.3.tar.xz";
+      sha256 = "8c312235076fdad431fc68dc3e8be18ab8317e8a6efb6e6170958cb7495ab479";
+      name = "kmplot-19.04.3.tar.xz";
     };
   };
   knavalbattle = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/knavalbattle-19.04.1.tar.xz";
-      sha256 = "f7b5ad956e4b1c06b04fec2d6f39331e81f2c44c716c2e666ef75b9d786982bc";
-      name = "knavalbattle-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/knavalbattle-19.04.3.tar.xz";
+      sha256 = "468e3fc16e17d3cbde2e213a46dcb07d1ea030a1522f40ab10b429254b8249af";
+      name = "knavalbattle-19.04.3.tar.xz";
     };
   };
   knetwalk = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/knetwalk-19.04.1.tar.xz";
-      sha256 = "e762415b6891c4098febc090bc80e5698cd3fb9ac2b8f4988aaf096816e3b62b";
-      name = "knetwalk-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/knetwalk-19.04.3.tar.xz";
+      sha256 = "d211a1bbc3a4f57dbea73da11d4ff351150de2ca6bd06251c2775a4e16601489";
+      name = "knetwalk-19.04.3.tar.xz";
     };
   };
   knights = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/knights-19.04.1.tar.xz";
-      sha256 = "d722fad8e835ea402337ffe1e6b8d1a5bda5a0e1c36ee3a89a6782b666a8534e";
-      name = "knights-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/knights-19.04.3.tar.xz";
+      sha256 = "ab2e01ee6e309bf5221333168b58cf41c20ad5a5e70beeb31520d4076f6153e5";
+      name = "knights-19.04.3.tar.xz";
     };
   };
   knotes = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/knotes-19.04.1.tar.xz";
-      sha256 = "b5cc805c657622e8cc4ab0ea07f30ea0258e767a87e525bc02fbc7d6ee9d7ec9";
-      name = "knotes-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/knotes-19.04.3.tar.xz";
+      sha256 = "8c269a5db708d623a7e36799d43204146b44f9de65f6e09a00782b1b62bf41fd";
+      name = "knotes-19.04.3.tar.xz";
     };
   };
   kolf = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kolf-19.04.1.tar.xz";
-      sha256 = "92a56f5e5602a898537f87e12968e47cfe6f76d10daac6240e9f60e6751d06d7";
-      name = "kolf-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kolf-19.04.3.tar.xz";
+      sha256 = "c7a352332a2ff8e856bcf09e3bd0bfa8670e140da2e43e894ecf9f022fcef020";
+      name = "kolf-19.04.3.tar.xz";
     };
   };
   kollision = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kollision-19.04.1.tar.xz";
-      sha256 = "2c243790feb8d7a7760fcadff6b06b21aea930218d0915664b420dccdc1c7de9";
-      name = "kollision-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kollision-19.04.3.tar.xz";
+      sha256 = "8374313b4bf4590ba051051fb6510774862690468719e8425addcdfd9daeff91";
+      name = "kollision-19.04.3.tar.xz";
     };
   };
   kolourpaint = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kolourpaint-19.04.1.tar.xz";
-      sha256 = "a2f78f1a2f99fa8176980ecd224ccfd8848ff8357e3434b463d4f83bcc7b5e46";
-      name = "kolourpaint-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kolourpaint-19.04.3.tar.xz";
+      sha256 = "7ba4089fe55c870b54ff44bd423eebe50303b0324c4b421589115c4d1d349cac";
+      name = "kolourpaint-19.04.3.tar.xz";
     };
   };
   kompare = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kompare-19.04.1.tar.xz";
-      sha256 = "ca270cde7c77fb44b40779ee22d556f14b9e0720e865ad6e3cf5cebbba4d7261";
-      name = "kompare-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kompare-19.04.3.tar.xz";
+      sha256 = "4dcb419336826ac1b8d37135ec153da585f8cebfdc9b6574c6abb866c277c8d0";
+      name = "kompare-19.04.3.tar.xz";
     };
   };
   konqueror = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/konqueror-19.04.1.tar.xz";
-      sha256 = "b5f3c5a005b71886bfa2318bf13f14e6bab8fb84e1db54192409769bc3bf0e92";
-      name = "konqueror-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/konqueror-19.04.3.tar.xz";
+      sha256 = "257488e521c024fb6c8fdbef71aaccd9315505c8b14c6ffde0ce4060a48579b4";
+      name = "konqueror-19.04.3.tar.xz";
     };
   };
   konquest = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/konquest-19.04.1.tar.xz";
-      sha256 = "cac10983efbc026d5c8cd3330c94865b43b1a229ff9bb76077ab25d734133aab";
-      name = "konquest-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/konquest-19.04.3.tar.xz";
+      sha256 = "cdf061ca7f2a3c30fd24b1bada2c9854ed4cb58232fbd5c999cb66602bc3d15b";
+      name = "konquest-19.04.3.tar.xz";
     };
   };
   konsole = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/konsole-19.04.1.tar.xz";
-      sha256 = "711c67c5d43eb2c02be177e9d1157c142ab99ac5b808f951ab9a70e2397119d8";
-      name = "konsole-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/konsole-19.04.3.tar.xz";
+      sha256 = "20cadcda75a22ce7b4cb19240a16c9b286fa6ed836f352b8b337fb418e9a3b4c";
+      name = "konsole-19.04.3.tar.xz";
     };
   };
   kontact = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kontact-19.04.1.tar.xz";
-      sha256 = "d60cc3165460a3e395778e4709ff55cbfbb80cc3536edb43d5d2335c70bd4714";
-      name = "kontact-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kontact-19.04.3.tar.xz";
+      sha256 = "05fab6c512635b07b6c99b3ee38d9e53060d44124052734381e9a6ddbef06e73";
+      name = "kontact-19.04.3.tar.xz";
     };
   };
   kontactinterface = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kontactinterface-19.04.1.tar.xz";
-      sha256 = "034dcf0b2740273037a40ce2c1dd0d4eb17aac1eba608eca81f7e905a336cbc2";
-      name = "kontactinterface-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kontactinterface-19.04.3.tar.xz";
+      sha256 = "d541daab32bddd6727b795d280be668be9da801ef7267159ea030f998b52ca74";
+      name = "kontactinterface-19.04.3.tar.xz";
     };
   };
   kopete = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kopete-19.04.1.tar.xz";
-      sha256 = "27586d90bd47abe6d8d6eddd7e41dbb6e3b3736984186cd24f84eee216e98b85";
-      name = "kopete-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kopete-19.04.3.tar.xz";
+      sha256 = "038c6385d6b2b6d1f35c5c337ebd8c492eea3e4a27d6f7236fd2fee219a7f28a";
+      name = "kopete-19.04.3.tar.xz";
     };
   };
   korganizer = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/korganizer-19.04.1.tar.xz";
-      sha256 = "cb5c06d13f9f6eb4191ef6b86dab72ecde92fe6d9c8b6d9a4396645c94f83b67";
-      name = "korganizer-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/korganizer-19.04.3.tar.xz";
+      sha256 = "b2bae3a41994794a9c4d9ddfe10695edb0fee103f14ee607c31aec42c9e5d06c";
+      name = "korganizer-19.04.3.tar.xz";
     };
   };
   kpat = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kpat-19.04.1.tar.xz";
-      sha256 = "2c0b29e5d372d55d77ceced098b8262b11a431518e818eec052d867c21ad6896";
-      name = "kpat-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kpat-19.04.3.tar.xz";
+      sha256 = "ca9d53d400a2be3ca421d6d916cafeff3b9dcf220e627a1762f96817e952e8e2";
+      name = "kpat-19.04.3.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kpimtextedit-19.04.1.tar.xz";
-      sha256 = "2fb2dc59a016dd70424c0fbad45ca1d750c2578f539e79d89bcace85bafd24d1";
-      name = "kpimtextedit-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kpimtextedit-19.04.3.tar.xz";
+      sha256 = "e71e0c4dc666db23a1cfcbe202d37cac3b0c5fd966c3edbdd88c85ed2e983f24";
+      name = "kpimtextedit-19.04.3.tar.xz";
     };
   };
   kpkpass = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kpkpass-19.04.1.tar.xz";
-      sha256 = "fb3554b04d00b326d5f5e14af9c0272c020092d3329808a6177fb0714f6a1cb7";
-      name = "kpkpass-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kpkpass-19.04.3.tar.xz";
+      sha256 = "ee602c3176f141bf83d20d0ab277d26306a8b13ac105ec5594cfc8835d838a55";
+      name = "kpkpass-19.04.3.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kqtquickcharts-19.04.1.tar.xz";
-      sha256 = "7e05638f534257e901e02b6fa377747efa7881760dd66484b5a882c65e778e72";
-      name = "kqtquickcharts-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kqtquickcharts-19.04.3.tar.xz";
+      sha256 = "18f51bd61d8ab28832355b69082bb63a0efa3cf720918d5e7ff434e2219c17f5";
+      name = "kqtquickcharts-19.04.3.tar.xz";
     };
   };
   krdc = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/krdc-19.04.1.tar.xz";
-      sha256 = "8238b6969352d896751d28baeef770705feb5a0866e7b950e9eb0b377c098b19";
-      name = "krdc-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/krdc-19.04.3.tar.xz";
+      sha256 = "2458858d3e4d00ca2a95151ff7433d3a1726518f9a28281d5e1bb90855132426";
+      name = "krdc-19.04.3.tar.xz";
     };
   };
   kreversi = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kreversi-19.04.1.tar.xz";
-      sha256 = "c8bce72bff0bd8b452335c158900d41a419ce3e62afd996f67a4b77abf38cdc9";
-      name = "kreversi-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kreversi-19.04.3.tar.xz";
+      sha256 = "25325dee759916c803f2c43b8f97152257b0fcb90f9687d4f916c132ae956af4";
+      name = "kreversi-19.04.3.tar.xz";
     };
   };
   krfb = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/krfb-19.04.1.tar.xz";
-      sha256 = "73dee235940cb0512cd218d88f90e6d2d62f232a6553f327b07e54c114c8480b";
-      name = "krfb-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/krfb-19.04.3.tar.xz";
+      sha256 = "6f1fd97b294150c017adebf18cb04dd1d554f5ece0d761e11131ecc549ee35b7";
+      name = "krfb-19.04.3.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kross-interpreters-19.04.1.tar.xz";
-      sha256 = "d745f844ebe6ecefbf0d234e1e972cc7d7933a9ef75999839a709ba008ec55fe";
-      name = "kross-interpreters-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kross-interpreters-19.04.3.tar.xz";
+      sha256 = "f72e5418c522122bffcc8c8ae28ef912a34b1444b5c3626b74be3452cf92461f";
+      name = "kross-interpreters-19.04.3.tar.xz";
     };
   };
   kruler = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kruler-19.04.1.tar.xz";
-      sha256 = "fdbff79128c8f4cb51f39dbb6f173726404d25c743aa68313651bb7a51addb53";
-      name = "kruler-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kruler-19.04.3.tar.xz";
+      sha256 = "58aa7dc6713647efa4dc0996c28736b614f2b88241f92fb21b60e662c7087a86";
+      name = "kruler-19.04.3.tar.xz";
     };
   };
   kshisen = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kshisen-19.04.1.tar.xz";
-      sha256 = "a9e0e7324bb1bcad6c9427c0563236e557de85ad9724a52cfc917b43726b1aa6";
-      name = "kshisen-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kshisen-19.04.3.tar.xz";
+      sha256 = "3109a0bdb8933eebf10b945a75fc8b355aa8c97d5debd28943d8145a80efe2fe";
+      name = "kshisen-19.04.3.tar.xz";
     };
   };
   ksirk = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksirk-19.04.1.tar.xz";
-      sha256 = "170cc0f9dea3f35e15de5d1090e8e3fa2b2ed16fa1722dfeaef47339667f322e";
-      name = "ksirk-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ksirk-19.04.3.tar.xz";
+      sha256 = "d91e6c34ac284e7f7e95d07d2f94852cb6ef549dd7e00f404ea40e22a4d2802b";
+      name = "ksirk-19.04.3.tar.xz";
     };
   };
   ksmtp = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksmtp-19.04.1.tar.xz";
-      sha256 = "965f5f1c44cd64f9899ff5919372fe449e0f8b63e492f566017c9b8d5eb324bb";
-      name = "ksmtp-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ksmtp-19.04.3.tar.xz";
+      sha256 = "8d5eae342468f128fe1311b4797c9533b6017b9fb0901fb4c0d09bb73e39d02e";
+      name = "ksmtp-19.04.3.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksnakeduel-19.04.1.tar.xz";
-      sha256 = "89de9e20e71ac8225e94d406cd3d25f057df35c96d4a3b7d418ffe5e6b0ef046";
-      name = "ksnakeduel-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ksnakeduel-19.04.3.tar.xz";
+      sha256 = "05b5c7f0f4ed21ac2926bbe9d2b3913ed8b512863837c3b83754c1048fe0cd04";
+      name = "ksnakeduel-19.04.3.tar.xz";
     };
   };
   kspaceduel = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kspaceduel-19.04.1.tar.xz";
-      sha256 = "388eaf152c996bd7326f0a4cd18fafb2600659513750d0aadd98b780eb6ec8b7";
-      name = "kspaceduel-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kspaceduel-19.04.3.tar.xz";
+      sha256 = "c6a0e64f6c3149b408d3d11435388b6cd7760c2b1a4ead03a72215ca7fbadae0";
+      name = "kspaceduel-19.04.3.tar.xz";
     };
   };
   ksquares = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksquares-19.04.1.tar.xz";
-      sha256 = "3c9b0cb0921d1c29c6c451a22b318151010a3321350292d0d5fc26cc16618773";
-      name = "ksquares-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ksquares-19.04.3.tar.xz";
+      sha256 = "d85c90f883c3ce1559dd0d3ceb20500563704cf6d1824c5fea3ddce0e1ca7563";
+      name = "ksquares-19.04.3.tar.xz";
     };
   };
   ksudoku = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksudoku-19.04.1.tar.xz";
-      sha256 = "4f95ccd1b162c7fb7cad2b04e08e3a29cfc98ad27b87e6e76e389418d09c0f7b";
-      name = "ksudoku-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ksudoku-19.04.3.tar.xz";
+      sha256 = "608ffcde2d0bad3e2a19d7842c47b41627d009721a4e3161ccf2736f7777e922";
+      name = "ksudoku-19.04.3.tar.xz";
     };
   };
   ksystemlog = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksystemlog-19.04.1.tar.xz";
-      sha256 = "c8e6cb81803b8754d394d9365d3a6533706c742c822a5ef9d46bdc2def356db4";
-      name = "ksystemlog-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ksystemlog-19.04.3.tar.xz";
+      sha256 = "7d155c91d57e253c00f038100e136e4bf6eb4d709549d689608ee0026354a965";
+      name = "ksystemlog-19.04.3.tar.xz";
     };
   };
   kteatime = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kteatime-19.04.1.tar.xz";
-      sha256 = "68a23aa6a8bc575586966388315f403e464b43e1b2f4b669689f3161db1669f0";
-      name = "kteatime-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kteatime-19.04.3.tar.xz";
+      sha256 = "49a404223896bd3df976e0c155a6907936f52721fc7da14289998b9d1ea372ba";
+      name = "kteatime-19.04.3.tar.xz";
     };
   };
   ktimer = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktimer-19.04.1.tar.xz";
-      sha256 = "7ec4ebbdb8fc388763d832f8601bc7a32848836edc235f4c877bfb6d1726d809";
-      name = "ktimer-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktimer-19.04.3.tar.xz";
+      sha256 = "c282a02019f7b1f69eae09b564481ed7526c7c836155b1eed2b22fb01fcaf563";
+      name = "ktimer-19.04.3.tar.xz";
     };
   };
   ktnef = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktnef-19.04.1.tar.xz";
-      sha256 = "6f9449307d83a7bf0dc30022c36e3d854a06b370af18e44ca6e2eab684b97c93";
-      name = "ktnef-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktnef-19.04.3.tar.xz";
+      sha256 = "ef0760dc31cad222f73a56d5098ffa9bff0e4c68a26f6f85ad542bb4f8dd3693";
+      name = "ktnef-19.04.3.tar.xz";
     };
   };
   ktouch = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktouch-19.04.1.tar.xz";
-      sha256 = "09aa2ef862fffcdfc580b4aefff96a0591d99f470055365a90a41b25a3c6dcf2";
-      name = "ktouch-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktouch-19.04.3.tar.xz";
+      sha256 = "dce3f72204f43ddde109a39fca65f2936e9d9db686e6b3edf8ae04bc9c1c0e55";
+      name = "ktouch-19.04.3.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-accounts-kcm-19.04.1.tar.xz";
-      sha256 = "c4ecda8ca35438e45b48b9b86415bea1a44eeb2b2cd9af11ab1739f7ceeff045";
-      name = "ktp-accounts-kcm-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-accounts-kcm-19.04.3.tar.xz";
+      sha256 = "1c2f411bc161bbf08276bd3a12329f11f233e84e3e04cb632a2096c6e4d03afb";
+      name = "ktp-accounts-kcm-19.04.3.tar.xz";
     };
   };
   ktp-approver = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-approver-19.04.1.tar.xz";
-      sha256 = "e12421c0e79692532497dbd6db6b09faba010d99c57db1893eae3e59f7df47cd";
-      name = "ktp-approver-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-approver-19.04.3.tar.xz";
+      sha256 = "40796bfd2644b1d43f6ecd3ce48298240af53967485283fa8d9cd330e8377b74";
+      name = "ktp-approver-19.04.3.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-auth-handler-19.04.1.tar.xz";
-      sha256 = "8d06e90a7e73b034c6087079b510e0ac1c27728c885e9aa2e8baef463a892d65";
-      name = "ktp-auth-handler-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-auth-handler-19.04.3.tar.xz";
+      sha256 = "f65ceba1958b846f24894d57e180cf80f94ddad289713965f2abfd1ec8d91292";
+      name = "ktp-auth-handler-19.04.3.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-call-ui-19.04.1.tar.xz";
-      sha256 = "ad2efd84dc45cf55366dbc182d9301816129335ec4dc021dbbcc097c52656a0f";
-      name = "ktp-call-ui-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-call-ui-19.04.3.tar.xz";
+      sha256 = "e747049eefe80f7fccf4639c2bb1ed294538dc79e17a2ed395003d213a64821c";
+      name = "ktp-call-ui-19.04.3.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-common-internals-19.04.1.tar.xz";
-      sha256 = "041e5971071a060cef24abe68f699b5fcc657ba15a1e77feb227312fb1c13fd1";
-      name = "ktp-common-internals-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-common-internals-19.04.3.tar.xz";
+      sha256 = "43bcf817c3269251578e16fb9519668683e6efe4e33f453e13f5ef95fd96a9aa";
+      name = "ktp-common-internals-19.04.3.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-list-19.04.1.tar.xz";
-      sha256 = "7d8f7d841142d75036dc9dc4e31aefe8ff8906de6205b0e348b48e57da1400d9";
-      name = "ktp-contact-list-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-contact-list-19.04.3.tar.xz";
+      sha256 = "c74903c4d099f4a138fa3cb4758460b2fdf49292070439e4da6194c0cc486c2f";
+      name = "ktp-contact-list-19.04.3.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-runner-19.04.1.tar.xz";
-      sha256 = "68580e429fe0c9472a924af4f71df2da74684c5c11374464c110b9faca28c66f";
-      name = "ktp-contact-runner-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-contact-runner-19.04.3.tar.xz";
+      sha256 = "30551ec0419e978f43d25f1a9b48d07429a14cde0feba58a08ad452a2f2d3b0e";
+      name = "ktp-contact-runner-19.04.3.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-desktop-applets-19.04.1.tar.xz";
-      sha256 = "1114d5bcbc5a20c2d4822b1e2ad07d5d493ceace0a75b77575e978c30dc5fa75";
-      name = "ktp-desktop-applets-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-desktop-applets-19.04.3.tar.xz";
+      sha256 = "826dd1e28e3fc7f730dbbe465183fc5df3bc1be67c89ccc8615607de783cc91d";
+      name = "ktp-desktop-applets-19.04.3.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-filetransfer-handler-19.04.1.tar.xz";
-      sha256 = "3e53fc28f4a1a8dd0dd2cb63b0a287061176a5c6e1db6480d50ebc70e2d8f189";
-      name = "ktp-filetransfer-handler-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-filetransfer-handler-19.04.3.tar.xz";
+      sha256 = "a2408806c9a3a50a7f04bb9106d27ba62e4b0e670957e6630a7841a191b5ca9c";
+      name = "ktp-filetransfer-handler-19.04.3.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-kded-module-19.04.1.tar.xz";
-      sha256 = "fe5fc292618b28d11dddec435e86a89899c52b074b7c729aefe951b0b7697a66";
-      name = "ktp-kded-module-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-kded-module-19.04.3.tar.xz";
+      sha256 = "dbbb1876c55e8bef22cde4bb59395ae6d4d01dd851368a5f293c5f7e2aed25e4";
+      name = "ktp-kded-module-19.04.3.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-send-file-19.04.1.tar.xz";
-      sha256 = "8d3100de23666e3cb449663db376ed20e38647758371d37d721385af2b0d8d7a";
-      name = "ktp-send-file-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-send-file-19.04.3.tar.xz";
+      sha256 = "1ef4f7099e571e2a1f5fbaaf802d1002f14f5a644d5054b4b850a292bbb676c6";
+      name = "ktp-send-file-19.04.3.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-text-ui-19.04.1.tar.xz";
-      sha256 = "dfc51070d1a25edde7c0f33d4eb83185738a70e6feb40a8b385403e833cca0b5";
-      name = "ktp-text-ui-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktp-text-ui-19.04.3.tar.xz";
+      sha256 = "cf21be1ee61e5b4703feacab093f89aa66f126aba248b71111281513ba65661a";
+      name = "ktp-text-ui-19.04.3.tar.xz";
     };
   };
   ktuberling = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktuberling-19.04.1.tar.xz";
-      sha256 = "f8146ecbe3a1005871a589054b996d059e5ff08b9d7fdeaa06591ae0ab05b8cb";
-      name = "ktuberling-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/ktuberling-19.04.3.tar.xz";
+      sha256 = "7abc2254d7a5c594e021807172486dfd93cfbda827a1b41583f8b1977a1a4f21";
+      name = "ktuberling-19.04.3.tar.xz";
     };
   };
   kturtle = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kturtle-19.04.1.tar.xz";
-      sha256 = "f932a56d8f380cc422215e580d8c4d51eabd189f2b4ca3b4205e617d52e6e10d";
-      name = "kturtle-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kturtle-19.04.3.tar.xz";
+      sha256 = "811df4d31b920a2b3a6a0420df68e97e68b4226defd97d264f0b0b05c775c469";
+      name = "kturtle-19.04.3.tar.xz";
     };
   };
   kubrick = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kubrick-19.04.1.tar.xz";
-      sha256 = "636080a8cac2f689f5af8de9aacef9e90029eafaaf7f1867b8a53a8a558e94c7";
-      name = "kubrick-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kubrick-19.04.3.tar.xz";
+      sha256 = "ee2932136e6bb7c9b03d0014c6ec845fb789668035ef22b2235dad23e6a5e4c7";
+      name = "kubrick-19.04.3.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kwalletmanager-19.04.1.tar.xz";
-      sha256 = "793a3a335e53b6af36272398d7933ff0cc77918860799db2b5688ee249ce215d";
-      name = "kwalletmanager-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kwalletmanager-19.04.3.tar.xz";
+      sha256 = "b7eafd7ce252396bba0609d4114f88e0d1956e9f0f7f9703000eadda0cd7cc0e";
+      name = "kwalletmanager-19.04.3.tar.xz";
     };
   };
   kwave = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kwave-19.04.1.tar.xz";
-      sha256 = "1fd7e256a5d9b77ef691642891b2423357ef4aea7f40ae64304ec922e5930fd6";
-      name = "kwave-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kwave-19.04.3.tar.xz";
+      sha256 = "dc9ad96a59b4bab1cd8f04401b3d87883cf888711898fdfc20d96113faf92431";
+      name = "kwave-19.04.3.tar.xz";
     };
   };
   kwordquiz = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kwordquiz-19.04.1.tar.xz";
-      sha256 = "970381004a7382f4f24dad61eda8a386e138735d78c2609c92603e14acbe0158";
-      name = "kwordquiz-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/kwordquiz-19.04.3.tar.xz";
+      sha256 = "fc1a5a4780f667a805c17bda05d7024702d20d0e6aa552a0b7b6840b6e6cb381";
+      name = "kwordquiz-19.04.3.tar.xz";
     };
   };
   libgravatar = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libgravatar-19.04.1.tar.xz";
-      sha256 = "7d4af799effc13af4f4b056d21b188bd67cd503d1528a7ff37e19d228619b522";
-      name = "libgravatar-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libgravatar-19.04.3.tar.xz";
+      sha256 = "23f8d50c5831ec1df995d6d711a590eb4f7de2823971ea5692aea50707c54bea";
+      name = "libgravatar-19.04.3.tar.xz";
     };
   };
   libkcddb = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkcddb-19.04.1.tar.xz";
-      sha256 = "6773266408c0a68c128b08aca2df594249c210ff9b8fb3553b2bb82c591a2f51";
-      name = "libkcddb-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkcddb-19.04.3.tar.xz";
+      sha256 = "6471261ffef0e1546317040c4275a6fc11c131fde7229b5d0c9358a40442bec3";
+      name = "libkcddb-19.04.3.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkcompactdisc-19.04.1.tar.xz";
-      sha256 = "146d842741c24a379a0e134b8c0cbef916f5bd94fb8c6102703e5c764bf9b0ee";
-      name = "libkcompactdisc-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkcompactdisc-19.04.3.tar.xz";
+      sha256 = "9294aa908f158437241e27d57f924a2b7a07aa4203a51b83566de8c9690e86bc";
+      name = "libkcompactdisc-19.04.3.tar.xz";
     };
   };
   libkdcraw = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkdcraw-19.04.1.tar.xz";
-      sha256 = "54576a803929a0adb3d25e239395b541c0820fecd633f09ea40677882c82e42c";
-      name = "libkdcraw-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkdcraw-19.04.3.tar.xz";
+      sha256 = "5017a47a76346e183e57617e093d5b61780bf564df55a07d02b1d75e2ff98c2d";
+      name = "libkdcraw-19.04.3.tar.xz";
     };
   };
   libkdegames = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkdegames-19.04.1.tar.xz";
-      sha256 = "a16baa2818ab6f553d9c2635b252530538812787c50f9fbc0d18781943150e5c";
-      name = "libkdegames-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkdegames-19.04.3.tar.xz";
+      sha256 = "187aa81539113bc6786d861e1f5302fa17533ae1108299bbd1a86be18accfbc4";
+      name = "libkdegames-19.04.3.tar.xz";
     };
   };
   libkdepim = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkdepim-19.04.1.tar.xz";
-      sha256 = "28217ce30663955168d39eaa4e0c7efb47a437f59df77971f3e98efea99adc45";
-      name = "libkdepim-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkdepim-19.04.3.tar.xz";
+      sha256 = "d3719c533df0b0fe8800a7810ee39f108d8408b909e5fb583ee2ab7ed4b4a6e9";
+      name = "libkdepim-19.04.3.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkeduvocdocument-19.04.1.tar.xz";
-      sha256 = "c0b5e23a677cea13a2e15989a5b2240ddab2948b00be67e6306cf916e7ca2e59";
-      name = "libkeduvocdocument-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkeduvocdocument-19.04.3.tar.xz";
+      sha256 = "e0e229607c47b5da028588b9a22ffe41cf3e35d7e4f849eb109d9ce6c537277d";
+      name = "libkeduvocdocument-19.04.3.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkexiv2-19.04.1.tar.xz";
-      sha256 = "138e1bf75cbbf16c46b6ba35f25e700ad93fa8a2134d0ad4c344174c7701cbae";
-      name = "libkexiv2-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkexiv2-19.04.3.tar.xz";
+      sha256 = "b0c5da0e23e93a218f7e96f98a753b36e2d608e74ac68c687ae868b6de99d1e6";
+      name = "libkexiv2-19.04.3.tar.xz";
     };
   };
   libkgapi = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkgapi-19.04.1.tar.xz";
-      sha256 = "a9d499fe1f5371112ceb94b3b03f8e2b1a1faa4ee69722b4c1c9ba28e8f9052e";
-      name = "libkgapi-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkgapi-19.04.3.tar.xz";
+      sha256 = "0fa879280979775523f258c80ec17c58045f812cbc6961b994ab78974a75afac";
+      name = "libkgapi-19.04.3.tar.xz";
     };
   };
   libkgeomap = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkgeomap-19.04.1.tar.xz";
-      sha256 = "519345f30e46fc95816d145177347547c9c9eb440eab017c5ee928fa0ef8cf5a";
-      name = "libkgeomap-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkgeomap-19.04.3.tar.xz";
+      sha256 = "9266af7950b4cd73b694d61cf7bc0d03fc27d2bde3015f4c698e6d5d480d17bd";
+      name = "libkgeomap-19.04.3.tar.xz";
     };
   };
   libkipi = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkipi-19.04.1.tar.xz";
-      sha256 = "1f1a8b881f61c9fc151a2f0b98c6ba07baa0fe1ca8a0f77d7502e81c08a84020";
-      name = "libkipi-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkipi-19.04.3.tar.xz";
+      sha256 = "7da2a62e719b27221a74232375c907087be9a53b90fce0f7d36cbc11d7c13f7c";
+      name = "libkipi-19.04.3.tar.xz";
     };
   };
   libkleo = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkleo-19.04.1.tar.xz";
-      sha256 = "a75084129e44028ff3f7742cdcb1800df94845d8c6ace38389da317144fa0529";
-      name = "libkleo-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkleo-19.04.3.tar.xz";
+      sha256 = "6c4ad79234c8a3cbe5cb0b5a6e7a11ccec98c5c5058bd970e44419ccab8663de";
+      name = "libkleo-19.04.3.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkmahjongg-19.04.1.tar.xz";
-      sha256 = "7a1df5a03e1da1b801ca4530be3b9008b92cb4872ce8ec0038f2686ac325efbb";
-      name = "libkmahjongg-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkmahjongg-19.04.3.tar.xz";
+      sha256 = "995f10fc62c506dbbb31bdab635fd52cb08e03eb09c859353aaf3423f48c7381";
+      name = "libkmahjongg-19.04.3.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkomparediff2-19.04.1.tar.xz";
-      sha256 = "2ab1a9cb25996bd6fb80bf556ba4b91a07385e62688249e9415b1ead8b3ad1b3";
-      name = "libkomparediff2-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libkomparediff2-19.04.3.tar.xz";
+      sha256 = "35f45f48c9c6afb32ade11985ca9e886e8f77a7428e2ce6650e119c3f29ce9b7";
+      name = "libkomparediff2-19.04.3.tar.xz";
     };
   };
   libksane = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libksane-19.04.1.tar.xz";
-      sha256 = "c89039afa641640cbc65b01ae735ee9b70bd3283095d6b034665ddb048d33417";
-      name = "libksane-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libksane-19.04.3.tar.xz";
+      sha256 = "ec9c0a969806fefcefc0fda2e227bf0908e2b338fdf3377870a910d7f041e1e0";
+      name = "libksane-19.04.3.tar.xz";
     };
   };
   libksieve = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libksieve-19.04.1.tar.xz";
-      sha256 = "23cca1dfc1d79242f24dd95e8817a9672629276bced3a9ee56067570ef69ccff";
-      name = "libksieve-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/libksieve-19.04.3.tar.xz";
+      sha256 = "5853f1b3764872a26b21064f8c23dd4ec66e453648c1aefa510f22af780e3289";
+      name = "libksieve-19.04.3.tar.xz";
     };
   };
   lokalize = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/lokalize-19.04.1.tar.xz";
-      sha256 = "1e68faa5af9079e691e5d207b0397c0250fb6e1209b370e9762bfa949c35dce1";
-      name = "lokalize-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/lokalize-19.04.3.tar.xz";
+      sha256 = "ec8c552a176d131140273f975958e29f3a476c840cab0c470db072cc850e85c8";
+      name = "lokalize-19.04.3.tar.xz";
     };
   };
   lskat = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/lskat-19.04.1.tar.xz";
-      sha256 = "f83f9df9e4786a8d6d8d197defb8ac7f40b8bed8e88578673b2660c14c7a4edf";
-      name = "lskat-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/lskat-19.04.3.tar.xz";
+      sha256 = "4e31cbad9534838c3fe380fd1326f56158dcc2b3a63a1e4c05529dcc9fc9b703";
+      name = "lskat-19.04.3.tar.xz";
     };
   };
   mailcommon = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/mailcommon-19.04.1.tar.xz";
-      sha256 = "37b06e85e74d6ef1801485b8d99529fde5ca11bb446c231a6f5406e99f9c4d0f";
-      name = "mailcommon-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/mailcommon-19.04.3.tar.xz";
+      sha256 = "b38a23d2d59fed22dfcabeb9430b962c021fd62fd7e48d12ad3610b4d3a162fa";
+      name = "mailcommon-19.04.3.tar.xz";
     };
   };
   mailimporter = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/mailimporter-19.04.1.tar.xz";
-      sha256 = "e77c5c43f20f821664a3a559b929eb2f97ba5105e000875b1642516a6f298696";
-      name = "mailimporter-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/mailimporter-19.04.3.tar.xz";
+      sha256 = "17483bf5d57936179f13abcee347aadadcc17d2cf40c1e2a3b5f2b6d85db87ec";
+      name = "mailimporter-19.04.3.tar.xz";
     };
   };
   marble = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/marble-19.04.1.tar.xz";
-      sha256 = "acd9c15c4758684f6eff6c2318fc4dd88fd68dd41336de9458cad4d5f6832c61";
-      name = "marble-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/marble-19.04.3.tar.xz";
+      sha256 = "b2451d338bf433d5a0211c954f48fb5c6c80fecbb8fa69d604276fecb45fe826";
+      name = "marble-19.04.3.tar.xz";
     };
   };
   mbox-importer = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/mbox-importer-19.04.1.tar.xz";
-      sha256 = "3fcd5c6b3824dea9ff4145dde6bf7b472675e3927ce91258d89cbfe4d0ebb77a";
-      name = "mbox-importer-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/mbox-importer-19.04.3.tar.xz";
+      sha256 = "68160ddd977c7f8f771b2934e57ec15042508a92461ca9d233312546d8d2c537";
+      name = "mbox-importer-19.04.3.tar.xz";
     };
   };
   messagelib = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/messagelib-19.04.1.tar.xz";
-      sha256 = "7e4d0e2f2d6dfcb235408af0e4af235ab10dc8a8c4f1e169a672f03b37b180ad";
-      name = "messagelib-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/messagelib-19.04.3.tar.xz";
+      sha256 = "c97f88152593a031415148daa31384c56964973d4291aa86a892b2776333e223";
+      name = "messagelib-19.04.3.tar.xz";
     };
   };
   minuet = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/minuet-19.04.1.tar.xz";
-      sha256 = "5f2e3692c0b7ae9496fa7952bfd02045aa87ba5ee10c6ef84fb4557abe83d0f0";
-      name = "minuet-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/minuet-19.04.3.tar.xz";
+      sha256 = "6d4614b7b42391c8b68627b879f61f59c22942ff1b340a25f75d90e296cdeb33";
+      name = "minuet-19.04.3.tar.xz";
     };
   };
   okular = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/okular-19.04.1.tar.xz";
-      sha256 = "7145b1eea61c56a5b413e960e5b24038c7af5d3cb583a524deca344dae3a0e0e";
-      name = "okular-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/okular-19.04.3.tar.xz";
+      sha256 = "87ab5ffd852109d549d021b8fe94b9a4de212b2f164e9cc796b144732ff94282";
+      name = "okular-19.04.3.tar.xz";
     };
   };
   palapeli = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/palapeli-19.04.1.tar.xz";
-      sha256 = "dc661c88dcf6e3a17b9a2a403cac1ba9bd8f7144ff2c01ff3c286564159f796b";
-      name = "palapeli-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/palapeli-19.04.3.tar.xz";
+      sha256 = "7cbf7a1666e16a476de9bdab7155f17f2224baa7db9d80cd77c785dead6f2e10";
+      name = "palapeli-19.04.3.tar.xz";
     };
   };
   parley = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/parley-19.04.1.tar.xz";
-      sha256 = "c52746417d32e31f66c1165fd08ab87696d5ef4b5a020a175fe00e60474bc73f";
-      name = "parley-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/parley-19.04.3.tar.xz";
+      sha256 = "4c4aeaae4f1dd4193c422c5921d9cf02216fc6670f5077fcd92b4d48378fa720";
+      name = "parley-19.04.3.tar.xz";
     };
   };
   picmi = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/picmi-19.04.1.tar.xz";
-      sha256 = "10abab6e48f48e1e1308fbd2a687bb4c5051c6ae2a670b737d6974432fdef30c";
-      name = "picmi-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/picmi-19.04.3.tar.xz";
+      sha256 = "1e47527b49f8d94da0a6ea492d23215ae7ff3fcb403116abe43665efb567beab";
+      name = "picmi-19.04.3.tar.xz";
     };
   };
   pimcommon = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/pimcommon-19.04.1.tar.xz";
-      sha256 = "bc4612711775ea4665c0827c7935397503b5cf82f906bcf22a64b3ab1eaaaa72";
-      name = "pimcommon-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/pimcommon-19.04.3.tar.xz";
+      sha256 = "b979ba19d0c5c7d4f218992bfe434fdc9b49bd8cfdee0d25e4c44bbddc793fee";
+      name = "pimcommon-19.04.3.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/pim-data-exporter-19.04.1.tar.xz";
-      sha256 = "0fa9e20ef67f64d5a9c967f4ea32a476438b23ab8405774035cd4584e6100ebd";
-      name = "pim-data-exporter-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/pim-data-exporter-19.04.3.tar.xz";
+      sha256 = "33bc76f798849b4421563d3d7989ae72182ad75573e176469e785d08a867b653";
+      name = "pim-data-exporter-19.04.3.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/pim-sieve-editor-19.04.1.tar.xz";
-      sha256 = "3a8ce54140233fa7ae618fc05ae9d882cab6e56835e9fdb29e2242885ce50e10";
-      name = "pim-sieve-editor-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/pim-sieve-editor-19.04.3.tar.xz";
+      sha256 = "331eff69a144cb7f71bba2533bd2690f26bfb56adb796dc1adaa9c5f41db4e09";
+      name = "pim-sieve-editor-19.04.3.tar.xz";
     };
   };
   poxml = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/poxml-19.04.1.tar.xz";
-      sha256 = "d8439996821ded53dea321f84619f3754cc677b5fa08b5fd37aabb09b8dac2f9";
-      name = "poxml-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/poxml-19.04.3.tar.xz";
+      sha256 = "844ccecc8db4c6da4b84a4829cdd1961603a09fd5ee18dfda73a9def78addefe";
+      name = "poxml-19.04.3.tar.xz";
     };
   };
   print-manager = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/print-manager-19.04.1.tar.xz";
-      sha256 = "33d553bb048959ecfc5e404f3a1e118b0ed78305d96b3a6042ffd576a164e9fa";
-      name = "print-manager-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/print-manager-19.04.3.tar.xz";
+      sha256 = "5ab32527d6916c1063bf175a1515a0cebb0dfb93844881c4339b2ee690697907";
+      name = "print-manager-19.04.3.tar.xz";
     };
   };
   rocs = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/rocs-19.04.1.tar.xz";
-      sha256 = "5c0740d68ed26f7291e114faa811a2ae104ee682181f5ebed381865dd7d8db61";
-      name = "rocs-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/rocs-19.04.3.tar.xz";
+      sha256 = "eec0f7ab55f81946dafa2e31ee92a2bec5c1727e64bdeb8e7566c61f66e53d01";
+      name = "rocs-19.04.3.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/signon-kwallet-extension-19.04.1.tar.xz";
-      sha256 = "658bbae2534896e13a7aced654f38164130ee3c748349d044000d0d7dcaa1c38";
-      name = "signon-kwallet-extension-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/signon-kwallet-extension-19.04.3.tar.xz";
+      sha256 = "bddf5fe036b95769ad9ff02a9583b7f96280e9a48db4abc92f98e4d163f7daa9";
+      name = "signon-kwallet-extension-19.04.3.tar.xz";
     };
   };
   spectacle = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/spectacle-19.04.1.tar.xz";
-      sha256 = "6f420fc6a660e25a08449cfb6d2795e07a37f8dca25f1862d857121b43f9262c";
-      name = "spectacle-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/spectacle-19.04.3.tar.xz";
+      sha256 = "bbf2c17298608dc69139f1f0a07de05b724d83cf57e8fe085a376723d83d15d1";
+      name = "spectacle-19.04.3.tar.xz";
     };
   };
   step = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/step-19.04.1.tar.xz";
-      sha256 = "4fafff95339473e6449e9a45e273fe15758daf743e8697ff73f16129eb1dca05";
-      name = "step-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/step-19.04.3.tar.xz";
+      sha256 = "a9b2daff1c9821e9c0fa79d39fc15b96753a3d0c61863d76d07e4e3222b0a4a2";
+      name = "step-19.04.3.tar.xz";
     };
   };
   svgpart = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/svgpart-19.04.1.tar.xz";
-      sha256 = "3e30eb3b0f95073639697c73f1cc1d4689e53921cc87fe23cd0ec04ef6835624";
-      name = "svgpart-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/svgpart-19.04.3.tar.xz";
+      sha256 = "5dd870a24f275b6d8e0ec9593da713c29b521234d1eb07415726d57ae3fb8dc5";
+      name = "svgpart-19.04.3.tar.xz";
     };
   };
   sweeper = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/sweeper-19.04.1.tar.xz";
-      sha256 = "70ccd7a1d8d81ee2a54df724a1ad908157672bb20e80c81aff8db946241b6637";
-      name = "sweeper-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/sweeper-19.04.3.tar.xz";
+      sha256 = "03b0ed0006da9a9ee02b9e3201e4974444fba00a5a59fc14ca179656eeb86aaf";
+      name = "sweeper-19.04.3.tar.xz";
     };
   };
   umbrello = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/umbrello-19.04.1.tar.xz";
-      sha256 = "42f9ba60320558439a1d5c68cc4d730c6b17e0b2b8a57b4686031bbecb3ab3c2";
-      name = "umbrello-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/umbrello-19.04.3.tar.xz";
+      sha256 = "a507f31087c0103873e78004bc47b632d8cd7cdda2734e342a19da48d0c3780c";
+      name = "umbrello-19.04.3.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "19.04.1";
+    version = "19.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/zeroconf-ioslave-19.04.1.tar.xz";
-      sha256 = "e59c8a4b6ff93ead29b322fb40c94a3584d5c463077d58575720fcba2c511d87";
-      name = "zeroconf-ioslave-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.04.3/src/zeroconf-ioslave-19.04.3.tar.xz";
+      sha256 = "83c6fa651c6601c9b5e4f085e34fa0de5e88dda2420f95e88996ffad11303d7f";
+      name = "zeroconf-ioslave-19.04.3.tar.xz";
     };
   };
 }

From 6832e843fa522f471da01f14e4b33909ab294d8e Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 29 Jul 2019 14:06:46 +0200
Subject: [PATCH 054/794] plasma-5: 5.15.5 -> 5.16.3

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

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 034b57ec06a..2ec9fb2bfdf 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.5/ )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.3/ )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index ac0a3494c22..e17d474e3ab 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,363 +3,363 @@
 
 {
   bluedevil = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/bluedevil-5.15.5.tar.xz";
-      sha256 = "7379230de96c5e6d4ea40f4dfa8732e20a6ee3bd291e6f119ccb57646c33fe1f";
-      name = "bluedevil-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/bluedevil-5.16.3.tar.xz";
+      sha256 = "f22234c0561e143c03114943ccfaec962195b3aef55ffbc8a5ba2b8f722cd4bd";
+      name = "bluedevil-5.16.3.tar.xz";
     };
   };
   breeze = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/breeze-5.15.5.tar.xz";
-      sha256 = "a13de0472dacd5240c3d38d0841ea7b9098405cf1f8cff77504d1824d09dcac4";
-      name = "breeze-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/breeze-5.16.3.tar.xz";
+      sha256 = "f11b5d0118c7530d244b3455219d86fc40888cb7e7f6a74684464a1d1b7db2e5";
+      name = "breeze-5.16.3.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/breeze-grub-5.15.5.tar.xz";
-      sha256 = "4a27689446d66b7de043321022093e8f457dd4d47c124186f233b0606ddcfd64";
-      name = "breeze-grub-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/breeze-grub-5.16.3.tar.xz";
+      sha256 = "6a25f456121c17a2f3275220d1fe0af8438484918b2d1678ddd39ed020b99176";
+      name = "breeze-grub-5.16.3.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/breeze-gtk-5.15.5.tar.xz";
-      sha256 = "d4e16ffbcbe74c48fda7c5bfd18c3f479f56d54b761d9b1d9678119479412ca8";
-      name = "breeze-gtk-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/breeze-gtk-5.16.3.tar.xz";
+      sha256 = "52cbe5c7757fb395e3e7e35c12918017a80d64d9f13c32ce6cdfacd440ecaa64";
+      name = "breeze-gtk-5.16.3.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/breeze-plymouth-5.15.5.tar.xz";
-      sha256 = "0a518d5a9e1bddeb3e1c7329966ce178a36ab0a0bd6dd28caf803fe8c1680de8";
-      name = "breeze-plymouth-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/breeze-plymouth-5.16.3.tar.xz";
+      sha256 = "4fc6ca444449d42874009af1f79ba408c6a37d2c08722c05a97b9a268a447ce6";
+      name = "breeze-plymouth-5.16.3.tar.xz";
     };
   };
   discover = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/discover-5.15.5.tar.xz";
-      sha256 = "6f2bbaade87b959c8bd847e90ecec0c9aa8b4accee63318d25e5beb77deaf854";
-      name = "discover-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/discover-5.16.3.tar.xz";
+      sha256 = "1cbceecf8c7489a33a62b6efc5b1acf338f35e53db5d12fc2476e0374a0033cd";
+      name = "discover-5.16.3.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/drkonqi-5.15.5.tar.xz";
-      sha256 = "8669913aa8485257cbb19bbe5bb6956044d0a6896a365cea024b1247d0a6502e";
-      name = "drkonqi-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/drkonqi-5.16.3.tar.xz";
+      sha256 = "118afd1d85fd78e34faac0bd6aa548edb501f16d733ea9f0a28630c817496fda";
+      name = "drkonqi-5.16.3.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kactivitymanagerd-5.15.5.tar.xz";
-      sha256 = "e38ec9074e0bc5c1a21bd5eee97b7d99e6528186918e832fecf1e3f95da239db";
-      name = "kactivitymanagerd-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kactivitymanagerd-5.16.3.tar.xz";
+      sha256 = "6a8cb887c4ca74d209e38db40ce04b2e0fe1d9e9a625c8490945184dfa41dfc5";
+      name = "kactivitymanagerd-5.16.3.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kde-cli-tools-5.15.5.tar.xz";
-      sha256 = "fbff40188d7864a11aa6aea0b6d8cca2c66025924b3cb29275ac6d282ece9ace";
-      name = "kde-cli-tools-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kde-cli-tools-5.16.3.tar.xz";
+      sha256 = "ee68a8f958e1ce503252689d66eeb9897bad6b7e44f760c654d49225b3d55cd7";
+      name = "kde-cli-tools-5.16.3.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kdecoration-5.15.5.tar.xz";
-      sha256 = "33d613b706b83c025675d7d2b20e074219c9a0953a500c306081c24fcf84d99f";
-      name = "kdecoration-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kdecoration-5.16.3.tar.xz";
+      sha256 = "31b49d600280d6b2c23d37edc219976d87e38e1c7fd62b5dc9dbc36d365bb5ad";
+      name = "kdecoration-5.16.3.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kde-gtk-config-5.15.5.tar.xz";
-      sha256 = "958163b1134b7c9e9735b5b6a4448973f09dbf43991511f768b29bd038baa185";
-      name = "kde-gtk-config-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kde-gtk-config-5.16.3.tar.xz";
+      sha256 = "0477b3763e85acd2780306e0fd3fe309ee86805a512d0d3b150cab24c5153fd6";
+      name = "kde-gtk-config-5.16.3.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kdeplasma-addons-5.15.5.tar.xz";
-      sha256 = "1e11158f636e1d4bb25bbe4bb2f2fca37728c6aae07340ca6c2c1ec9e882ece3";
-      name = "kdeplasma-addons-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kdeplasma-addons-5.16.3.tar.xz";
+      sha256 = "83c6bb1c9a5928de4febc3d9ad4e6be0beb24857efcccb98e967629c28d29831";
+      name = "kdeplasma-addons-5.16.3.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kgamma5-5.15.5.tar.xz";
-      sha256 = "5e5d2dd439d4fd298eb0283fd9f2bad009c5efe22f72aea795138d22adfdc1e7";
-      name = "kgamma5-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kgamma5-5.16.3.tar.xz";
+      sha256 = "7b609d418e670bdc75d6c2894255088aab6a7a2005afe3ec99348a49d67eb61d";
+      name = "kgamma5-5.16.3.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/khotkeys-5.15.5.tar.xz";
-      sha256 = "59dd6a571d52401b1963cde732b6c6c589a328438155ec0e0c5c77b5ac029127";
-      name = "khotkeys-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/khotkeys-5.16.3.tar.xz";
+      sha256 = "caa65d8b3b6567dac483acf27f62e9baefc31416aa5f991409b0304920211f4e";
+      name = "khotkeys-5.16.3.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kinfocenter-5.15.5.tar.xz";
-      sha256 = "0119da58b2274bab76ef27d37032b5b104bad162675bfbee631286186d2e17a8";
-      name = "kinfocenter-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kinfocenter-5.16.3.tar.xz";
+      sha256 = "b123278ef644fd4c3a5af1fb29f3ab859d4dfb2717e0e5783d58927a69ad7f88";
+      name = "kinfocenter-5.16.3.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kmenuedit-5.15.5.tar.xz";
-      sha256 = "ad407757e93928dc506271998881a2e5f4a4c96bf763c25e80347e3e23361c26";
-      name = "kmenuedit-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kmenuedit-5.16.3.tar.xz";
+      sha256 = "2ccc8e7feea7b4d3616a7528cf65a62c5299388583afb295d0aa2379945035cd";
+      name = "kmenuedit-5.16.3.tar.xz";
     };
   };
   kscreen = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kscreen-5.15.5.tar.xz";
-      sha256 = "c0c47c6d5c618e2c40794dd37586a1733ef6939383b4bb760638e8758a0bd6f7";
-      name = "kscreen-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kscreen-5.16.3.tar.xz";
+      sha256 = "3c95f590ddc3483e2828585263feb2caa3e32c59f1b92f6aca23309565d4e139";
+      name = "kscreen-5.16.3.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kscreenlocker-5.15.5.tar.xz";
-      sha256 = "09d9d63e81a60d1c95532639287ba29403e0b04d7e4d46f5a49adbfccf215dcd";
-      name = "kscreenlocker-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kscreenlocker-5.16.3.tar.xz";
+      sha256 = "41f9a85f0e6a8ae9747b9022961361b44b21b0df0b5e2c1705694b88f371d377";
+      name = "kscreenlocker-5.16.3.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/ksshaskpass-5.15.5.tar.xz";
-      sha256 = "4b6eae3b594480f6265843fa0b2f3d2051fd45894d27eee3681b7b33c4f52e7e";
-      name = "ksshaskpass-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/ksshaskpass-5.16.3.tar.xz";
+      sha256 = "fbf9b535259aebd8e292d9e4db8ae5d8a2fe85658f8e95ab3b88e79f8093ea91";
+      name = "ksshaskpass-5.16.3.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/ksysguard-5.15.5.tar.xz";
-      sha256 = "c767cfff83cb8d6d99a6ba13fa534656d6d31666a3eaa7cdce677535e9f9624a";
-      name = "ksysguard-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/ksysguard-5.16.3.tar.xz";
+      sha256 = "f3bbc8b89bf117deab27e1e29d59f19ea1834be11d606f0be25c4a080c9766a3";
+      name = "ksysguard-5.16.3.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kwallet-pam-5.15.5.tar.xz";
-      sha256 = "36f3e50019dcd9919755d47b62abf99412299aa87ee27fecbf1dca212a94d22e";
-      name = "kwallet-pam-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kwallet-pam-5.16.3.tar.xz";
+      sha256 = "e5f2a2e9650008b7d6383a9c71b70d4ec092dc48e8c1409a4570531c56f8985c";
+      name = "kwallet-pam-5.16.3.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kwayland-integration-5.15.5.tar.xz";
-      sha256 = "8dec5719104a551fc8c1d6249568accedce9b8d18691d818f2b7abc13f21fd17";
-      name = "kwayland-integration-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kwayland-integration-5.16.3.tar.xz";
+      sha256 = "b0e844375a7c43579311899ffb2fed2b048279b4a59de91be687c99257449670";
+      name = "kwayland-integration-5.16.3.tar.xz";
     };
   };
   kwin = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kwin-5.15.5.tar.xz";
-      sha256 = "e341c8165354643fd201292e53418050970bf8819b2cd0dd932423a342d2f805";
-      name = "kwin-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kwin-5.16.3.tar.xz";
+      sha256 = "766ae9cec1535ab7a715c20d8ef1b409063be55bb8d8d8f593de9551ee12b01a";
+      name = "kwin-5.16.3.tar.xz";
     };
   };
   kwrited = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kwrited-5.15.5.tar.xz";
-      sha256 = "fbc27517898e57aa6b4c476673971f310121ac3d61e1d30a23e9289930056510";
-      name = "kwrited-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/kwrited-5.16.3.tar.xz";
+      sha256 = "9c86575d080219a00ad9fa99b7d12acc06b2cd807bd256fc9f4d96cc8d7ab37e";
+      name = "kwrited-5.16.3.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/libkscreen-5.15.5.tar.xz";
-      sha256 = "bee15b0ce38e17475542b0e500a82567fdbe0a635e84a543b2f3255ac8c58d87";
-      name = "libkscreen-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/libkscreen-5.16.3.tar.xz";
+      sha256 = "09f7dcef33dd23b7987444c25edbc1b5b91f99396c65bdafa1823d77c94b3422";
+      name = "libkscreen-5.16.3.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/libksysguard-5.15.5.tar.xz";
-      sha256 = "4255a997c4f0b2039201db6e00038e08519c5fde73032ba709ae9bcfaceabfd0";
-      name = "libksysguard-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/libksysguard-5.16.3.tar.xz";
+      sha256 = "a668348bf1bb65f991d0862fe55c182d852b02ae37ec2ddc88a70fd1477fcf6c";
+      name = "libksysguard-5.16.3.tar.xz";
     };
   };
   milou = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/milou-5.15.5.tar.xz";
-      sha256 = "2740cbfae30483c402471349f4d1315b98edf054827ec70980bb966cd6b3fcf9";
-      name = "milou-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/milou-5.16.3.tar.xz";
+      sha256 = "9a06e35d1bf613010301979d7ab5fbdb828943a432bc6a76c6b26ad20e5a199a";
+      name = "milou-5.16.3.tar.xz";
     };
   };
   oxygen = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/oxygen-5.15.5.tar.xz";
-      sha256 = "0791314c8894331bfa46d8b8aa30805972d09497a9e4bbe3f82270d4455be62c";
-      name = "oxygen-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/oxygen-5.16.3.tar.xz";
+      sha256 = "552b008ec09d08c4704aa3ea66b2d73cf98dc35be290792d34d7962c59f51544";
+      name = "oxygen-5.16.3.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-browser-integration-5.15.5.tar.xz";
-      sha256 = "f1883b504cb5e86a43e16fea803b93c81b09e4ce1339ae8bcf6cf35d7e734d3b";
-      name = "plasma-browser-integration-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/plasma-browser-integration-5.16.3.tar.xz";
+      sha256 = "dd3ea46d3339cbd4332c3bff2eda10fea819e316c74a8dd76f43ecb9510681d7";
+      name = "plasma-browser-integration-5.16.3.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-desktop-5.15.5.tar.xz";
-      sha256 = "42097c0b2553dd4767b6fde441db371d5e2defbd4e82389ca91d076f62ae3741";
-      name = "plasma-desktop-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/plasma-desktop-5.16.3.tar.xz";
+      sha256 = "2c49ce479dacd227324f5cbcb04a0f9903a79740f044eed593c0bf990d124486";
+      name = "plasma-desktop-5.16.3.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-integration-5.15.5.tar.xz";
-      sha256 = "05920610c68981a9effb1a97395a22d281d3b61e42d55d66adf8bb587da29621";
-      name = "plasma-integration-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/plasma-integration-5.16.3.tar.xz";
+      sha256 = "75d90d09cd32a4a351a43de8d84cce46920acc93519a8d8472ae357e7771c69e";
+      name = "plasma-integration-5.16.3.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-nm-5.15.5.tar.xz";
-      sha256 = "6a2cde83ff031de3565465d48538578380301debb8e49345e25ff3f723c908ee";
-      name = "plasma-nm-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/plasma-nm-5.16.3.tar.xz";
+      sha256 = "241ba7ee6a902f30748aaa520c556d8624381a36a04c881fc520fd4ff8db2bdb";
+      name = "plasma-nm-5.16.3.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-pa-5.15.5.tar.xz";
-      sha256 = "326a6d3f6f9d462a3b88402ae6be2dac976f166995a5cb750d294d51085a0a92";
-      name = "plasma-pa-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/plasma-pa-5.16.3.tar.xz";
+      sha256 = "e149732abd31b6958d845bb2326f65e344d6440e995d2448c997ddd707a466d6";
+      name = "plasma-pa-5.16.3.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-sdk-5.15.5.tar.xz";
-      sha256 = "f91ccb03f016328c2bd54ac11a916b4f874cfe2304da1600f3fa014faeb7d329";
-      name = "plasma-sdk-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/plasma-sdk-5.16.3.tar.xz";
+      sha256 = "53a5d03d83ae974032fc32414003038a1b068766eba01e831ecdb1fd91df5b15";
+      name = "plasma-sdk-5.16.3.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-tests-5.15.5.tar.xz";
-      sha256 = "534c018f45f8545f027aeccea8731a26311179328e7a746522fa11961c5c5827";
-      name = "plasma-tests-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/plasma-tests-5.16.3.tar.xz";
+      sha256 = "8effcd48b7c6393d649f06fc4b33854d9449435a653afb8baa228491a6db25ad";
+      name = "plasma-tests-5.16.3.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-vault-5.15.5.tar.xz";
-      sha256 = "2d7c356fa951b341fcb5ea48ed819f396fe9096e06e6f2026c9f59a59fa48fd5";
-      name = "plasma-vault-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/plasma-vault-5.16.3.tar.xz";
+      sha256 = "3e071eba3be70ace60010443b1c91ac9da0d86befa6184923867583231698fc0";
+      name = "plasma-vault-5.16.3.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz";
-      sha256 = "c25f9b348e3ab2d370325f7da989a3f599a408dabfadda65cbb590fb26a2f973";
-      name = "plasma-workspace-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/plasma-workspace-5.16.3.tar.xz";
+      sha256 = "ef1dcaff9cea12e764d743b1d0c24a7f0602a0ccaa4b62036b3885429724bd06";
+      name = "plasma-workspace-5.16.3.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-wallpapers-5.15.5.tar.xz";
-      sha256 = "0dc21728f3a08d823106bae7dd99d9b6b28b9b77abe8cf8f213bd4cf5b66b945";
-      name = "plasma-workspace-wallpapers-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/plasma-workspace-wallpapers-5.16.3.tar.xz";
+      sha256 = "27d7aaf26cf37810d022f9a0f26fea4e517c2380a5f82ef6c1238c7cd7fb5bb7";
+      name = "plasma-workspace-wallpapers-5.16.3.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plymouth-kcm-5.15.5.tar.xz";
-      sha256 = "9454cff23e7acae549bdd61818cb351332b334f9cf0b7a7eb065d6dd784950aa";
-      name = "plymouth-kcm-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/plymouth-kcm-5.16.3.tar.xz";
+      sha256 = "3301679e79e9a36c0aa785434e90c3136e4ff9b186532baf98b04f7a1febfd92";
+      name = "plymouth-kcm-5.16.3.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.15.5";
+    version = "1-5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/polkit-kde-agent-1-5.15.5.tar.xz";
-      sha256 = "628ce9a02defa31e98a6a373abb6a1f2bf39f065eaf82fdbb4f93bf07165e267";
-      name = "polkit-kde-agent-1-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/polkit-kde-agent-1-5.16.3.tar.xz";
+      sha256 = "571ea645d1c1ca0f3f00406ca5029663a12de7823db7fed86dc9e367c0f4d16a";
+      name = "polkit-kde-agent-1-5.16.3.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/powerdevil-5.15.5.tar.xz";
-      sha256 = "c435cdcab2ff367ca86f91a45ac43fa9f9b68251e8e444b285b7edd33482ad06";
-      name = "powerdevil-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/powerdevil-5.16.3.tar.xz";
+      sha256 = "75fd2fbf714f3b01a2233be5d2170e175994e38fd4daa47092f588697293a9aa";
+      name = "powerdevil-5.16.3.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/sddm-kcm-5.15.5.tar.xz";
-      sha256 = "4d5ee74e494f78a90d1586862749d53f4dc34970f47307d62a4e6ead9161c25b";
-      name = "sddm-kcm-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/sddm-kcm-5.16.3.tar.xz";
+      sha256 = "0fad91b5a7901a42df03113a2277d317ceddf048934f4aa83cd2d735bb9738a3";
+      name = "sddm-kcm-5.16.3.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/systemsettings-5.15.5.tar.xz";
-      sha256 = "a29227329f8ddd2db2ba8aafb3eb5f2b09d01e3a6f761d291afba95935ceb93a";
-      name = "systemsettings-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/systemsettings-5.16.3.tar.xz";
+      sha256 = "55a861bb75ea3e50543001bac9505fd5de2733f9b0c234d8b8e3bd7c879ee21e";
+      name = "systemsettings-5.16.3.tar.xz";
     };
   };
   user-manager = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/user-manager-5.15.5.tar.xz";
-      sha256 = "09e746e14bc732e296e93290929dfd1d378abe0b6b47fce084c97dd82a3f2431";
-      name = "user-manager-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/user-manager-5.16.3.tar.xz";
+      sha256 = "9d71980a976e5f37ac9e324d83e9c4de533cd4e77add66f9fdee7c5a0ec9ec0c";
+      name = "user-manager-5.16.3.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.15.5";
+    version = "5.16.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/xdg-desktop-portal-kde-5.15.5.tar.xz";
-      sha256 = "fd98af5fe77e5a387bee25bcbdfa39607d1b91ba1cd431ae72cff8103548ac50";
-      name = "xdg-desktop-portal-kde-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.3/xdg-desktop-portal-kde-5.16.3.tar.xz";
+      sha256 = "919e526a9e4a68c50b0dc4972713196076eecfff90445833d8f5665b0f88f1a0";
+      name = "xdg-desktop-portal-kde-5.16.3.tar.xz";
     };
   };
 }

From 357ae3c88403770f734cdeb92d0cee2050962463 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 29 Jul 2019 14:08:13 +0200
Subject: [PATCH 055/794] kwallet-pam: add new kwallet dependency

---
 pkgs/desktops/plasma-5/kwallet-pam.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index 1cbfb87ea56..b4fd032cf1f 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -1,9 +1,9 @@
-{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, }:
+{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, kwallet, }:
 
 mkDerivation {
   name = "kwallet-pam";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ pam socat libgcrypt qtbase ];
+  buildInputs = [ pam socat libgcrypt qtbase kwallet ];
   postPatch = ''
     sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|"
   '';

From ea1131fc39bf314b8615f448fe9bec94f739bc7c Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 29 Jul 2019 16:22:49 +0200
Subject: [PATCH 056/794] kwin: fix xwayland patch

The Xwayland code path was moved from ApplicationWayland to a dedicated
class
https://phabricator.kde.org/D15020
---
 pkgs/desktops/plasma-5/kwin/xwayland.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/plasma-5/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch
index 51f15c87d27..9d405b3bbb8 100644
--- a/pkgs/desktops/plasma-5/kwin/xwayland.patch
+++ b/pkgs/desktops/plasma-5/kwin/xwayland.patch
@@ -1,13 +1,13 @@
-Index: kwin-5.7.3/main_wayland.cpp
+Index: kwin-5.15.5/xwl/xwayland.cpp
 ===================================================================
---- kwin-5.7.3.orig/main_wayland.cpp
-+++ kwin-5.7.3/main_wayland.cpp
-@@ -315,7 +315,7 @@ void ApplicationWayland::startXwaylandSe
+--- kwin-5.15.5.orig/xwl/xwayland.cpp
++++ kwin-5.15.5/xwl/xwayland.cpp
+@@ -143,7 +143,7 @@ void Xwayland::init()
  
-     m_xwaylandProcess = new Process(kwinApp());
+     m_xwaylandProcess = new Process(this);
      m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
 -    m_xwaylandProcess->setProgram(QStringLiteral("Xwayland"));
 +    m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND));
-     QProcessEnvironment env = m_environment;
+     QProcessEnvironment env = m_app->processStartupEnvironment();
      env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
-     m_xwaylandProcess->setProcessEnvironment(env);
+     env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM"));

From a1d21260c33602a2970ea4191668c18fd77d4d3b Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 29 Jul 2019 17:21:35 +0200
Subject: [PATCH 057/794] plasma-workspace: fix patch with new wallpaper path

---
 .../plasma-5/plasma-workspace/plasma-workspace.patch       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
index 55a4518021e..5c27eee5010 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
@@ -2,12 +2,13 @@ diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
 index 69d3070..52e9102 100644
 --- a/sddm-theme/theme.conf.cmake
 +++ b/sddm-theme/theme.conf.cmake
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
  [General]
  type=image
  color=#1d99f3
--background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
-+background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
+ fontSize=10
+-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
++background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
 diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
 index 6a1a212..f03fd34 100644
 --- a/startkde/CMakeLists.txt

From ef90b86924dcc304fb51ceb1154c4d39c3eb8c40 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 30 Jul 2019 23:01:54 +0200
Subject: [PATCH 058/794] gwenview: remove obsolete patch

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

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

From 1cfe46034bc8d11483a9e8d15dd475f00acf0e3f Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 31 Jul 2019 12:49:01 +0200
Subject: [PATCH 059/794] plasma-5: 5.16.3 -> 5.16.4

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

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 2ec9fb2bfdf..4efd493a3dd 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.3/ )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.4/ )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index e17d474e3ab..21dd5c36d78 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,363 +3,363 @@
 
 {
   bluedevil = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/bluedevil-5.16.3.tar.xz";
-      sha256 = "f22234c0561e143c03114943ccfaec962195b3aef55ffbc8a5ba2b8f722cd4bd";
-      name = "bluedevil-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/bluedevil-5.16.4.tar.xz";
+      sha256 = "36eaff3da49104fb4ca8de32c2cd42657af7cde94f54c95bacf5abd6c1d39521";
+      name = "bluedevil-5.16.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/breeze-5.16.3.tar.xz";
-      sha256 = "f11b5d0118c7530d244b3455219d86fc40888cb7e7f6a74684464a1d1b7db2e5";
-      name = "breeze-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/breeze-5.16.4.tar.xz";
+      sha256 = "84fea0c31a41521983698ad2aed603b5e2c6e4f6e8723e2c64c66c37eb2a5395";
+      name = "breeze-5.16.4.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/breeze-grub-5.16.3.tar.xz";
-      sha256 = "6a25f456121c17a2f3275220d1fe0af8438484918b2d1678ddd39ed020b99176";
-      name = "breeze-grub-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/breeze-grub-5.16.4.tar.xz";
+      sha256 = "c36b2183fff7d559ae944881443e0caa03c63bcc81af9f6b21b722109d2e34db";
+      name = "breeze-grub-5.16.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/breeze-gtk-5.16.3.tar.xz";
-      sha256 = "52cbe5c7757fb395e3e7e35c12918017a80d64d9f13c32ce6cdfacd440ecaa64";
-      name = "breeze-gtk-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/breeze-gtk-5.16.4.tar.xz";
+      sha256 = "8c954a8754bc75b2d8edff70a7b322c559da6e23dc75e1ed616ac926fbe186eb";
+      name = "breeze-gtk-5.16.4.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/breeze-plymouth-5.16.3.tar.xz";
-      sha256 = "4fc6ca444449d42874009af1f79ba408c6a37d2c08722c05a97b9a268a447ce6";
-      name = "breeze-plymouth-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/breeze-plymouth-5.16.4.tar.xz";
+      sha256 = "7556c8f6bff771f3439036f843309b45594c5e903fc11a3275cc2c38346dec9f";
+      name = "breeze-plymouth-5.16.4.tar.xz";
     };
   };
   discover = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/discover-5.16.3.tar.xz";
-      sha256 = "1cbceecf8c7489a33a62b6efc5b1acf338f35e53db5d12fc2476e0374a0033cd";
-      name = "discover-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/discover-5.16.4.tar.xz";
+      sha256 = "0e07a49d3ee93434452d69330b11653546a2104601ec08518be111ba7967f1b0";
+      name = "discover-5.16.4.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/drkonqi-5.16.3.tar.xz";
-      sha256 = "118afd1d85fd78e34faac0bd6aa548edb501f16d733ea9f0a28630c817496fda";
-      name = "drkonqi-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/drkonqi-5.16.4.tar.xz";
+      sha256 = "9d030a59a6d1d732241f8c54a54291ac60584d542ea0b891ca4b2bcb958bd51f";
+      name = "drkonqi-5.16.4.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kactivitymanagerd-5.16.3.tar.xz";
-      sha256 = "6a8cb887c4ca74d209e38db40ce04b2e0fe1d9e9a625c8490945184dfa41dfc5";
-      name = "kactivitymanagerd-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kactivitymanagerd-5.16.4.tar.xz";
+      sha256 = "a287fc9624390c8493a35a5440e2161d1bb67252b6986231acb6268440bb4770";
+      name = "kactivitymanagerd-5.16.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kde-cli-tools-5.16.3.tar.xz";
-      sha256 = "ee68a8f958e1ce503252689d66eeb9897bad6b7e44f760c654d49225b3d55cd7";
-      name = "kde-cli-tools-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kde-cli-tools-5.16.4.tar.xz";
+      sha256 = "56c7c2566217704a9d613757767c3b8ee8d1bc4601b9414a44acb50aaaaedc0d";
+      name = "kde-cli-tools-5.16.4.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kdecoration-5.16.3.tar.xz";
-      sha256 = "31b49d600280d6b2c23d37edc219976d87e38e1c7fd62b5dc9dbc36d365bb5ad";
-      name = "kdecoration-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kdecoration-5.16.4.tar.xz";
+      sha256 = "aa77507dcf357243cca9002764f8c8d1c8404d7e5b7249ad0d0f900f0a47ace4";
+      name = "kdecoration-5.16.4.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kde-gtk-config-5.16.3.tar.xz";
-      sha256 = "0477b3763e85acd2780306e0fd3fe309ee86805a512d0d3b150cab24c5153fd6";
-      name = "kde-gtk-config-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kde-gtk-config-5.16.4.tar.xz";
+      sha256 = "c271b1caebac0837483af7ae11d2e4786a7770ff85753f1a3da4c8d28681111c";
+      name = "kde-gtk-config-5.16.4.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kdeplasma-addons-5.16.3.tar.xz";
-      sha256 = "83c6bb1c9a5928de4febc3d9ad4e6be0beb24857efcccb98e967629c28d29831";
-      name = "kdeplasma-addons-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kdeplasma-addons-5.16.4.tar.xz";
+      sha256 = "4c0884dcb8413fa836d7e390b1c12fc71127c0e5e6fa278a338c253d1539f4a1";
+      name = "kdeplasma-addons-5.16.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kgamma5-5.16.3.tar.xz";
-      sha256 = "7b609d418e670bdc75d6c2894255088aab6a7a2005afe3ec99348a49d67eb61d";
-      name = "kgamma5-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kgamma5-5.16.4.tar.xz";
+      sha256 = "18c01c6a9d73f2450da24ac7a52c00b9d355a1ba41bd346eb71fbe271de85f46";
+      name = "kgamma5-5.16.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/khotkeys-5.16.3.tar.xz";
-      sha256 = "caa65d8b3b6567dac483acf27f62e9baefc31416aa5f991409b0304920211f4e";
-      name = "khotkeys-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/khotkeys-5.16.4.tar.xz";
+      sha256 = "a8646ab20cd067a515d4a9318c814760be0030f27856f155edf11920caeddd0d";
+      name = "khotkeys-5.16.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kinfocenter-5.16.3.tar.xz";
-      sha256 = "b123278ef644fd4c3a5af1fb29f3ab859d4dfb2717e0e5783d58927a69ad7f88";
-      name = "kinfocenter-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kinfocenter-5.16.4.tar.xz";
+      sha256 = "30e4df2d641c4faa385a718c772d893900eca99591ffee5787d6563fe5130426";
+      name = "kinfocenter-5.16.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kmenuedit-5.16.3.tar.xz";
-      sha256 = "2ccc8e7feea7b4d3616a7528cf65a62c5299388583afb295d0aa2379945035cd";
-      name = "kmenuedit-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kmenuedit-5.16.4.tar.xz";
+      sha256 = "f749ca062d9c7bfd2033c4016e8a3dcc9f849f83f941dd9a60fd5b0232d023a2";
+      name = "kmenuedit-5.16.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kscreen-5.16.3.tar.xz";
-      sha256 = "3c95f590ddc3483e2828585263feb2caa3e32c59f1b92f6aca23309565d4e139";
-      name = "kscreen-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kscreen-5.16.4.tar.xz";
+      sha256 = "40c29ad2236459a267eed3cad4a6fc64b5e3f12df8567fcf8869ba770c2e2328";
+      name = "kscreen-5.16.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kscreenlocker-5.16.3.tar.xz";
-      sha256 = "41f9a85f0e6a8ae9747b9022961361b44b21b0df0b5e2c1705694b88f371d377";
-      name = "kscreenlocker-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kscreenlocker-5.16.4.tar.xz";
+      sha256 = "92a858f1f4bd6f209f328ca6456dfadc6b542e2a1e3d04ecdcc70f70c1cc2f6f";
+      name = "kscreenlocker-5.16.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/ksshaskpass-5.16.3.tar.xz";
-      sha256 = "fbf9b535259aebd8e292d9e4db8ae5d8a2fe85658f8e95ab3b88e79f8093ea91";
-      name = "ksshaskpass-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/ksshaskpass-5.16.4.tar.xz";
+      sha256 = "e3ff91e5c160b8e83b48215fca5d70f4baeef95b6c3b32e8cfc749183b0ec97c";
+      name = "ksshaskpass-5.16.4.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/ksysguard-5.16.3.tar.xz";
-      sha256 = "f3bbc8b89bf117deab27e1e29d59f19ea1834be11d606f0be25c4a080c9766a3";
-      name = "ksysguard-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/ksysguard-5.16.4.tar.xz";
+      sha256 = "10abf3bfa676275b6fded5e49979466a011e0552b9357c1b8923f01184c029d5";
+      name = "ksysguard-5.16.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kwallet-pam-5.16.3.tar.xz";
-      sha256 = "e5f2a2e9650008b7d6383a9c71b70d4ec092dc48e8c1409a4570531c56f8985c";
-      name = "kwallet-pam-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kwallet-pam-5.16.4.tar.xz";
+      sha256 = "7332dd9729c55f4b24260b3ec1266f72284f834eed66ce76badd4ac5af3dd429";
+      name = "kwallet-pam-5.16.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kwayland-integration-5.16.3.tar.xz";
-      sha256 = "b0e844375a7c43579311899ffb2fed2b048279b4a59de91be687c99257449670";
-      name = "kwayland-integration-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kwayland-integration-5.16.4.tar.xz";
+      sha256 = "f15ae33af1d9ff999ec45d00752f202242f71fc022ae72b9522e5bf3a20edace";
+      name = "kwayland-integration-5.16.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kwin-5.16.3.tar.xz";
-      sha256 = "766ae9cec1535ab7a715c20d8ef1b409063be55bb8d8d8f593de9551ee12b01a";
-      name = "kwin-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kwin-5.16.4.tar.xz";
+      sha256 = "71b96f1efef0b3f4974900373285a08d425a63628404fe9e89c27f61119383e6";
+      name = "kwin-5.16.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/kwrited-5.16.3.tar.xz";
-      sha256 = "9c86575d080219a00ad9fa99b7d12acc06b2cd807bd256fc9f4d96cc8d7ab37e";
-      name = "kwrited-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kwrited-5.16.4.tar.xz";
+      sha256 = "c3011ee1c7a431b25797e12fa0b16e6d92277c8fe5dc1e656121a135ad156c0f";
+      name = "kwrited-5.16.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/libkscreen-5.16.3.tar.xz";
-      sha256 = "09f7dcef33dd23b7987444c25edbc1b5b91f99396c65bdafa1823d77c94b3422";
-      name = "libkscreen-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/libkscreen-5.16.4.tar.xz";
+      sha256 = "f20f33a2f32b3db39e94ca9d10e240591650357d03c1a2f8eb6c5faa4d1bf723";
+      name = "libkscreen-5.16.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/libksysguard-5.16.3.tar.xz";
-      sha256 = "a668348bf1bb65f991d0862fe55c182d852b02ae37ec2ddc88a70fd1477fcf6c";
-      name = "libksysguard-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/libksysguard-5.16.4.tar.xz";
+      sha256 = "b9a8166bf808a54dd80eb8f760047c63989f1f10a9a7f649c8298c9a5031368f";
+      name = "libksysguard-5.16.4.tar.xz";
     };
   };
   milou = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/milou-5.16.3.tar.xz";
-      sha256 = "9a06e35d1bf613010301979d7ab5fbdb828943a432bc6a76c6b26ad20e5a199a";
-      name = "milou-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/milou-5.16.4.tar.xz";
+      sha256 = "de9addbc504135839b1735742938d340cb191827606aa390f4b6ce1625c1ed89";
+      name = "milou-5.16.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/oxygen-5.16.3.tar.xz";
-      sha256 = "552b008ec09d08c4704aa3ea66b2d73cf98dc35be290792d34d7962c59f51544";
-      name = "oxygen-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/oxygen-5.16.4.tar.xz";
+      sha256 = "7ba8a18a0b44d2bf48c96679328f698a9bfd4d041724b960095fed67f228f2e1";
+      name = "oxygen-5.16.4.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/plasma-browser-integration-5.16.3.tar.xz";
-      sha256 = "dd3ea46d3339cbd4332c3bff2eda10fea819e316c74a8dd76f43ecb9510681d7";
-      name = "plasma-browser-integration-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-browser-integration-5.16.4.tar.xz";
+      sha256 = "a097b90dd47cdd01f6b7207cb9439c7f6e0ce68555272172f8b3b8e2086199ef";
+      name = "plasma-browser-integration-5.16.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/plasma-desktop-5.16.3.tar.xz";
-      sha256 = "2c49ce479dacd227324f5cbcb04a0f9903a79740f044eed593c0bf990d124486";
-      name = "plasma-desktop-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-desktop-5.16.4.tar.xz";
+      sha256 = "990e93eed2753053ac732ce5d1d45e7c9a52daa660b41b0d48955428e4834344";
+      name = "plasma-desktop-5.16.4.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/plasma-integration-5.16.3.tar.xz";
-      sha256 = "75d90d09cd32a4a351a43de8d84cce46920acc93519a8d8472ae357e7771c69e";
-      name = "plasma-integration-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-integration-5.16.4.tar.xz";
+      sha256 = "d4c5022ea91f9727cfebab821cb6b8e7b52671a6508cd7450e05bf51e248452d";
+      name = "plasma-integration-5.16.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/plasma-nm-5.16.3.tar.xz";
-      sha256 = "241ba7ee6a902f30748aaa520c556d8624381a36a04c881fc520fd4ff8db2bdb";
-      name = "plasma-nm-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-nm-5.16.4.tar.xz";
+      sha256 = "2da834873d4fa471ad87ee8ce18a871dfb2acdf0bdc0b764789e8e26ebc2ca09";
+      name = "plasma-nm-5.16.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/plasma-pa-5.16.3.tar.xz";
-      sha256 = "e149732abd31b6958d845bb2326f65e344d6440e995d2448c997ddd707a466d6";
-      name = "plasma-pa-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-pa-5.16.4.tar.xz";
+      sha256 = "9b166e11f7115576181c17f0ced51b9a7ec689334d4b15ebb55d4e6e7ff6cbd4";
+      name = "plasma-pa-5.16.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/plasma-sdk-5.16.3.tar.xz";
-      sha256 = "53a5d03d83ae974032fc32414003038a1b068766eba01e831ecdb1fd91df5b15";
-      name = "plasma-sdk-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-sdk-5.16.4.tar.xz";
+      sha256 = "ce8152ad6044e2cf430834bf97bb4542e69e168a4b7350e313d148a9bd3b9403";
+      name = "plasma-sdk-5.16.4.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/plasma-tests-5.16.3.tar.xz";
-      sha256 = "8effcd48b7c6393d649f06fc4b33854d9449435a653afb8baa228491a6db25ad";
-      name = "plasma-tests-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-tests-5.16.4.tar.xz";
+      sha256 = "9e0f8fcef080fc1b0ffae01f6b3caa17eccac27445e312243221fcace56d1097";
+      name = "plasma-tests-5.16.4.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/plasma-vault-5.16.3.tar.xz";
-      sha256 = "3e071eba3be70ace60010443b1c91ac9da0d86befa6184923867583231698fc0";
-      name = "plasma-vault-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-vault-5.16.4.tar.xz";
+      sha256 = "8d01b80079477fd7ea48a4cc3ff59728ae7dac3a5f6e552092dd5e67d72148f6";
+      name = "plasma-vault-5.16.4.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/plasma-workspace-5.16.3.tar.xz";
-      sha256 = "ef1dcaff9cea12e764d743b1d0c24a7f0602a0ccaa4b62036b3885429724bd06";
-      name = "plasma-workspace-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-5.16.4.tar.xz";
+      sha256 = "5cd9366ef3d0b68159d9dee2f14886d1f81d1ccf7aedceed1ae5cf8e32d243f1";
+      name = "plasma-workspace-5.16.4.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/plasma-workspace-wallpapers-5.16.3.tar.xz";
-      sha256 = "27d7aaf26cf37810d022f9a0f26fea4e517c2380a5f82ef6c1238c7cd7fb5bb7";
-      name = "plasma-workspace-wallpapers-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-wallpapers-5.16.4.tar.xz";
+      sha256 = "052f6d978b1230706821f67574a7d053fadfb25de65227ffc8389a8570ac6003";
+      name = "plasma-workspace-wallpapers-5.16.4.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/plymouth-kcm-5.16.3.tar.xz";
-      sha256 = "3301679e79e9a36c0aa785434e90c3136e4ff9b186532baf98b04f7a1febfd92";
-      name = "plymouth-kcm-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plymouth-kcm-5.16.4.tar.xz";
+      sha256 = "cf9d3e6f14d012617cc8a5c3381295449e68b1b13209436b561417232d21863f";
+      name = "plymouth-kcm-5.16.4.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.16.3";
+    version = "1-5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/polkit-kde-agent-1-5.16.3.tar.xz";
-      sha256 = "571ea645d1c1ca0f3f00406ca5029663a12de7823db7fed86dc9e367c0f4d16a";
-      name = "polkit-kde-agent-1-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/polkit-kde-agent-1-5.16.4.tar.xz";
+      sha256 = "917b31f194fcf5d56d465bd4a3a1cc8d0a30e302be63b9048b1b85b6746b46a0";
+      name = "polkit-kde-agent-1-5.16.4.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/powerdevil-5.16.3.tar.xz";
-      sha256 = "75fd2fbf714f3b01a2233be5d2170e175994e38fd4daa47092f588697293a9aa";
-      name = "powerdevil-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/powerdevil-5.16.4.tar.xz";
+      sha256 = "40885869890366f7ea92946ed0f8d251546fb14228eddd2ad128e3be8f88d2ed";
+      name = "powerdevil-5.16.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/sddm-kcm-5.16.3.tar.xz";
-      sha256 = "0fad91b5a7901a42df03113a2277d317ceddf048934f4aa83cd2d735bb9738a3";
-      name = "sddm-kcm-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/sddm-kcm-5.16.4.tar.xz";
+      sha256 = "340034c5475d751c19c96a75445fa50877fad1c4de3422bc02f4b95e8f14bd68";
+      name = "sddm-kcm-5.16.4.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/systemsettings-5.16.3.tar.xz";
-      sha256 = "55a861bb75ea3e50543001bac9505fd5de2733f9b0c234d8b8e3bd7c879ee21e";
-      name = "systemsettings-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/systemsettings-5.16.4.tar.xz";
+      sha256 = "73b78c3c5177aa3ba0ffe970a83cb8bea1ba8ac54420a6c8379d6e86cabda31e";
+      name = "systemsettings-5.16.4.tar.xz";
     };
   };
   user-manager = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/user-manager-5.16.3.tar.xz";
-      sha256 = "9d71980a976e5f37ac9e324d83e9c4de533cd4e77add66f9fdee7c5a0ec9ec0c";
-      name = "user-manager-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/user-manager-5.16.4.tar.xz";
+      sha256 = "3dd29a6abf8c15014ed87a448b13190516e16d8dc3a67d56f05f62d1f2e1b745";
+      name = "user-manager-5.16.4.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.16.3";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.3/xdg-desktop-portal-kde-5.16.3.tar.xz";
-      sha256 = "919e526a9e4a68c50b0dc4972713196076eecfff90445833d8f5665b0f88f1a0";
-      name = "xdg-desktop-portal-kde-5.16.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/xdg-desktop-portal-kde-5.16.4.tar.xz";
+      sha256 = "3b8aa78451cfc97ef316f1632f6a255ccebbe383ec8389ffc74d44540fc05052";
+      name = "xdg-desktop-portal-kde-5.16.4.tar.xz";
     };
   };
 }

From 5ce0480a8cf9c41139f9cd656385de9bbf9b33f4 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 31 Jul 2019 20:06:43 +0200
Subject: [PATCH 060/794] sddm: add missing dependency for breeze theme

---
 pkgs/applications/display-managers/sddm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index b5d32493003..63f241d9d1c 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, lib, fetchFromGitHub
 , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs
-, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
+, libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd
 }:
 
 let
@@ -29,7 +29,7 @@ in mkDerivation rec {
   nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
 
   buildInputs = [
-    libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd
+    libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative qtquickcontrols2 systemd
   ];
 
   cmakeFlags = [

From 444ddcbcc52c05edec5ac8d8176db3504ca3a890 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 11 Aug 2019 19:42:49 +0200
Subject: [PATCH 061/794] kdeFrameworks: 5.60 -> 5.61

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 632 +++++++++---------
 2 files changed, 317 insertions(+), 317 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 1b23a9da6e7..096376ca671 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.60/ )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.61/ )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 63819cda658..549f99a5588 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,635 +3,635 @@
 
 {
   attica = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/attica-5.60.0.tar.xz";
-      sha256 = "6658a886950ab87d779991b4c39beeff250f5aff64c71ee98b5c472a219ac6de";
-      name = "attica-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/attica-5.61.0.tar.xz";
+      sha256 = "9d3ad34c17223333b5a77144cc5a9d941cbb7baa01ab4a2ffe34ae9398c90dde";
+      name = "attica-5.61.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/baloo-5.60.0.tar.xz";
-      sha256 = "d96a19ff94caf3e3b10e8d5f165e276829a42a1c70fb8451d70cb3764f06671e";
-      name = "baloo-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/baloo-5.61.0.tar.xz";
+      sha256 = "dd559e06237843f51d68eb5001b835037d4b2f6d62b7dc4d040961f9863632f1";
+      name = "baloo-5.61.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/bluez-qt-5.60.0.tar.xz";
-      sha256 = "328aba853ec0c034e777261d9e3ac3202ad941ffde844392e196afaed04be0d4";
-      name = "bluez-qt-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/bluez-qt-5.61.0.tar.xz";
+      sha256 = "0ea647de61fcc18a85c660fa8e05fe93072a713a8d00a018ba8e99ea790e5d27";
+      name = "bluez-qt-5.61.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/breeze-icons-5.60.0.tar.xz";
-      sha256 = "99d0cbda6a38766079166633a06493929222c6443e8718c1a2db4aeb5b5f20b7";
-      name = "breeze-icons-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/breeze-icons-5.61.0.tar.xz";
+      sha256 = "1d260a01a2617f5f755d2eb38423af19bf4a1a2ccfa9339b441b4f6be6381c30";
+      name = "breeze-icons-5.61.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/extra-cmake-modules-5.60.0.tar.xz";
-      sha256 = "2bd9da815de98d5908d3371815df963d305c828f90ba1a076f38543876690248";
-      name = "extra-cmake-modules-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/extra-cmake-modules-5.61.0.tar.xz";
+      sha256 = "a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c";
+      name = "extra-cmake-modules-5.61.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/frameworkintegration-5.60.0.tar.xz";
-      sha256 = "c82600be42b1db398acf4059bde92b3449bb6e52fd0180e66b41060e185e4872";
-      name = "frameworkintegration-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/frameworkintegration-5.61.0.tar.xz";
+      sha256 = "a1a2bbb15d287b67643750cb5414ceb10c6583861dd5c00118010d409f106efb";
+      name = "frameworkintegration-5.61.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kactivities-5.60.0.tar.xz";
-      sha256 = "7703b894c25a576a87c201d41899e793c3c2f89eaa57c1ab71266ae950091883";
-      name = "kactivities-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kactivities-5.61.0.tar.xz";
+      sha256 = "0d7d7e5bd68541ad1dcf1f96c7205330cb7b075c6ff0d8b46774e781eff84af5";
+      name = "kactivities-5.61.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kactivities-stats-5.60.0.tar.xz";
-      sha256 = "f7374d1d2fe94bae935796193a62e46ee1963a39e11b183cc0a40baedb973788";
-      name = "kactivities-stats-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kactivities-stats-5.61.0.tar.xz";
+      sha256 = "9062eb0f189f1b50674e65a7db9a4b821c628acd1ac650000cebbf1f7bdf0068";
+      name = "kactivities-stats-5.61.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kapidox-5.60.0.tar.xz";
-      sha256 = "88cb8b8637e1c6e93d908d3384253d8d99efaa28ef7ba9c7a3089544e1f114dc";
-      name = "kapidox-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kapidox-5.61.0.tar.xz";
+      sha256 = "3c948c87c7f7b16a3835f7df8387c110efe5fefecf8a7d6ffa1cae647be0669f";
+      name = "kapidox-5.61.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/karchive-5.60.0.tar.xz";
-      sha256 = "4e3d2a6ba551c6ada44a6517150e031df92691919119bc3b5eb4efc741ff7564";
-      name = "karchive-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/karchive-5.61.0.tar.xz";
+      sha256 = "457ed420449630625cb161fcc9bedc7c6a16527f48d6db4008aea76cdb948387";
+      name = "karchive-5.61.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kauth-5.60.0.tar.xz";
-      sha256 = "50a2a2eb90d7529bb6fc4ddd77e37ef5b25c612b18487cc63d8d086d5ec28916";
-      name = "kauth-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kauth-5.61.0.tar.xz";
+      sha256 = "b04458f32046b2dd61b48118646180df63d2c843cb2d53560aaa15168df087f1";
+      name = "kauth-5.61.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kbookmarks-5.60.0.tar.xz";
-      sha256 = "a2b77f0b084211badce2eb90c19e00caf078ab59512c326ed1c90f4a58de0d9f";
-      name = "kbookmarks-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kbookmarks-5.61.0.tar.xz";
+      sha256 = "24f87ff1acc5f0c257518f67af277b454566e607f82eb09e75b4a6ed02403377";
+      name = "kbookmarks-5.61.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kcmutils-5.60.0.tar.xz";
-      sha256 = "22226ca10caedc6021b966a26a45096f30837ca9eedcc97479e30f950abc7b8c";
-      name = "kcmutils-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kcmutils-5.61.0.tar.xz";
+      sha256 = "b8b79ef2f4513fbe5e4c61cf4726ed33b95efffabdd512fcc2dcff23c23cdfa7";
+      name = "kcmutils-5.61.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kcodecs-5.60.0.tar.xz";
-      sha256 = "cf8d5e5d47cbee31ea45faa1ca4d6043d3f8d9cbff2e5d40ce749a0b2cec50df";
-      name = "kcodecs-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kcodecs-5.61.0.tar.xz";
+      sha256 = "4604323e44c1be7547f25b43b71bd541048c3d036a7fc5ca74e5ece9792ff5ee";
+      name = "kcodecs-5.61.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kcompletion-5.60.0.tar.xz";
-      sha256 = "d5afb075661dfe2da5e300bd73dee89f92736f39859be711f186310bed245f7c";
-      name = "kcompletion-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kcompletion-5.61.0.tar.xz";
+      sha256 = "68697be65d6c9e0053fc3e504170d23c3162c05a0a9027249c575bc6dc8bd3ec";
+      name = "kcompletion-5.61.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kconfig-5.60.0.tar.xz";
-      sha256 = "541acceead9ca516e3562109e7e94351ce378c234bea968c8dfde78f00559233";
-      name = "kconfig-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kconfig-5.61.0.tar.xz";
+      sha256 = "94c0e292a5d57e014aa745be6b59a989118ead1252d56c768f2719b5c6471372";
+      name = "kconfig-5.61.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kconfigwidgets-5.60.0.tar.xz";
-      sha256 = "74ad4cf5b2858955e7966bb27f7b7ec38c6ddc7c95aa10ba356ef5775afeede3";
-      name = "kconfigwidgets-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kconfigwidgets-5.61.0.tar.xz";
+      sha256 = "4cc1e55c5f994abbec03b32bef73bdf54c2613199a446ad63f4ced6e3a0e2165";
+      name = "kconfigwidgets-5.61.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kcoreaddons-5.60.0.tar.xz";
-      sha256 = "c78e41596e65fec08b1f7b212dd584cb61b5a9fe89c1bb312e06238fac3e137d";
-      name = "kcoreaddons-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kcoreaddons-5.61.0.tar.xz";
+      sha256 = "6a4ea2eca77944c24fe63d2f7111913db721533d5971497cb5bdd2cac896e813";
+      name = "kcoreaddons-5.61.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kcrash-5.60.0.tar.xz";
-      sha256 = "4f45a5ac0620a0fbf4b983ac3d3e68053a3a0f94bae86076f3bc3ec82ecac299";
-      name = "kcrash-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kcrash-5.61.0.tar.xz";
+      sha256 = "83e6333ea0cd7d1ded3fa84f126e3c86a010d7bdb7fd183e7c5d42a8b8e74db8";
+      name = "kcrash-5.61.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kdbusaddons-5.60.0.tar.xz";
-      sha256 = "996a9c41d6290e9520dfaa88a97a476f29b2992a135024ab0ad2bc707b0df881";
-      name = "kdbusaddons-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdbusaddons-5.61.0.tar.xz";
+      sha256 = "f24fadc71670591bb679cde68147e53819f6c3d56126ecbafe59688fc47b347d";
+      name = "kdbusaddons-5.61.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kdeclarative-5.60.0.tar.xz";
-      sha256 = "bbfd1438752866352e4fc7cb69b616c7413eb0b765f73777aa52d5063e2eefb4";
-      name = "kdeclarative-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdeclarative-5.61.0.tar.xz";
+      sha256 = "464a77f88cce72c1616654c371068c11d51e484e0de5c0c5e032126d71afedaa";
+      name = "kdeclarative-5.61.0.tar.xz";
     };
   };
   kded = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kded-5.60.0.tar.xz";
-      sha256 = "cd472a852dcb3206b219a46660558ee24b09356d7342ce39b89ab54ea160c388";
-      name = "kded-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kded-5.61.0.tar.xz";
+      sha256 = "ca970111cb2d0073305a226cc005e2085952c2a02703168a775f954d27d723bc";
+      name = "kded-5.61.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/portingAids/kdelibs4support-5.60.0.tar.xz";
-      sha256 = "91b207b3d46c6bc5e97b9b89717db1ef7c4359c65bc4595794143ba78ce92a60";
-      name = "kdelibs4support-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kdelibs4support-5.61.0.tar.xz";
+      sha256 = "ae6f7c10e1fe67ded687f38a8ab3c8d483ae06ae69344bd1e683af752cf40b5c";
+      name = "kdelibs4support-5.61.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kdesignerplugin-5.60.0.tar.xz";
-      sha256 = "9472332c5a8f7c27d6c581a4f0f4f837d82e2780c1f9b25f2f034afd1d250607";
-      name = "kdesignerplugin-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdesignerplugin-5.61.0.tar.xz";
+      sha256 = "6b204dffbb4897f51143650d75383b5a3ddf4254455e5827d316c7b4ee7b3f33";
+      name = "kdesignerplugin-5.61.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kdesu-5.60.0.tar.xz";
-      sha256 = "3a040ae9825738d9b4953086d6c262009dcff877a4ed7e6925e3a34086007687";
-      name = "kdesu-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdesu-5.61.0.tar.xz";
+      sha256 = "398e74bdfe695ec2d7b57ce78f9fce3e19bb447a8eb5924441718a8f7384f888";
+      name = "kdesu-5.61.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/portingAids/kdewebkit-5.60.0.tar.xz";
-      sha256 = "bf16bf33dfdecc5e4e50bacc5ce142774c5c1522639d3d0042779734767f12fb";
-      name = "kdewebkit-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kdewebkit-5.61.0.tar.xz";
+      sha256 = "1ee2a00ee3d95df9270e8c3d434568cda8f42151e361bc07fe374bf0f7afe211";
+      name = "kdewebkit-5.61.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kdnssd-5.60.0.tar.xz";
-      sha256 = "8313b1a418559032a110f07b8816afd676770e0897d72d1d8cc353349a281964";
-      name = "kdnssd-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdnssd-5.61.0.tar.xz";
+      sha256 = "02d70e5ee18697867c1a12373c1dbe31e1efba1fcb1e26bba3c75472cd3b271d";
+      name = "kdnssd-5.61.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kdoctools-5.60.0.tar.xz";
-      sha256 = "b231ea9857c5c1335fbf1a63907311a136651d93af4a4143e0b4caad833ae834";
-      name = "kdoctools-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdoctools-5.61.0.tar.xz";
+      sha256 = "e48d8f8f075171c6b83189999a10552c772c6a7e9a115a2643414f9ecec77c6f";
+      name = "kdoctools-5.61.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kemoticons-5.60.0.tar.xz";
-      sha256 = "60e2f227ed7094a0d4d973f7968d4d70b7c9d176dadb45c540541a3d448a5125";
-      name = "kemoticons-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kemoticons-5.61.0.tar.xz";
+      sha256 = "cfc17de43320fbb353be30ae8d5b448b88da6f83bd23e29d678cd95a4bd7a380";
+      name = "kemoticons-5.61.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kfilemetadata-5.60.0.tar.xz";
-      sha256 = "6d2ddfe0b16d73a139573dd02766825b21b958af16f51682c1f4cb816b3929f8";
-      name = "kfilemetadata-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kfilemetadata-5.61.0.tar.xz";
+      sha256 = "15f20af053c71c1e5ba6c6ade90b7cce27645b27ee30f1e6e73038e81a2c958e";
+      name = "kfilemetadata-5.61.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kglobalaccel-5.60.0.tar.xz";
-      sha256 = "660f2b930fd2ea4ad935f37d4e26253a7537ff30cf665ac57a41087dd4c2e805";
-      name = "kglobalaccel-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kglobalaccel-5.61.0.tar.xz";
+      sha256 = "ad6bd2648e39854369555dd8a0823b08d9631f3638472627eb80e01d9902150e";
+      name = "kglobalaccel-5.61.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kguiaddons-5.60.0.tar.xz";
-      sha256 = "228dc1715a35979072381658ca244795e989ea941e703559de398fdea793c548";
-      name = "kguiaddons-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kguiaddons-5.61.0.tar.xz";
+      sha256 = "40cefa421b5ad5cf211875a35408ba526a5fb34e5ba19ebbda718dbf6b742520";
+      name = "kguiaddons-5.61.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kholidays-5.60.0.tar.xz";
-      sha256 = "af1954758e946b62e387e2197f128e7ae53b6054717f35bcabc674bec19b2d14";
-      name = "kholidays-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kholidays-5.61.0.tar.xz";
+      sha256 = "ce3d879824a3e429b468008c1ccec5de44c07299d412ea32f9a2a814c27c08c1";
+      name = "kholidays-5.61.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/portingAids/khtml-5.60.0.tar.xz";
-      sha256 = "c18a5fa51cbf9f9a0a0f104e2fc0581abdb99a5bd36f8426ef129ea848414037";
-      name = "khtml-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/khtml-5.61.0.tar.xz";
+      sha256 = "5d8612b584eecf96959d56bb75b1470b3b34ff7176cef7a0a15bc2531b21720b";
+      name = "khtml-5.61.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/ki18n-5.60.0.tar.xz";
-      sha256 = "b94598e6cb40019c9db403cb392b647d798692899467883f2f9419e1de5782c3";
-      name = "ki18n-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/ki18n-5.61.0.tar.xz";
+      sha256 = "d8c0594268b386ee42823360aa937c664cf04eedac8232bc18a653a9c52491d9";
+      name = "ki18n-5.61.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kiconthemes-5.60.0.tar.xz";
-      sha256 = "054bfdb9129ae8610cad742198e2ad047f3960f810b8153dc28ead76687d9e79";
-      name = "kiconthemes-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kiconthemes-5.61.0.tar.xz";
+      sha256 = "341741abd0b8aeeec8a2a87fe781b4ec1ab593563b1c063cdfdccead3706cdd7";
+      name = "kiconthemes-5.61.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kidletime-5.60.0.tar.xz";
-      sha256 = "e7c4ca5ca3e847c37add4c81b3d430f4c4bf0214433a234a32d766c9199adb27";
-      name = "kidletime-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kidletime-5.61.0.tar.xz";
+      sha256 = "8fb302dcc5b891ac2f06b5278bd6e08043772f3325bc209175c945280621fca2";
+      name = "kidletime-5.61.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kimageformats-5.60.0.tar.xz";
-      sha256 = "4e2fd48a2c5b7ee3af0b82bce9aaa0847e840b881bbb307c049bb8c881302635";
-      name = "kimageformats-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kimageformats-5.61.0.tar.xz";
+      sha256 = "5a81359a043e201b29e205dd93559de077e0317d26712cb1c07e624d76aeb207";
+      name = "kimageformats-5.61.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kinit-5.60.0.tar.xz";
-      sha256 = "c8c109e220e8eb812a09d3474439b0f6f6af4d25861322a9494fc206da51afdc";
-      name = "kinit-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kinit-5.61.0.tar.xz";
+      sha256 = "1806bba9cc3f4d9c5ed23f49eca30707e8f74a99d35f5022130a46a395f2858f";
+      name = "kinit-5.61.0.tar.xz";
     };
   };
   kio = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kio-5.60.0.tar.xz";
-      sha256 = "be433fcf665679671a2e320556c39b708ed0789271e76ebb6142df058260238d";
-      name = "kio-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kio-5.61.0.tar.xz";
+      sha256 = "1fa35126f8167bdbe029e515d01c8d4b91a07556ce6d5c9418e0ea10d7c2e44e";
+      name = "kio-5.61.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kirigami2-5.60.0.tar.xz";
-      sha256 = "f016481d393041513dda11345e9ee84723587fa4be9f17391ed1a5868477e153";
-      name = "kirigami2-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kirigami2-5.61.0.tar.xz";
+      sha256 = "afdbe922f0627330319f22834d6631af13edb0081c687422d36acb8697a88c30";
+      name = "kirigami2-5.61.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kitemmodels-5.60.0.tar.xz";
-      sha256 = "364799922efa153d5bd6c326a8c3311d7170356807be1e67eb4d5135ec62f5ff";
-      name = "kitemmodels-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kitemmodels-5.61.0.tar.xz";
+      sha256 = "47db271ba24904933629ed00f7a4f916a19969967dcfbfd59ae5e98f08f89d68";
+      name = "kitemmodels-5.61.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kitemviews-5.60.0.tar.xz";
-      sha256 = "e43c1479bd5a8c90ba8e396a34299e0a96143ad6cdfd1edef0be5839fb95437f";
-      name = "kitemviews-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kitemviews-5.61.0.tar.xz";
+      sha256 = "0447b361444a853409f65e2fb5650cc95eb799ca54a5d7e15cd6d8ca527002da";
+      name = "kitemviews-5.61.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kjobwidgets-5.60.0.tar.xz";
-      sha256 = "b9d2a044a17eff6ced2cf6c4bd06661a0d64cbeea2b18248cdac4f969ea69353";
-      name = "kjobwidgets-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kjobwidgets-5.61.0.tar.xz";
+      sha256 = "5246c2a230e3b4e9d7ba87c5a6b13b5f96fef6af0d1262f27f91fa0c619cf378";
+      name = "kjobwidgets-5.61.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/portingAids/kjs-5.60.0.tar.xz";
-      sha256 = "9f4beaf9d773afbd73de5a9adf1f481c9b95fb02cc7cfe8ec050625c13811355";
-      name = "kjs-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kjs-5.61.0.tar.xz";
+      sha256 = "968e1592c98ee260d80644bf4631bf09479512e48fa878887ee3b9d6d57d3d17";
+      name = "kjs-5.61.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/portingAids/kjsembed-5.60.0.tar.xz";
-      sha256 = "91c8767a533ee414cd0b4789270881495a8e06482d68bda988cc5fdeb987c421";
-      name = "kjsembed-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kjsembed-5.61.0.tar.xz";
+      sha256 = "d8e0afad638574c31c89d716d78456ce51ffe6dd03eae6787bc9b4f8b52d5b44";
+      name = "kjsembed-5.61.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/portingAids/kmediaplayer-5.60.0.tar.xz";
-      sha256 = "c27ab1227276a65b1c98796b5bae5e62f0e5c45a904760d94f5624bd3a46949e";
-      name = "kmediaplayer-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kmediaplayer-5.61.0.tar.xz";
+      sha256 = "ae15a4a39e6530b505d699fb1b1ab3fd5f0e64d87dd758db17702463e44ce181";
+      name = "kmediaplayer-5.61.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/knewstuff-5.60.0.tar.xz";
-      sha256 = "64744c6775c839d9d8216c4a81161df5544e113570b4cee8533b5a9b4c7b36f2";
-      name = "knewstuff-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/knewstuff-5.61.0.tar.xz";
+      sha256 = "87f8ec030223f5f0e4e39de8407fc0d28542e48e057c1752adb2466c55fe365b";
+      name = "knewstuff-5.61.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/knotifications-5.60.0.tar.xz";
-      sha256 = "fbed417c689b8abf08e1f29df5094cab55b193ce03483658dfb8cdbea3f2d928";
-      name = "knotifications-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/knotifications-5.61.0.tar.xz";
+      sha256 = "f72ce6394465316a5324e38afb07f4f71d5f8e281d09b5cf340246c9905568ac";
+      name = "knotifications-5.61.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/knotifyconfig-5.60.0.tar.xz";
-      sha256 = "77e78f15226334ffaaa0469c06052cca60a9c18063140f38b9cd6dbf8de8f099";
-      name = "knotifyconfig-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/knotifyconfig-5.61.0.tar.xz";
+      sha256 = "bbd2260a98f70779415369ca1d99807bc3e57f618024b9663d2a462a74169bee";
+      name = "knotifyconfig-5.61.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kpackage-5.60.0.tar.xz";
-      sha256 = "18d951c2ae16cfe2765dfec3ff42ce88f4b716b242294690efe8ff727395406d";
-      name = "kpackage-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kpackage-5.61.0.tar.xz";
+      sha256 = "8ff82d14fe0dd92ac774d5cd9cd6334b01574f0f5c584266f97359dde5db9a5f";
+      name = "kpackage-5.61.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kparts-5.60.0.tar.xz";
-      sha256 = "6df0c2bf4481716e68d57b0e2040e9c2f0ee66e81309ba594d868026ea9f5ac6";
-      name = "kparts-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kparts-5.61.0.tar.xz";
+      sha256 = "f223b38f34f009bb25511ce7d97c607102cbb0a1bd0253ec1b7d1fe1b7c81436";
+      name = "kparts-5.61.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kpeople-5.60.0.tar.xz";
-      sha256 = "ec72c0a0b8e5ee9541eb3d0dedfffc78aee39d54fec91d78adb33243a8b3bd1d";
-      name = "kpeople-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kpeople-5.61.0.tar.xz";
+      sha256 = "549edacd7b63d704dd165bc803ae03f8d9e8c1ba31f8dbaea3f7e12c466b4298";
+      name = "kpeople-5.61.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kplotting-5.60.0.tar.xz";
-      sha256 = "75e8c21c2417a65cb423d11e4abd28a93a9cf9e3b2f01695cdedf9ee4b2fa7a0";
-      name = "kplotting-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kplotting-5.61.0.tar.xz";
+      sha256 = "95781b50bef0e081e48b472b4fcbbcd3301ec45245498261e4a3ec8e42b892ba";
+      name = "kplotting-5.61.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kpty-5.60.0.tar.xz";
-      sha256 = "757daec3b77395cdf390b35419972641b2ca18c986b39b98ccf8fb3384547338";
-      name = "kpty-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kpty-5.61.0.tar.xz";
+      sha256 = "b91a88c00d3387927d1f6886a04e6e5bcc615ee1d0e72f647d51320ebf73471c";
+      name = "kpty-5.61.0.tar.xz";
     };
   };
   kross = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/portingAids/kross-5.60.0.tar.xz";
-      sha256 = "e83f3388ca8e89057e272b3b98233f294528ed0dcb62a6edb6cf37b7a1891f45";
-      name = "kross-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kross-5.61.0.tar.xz";
+      sha256 = "103837799febbd62365a6445db046a2ee4add13d7d250abf925872cac642986e";
+      name = "kross-5.61.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/krunner-5.60.0.tar.xz";
-      sha256 = "e0fce95407c52d1769a38a2f95f80637bbedb039b0df702b71c5b191795fdce3";
-      name = "krunner-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/krunner-5.61.0.tar.xz";
+      sha256 = "f32ea603a9bcb9c2e39231f99bfc6079d118eebbf2c72e0818e2a9cd060543be";
+      name = "krunner-5.61.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kservice-5.60.0.tar.xz";
-      sha256 = "2d891e2781da5a562515ae09f5fb9ebd85ce397631cb217de11cb998e79516f8";
-      name = "kservice-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kservice-5.61.0.tar.xz";
+      sha256 = "4489ac4553522bb76604e284338ab37a7a2369eea45dadd96a955fedf8ca99f9";
+      name = "kservice-5.61.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/ktexteditor-5.60.0.tar.xz";
-      sha256 = "7484dfaa4df868c8193e15cc760b3ce7e8e0948daaa4a1b3ca6b96550041385d";
-      name = "ktexteditor-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/ktexteditor-5.61.0.tar.xz";
+      sha256 = "ae99eacb445f8bc27af379d1ec54e8df4d25f601fc12053bc2928a8c639ad0cb";
+      name = "ktexteditor-5.61.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/ktextwidgets-5.60.0.tar.xz";
-      sha256 = "8149a999ca6d2dda523d6047956ca62fd283d71356b84dfd7db6fd1582b5d43e";
-      name = "ktextwidgets-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/ktextwidgets-5.61.0.tar.xz";
+      sha256 = "a2fddad3dda750ea6bdb104c460e50586946ded3e1f46a8729dbd304016a0b5a";
+      name = "ktextwidgets-5.61.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kunitconversion-5.60.0.tar.xz";
-      sha256 = "0e377f67b6977787861aba971167aedfaa0e4c023609d505ea2d57357c082a79";
-      name = "kunitconversion-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kunitconversion-5.61.0.tar.xz";
+      sha256 = "e5ffa3ff954c46b2416823467fcecd37c6ddb8304529703bc9cc3a24b74b6c24";
+      name = "kunitconversion-5.61.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kwallet-5.60.0.tar.xz";
-      sha256 = "2ac2186dd7d004b6740cb14e7651ddcb7d74390acb382c9d55874f3a03a8111d";
-      name = "kwallet-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kwallet-5.61.0.tar.xz";
+      sha256 = "628ded35a8f44750a770bf10bba9a763994660923a689eee05f8dfb7e92baec8";
+      name = "kwallet-5.61.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kwayland-5.60.0.tar.xz";
-      sha256 = "a0645594c2dc7c121b11eecf1c1d31448d110d13dab200caadddb7e1d836d905";
-      name = "kwayland-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kwayland-5.61.0.tar.xz";
+      sha256 = "42d3bc629710e09074006af288986b00683853660648c9364fb09d49db3f0e07";
+      name = "kwayland-5.61.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kwidgetsaddons-5.60.0.tar.xz";
-      sha256 = "2e74d3897290c43871836a55ce0dbf4e6f3563f97016827d7ffccf0e5342a39d";
-      name = "kwidgetsaddons-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kwidgetsaddons-5.61.0.tar.xz";
+      sha256 = "5abc169f431fba18418f23ff1749414d8318baff868a7b821916cc44508c6891";
+      name = "kwidgetsaddons-5.61.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kwindowsystem-5.60.0.tar.xz";
-      sha256 = "3bdce23b75b4b1d1eea69fb2035ff5be94ea2c1b7bb3d4e529a9b1740b106315";
-      name = "kwindowsystem-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kwindowsystem-5.61.0.tar.xz";
+      sha256 = "17958b612e751e838aa7a0d4f8c7a8a8d83d3f4ace5498fe1f2b8650a2d8f984";
+      name = "kwindowsystem-5.61.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kxmlgui-5.60.0.tar.xz";
-      sha256 = "c81c2794610add13fd8019031fb40b0d002085d40ba358f6406c54f79581c149";
-      name = "kxmlgui-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kxmlgui-5.61.0.tar.xz";
+      sha256 = "867ff1c3ad464bb6268d00ca290569ef1da7659d3fd2f6349015bc3e2562836b";
+      name = "kxmlgui-5.61.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/kxmlrpcclient-5.60.0.tar.xz";
-      sha256 = "e5f3bef626027b3cd84873362a5c6ee26692ee99a394ef9d944741670b1ca322";
-      name = "kxmlrpcclient-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kxmlrpcclient-5.61.0.tar.xz";
+      sha256 = "382b4730e4b32c1d300f8fdb6269e40995ec282ebe1cbb044ab1a2b2b68c3a1a";
+      name = "kxmlrpcclient-5.61.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/modemmanager-qt-5.60.0.tar.xz";
-      sha256 = "461b99099376d1210dad7867627c67b2a64af908a4fca0aeed75fc36059cad4e";
-      name = "modemmanager-qt-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/modemmanager-qt-5.61.0.tar.xz";
+      sha256 = "c9883a3aac7415045a03f0bda435a2a5ff7523538868b72dffa8e4b40e88502a";
+      name = "modemmanager-qt-5.61.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/networkmanager-qt-5.60.0.tar.xz";
-      sha256 = "fae1d2e36e0c79095cfa3d907c86c47272226a6952ab93139b750f29e9215a65";
-      name = "networkmanager-qt-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/networkmanager-qt-5.61.0.tar.xz";
+      sha256 = "1ded63af93957a04292e965ecce06388f183d3adc555b4f3d33337ee15d858c3";
+      name = "networkmanager-qt-5.61.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/oxygen-icons5-5.60.0.tar.xz";
-      sha256 = "dca378431ec83106859736938dcc81156435b71ead564ff7ddfda85311b94e5f";
-      name = "oxygen-icons5-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/oxygen-icons5-5.61.0.tar.xz";
+      sha256 = "1ca8f6e42186d069cb4f0581914b147cabc3be3e720c382e77048be134bb1b26";
+      name = "oxygen-icons5-5.61.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/plasma-framework-5.60.0.tar.xz";
-      sha256 = "96c93ea54d1ce29f930e707ab4b0eafc9e31d022f9939d2bd42b2d884e450141";
-      name = "plasma-framework-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/plasma-framework-5.61.0.tar.xz";
+      sha256 = "873d604aadbe21ba38cdb12b778d3baf121a54e6155596f0ebee1840138060fe";
+      name = "plasma-framework-5.61.0.tar.xz";
     };
   };
   prison = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/prison-5.60.0.tar.xz";
-      sha256 = "1b8149b8965c287f7fddfd91fb1d9cf95f150dda5b70b19480452c2e855945b5";
-      name = "prison-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/prison-5.61.0.tar.xz";
+      sha256 = "9ebab1755e9d7cb01b2aa6e8b63640eb112d8557073423abdb94faecb42d87ab";
+      name = "prison-5.61.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/purpose-5.60.0.tar.xz";
-      sha256 = "830669315e15a3edbf91130711b604967d1dae2cabb1fa79e0d72866f05b9f0a";
-      name = "purpose-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/purpose-5.61.0.tar.xz";
+      sha256 = "810a660d0a4d6de41e1b4d00fcb039d3b099ceae65ec96261ca8dd1fba458d08";
+      name = "purpose-5.61.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/qqc2-desktop-style-5.60.0.tar.xz";
-      sha256 = "75e2cf793f1ba6af6592edf910412214a640366e08fea8487f20251a3e535140";
-      name = "qqc2-desktop-style-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/qqc2-desktop-style-5.61.0.tar.xz";
+      sha256 = "26042c4f939b94caa559cba3ef171ef7bb1490f57c9907f5e4b30a701659abb4";
+      name = "qqc2-desktop-style-5.61.0.tar.xz";
     };
   };
   solid = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/solid-5.60.0.tar.xz";
-      sha256 = "bf3dbf22dc63946cf83cd69882f0d5fb8bf938c90252b85c849ef644caebac8a";
-      name = "solid-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/solid-5.61.0.tar.xz";
+      sha256 = "c3a032086eacbb836fc102bd77236285ad5a808c0537ff55dbacda539ba3eacf";
+      name = "solid-5.61.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/sonnet-5.60.0.tar.xz";
-      sha256 = "f6734ac4a8dcef69f159ce0810a66ebbc2bdb8f67aac58376e8af35eb7c3dfc3";
-      name = "sonnet-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/sonnet-5.61.0.tar.xz";
+      sha256 = "4c8818897ea5dac25e0120acfd4e15c44adf2ee76749870b8f70178f1a3d8b29";
+      name = "sonnet-5.61.0.tar.xz";
     };
   };
   syndication = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/syndication-5.60.0.tar.xz";
-      sha256 = "67bf74432d362af7e7d21984f6915b047b596a8a0ac789cbf724ea7c4f8943d9";
-      name = "syndication-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/syndication-5.61.0.tar.xz";
+      sha256 = "2803b2960dd23492ad002e0f23563c9f06500ddc144dd0be2e3e0ef2f6c1f576";
+      name = "syndication-5.61.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/syntax-highlighting-5.60.0.tar.xz";
-      sha256 = "45ada4dca20641654a2d076ecb45b9ef78a4aa8032afe54ade33f140cdca504d";
-      name = "syntax-highlighting-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/syntax-highlighting-5.61.0.tar.xz";
+      sha256 = "475392c03534d7b5301ff2e02461444e463ad4def985da81ad4b315660416721";
+      name = "syntax-highlighting-5.61.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.60.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.60/threadweaver-5.60.0.tar.xz";
-      sha256 = "8bf6520e006dadacc82735242500c73810ff3ed4e3053c8352724c9d45f4a122";
-      name = "threadweaver-5.60.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/threadweaver-5.61.0.tar.xz";
+      sha256 = "e7a0cecfaa60c7a8e4bdd4dfe842fb54a344d331a6c62316c147d8dc2a5e5843";
+      name = "threadweaver-5.61.0.tar.xz";
     };
   };
 }

From 2b22167ad7c3dbee95498fe67deb8cd78b721497 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 11 Aug 2019 20:36:09 +0200
Subject: [PATCH 062/794] kwayland: add missing dependency

---
 pkgs/development/libraries/kde-frameworks/kwayland.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index ee19b39bd15..c19836ed7a7 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, propagateBin,
   extra-cmake-modules,
-  qtbase, wayland
+  qtbase, wayland, wayland-protocols
 }:
 
 mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ wayland ];
+  buildInputs = [ wayland wayland-protocols ];
   propagatedBuildInputs = [ qtbase ];
   setupHook = propagateBin; # XDG_CONFIG_DIRS
 }

From 3085451655907817283ecfbc9b035f64fb4ef4f3 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 12 Aug 2019 01:16:40 +0200
Subject: [PATCH 063/794] konversation: add patch "Fix build with Qt 5.13"

---
 .../applications/networking/irc/konversation/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 27297b01dce..6a58241b89a 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,6 +1,7 @@
 { mkDerivation
 , lib
 , fetchurl
+, fetchpatch
 , extra-cmake-modules
 , kdoctools
 , kbookmarks
@@ -38,6 +39,14 @@ in mkDerivation rec {
     sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0";
   };
 
+  patches = [
+    # Delete this patch for konversation > 1.7.5
+    (fetchpatch {
+      url = "https://cgit.kde.org/konversation.git/patch/?id=4d0036617becc26a76fd021138c98aceec4c7b53";
+      sha256 = "17hdj6zyln3n93b71by26mrwbgyh4k052ck5iw1drysx5dyd5l6y";
+    })
+  ];
+
   buildInputs = [
     kbookmarks
     karchive

From 022db304738c2cb65d63f44f1de0a35ebc937260 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 13 Aug 2019 01:08:28 +0200
Subject: [PATCH 064/794] kinit: fix kdeinit-extra_libs.patch

---
 .../libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
index 75e632d4129..89145e3e1dd 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
@@ -2,15 +2,13 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp
 ===================================================================
 --- kinit-5.32.0.orig/src/kdeinit/kinit.cpp
 +++ kinit-5.32.0/src/kdeinit/kinit.cpp
-@@ -96,11 +96,9 @@ static const char *extra_libs[] = {
+@@ -96,9 +96,9 @@ static const char *extra_libs[] = {
      "libKF5Parts.5.dylib",
      "libKF5Plasma.5.dylib"
  #else
 -    "libKF5KIOCore.so.5",
 -    "libKF5Parts.so.5",
--//#ifdef __KDE_HAVE_GCC_VISIBILITY // Removed for KF5, we'll see.
 -    "libKF5Plasma.so.5"
--//#endif
 +    NIXPKGS_KF5_KIOCORE,
 +    NIXPKGS_KF5_PARTS,
 +    NIXPKGS_KF5_PLASMA

From 5268987144ba690e907d04a22906b985ef7c0b04 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 13 Aug 2019 19:47:21 +0200
Subject: [PATCH 065/794] ark: add patch "missing QVector include"

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

diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 6015cb69d77..96332cc9168 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, config,
+  mkDerivation, lib, config, fetchpatch,
 
   extra-cmake-modules, kdoctools,
 
@@ -27,6 +27,14 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
 
+  patches = [
+    # This patch should be backported in 19.04.4 KDE applications
+    (fetchpatch {
+      url = "https://cgit.kde.org/ark.git/patch/?id=7065c5390c78c2b18807721490f19c62761220e5";
+      sha256 = "0sipw5z60gk6l025rk4xsbc10n3bvv9743f4cbvf6hyy4mbm4p1m";
+    })
+  ];
+
   outputs = [ "out" "dev" ];
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ libarchive libzip ] ++ extraTools;

From 9825b2ac46b2dc4de7f6c81551c980e3ec76db5c Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 13 Aug 2019 20:24:55 +0200
Subject: [PATCH 066/794] kate: add patch "add missing header"

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

diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index e6b4f6b6bdd..7051bac404b 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, fetchpatch,
   extra-cmake-modules, kdoctools,
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
@@ -13,6 +13,15 @@ mkDerivation {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+
+  patches = [
+    # This patch should be backported in 19.04.4 KDE applications
+    (fetchpatch {
+      url = "https://cgit.kde.org/kate.git/patch/?id=76ec8b55a86a29a90125b2ff3f512df007789cb1";
+      sha256 = "1q0bkb6vl4xvh4aba1rlqii4a75pvl7vbcs4plny8lalzslnbzhj";
+    })
+  ];
+
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ libgit2 ];
   propagatedBuildInputs = [

From 766c8f106e8b487a095f682318f84254051c8e2d Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 13 Aug 2019 21:21:08 +0200
Subject: [PATCH 067/794] kmail: add patch "fix build by including QMap"

---
 pkgs/applications/kde/kmail.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
index a58b3b8c45d..b08444f18bb 100644
--- a/pkgs/applications/kde/kmail.nix
+++ b/pkgs/applications/kde/kmail.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, kdepimTeam,
+  mkDerivation, lib, kdepimTeam, fetchpatch,
   extra-cmake-modules, kdoctools,
   akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
   kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim,
@@ -26,5 +26,13 @@ mkDerivation {
     libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
   ];
   propagatedUserEnvPkgs = [ kdepim-runtime kwallet ];
-  patches = [ ./kmail.patch ];
+  patches = [
+    ./kmail.patch
+
+    # This patch should be backported in 19.04.4 KDE applications
+    (fetchpatch {
+      url = "https://cgit.kde.org/kmail.git/patch/?id=28a8cf907b3cd903aef0b963314df219afc6b66a";
+      sha256 = "1gr94zmxnyhhyqjhcmm8aykvmf15pmn751cvdh4ll59rzbra8h0n";
+    })
+  ];
 }

From 505f0c2232b9b09b259e2c3279fd3c0d5a67cbfb Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 14 Aug 2019 00:29:41 +0200
Subject: [PATCH 068/794] ksysguard: replace qtwebkit by qtwebengine

https://github.com/KDE/libksysguard/commit/c9747e37c53101c8228f9571c9367ce4193d3b51
---
 pkgs/desktops/plasma-5/ksysguard.nix            | 4 ++--
 pkgs/desktops/plasma-5/libksysguard/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
index 150b97be50d..01e740f74c4 100644
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules, kdoctools,
   lm_sensors,
   kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
-  knewstuff, libksysguard, qtwebkit
+  knewstuff, libksysguard
 }:
 
 mkDerivation {
@@ -11,6 +11,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
-    kdelibs4support ki18n lm_sensors qtwebkit
+    kdelibs4support ki18n lm_sensors
   ];
 }
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index 0f9fe40d73c..96d113e11fb 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules,
   kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
-  kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit,
+  kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebengine,
   qtx11extras
 }:
 
@@ -15,7 +15,7 @@ mkDerivation {
   buildInputs = [
     kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
     kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
-    qtwebkit
+    qtwebengine
   ];
   outputs = [ "bin" "dev" "out" ];
 }

From 7489145b3000f4b5fbf24c2f0f5729ebaa6dc9ec Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 16 Aug 2019 10:11:52 +0200
Subject: [PATCH 069/794] kde_applications: 19.04.3 -> 19.08.0

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 1736 ++++++++++++++++----------------
 2 files changed, 877 insertions(+), 861 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 6659865bc01..5c72e78c582 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/19.04.3/ )
+WGET_ARGS=( https://download.kde.org/stable/applications/19.08.0/ )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index a4cd9eb2b09..fb0581cb341 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1723 +3,1739 @@
 
 {
   akonadi = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/akonadi-19.04.3.tar.xz";
-      sha256 = "7ac34dc7c3e2bf8e53ec9eebeecc8d96541c0b663dd71963e6bcd94e7ac41b07";
-      name = "akonadi-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-19.08.0.tar.xz";
+      sha256 = "ff53f078b024f2674a8b2990515f5cbafe2bc965390d74a464b2a044aee32831";
+      name = "akonadi-19.08.0.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/akonadi-calendar-19.04.3.tar.xz";
-      sha256 = "939691e3c31993e3708a74759cbab951a51d0b36239426fe09c9ee9ff9622013";
-      name = "akonadi-calendar-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-19.08.0.tar.xz";
+      sha256 = "74743ff7822ce75f0e0170f154e4596644855a5fe9322a09b76e01bd1d078e3b";
+      name = "akonadi-calendar-19.08.0.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/akonadi-calendar-tools-19.04.3.tar.xz";
-      sha256 = "b7bf7c6a8df76f66d13209b3a2d1c47d703f0a3fff7936d2c880c11c2eb33d39";
-      name = "akonadi-calendar-tools-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-tools-19.08.0.tar.xz";
+      sha256 = "9620a4418245a74334c6f57db4ba5558825879440aee5903f5614db08f61e976";
+      name = "akonadi-calendar-tools-19.08.0.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/akonadiconsole-19.04.3.tar.xz";
-      sha256 = "25a302f3e582555cf003b48e28788d289a771e0c29c500afcd5d915e0bb34bda";
-      name = "akonadiconsole-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadiconsole-19.08.0.tar.xz";
+      sha256 = "a683b184109cddbc4d66c55ee3efa2c69092a72e2cd9e78903c4dcf7f442c055";
+      name = "akonadiconsole-19.08.0.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/akonadi-contacts-19.04.3.tar.xz";
-      sha256 = "9ecae008ccc77ff5982de5152dfc2be62eb1137f24a58aeb74a62291fc2fd93c";
-      name = "akonadi-contacts-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-contacts-19.08.0.tar.xz";
+      sha256 = "912a657a11d1bd1e680a71b43d69a5a871136ed83f171b11c52f1974d7381ce4";
+      name = "akonadi-contacts-19.08.0.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/akonadi-import-wizard-19.04.3.tar.xz";
-      sha256 = "5e4b74790927be8372939237336e3684d7560d0c0652a26b57cc3233109234c4";
-      name = "akonadi-import-wizard-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-import-wizard-19.08.0.tar.xz";
+      sha256 = "e21454b8ac346c4b8d35e5979dc11346b96e3520df22f44270dc668d5abcd915";
+      name = "akonadi-import-wizard-19.08.0.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/akonadi-mime-19.04.3.tar.xz";
-      sha256 = "ec4fbd594fb4fc57f1a7e11763b517721fc5e050ffa7bbc2bdddf5e76694d9f9";
-      name = "akonadi-mime-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-mime-19.08.0.tar.xz";
+      sha256 = "32dcee53d8bd79a4ad85dfa453aa762d69194493ad6622aea4fd7cd05bde3ec4";
+      name = "akonadi-mime-19.08.0.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/akonadi-notes-19.04.3.tar.xz";
-      sha256 = "c95f50c9ab0fc3587d3e1e78073038e3a044f3dc116068b354b2d148d6288dbf";
-      name = "akonadi-notes-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-notes-19.08.0.tar.xz";
+      sha256 = "26000875958b3a0ff68c5ad871fd697623c8408b88fc46679c8a13ad308c33d3";
+      name = "akonadi-notes-19.08.0.tar.xz";
     };
   };
   akonadi-search = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/akonadi-search-19.04.3.tar.xz";
-      sha256 = "c5298a5b903373590e63039777c954720aa0bc46b25ec0c48e6409265b38d4ed";
-      name = "akonadi-search-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-search-19.08.0.tar.xz";
+      sha256 = "fadc158343eb7c124454ca3e22ade14230772f1d1a89e04a0059c924ed3959d0";
+      name = "akonadi-search-19.08.0.tar.xz";
     };
   };
   akregator = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/akregator-19.04.3.tar.xz";
-      sha256 = "5d883061c4a53374ff2351646711d2b6eb047187ffd0d620a038fb6509bb60c0";
-      name = "akregator-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akregator-19.08.0.tar.xz";
+      sha256 = "d3cb8b97a3d2c9eeb805e1b7fc26cb637ad21589675d837b545580e6be764820";
+      name = "akregator-19.08.0.tar.xz";
     };
   };
   analitza = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/analitza-19.04.3.tar.xz";
-      sha256 = "771cf26918ea09f1597ee95328bdfc1c65b28617b0b312ca609676a718fc2a9e";
-      name = "analitza-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/analitza-19.08.0.tar.xz";
+      sha256 = "516f29f089be92fecf5e17dcf466a9daf8525ec9e594f52f04338603914c2003";
+      name = "analitza-19.08.0.tar.xz";
     };
   };
   ark = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ark-19.04.3.tar.xz";
-      sha256 = "a06cc2937aa4ed41bab0a38344164f367b993a80bcd74011e4ab72643bfee8ee";
-      name = "ark-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ark-19.08.0.tar.xz";
+      sha256 = "0685285486ca933e3467f35c3d5d4e8633ae80f1e5529f8a4d8257d0b53d9512";
+      name = "ark-19.08.0.tar.xz";
     };
   };
   artikulate = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/artikulate-19.04.3.tar.xz";
-      sha256 = "3f0b811017c59a05260ca43a7e298633a6ac9ef0f9cfb8ec62890da0f3ec1217";
-      name = "artikulate-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/artikulate-19.08.0.tar.xz";
+      sha256 = "40f1ecb2e6d0d2e8bb1c86d64935c9f2411e0e72781e3211ed0014a02acd72ba";
+      name = "artikulate-19.08.0.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/audiocd-kio-19.04.3.tar.xz";
-      sha256 = "4e684ab03fafd4ee37d7ef7d2c2edb883e76bb5a81e11415173317160997accf";
-      name = "audiocd-kio-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/audiocd-kio-19.08.0.tar.xz";
+      sha256 = "46013e95fa358004083c185d43afe48b96bd18acba1a33e5706f75b128a3e954";
+      name = "audiocd-kio-19.08.0.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/baloo-widgets-19.04.3.tar.xz";
-      sha256 = "ee14c03ac8254a0d0680bce856178a2110f0339b9dd5021927c59ff2df90606f";
-      name = "baloo-widgets-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/baloo-widgets-19.08.0.tar.xz";
+      sha256 = "3ef81f74ce6fccd6eaf60e0dfd18fe660ac357e75c4715801da9bb3a203a6008";
+      name = "baloo-widgets-19.08.0.tar.xz";
     };
   };
   blinken = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/blinken-19.04.3.tar.xz";
-      sha256 = "db0cb33ef117ad3c05f7f90a0d931106141431448d7fbb7c49f4832273313001";
-      name = "blinken-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/blinken-19.08.0.tar.xz";
+      sha256 = "9b993586d8ddab3821b1b4f805cd8b6603822faca93402d42775bea2eb346971";
+      name = "blinken-19.08.0.tar.xz";
     };
   };
   bomber = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/bomber-19.04.3.tar.xz";
-      sha256 = "48214f30503d37343268b817c68b47042cb9855688cc7564bf9c6dd5d2a31dda";
-      name = "bomber-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/bomber-19.08.0.tar.xz";
+      sha256 = "5274f8ef6cd94fcbd887220d6c7b08c1f71050c601d14cf53d847f41f254e043";
+      name = "bomber-19.08.0.tar.xz";
     };
   };
   bovo = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/bovo-19.04.3.tar.xz";
-      sha256 = "ee4b2480d51ba768e241faf70fcbe955656840c648e9d81c2a269ccc8558ea35";
-      name = "bovo-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/bovo-19.08.0.tar.xz";
+      sha256 = "829ecfe3a46bc1c009fea14c5860aa17ea18f36ed33fdc9296c499992aeed466";
+      name = "bovo-19.08.0.tar.xz";
     };
   };
   calendarsupport = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/calendarsupport-19.04.3.tar.xz";
-      sha256 = "789ae6f2cb75baf239079b11742fbe40353c55eac84b0a396f761f010bc9041c";
-      name = "calendarsupport-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/calendarsupport-19.08.0.tar.xz";
+      sha256 = "af590cf5443c1205a8bd59d00c430bbdf65a185a36ed36e92e6ef78bba8551e4";
+      name = "calendarsupport-19.08.0.tar.xz";
     };
   };
   cantor = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/cantor-19.04.3.tar.xz";
-      sha256 = "6ac01cf576d6ee6292d9656bebe2fa6f1216814148f77d0b9971df6a92ff5a47";
-      name = "cantor-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/cantor-19.08.0.tar.xz";
+      sha256 = "b1d1a735e83ca03d51b79f1fc59612153e94b274d716d65ff3fa94ffdd2f3adc";
+      name = "cantor-19.08.0.tar.xz";
     };
   };
   cervisia = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/cervisia-19.04.3.tar.xz";
-      sha256 = "e0e04076ef5d43b18a571b5f3f8acb774a5c2fe03a901cd5fbf65621fc5e05eb";
-      name = "cervisia-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/cervisia-19.08.0.tar.xz";
+      sha256 = "a72c3a7bad3b30a466d6793318248329d7ddb1a0e00c832744b628a9eb8b8257";
+      name = "cervisia-19.08.0.tar.xz";
     };
   };
   dolphin = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/dolphin-19.04.3.tar.xz";
-      sha256 = "67a2b283049591fa0f00304b4da6532e9d59d9dc9067916e0ffe8aa19d93f579";
-      name = "dolphin-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/dolphin-19.08.0.tar.xz";
+      sha256 = "fd44714541ae7082d4615e441242afdba2d7810a373bfc8c3e64ff5c7db0a0f0";
+      name = "dolphin-19.08.0.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/dolphin-plugins-19.04.3.tar.xz";
-      sha256 = "a68e15b71fa35acb190952ef49b2611876317e3bb0420d65d5365bc03feb9542";
-      name = "dolphin-plugins-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/dolphin-plugins-19.08.0.tar.xz";
+      sha256 = "f074aa7151f4b4d9202d90257952638652a1bf09d02699762f346d85b61c5f54";
+      name = "dolphin-plugins-19.08.0.tar.xz";
     };
   };
   dragon = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/dragon-19.04.3.tar.xz";
-      sha256 = "498bbcf3441a32a588568981ee3ad563b6c4fd88b226d1673d83da09901f117a";
-      name = "dragon-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/dragon-19.08.0.tar.xz";
+      sha256 = "3d792f6dfd4a5d8ad7726fa942840ebed2b2bb6f25ec6f68883b83859c21cacc";
+      name = "dragon-19.08.0.tar.xz";
     };
   };
   eventviews = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/eventviews-19.04.3.tar.xz";
-      sha256 = "3f479f695756cea5d10ea2ab028dd6a954e677223a5c1ff9f7be208742952f22";
-      name = "eventviews-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/eventviews-19.08.0.tar.xz";
+      sha256 = "2f7713173b3820800d7927aff64eb7bcc84c643d9da43adbe6560cb842081295";
+      name = "eventviews-19.08.0.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ffmpegthumbs-19.04.3.tar.xz";
-      sha256 = "ddd6cb3388c1af96a14d611de9575f6f6c22c6acfe52e63e44b746709ac8024b";
-      name = "ffmpegthumbs-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ffmpegthumbs-19.08.0.tar.xz";
+      sha256 = "13f5f8b40c0f6146cdd4d1d9e6a7b7dd19cda9650fe08f9731c050e58f11efee";
+      name = "ffmpegthumbs-19.08.0.tar.xz";
     };
   };
   filelight = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/filelight-19.04.3.tar.xz";
-      sha256 = "4ad45db886f06afdff1e5c580261eea18f2c0cf3bcde92ecdc626583641d6c88";
-      name = "filelight-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/filelight-19.08.0.tar.xz";
+      sha256 = "bdd3d32f6666b3d2fa4c614f5f058571c8849484e1ba17a97996680503f8e8e6";
+      name = "filelight-19.08.0.tar.xz";
     };
   };
   granatier = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/granatier-19.04.3.tar.xz";
-      sha256 = "996dafafc4a72cf49748c9e7046267980d5c9639b84c26e85266850dd1a9df21";
-      name = "granatier-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/granatier-19.08.0.tar.xz";
+      sha256 = "b61bf45df63dc3fb324e1a74ec84ae4f2d58371af88ccd28593b0716673dc00a";
+      name = "granatier-19.08.0.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/grantlee-editor-19.04.3.tar.xz";
-      sha256 = "b244eef352ef776cbb0d3d5e51ffaa629d4ca3b6bd7fc86a8fda8d24e5090bca";
-      name = "grantlee-editor-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/grantlee-editor-19.08.0.tar.xz";
+      sha256 = "00a7d07aeffc35ac6e3dd39434194ba35c855a603cdc6eca0ece5b00ae1e0e30";
+      name = "grantlee-editor-19.08.0.tar.xz";
     };
   };
   grantleetheme = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/grantleetheme-19.04.3.tar.xz";
-      sha256 = "c5cf79f1daddde3bc5b9387546b10e1d3ae4512279d50e3545ad38982c7f9aaf";
-      name = "grantleetheme-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/grantleetheme-19.08.0.tar.xz";
+      sha256 = "c966ad7ef55a784c8cf97a69d4885b9b9d7956c84a4e323404e5cf88154cc543";
+      name = "grantleetheme-19.08.0.tar.xz";
     };
   };
   gwenview = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/gwenview-19.04.3.tar.xz";
-      sha256 = "1e4c6881674dfcde52a196420eae2fab61dffb05b976125dfbd65c3bf2395035";
-      name = "gwenview-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/gwenview-19.08.0.tar.xz";
+      sha256 = "1d1d4713bcebdd8c7c458c075b7101055c81cf94a802ac8b9b3528a3c3c961a3";
+      name = "gwenview-19.08.0.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/incidenceeditor-19.04.3.tar.xz";
-      sha256 = "b3a0ac35b04bc7851a32021552369ba5ac5b2e69969c29121d9cb2adfd5ccf70";
-      name = "incidenceeditor-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/incidenceeditor-19.08.0.tar.xz";
+      sha256 = "43915613a5db71847be425bc4434c0e04f5410b3575cea3141ffcd99b2cdb9ea";
+      name = "incidenceeditor-19.08.0.tar.xz";
     };
   };
   juk = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/juk-19.04.3.tar.xz";
-      sha256 = "f4a272aa677ac7b5eb8c3f30234dea129e41863c5c78d812b27d30dde0f5d750";
-      name = "juk-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/juk-19.08.0.tar.xz";
+      sha256 = "d2549c709f8934a5306a16e3a1e2b9e057ead54dc85efe17009e7aacd395edd0";
+      name = "juk-19.08.0.tar.xz";
     };
   };
   k3b = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/k3b-19.04.3.tar.xz";
-      sha256 = "c92b7b811f47d31b107aa14fb1e21d01a8635c208c1503f4ddf183522501df61";
-      name = "k3b-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/k3b-19.08.0.tar.xz";
+      sha256 = "6a740724945496395cea1b5850ea9567a9aa9cc8a28c5366c9709b4226dc4b10";
+      name = "k3b-19.08.0.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kaccounts-integration-19.04.3.tar.xz";
-      sha256 = "fea6cc555de2e345079ed576be0c957ff5c7177ff658f31ce3bcb23176174372";
-      name = "kaccounts-integration-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kaccounts-integration-19.08.0.tar.xz";
+      sha256 = "b6602a1270037c8c9dc366e3bf6ddf6d7dcd14ca66623e3ecc6641fd474c0d2a";
+      name = "kaccounts-integration-19.08.0.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kaccounts-providers-19.04.3.tar.xz";
-      sha256 = "483b87dc74913d7ab3b569d64e890d4358d95e2544ec8027cd21232495457636";
-      name = "kaccounts-providers-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kaccounts-providers-19.08.0.tar.xz";
+      sha256 = "9fc235e2140e76e4b95589a8a5b1e98f7aac00f4c9ad8ba774be0d0d360df8c3";
+      name = "kaccounts-providers-19.08.0.tar.xz";
     };
   };
   kaddressbook = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kaddressbook-19.04.3.tar.xz";
-      sha256 = "dc379c4a2d15a94fe5d7416e692301827377b503ba0880f3b508fe2c812d4349";
-      name = "kaddressbook-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kaddressbook-19.08.0.tar.xz";
+      sha256 = "9639047be5c5ea245844831e315fa0f0baca40d243f611a98bbab3503af127cf";
+      name = "kaddressbook-19.08.0.tar.xz";
     };
   };
   kajongg = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kajongg-19.04.3.tar.xz";
-      sha256 = "e367307310102b0f0b171718ae1bc6508e26b8200ba3d484dc0d7608f942ec2b";
-      name = "kajongg-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kajongg-19.08.0.tar.xz";
+      sha256 = "0f522477939de09d4d56d2947fb02b0f20ca0cbac4d21326a9477e11fc173244";
+      name = "kajongg-19.08.0.tar.xz";
     };
   };
   kalarm = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kalarm-19.04.3.tar.xz";
-      sha256 = "c686f5b768719e77e913ee616267f2980c9827ea71f3738099f18cb4d4178d84";
-      name = "kalarm-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kalarm-19.08.0.tar.xz";
+      sha256 = "e0ddabb2abfc2d593ec88864179c30eda219f7db4c25b7fc9951ac3b388eee84";
+      name = "kalarm-19.08.0.tar.xz";
     };
   };
   kalarmcal = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kalarmcal-19.04.3.tar.xz";
-      sha256 = "f0965229600ee962be3db85cfb94105e2734c8e066ff316e216c625c70dd25d7";
-      name = "kalarmcal-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kalarmcal-19.08.0.tar.xz";
+      sha256 = "5f764d58716e7d271fac4cb3a4df6ab157014533782c47c38bacab59ca669419";
+      name = "kalarmcal-19.08.0.tar.xz";
     };
   };
   kalgebra = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kalgebra-19.04.3.tar.xz";
-      sha256 = "b63904f2fc5609d8c62b18ae5e8b0f917785d9eaf46357a1045a9de89aa129ea";
-      name = "kalgebra-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kalgebra-19.08.0.tar.xz";
+      sha256 = "b875b2bfe985e5c595f60fbb146fb4545c34321bb86f7fc04164a23f0bb3e9eb";
+      name = "kalgebra-19.08.0.tar.xz";
     };
   };
   kalzium = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kalzium-19.04.3.tar.xz";
-      sha256 = "2a7bf84021be5013aa1e2b14d0c97e6c80b1b7b9e2c78c8df50c0a94925699d1";
-      name = "kalzium-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kalzium-19.08.0.tar.xz";
+      sha256 = "0dac199871b8d01890b8959cd5c4776eb2f938f7fb4a558b23364f9dd8e15111";
+      name = "kalzium-19.08.0.tar.xz";
     };
   };
   kamera = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kamera-19.04.3.tar.xz";
-      sha256 = "acf5ecf939fa8f4366d607742dc673a307fd72cfa05f4fedb04547f7d336be43";
-      name = "kamera-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kamera-19.08.0.tar.xz";
+      sha256 = "f287f1db119946d2e62d4ccd52a66671343042563cc87da246f2692fa1b775c6";
+      name = "kamera-19.08.0.tar.xz";
     };
   };
   kamoso = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kamoso-19.04.3.tar.xz";
-      sha256 = "19168e5f45762b04254ebf598dfa7f066858ae243a9b7286d7e3e43385018ec6";
-      name = "kamoso-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kamoso-19.08.0.tar.xz";
+      sha256 = "2aa8765f71109e813836dced26994a953973ef6f4d517ab224691f2342d64129";
+      name = "kamoso-19.08.0.tar.xz";
     };
   };
   kanagram = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kanagram-19.04.3.tar.xz";
-      sha256 = "945276e94ccc82d958400583af4377f40d473bdc566d37962f7137f47663a728";
-      name = "kanagram-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kanagram-19.08.0.tar.xz";
+      sha256 = "4f4ccf9cf48711d8fe9a5966294ba16b43092b8df3fdb03b5c236d22157d275c";
+      name = "kanagram-19.08.0.tar.xz";
     };
   };
   kapman = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kapman-19.04.3.tar.xz";
-      sha256 = "6b1810bf946ff84b34b9fd6e913811d0e0a249cad5cb49b7990d742ec2832ca1";
-      name = "kapman-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kapman-19.08.0.tar.xz";
+      sha256 = "e0e53e60e7af1f0002343969b2ce0ce47e0cd3d7318b44d2827478291c2a9cd4";
+      name = "kapman-19.08.0.tar.xz";
     };
   };
   kapptemplate = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kapptemplate-19.04.3.tar.xz";
-      sha256 = "023273adf6df75d68b3ee52d14924887e403b80dea23eb765a98242fddcd4f37";
-      name = "kapptemplate-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kapptemplate-19.08.0.tar.xz";
+      sha256 = "a25170f3527e85bea9509fe5cb991544c0a1dab8f7025c71fd5b0d4c82d9e169";
+      name = "kapptemplate-19.08.0.tar.xz";
     };
   };
   kate = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kate-19.04.3.tar.xz";
-      sha256 = "b1dcd45270c0494e97f32f435a943ca27b0bcb23065a9ad2a1fe37e4a81ad9a6";
-      name = "kate-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kate-19.08.0.tar.xz";
+      sha256 = "6acc3172429191ab47722d788f324292ea5ee2f1e419d48c72200579b9b30878";
+      name = "kate-19.08.0.tar.xz";
     };
   };
   katomic = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/katomic-19.04.3.tar.xz";
-      sha256 = "e4edc6a0058ed929204b64bb99af294752bc20b1693e5930c2616af45d0587c3";
-      name = "katomic-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/katomic-19.08.0.tar.xz";
+      sha256 = "12b2a0e703312159a8a217ddb5e19c9a9bea1825d668dd4377fe8e52101f3c90";
+      name = "katomic-19.08.0.tar.xz";
     };
   };
   kbackup = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kbackup-19.04.3.tar.xz";
-      sha256 = "421e05fbc7b6332cfdca08faa65e74def2c5fa40a6211e6623e03cc4ec568019";
-      name = "kbackup-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kbackup-19.08.0.tar.xz";
+      sha256 = "2cd447ef7d53e7ee55868086e7a894f550fd81515cf5d87d0561520f45145127";
+      name = "kbackup-19.08.0.tar.xz";
     };
   };
   kblackbox = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kblackbox-19.04.3.tar.xz";
-      sha256 = "45b8f5218c8817c38a13269ac5464c5abd2010d1ddb27ec255de1bf43ef2fe91";
-      name = "kblackbox-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kblackbox-19.08.0.tar.xz";
+      sha256 = "44907aed2a2a24f57cb5ae0046a857645788d8d7aeb9383187b516c9f519a72c";
+      name = "kblackbox-19.08.0.tar.xz";
     };
   };
   kblocks = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kblocks-19.04.3.tar.xz";
-      sha256 = "10b350f91978c221c224c42e2f50dc8c2e86e187de8e46258b10cf3799fb4b74";
-      name = "kblocks-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kblocks-19.08.0.tar.xz";
+      sha256 = "3337c6fb57fdb8439e6e6edc0186fec76641196714daa955465e009923573b84";
+      name = "kblocks-19.08.0.tar.xz";
     };
   };
   kblog = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kblog-19.04.3.tar.xz";
-      sha256 = "5890ae54f85057e22807a7f47681004f521c3558c750ef75b90328118363a07d";
-      name = "kblog-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kblog-19.08.0.tar.xz";
+      sha256 = "15abd5dfd0499633703273823ceddc8e64b52b0217b04bea3d86cb9ac54da189";
+      name = "kblog-19.08.0.tar.xz";
     };
   };
   kbounce = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kbounce-19.04.3.tar.xz";
-      sha256 = "9a4ee5257becad72b359cc5985412ba2c4a15a81afe89022f812ec9eda7b5356";
-      name = "kbounce-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kbounce-19.08.0.tar.xz";
+      sha256 = "3df779542c1d74d63e66a4db86210d75e37939f8f29947851b9c76c347856025";
+      name = "kbounce-19.08.0.tar.xz";
     };
   };
   kbreakout = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kbreakout-19.04.3.tar.xz";
-      sha256 = "7ef268806451e3b7ee813b921247257ff1a466ebd3c48b20bfc77ebebef10c9e";
-      name = "kbreakout-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kbreakout-19.08.0.tar.xz";
+      sha256 = "87748c5bda9b7563531e0b0701ec4a745cd95121b9bd426448e5ed476292fdd4";
+      name = "kbreakout-19.08.0.tar.xz";
     };
   };
   kbruch = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kbruch-19.04.3.tar.xz";
-      sha256 = "131455d024ead96cf2396cf6074a23584799c0793464b83eb3ecc2a455c5d355";
-      name = "kbruch-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kbruch-19.08.0.tar.xz";
+      sha256 = "29c83039af494703e9d665eca2acde30bb4b94666b3dfe9092833e35f83a9541";
+      name = "kbruch-19.08.0.tar.xz";
     };
   };
   kcachegrind = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kcachegrind-19.04.3.tar.xz";
-      sha256 = "856649529f0c19749a2b73125351400f401521664c9044fc33f92a09073d5270";
-      name = "kcachegrind-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcachegrind-19.08.0.tar.xz";
+      sha256 = "676dd522eb9976789da17eea1dc103c9c67b6df7bfa70d998e29c0e7dde0608b";
+      name = "kcachegrind-19.08.0.tar.xz";
     };
   };
   kcalc = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kcalc-19.04.3.tar.xz";
-      sha256 = "42da5439af4f59402d27f2c48d4ee9c68d4a84bfda8d16a5ab9d7ab6bdcc02d5";
-      name = "kcalc-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcalc-19.08.0.tar.xz";
+      sha256 = "58c26a9698bfc9e0d3a5614ab26c53878e87fc601688ad6c5848fbdbc21c4103";
+      name = "kcalc-19.08.0.tar.xz";
     };
   };
   kcalcore = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kcalcore-19.04.3.tar.xz";
-      sha256 = "335df0ae376b7abfc8274d46bb5a9956fb8ef438c1065d7f79a57db23005ca45";
-      name = "kcalcore-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcalcore-19.08.0.tar.xz";
+      sha256 = "7c7bbca70ada8c8317d6d3d91e0357b2b5886328189423e0b7fac1d326f8ed85";
+      name = "kcalcore-19.08.0.tar.xz";
     };
   };
   kcalutils = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kcalutils-19.04.3.tar.xz";
-      sha256 = "de08972947008fd74fdeb7b2ddf642a356d84009b853a5aeec2ded98b399290e";
-      name = "kcalutils-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcalutils-19.08.0.tar.xz";
+      sha256 = "ce0cb6633d7f85fdfa54085710c421f0465b286e9236f55c0297737abdfbaf7e";
+      name = "kcalutils-19.08.0.tar.xz";
     };
   };
   kcharselect = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kcharselect-19.04.3.tar.xz";
-      sha256 = "98ebcf13ec02f490bfeaa1001e46a397163939d75d73cf26cd4707e9aa2a4186";
-      name = "kcharselect-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcharselect-19.08.0.tar.xz";
+      sha256 = "31caf29e82327d7e31badff141dd7d5f179b87e9547c322b074f58bc07063020";
+      name = "kcharselect-19.08.0.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kcolorchooser-19.04.3.tar.xz";
-      sha256 = "f60ee47baaca59b7df8ce58902ae09d44d2cb5b7f3f5ec7b9a401c7f7e3e5ab4";
-      name = "kcolorchooser-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcolorchooser-19.08.0.tar.xz";
+      sha256 = "bd9fa8940218f686b0a2d8c6fbe38b996646508a1908dd53925c2513f6fd39eb";
+      name = "kcolorchooser-19.08.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kcontacts-19.04.3.tar.xz";
-      sha256 = "28f3c61b99f6f6b1264a8373ab9915e6844f4025c74652cd897b7b560067e241";
-      name = "kcontacts-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcontacts-19.08.0.tar.xz";
+      sha256 = "b245832fe6150a915d3bcbf1ec4c2c37b6aab541b2568f4955dcd76afa1c486e";
+      name = "kcontacts-19.08.0.tar.xz";
     };
   };
   kcron = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kcron-19.04.3.tar.xz";
-      sha256 = "24f6f36d058c3e0587a7a70cc2d2df77eb593efa642833cfb17bc671e97c9cd6";
-      name = "kcron-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcron-19.08.0.tar.xz";
+      sha256 = "1594aafc964d8e6c9ff31056d8f6f9ca6ee51ef9067b3ee1c991744baf54a88c";
+      name = "kcron-19.08.0.tar.xz";
     };
   };
   kdav = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdav-19.04.3.tar.xz";
-      sha256 = "f182a3ad6e23ff9e8165d11c3d4964e470e5d4d3f0183207cbe380f5c111af85";
-      name = "kdav-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdav-19.08.0.tar.xz";
+      sha256 = "8bfd0657c0eaa74068c7601208baacb9d11bc6574cd353d4d346473c6c43b6f6";
+      name = "kdav-19.08.0.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdebugsettings-19.04.3.tar.xz";
-      sha256 = "0f3f2afafad0cfb312b51b15de6615359ba5ccd7bee6b35ce48a40e3a58368c5";
-      name = "kdebugsettings-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdebugsettings-19.08.0.tar.xz";
+      sha256 = "b47987cabffe464c21c96b31991643efafc24f77d31b768ed9dff075567aa361";
+      name = "kdebugsettings-19.08.0.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kde-dev-scripts-19.04.3.tar.xz";
-      sha256 = "ef71c4891e9fe8bde99159a12a2539227b3994ad33ad46073a08074d61ec5b61";
-      name = "kde-dev-scripts-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kde-dev-scripts-19.08.0.tar.xz";
+      sha256 = "8028d1f5390f608974235123a7c14342fb0c247456e6088d4f16797875efdf18";
+      name = "kde-dev-scripts-19.08.0.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kde-dev-utils-19.04.3.tar.xz";
-      sha256 = "b8bde609a66482224d8c581692ecba0665894143ba64e816797a44eea7453a43";
-      name = "kde-dev-utils-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kde-dev-utils-19.08.0.tar.xz";
+      sha256 = "fc95211b92fa76e53558111d5cd64227f194df15fb13f2d81c809facd796f2c5";
+      name = "kde-dev-utils-19.08.0.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdeedu-data-19.04.3.tar.xz";
-      sha256 = "03d8e219a3d7f82f92887f200e017eaeb2fc3f9316f0ea63d4caa271c62f7791";
-      name = "kdeedu-data-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdeedu-data-19.08.0.tar.xz";
+      sha256 = "658063227b9d4d7e4e238038ffa9c76e5c5f3015c923967477f514b063940eb0";
+      name = "kdeedu-data-19.08.0.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdegraphics-mobipocket-19.04.3.tar.xz";
-      sha256 = "c073730b7f3d468f4e710a67bdb90d794b69bf0f2c149f7fac705b44b912fa94";
-      name = "kdegraphics-mobipocket-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdegraphics-mobipocket-19.08.0.tar.xz";
+      sha256 = "28c6566f32855a43d10829070cc47d0f4c879ca89eb3228ea6274d0f32fa90fe";
+      name = "kdegraphics-mobipocket-19.08.0.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdegraphics-thumbnailers-19.04.3.tar.xz";
-      sha256 = "1cca91081a97e851156d187794037bdcbffe996f607a1eed59a2ea00049a9f78";
-      name = "kdegraphics-thumbnailers-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdegraphics-thumbnailers-19.08.0.tar.xz";
+      sha256 = "127a99fffdaee3772b03a6c197357311ec56047caccce967f0d74b5489722ddf";
+      name = "kdegraphics-thumbnailers-19.08.0.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdenetwork-filesharing-19.04.3.tar.xz";
-      sha256 = "bc3763ecf49b85e159503928692c9cb68083c6acc49f2dead27f538fca0e8ab5";
-      name = "kdenetwork-filesharing-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdenetwork-filesharing-19.08.0.tar.xz";
+      sha256 = "a7e2e7d79c7e6486e2d2efe8f85e2be2f6231ca5e4e49e2bd332befb9d6d4288";
+      name = "kdenetwork-filesharing-19.08.0.tar.xz";
     };
   };
   kdenlive = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdenlive-19.04.3.tar.xz";
-      sha256 = "c981954ce9759da2878b4c76d97b9bb7aa92fc1f073a9f759142870e287d2a1e";
-      name = "kdenlive-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdenlive-19.08.0.tar.xz";
+      sha256 = "01b60bf58f6818a5ca9aa6e7a79111965700e6948da0bc0edd1184c26fd872e4";
+      name = "kdenlive-19.08.0.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdepim-addons-19.04.3.tar.xz";
-      sha256 = "a748027568ed2f82f9178c24f6eba18f1d5af26f51d1cc1ddedea645e04190a6";
-      name = "kdepim-addons-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdepim-addons-19.08.0.tar.xz";
+      sha256 = "8eb692f9dcb86fec2ec207f719c774492df222fceab2ccc2bdf530cb57aa1c3e";
+      name = "kdepim-addons-19.08.0.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdepim-apps-libs-19.04.3.tar.xz";
-      sha256 = "a3ad12f4b7c58154aef49fc5d0ac388a6e9441972605aaa02e17dd6a0583eeb2";
-      name = "kdepim-apps-libs-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdepim-apps-libs-19.08.0.tar.xz";
+      sha256 = "2a19e9b0c3b6b2fecaeb4054bf101170056b8c9e831e45fb796b59666f103f2e";
+      name = "kdepim-apps-libs-19.08.0.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdepim-runtime-19.04.3.tar.xz";
-      sha256 = "720945f803dc9027211eb46f281ef52b35da3fe4d990c1aeed6d57a89a45215a";
-      name = "kdepim-runtime-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdepim-runtime-19.08.0.tar.xz";
+      sha256 = "634419978329902a1877810d87d4ddae8cb07adbabbfa4540b521689d8bc85ef";
+      name = "kdepim-runtime-19.08.0.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdesdk-kioslaves-19.04.3.tar.xz";
-      sha256 = "682e13382f41b76306e48ee9d75e993f84a4619be8de08023354653c6b350842";
-      name = "kdesdk-kioslaves-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdesdk-kioslaves-19.08.0.tar.xz";
+      sha256 = "cb49f23038d6841ea3a08f840328372aaee53dd915ab5a923753a4a899199ae0";
+      name = "kdesdk-kioslaves-19.08.0.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdesdk-thumbnailers-19.04.3.tar.xz";
-      sha256 = "771052d4f4482e88bb70a00a55b3b1755055088dce998e723948ff3de5c576fe";
-      name = "kdesdk-thumbnailers-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdesdk-thumbnailers-19.08.0.tar.xz";
+      sha256 = "e640f1a484482f6dd4ba4ebda92832a027a20e64e1e12d2306bd7dd618b36356";
+      name = "kdesdk-thumbnailers-19.08.0.tar.xz";
     };
   };
   kdf = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdf-19.04.3.tar.xz";
-      sha256 = "4d3d3218cee73238e9be73db131062f186ede393bbe0115e4df633c7d21f2572";
-      name = "kdf-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdf-19.08.0.tar.xz";
+      sha256 = "e6effd6aaf08c9bfa649b194313e7719b65a9d53f00570e14d2752ce68d13bfe";
+      name = "kdf-19.08.0.tar.xz";
     };
   };
   kdialog = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdialog-19.04.3.tar.xz";
-      sha256 = "647c5eac9d34f2cc8011f6214bc5a8ddc1eca8f0b381c66eaf20848eccdf9823";
-      name = "kdialog-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdialog-19.08.0.tar.xz";
+      sha256 = "dc60f9ea0c59435b0da37f4bc50716d43ebfb9b9d0b05955c96393e6d06ea687";
+      name = "kdialog-19.08.0.tar.xz";
     };
   };
   kdiamond = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kdiamond-19.04.3.tar.xz";
-      sha256 = "22a567a63dd2bf9006d970e9aa5aeabff94c2ae9c98004bbd6cc35083a995536";
-      name = "kdiamond-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdiamond-19.08.0.tar.xz";
+      sha256 = "f37d526610fa0579d5be9de19325ed82e14763c997d9ea026dfcf1068bf2428a";
+      name = "kdiamond-19.08.0.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/keditbookmarks-19.04.3.tar.xz";
-      sha256 = "b255d6f85d34abf635857f922b059c3311fd7859262039bec0c90b6538c5e92e";
-      name = "keditbookmarks-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/keditbookmarks-19.08.0.tar.xz";
+      sha256 = "98c539e63a0e2bb62680003022d9ea5aececc4aa1c2d19a7b4c4aa3d8999e7ac";
+      name = "keditbookmarks-19.08.0.tar.xz";
     };
   };
   kfind = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kfind-19.04.3.tar.xz";
-      sha256 = "2fcb5af039d976161ed09d87cb7c909bd2854647ea15688203b90dbebc54447f";
-      name = "kfind-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kfind-19.08.0.tar.xz";
+      sha256 = "25b7b442600c4e109b0a6f7f09962a4d95d419673f6b64eebf226dcdae8cc6ff";
+      name = "kfind-19.08.0.tar.xz";
     };
   };
   kfloppy = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kfloppy-19.04.3.tar.xz";
-      sha256 = "7f3a206b6f4cd03771d8fba94423bf749a2b8e6bb4dfd01f30502d1ab08f1d8e";
-      name = "kfloppy-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kfloppy-19.08.0.tar.xz";
+      sha256 = "312345286fa1dba2cac782523d95c1e4ed0d7ef272c93c5d7bf2f9d8f635fa82";
+      name = "kfloppy-19.08.0.tar.xz";
     };
   };
   kfourinline = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kfourinline-19.04.3.tar.xz";
-      sha256 = "62a163f9c2034deba3daa93c4ac07c476895514ec9fefdd9a0792726a61d066f";
-      name = "kfourinline-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kfourinline-19.08.0.tar.xz";
+      sha256 = "f84ad6a3e0b2ecbb8c8ab7f451e9534f47627d9d90ff21f188df23dfd23ce22e";
+      name = "kfourinline-19.08.0.tar.xz";
     };
   };
   kgeography = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kgeography-19.04.3.tar.xz";
-      sha256 = "a94742602100e989b4dbbfa37c8bde99054710f28a1679ad458ee65de0db8b7e";
-      name = "kgeography-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kgeography-19.08.0.tar.xz";
+      sha256 = "83eb429851360d848e3e028ef2748a9d66470b8f3dc3bf66fbbfd08b534a7a75";
+      name = "kgeography-19.08.0.tar.xz";
     };
   };
   kget = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kget-19.04.3.tar.xz";
-      sha256 = "9620ca07792e8a8d9bcb2069d36b665f2aa21d2428f109d825a663ccb6c12e25";
-      name = "kget-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kget-19.08.0.tar.xz";
+      sha256 = "4db589499c8e5fc3cbb5e398054b1292f68fa23ad1798f2bb2065ba56723d06b";
+      name = "kget-19.08.0.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kgoldrunner-19.04.3.tar.xz";
-      sha256 = "f1325580ebd91dcac9a79e66f939b372e7ea8264ef8671098471055f297110a8";
-      name = "kgoldrunner-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kgoldrunner-19.08.0.tar.xz";
+      sha256 = "db203add309e10902a0e2b770929bf002b22ab78668ea432ecbf4497dfdc06b6";
+      name = "kgoldrunner-19.08.0.tar.xz";
     };
   };
   kgpg = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kgpg-19.04.3.tar.xz";
-      sha256 = "740ad342cfa1edf1c7cbbe8d15789533d5003dda5bf3899687eb4182b582236d";
-      name = "kgpg-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kgpg-19.08.0.tar.xz";
+      sha256 = "3aa31f524c7f8ab50a86d83066590b98cd4ffbeb94b5a6fb7dadec9fe3072845";
+      name = "kgpg-19.08.0.tar.xz";
     };
   };
   khangman = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/khangman-19.04.3.tar.xz";
-      sha256 = "f2fd0d70c405ebd158f3e11a52cd1e268b1238fdada674b2f59b46324d2610a8";
-      name = "khangman-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/khangman-19.08.0.tar.xz";
+      sha256 = "ff14cefbd78f047b6250ec3cf4d11e13484f30cc5610616c0a9270008b36f1a1";
+      name = "khangman-19.08.0.tar.xz";
     };
   };
   khelpcenter = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/khelpcenter-19.04.3.tar.xz";
-      sha256 = "d18e0960859d72d9c2ebf187a9f5b1b65a8c78032e32df0d6eb0cce73921e972";
-      name = "khelpcenter-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/khelpcenter-19.08.0.tar.xz";
+      sha256 = "36810c12ae5d163738101b0f5f13c03cda03ee4c157f641df0f73105a894644f";
+      name = "khelpcenter-19.08.0.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kidentitymanagement-19.04.3.tar.xz";
-      sha256 = "4bbe8bffe0624b516d102354197c508ff1a83b6280036f5ab100e7897b99e8da";
-      name = "kidentitymanagement-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kidentitymanagement-19.08.0.tar.xz";
+      sha256 = "9fe5c473af0d042b482f1d1dac499c1d8227b60a79f1b5678043f0f49f19013d";
+      name = "kidentitymanagement-19.08.0.tar.xz";
     };
   };
   kig = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kig-19.04.3.tar.xz";
-      sha256 = "05566395ce58c6c049d797f579362d52b612ab1718b111f7a054e9e3ae229459";
-      name = "kig-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kig-19.08.0.tar.xz";
+      sha256 = "ec35f8e9c10e0a984ab7ff06fc810a26e0abc825ee5674af238bb04e83ce38ee";
+      name = "kig-19.08.0.tar.xz";
     };
   };
   kigo = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kigo-19.04.3.tar.xz";
-      sha256 = "be91e9fa965505515c36733f260120e6c2ca7fe4856622f03bda07d7a0595ef0";
-      name = "kigo-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kigo-19.08.0.tar.xz";
+      sha256 = "0100195b3289b88b9813e453fc7ec6229a648718a6525bb3e6d0e0c0ead97595";
+      name = "kigo-19.08.0.tar.xz";
     };
   };
   killbots = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/killbots-19.04.3.tar.xz";
-      sha256 = "4295853c0ee137474a3a8c193d4b038f020504a37a6ab3daf81cf4d43ed5d656";
-      name = "killbots-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/killbots-19.08.0.tar.xz";
+      sha256 = "909ce7808251a5d0537e2d35fae944b932973c36035f1c08f3143227e2d5cf4f";
+      name = "killbots-19.08.0.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kimagemapeditor-19.04.3.tar.xz";
-      sha256 = "a7e5ba3d85c09c446e37baeac1c149395381b542fbbb1ab642645f631b5ab2de";
-      name = "kimagemapeditor-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kimagemapeditor-19.08.0.tar.xz";
+      sha256 = "e2c0b75b65176a9ccbdccbae57be90ee8084593a64bee10b133787077affbde9";
+      name = "kimagemapeditor-19.08.0.tar.xz";
     };
   };
   kimap = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kimap-19.04.3.tar.xz";
-      sha256 = "58ed8471dc7e9c43e7bdb61c791e3bb612b2473bf0fb8f67857cb6fa72ddcf35";
-      name = "kimap-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kimap-19.08.0.tar.xz";
+      sha256 = "d9e3af3e1bb03d929a08287b1a29540915d25dbb6a38d152560302c93e4c5060";
+      name = "kimap-19.08.0.tar.xz";
     };
   };
   kio-extras = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kio-extras-19.04.3.tar.xz";
-      sha256 = "b65cb37a5965782a9eaae80840fdd7e06505aece33cc6774510c65e1fea3f55b";
-      name = "kio-extras-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kio-extras-19.08.0.tar.xz";
+      sha256 = "792a6a6d1ea2457dda10aedc6cefd3518064c8f47c62f9c3c4a508442b83d3cd";
+      name = "kio-extras-19.08.0.tar.xz";
+    };
+  };
+  kipi-plugins = {
+    version = "19.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/19.08.0/src/kipi-plugins-19.08.0.tar.xz";
+      sha256 = "21fb6b997aeeeb462fd83ff90a36597b5c74b5711a837959f1e6cdc9a300c4e9";
+      name = "kipi-plugins-19.08.0.tar.xz";
     };
   };
   kirigami-gallery = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kirigami-gallery-19.04.3.tar.xz";
-      sha256 = "cd5bba6cf50b820492b5df6606288b9944f640634bba03d2d4e40279d5c4d1a4";
-      name = "kirigami-gallery-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kirigami-gallery-19.08.0.tar.xz";
+      sha256 = "e32f596c188911336060838c071f7856aba02438b335f107bf057644948cf9d6";
+      name = "kirigami-gallery-19.08.0.tar.xz";
     };
   };
   kiriki = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kiriki-19.04.3.tar.xz";
-      sha256 = "ccb33616936c879aa61fdbaa87ae130c4f22c34b70cdd9b38b128bace850466e";
-      name = "kiriki-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kiriki-19.08.0.tar.xz";
+      sha256 = "42f69734c0268f4c3c4ed0b915318d9570d599c6a0fd8a2a02597f1e31cd50d7";
+      name = "kiriki-19.08.0.tar.xz";
     };
   };
   kiten = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kiten-19.04.3.tar.xz";
-      sha256 = "c2e7fc12e305eeddc031de02254295427117b3a3910b8d5bcfc6ff97855f8fbc";
-      name = "kiten-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kiten-19.08.0.tar.xz";
+      sha256 = "891ccf6c610099c63045aedccee4d1ac87c5189066fd2763e0743a40b2538b53";
+      name = "kiten-19.08.0.tar.xz";
     };
   };
   kitinerary = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kitinerary-19.04.3.tar.xz";
-      sha256 = "c2e9d1ae70797968382538da98bc8f9555e0d8d13faeb739bdadb5844c989227";
-      name = "kitinerary-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kitinerary-19.08.0.tar.xz";
+      sha256 = "76db853705b87015a934334985c216d11b48e853a3dd31429abb3bc6bd7f52e6";
+      name = "kitinerary-19.08.0.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kjumpingcube-19.04.3.tar.xz";
-      sha256 = "03feb2c3e0f46f1ca4f4d24ce8fd350c607bfaf52f715abbf379709d8d0a6818";
-      name = "kjumpingcube-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kjumpingcube-19.08.0.tar.xz";
+      sha256 = "d72c1164777f27b7711a0b74575ba38a9e34fca45c22915e10e7e792f7c00b33";
+      name = "kjumpingcube-19.08.0.tar.xz";
     };
   };
   kldap = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kldap-19.04.3.tar.xz";
-      sha256 = "6b4bf8e69e6c372f60f746f2a6c453262283e25643a97192eef3c07c5c8d94df";
-      name = "kldap-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kldap-19.08.0.tar.xz";
+      sha256 = "4bee7b041aff8e1a76330bde12ab9368176181136be1136c4b0c0b733eb9bc16";
+      name = "kldap-19.08.0.tar.xz";
     };
   };
   kleopatra = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kleopatra-19.04.3.tar.xz";
-      sha256 = "a6265e182d480a146464751bf34e3430804dfbc954c09ff85bac15273aa1c033";
-      name = "kleopatra-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kleopatra-19.08.0.tar.xz";
+      sha256 = "161e6f7cf39aadfc856446642bf4c95c97b21647ba90698b17ab557e9c9e70ef";
+      name = "kleopatra-19.08.0.tar.xz";
     };
   };
   klettres = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/klettres-19.04.3.tar.xz";
-      sha256 = "ba8498a28af8534083b2ea3eab5ada7b57deffe49673ef0e4ef278023e8b96af";
-      name = "klettres-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/klettres-19.08.0.tar.xz";
+      sha256 = "0a680ff0c2c3868a2478da0e2a5eb8db8579e5ba9165743c8a2c20704c062be4";
+      name = "klettres-19.08.0.tar.xz";
     };
   };
   klickety = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/klickety-19.04.3.tar.xz";
-      sha256 = "27b05ed8522ff353b4327f79ec069c453fc4545d2a07ca11fc53e53647841fe9";
-      name = "klickety-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/klickety-19.08.0.tar.xz";
+      sha256 = "aad8c7b9e4c07ca8bd64beae71330e51d45dcaa9929a9ce56b7c675fc9e583f0";
+      name = "klickety-19.08.0.tar.xz";
     };
   };
   klines = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/klines-19.04.3.tar.xz";
-      sha256 = "a0d133a9a08e8f3953ae54b7da187c56cfbc518bfeadac4f32b82c9aa4f33c8b";
-      name = "klines-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/klines-19.08.0.tar.xz";
+      sha256 = "c49ff3c4bb1612d5699c4a3b0613c6599cf23c0baa79806b8616dbea757d48f8";
+      name = "klines-19.08.0.tar.xz";
     };
   };
   kmag = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmag-19.04.3.tar.xz";
-      sha256 = "4fad3d4414884fa8fb7dcfb27e7cc4207dfe219819ffda75355de5c1b4981e35";
-      name = "kmag-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmag-19.08.0.tar.xz";
+      sha256 = "7d42c254e62750899e429482c2b6ed3b4b1e8c5a66fbc371eec656421817d0a4";
+      name = "kmag-19.08.0.tar.xz";
     };
   };
   kmahjongg = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmahjongg-19.04.3.tar.xz";
-      sha256 = "41bd533bf8d8b1e04451cb3c9165b08f9135603c0085d8b402d0e8e026b8ed00";
-      name = "kmahjongg-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmahjongg-19.08.0.tar.xz";
+      sha256 = "f601963d0670639a11c4100ed1f53a0e308f79ddf98e1b4fc6a0a4674e117f22";
+      name = "kmahjongg-19.08.0.tar.xz";
     };
   };
   kmail = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmail-19.04.3.tar.xz";
-      sha256 = "8e1d45741a9fab9848a659ab05497f82d79f7ffe3a42f121cb5136b1fcae833f";
-      name = "kmail-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmail-19.08.0.tar.xz";
+      sha256 = "052d5b0da402024646673f5e57785b509c328bd5f5ac064f742f9c63e75f3b28";
+      name = "kmail-19.08.0.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmail-account-wizard-19.04.3.tar.xz";
-      sha256 = "a8cc19b30198459cb0fd74fb0d789a012354b4a9952a14312508af7079f92291";
-      name = "kmail-account-wizard-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmail-account-wizard-19.08.0.tar.xz";
+      sha256 = "5eddd4029047b3c37146c49e043d17c1f9086bc738726d5da2756cbe9ad28622";
+      name = "kmail-account-wizard-19.08.0.tar.xz";
     };
   };
   kmailtransport = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmailtransport-19.04.3.tar.xz";
-      sha256 = "2a3115a81f2c85c42345ee6380ea1c28129be5dd5a518270c6ec1062ea22abc5";
-      name = "kmailtransport-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmailtransport-19.08.0.tar.xz";
+      sha256 = "cc5f865f2059e8fd8d45d1597d8483bbfe0b743e472d91dd4e7cc3837c3fa2dd";
+      name = "kmailtransport-19.08.0.tar.xz";
     };
   };
   kmbox = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmbox-19.04.3.tar.xz";
-      sha256 = "4025f1ef0288f2c30e64d8eb02bde117f1ee482b760bef52aa71faedc500733f";
-      name = "kmbox-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmbox-19.08.0.tar.xz";
+      sha256 = "6600033298b0d5ff84705dc66fa529156cb08aeda7503ba7890581b618f83228";
+      name = "kmbox-19.08.0.tar.xz";
     };
   };
   kmime = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmime-19.04.3.tar.xz";
-      sha256 = "a6fe422eddb15eb52fbacde97b45ec6752b60f46149657a3bb7f48dc899e1c02";
-      name = "kmime-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmime-19.08.0.tar.xz";
+      sha256 = "1422e6235659b66b3ee5e91cdd732d8c3738d42f81435e69f3cbb18f04a0be75";
+      name = "kmime-19.08.0.tar.xz";
     };
   };
   kmines = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmines-19.04.3.tar.xz";
-      sha256 = "34b23a66121183272a58f2cb38b798cab4f290d9f04546418ddb4b2b20e262a1";
-      name = "kmines-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmines-19.08.0.tar.xz";
+      sha256 = "290efbc208d2fa6ad5552fe8c0679fd0669f4abf6dc31fafd267bd9444add981";
+      name = "kmines-19.08.0.tar.xz";
     };
   };
   kmix = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmix-19.04.3.tar.xz";
-      sha256 = "d08a0d40fb9a7a3f032f8995dbd9260777119b249669323447fa2575e44e3bf9";
-      name = "kmix-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmix-19.08.0.tar.xz";
+      sha256 = "3d9cf6dcb35ded0091d16f5e9f4cb384ae21ea4065547b52d5f13f199d3d7b08";
+      name = "kmix-19.08.0.tar.xz";
     };
   };
   kmousetool = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmousetool-19.04.3.tar.xz";
-      sha256 = "15c4e02c02a993d2724320b6625e9a44d5658c47136dd9a9895897893305dbd0";
-      name = "kmousetool-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmousetool-19.08.0.tar.xz";
+      sha256 = "3b2f5a4fcc3231c249923431059285e3f8371f7c8d53fcaea76dec3945a13b09";
+      name = "kmousetool-19.08.0.tar.xz";
     };
   };
   kmouth = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmouth-19.04.3.tar.xz";
-      sha256 = "712e21cc8cb45880b02c9cf5aa3a1bb2d54f9a2e09d1bbd2667eb99beded64dc";
-      name = "kmouth-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmouth-19.08.0.tar.xz";
+      sha256 = "608479db4b2a98ecd17bdc1b1ef20203f492647b43311e903fb10338a59e0098";
+      name = "kmouth-19.08.0.tar.xz";
     };
   };
   kmplot = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kmplot-19.04.3.tar.xz";
-      sha256 = "8c312235076fdad431fc68dc3e8be18ab8317e8a6efb6e6170958cb7495ab479";
-      name = "kmplot-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmplot-19.08.0.tar.xz";
+      sha256 = "66384c96ba1e82b32427a873f944d5efa915bb2bf7d9ee886c94f368bd1f5e94";
+      name = "kmplot-19.08.0.tar.xz";
     };
   };
   knavalbattle = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/knavalbattle-19.04.3.tar.xz";
-      sha256 = "468e3fc16e17d3cbde2e213a46dcb07d1ea030a1522f40ab10b429254b8249af";
-      name = "knavalbattle-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/knavalbattle-19.08.0.tar.xz";
+      sha256 = "7fbf132662e12f785390dbef7086dad5372ebaea8f8c3f55c24fe37bf17df35e";
+      name = "knavalbattle-19.08.0.tar.xz";
     };
   };
   knetwalk = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/knetwalk-19.04.3.tar.xz";
-      sha256 = "d211a1bbc3a4f57dbea73da11d4ff351150de2ca6bd06251c2775a4e16601489";
-      name = "knetwalk-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/knetwalk-19.08.0.tar.xz";
+      sha256 = "135e8c3b0d46eda0eda2429c6fa89226cba184fb7357b86a3d3101797a7a8c96";
+      name = "knetwalk-19.08.0.tar.xz";
     };
   };
   knights = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/knights-19.04.3.tar.xz";
-      sha256 = "ab2e01ee6e309bf5221333168b58cf41c20ad5a5e70beeb31520d4076f6153e5";
-      name = "knights-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/knights-19.08.0.tar.xz";
+      sha256 = "1e22413a23b8afeab8b5d46a4d6d81a5e00a891636676b99c5bd08806f97795c";
+      name = "knights-19.08.0.tar.xz";
     };
   };
   knotes = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/knotes-19.04.3.tar.xz";
-      sha256 = "8c269a5db708d623a7e36799d43204146b44f9de65f6e09a00782b1b62bf41fd";
-      name = "knotes-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/knotes-19.08.0.tar.xz";
+      sha256 = "578afb9d879023db9fef4e58e326927d0e2e24edd1e1ac0d46eee968a0ab7030";
+      name = "knotes-19.08.0.tar.xz";
     };
   };
   kolf = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kolf-19.04.3.tar.xz";
-      sha256 = "c7a352332a2ff8e856bcf09e3bd0bfa8670e140da2e43e894ecf9f022fcef020";
-      name = "kolf-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kolf-19.08.0.tar.xz";
+      sha256 = "1a2a7e9809fd6551518d1393dcfd365976b06ddf17aaa1056a36e8f167e7db5a";
+      name = "kolf-19.08.0.tar.xz";
     };
   };
   kollision = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kollision-19.04.3.tar.xz";
-      sha256 = "8374313b4bf4590ba051051fb6510774862690468719e8425addcdfd9daeff91";
-      name = "kollision-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kollision-19.08.0.tar.xz";
+      sha256 = "24a8ae084443359d59c16cbbafc450bbc467bd8b2a2516572e70ef24823750fd";
+      name = "kollision-19.08.0.tar.xz";
     };
   };
   kolourpaint = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kolourpaint-19.04.3.tar.xz";
-      sha256 = "7ba4089fe55c870b54ff44bd423eebe50303b0324c4b421589115c4d1d349cac";
-      name = "kolourpaint-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kolourpaint-19.08.0.tar.xz";
+      sha256 = "00596d813eff27e45de7f51ae411b144ee21a7ae2baf576e248046dbd97e097d";
+      name = "kolourpaint-19.08.0.tar.xz";
     };
   };
   kompare = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kompare-19.04.3.tar.xz";
-      sha256 = "4dcb419336826ac1b8d37135ec153da585f8cebfdc9b6574c6abb866c277c8d0";
-      name = "kompare-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kompare-19.08.0.tar.xz";
+      sha256 = "695c4096c3ac15ab38e5cfb4114f9425c8ccb2f618a65b5f36f3ddee5edec212";
+      name = "kompare-19.08.0.tar.xz";
     };
   };
   konqueror = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/konqueror-19.04.3.tar.xz";
-      sha256 = "257488e521c024fb6c8fdbef71aaccd9315505c8b14c6ffde0ce4060a48579b4";
-      name = "konqueror-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/konqueror-19.08.0.tar.xz";
+      sha256 = "cc37709dcf183c68effb5332c29527b13fe7aae78216b84680ef6cc73192f971";
+      name = "konqueror-19.08.0.tar.xz";
     };
   };
   konquest = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/konquest-19.04.3.tar.xz";
-      sha256 = "cdf061ca7f2a3c30fd24b1bada2c9854ed4cb58232fbd5c999cb66602bc3d15b";
-      name = "konquest-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/konquest-19.08.0.tar.xz";
+      sha256 = "94919dce58182859f7e720ece73be81b5bafc359afdc1c29f4f45a3b24155e60";
+      name = "konquest-19.08.0.tar.xz";
     };
   };
   konsole = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/konsole-19.04.3.tar.xz";
-      sha256 = "20cadcda75a22ce7b4cb19240a16c9b286fa6ed836f352b8b337fb418e9a3b4c";
-      name = "konsole-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/konsole-19.08.0.tar.xz";
+      sha256 = "4d495bf42fad1f457282a57f19fe2aece1ddbc88239352f0ebadfbcebf52ad6e";
+      name = "konsole-19.08.0.tar.xz";
     };
   };
   kontact = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kontact-19.04.3.tar.xz";
-      sha256 = "05fab6c512635b07b6c99b3ee38d9e53060d44124052734381e9a6ddbef06e73";
-      name = "kontact-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kontact-19.08.0.tar.xz";
+      sha256 = "e47d3b4133e24b1c90a3a15f99a77cef442eefa0f2570dd34d5a9e302e845d9b";
+      name = "kontact-19.08.0.tar.xz";
     };
   };
   kontactinterface = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kontactinterface-19.04.3.tar.xz";
-      sha256 = "d541daab32bddd6727b795d280be668be9da801ef7267159ea030f998b52ca74";
-      name = "kontactinterface-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kontactinterface-19.08.0.tar.xz";
+      sha256 = "e490fb4dc0e762d4f12a837ecbddc2f14276672d8f46d10029987222b372f3bc";
+      name = "kontactinterface-19.08.0.tar.xz";
     };
   };
   kopete = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kopete-19.04.3.tar.xz";
-      sha256 = "038c6385d6b2b6d1f35c5c337ebd8c492eea3e4a27d6f7236fd2fee219a7f28a";
-      name = "kopete-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kopete-19.08.0.tar.xz";
+      sha256 = "ef777cc2840db7fc462c3b00a8a289be3db3786ff16ae51ac9a988621848d7b7";
+      name = "kopete-19.08.0.tar.xz";
     };
   };
   korganizer = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/korganizer-19.04.3.tar.xz";
-      sha256 = "b2bae3a41994794a9c4d9ddfe10695edb0fee103f14ee607c31aec42c9e5d06c";
-      name = "korganizer-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/korganizer-19.08.0.tar.xz";
+      sha256 = "fbb6db9e517f7065ed978c6356989a38cea0c9520693d5e67fa04d8cfa625722";
+      name = "korganizer-19.08.0.tar.xz";
     };
   };
   kpat = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kpat-19.04.3.tar.xz";
-      sha256 = "ca9d53d400a2be3ca421d6d916cafeff3b9dcf220e627a1762f96817e952e8e2";
-      name = "kpat-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kpat-19.08.0.tar.xz";
+      sha256 = "1d68ac9094ad8f9bf0487daced786508f96ce2a63fd8d9884c2d03960fda9328";
+      name = "kpat-19.08.0.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kpimtextedit-19.04.3.tar.xz";
-      sha256 = "e71e0c4dc666db23a1cfcbe202d37cac3b0c5fd966c3edbdd88c85ed2e983f24";
-      name = "kpimtextedit-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kpimtextedit-19.08.0.tar.xz";
+      sha256 = "45fcc5898e921c41eb28bb64ddd6d8240f4261360b9149a149ae4c281844dfcb";
+      name = "kpimtextedit-19.08.0.tar.xz";
     };
   };
   kpkpass = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kpkpass-19.04.3.tar.xz";
-      sha256 = "ee602c3176f141bf83d20d0ab277d26306a8b13ac105ec5594cfc8835d838a55";
-      name = "kpkpass-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kpkpass-19.08.0.tar.xz";
+      sha256 = "1555856e987d3667eea8a210e3dd592742ca953dfa2d381e50bc9670183e7137";
+      name = "kpkpass-19.08.0.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kqtquickcharts-19.04.3.tar.xz";
-      sha256 = "18f51bd61d8ab28832355b69082bb63a0efa3cf720918d5e7ff434e2219c17f5";
-      name = "kqtquickcharts-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kqtquickcharts-19.08.0.tar.xz";
+      sha256 = "6b25edca7643287acaf436ba58124077b89d067e2881a5dbfbd8833b68f3cb05";
+      name = "kqtquickcharts-19.08.0.tar.xz";
     };
   };
   krdc = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/krdc-19.04.3.tar.xz";
-      sha256 = "2458858d3e4d00ca2a95151ff7433d3a1726518f9a28281d5e1bb90855132426";
-      name = "krdc-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/krdc-19.08.0.tar.xz";
+      sha256 = "62c995dc1b6eabf2486d475ad089cb3e286d37c6927e4c5bd2455489f52a3e75";
+      name = "krdc-19.08.0.tar.xz";
     };
   };
   kreversi = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kreversi-19.04.3.tar.xz";
-      sha256 = "25325dee759916c803f2c43b8f97152257b0fcb90f9687d4f916c132ae956af4";
-      name = "kreversi-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kreversi-19.08.0.tar.xz";
+      sha256 = "1dbfcce80813c238d5a9084ffcde828b0abeb7b370cfb1e82b55de75a5f02ba9";
+      name = "kreversi-19.08.0.tar.xz";
     };
   };
   krfb = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/krfb-19.04.3.tar.xz";
-      sha256 = "6f1fd97b294150c017adebf18cb04dd1d554f5ece0d761e11131ecc549ee35b7";
-      name = "krfb-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/krfb-19.08.0.tar.xz";
+      sha256 = "1142e493a37ce867b069ac278215377b56061b2412ee2dd46b0db456fb1419d4";
+      name = "krfb-19.08.0.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kross-interpreters-19.04.3.tar.xz";
-      sha256 = "f72e5418c522122bffcc8c8ae28ef912a34b1444b5c3626b74be3452cf92461f";
-      name = "kross-interpreters-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kross-interpreters-19.08.0.tar.xz";
+      sha256 = "d0cda357a32d755d6eba373871c0903a5e6ee5f63289aa6f40c623e985453ecd";
+      name = "kross-interpreters-19.08.0.tar.xz";
     };
   };
   kruler = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kruler-19.04.3.tar.xz";
-      sha256 = "58aa7dc6713647efa4dc0996c28736b614f2b88241f92fb21b60e662c7087a86";
-      name = "kruler-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kruler-19.08.0.tar.xz";
+      sha256 = "a78d054359b559b612dd1dac8f0974f554fb7a52bd8de7152de88866719f9226";
+      name = "kruler-19.08.0.tar.xz";
     };
   };
   kshisen = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kshisen-19.04.3.tar.xz";
-      sha256 = "3109a0bdb8933eebf10b945a75fc8b355aa8c97d5debd28943d8145a80efe2fe";
-      name = "kshisen-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kshisen-19.08.0.tar.xz";
+      sha256 = "f591834b26ff622c995be81acdb07b6d25cf2e25745688a7c162d0b92532066d";
+      name = "kshisen-19.08.0.tar.xz";
     };
   };
   ksirk = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ksirk-19.04.3.tar.xz";
-      sha256 = "d91e6c34ac284e7f7e95d07d2f94852cb6ef549dd7e00f404ea40e22a4d2802b";
-      name = "ksirk-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksirk-19.08.0.tar.xz";
+      sha256 = "a929c6b10a01d765c8702afc1fa8e77ada7357cf8064c45cff34623d23a2c94c";
+      name = "ksirk-19.08.0.tar.xz";
     };
   };
   ksmtp = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ksmtp-19.04.3.tar.xz";
-      sha256 = "8d5eae342468f128fe1311b4797c9533b6017b9fb0901fb4c0d09bb73e39d02e";
-      name = "ksmtp-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksmtp-19.08.0.tar.xz";
+      sha256 = "2947d49f183fe25dc340dd3fa6145c85b1896c8adb08bab9966e1f99a927a003";
+      name = "ksmtp-19.08.0.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ksnakeduel-19.04.3.tar.xz";
-      sha256 = "05b5c7f0f4ed21ac2926bbe9d2b3913ed8b512863837c3b83754c1048fe0cd04";
-      name = "ksnakeduel-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksnakeduel-19.08.0.tar.xz";
+      sha256 = "51799e15ce35237cf410bfd69cca40eeea6ec75ac3b3b98686b44028e8fd2b0b";
+      name = "ksnakeduel-19.08.0.tar.xz";
     };
   };
   kspaceduel = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kspaceduel-19.04.3.tar.xz";
-      sha256 = "c6a0e64f6c3149b408d3d11435388b6cd7760c2b1a4ead03a72215ca7fbadae0";
-      name = "kspaceduel-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kspaceduel-19.08.0.tar.xz";
+      sha256 = "fcd3b90e5a61cb27753cbacf4699c156317cfe30d50732f1f89ac4973dfb39f2";
+      name = "kspaceduel-19.08.0.tar.xz";
     };
   };
   ksquares = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ksquares-19.04.3.tar.xz";
-      sha256 = "d85c90f883c3ce1559dd0d3ceb20500563704cf6d1824c5fea3ddce0e1ca7563";
-      name = "ksquares-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksquares-19.08.0.tar.xz";
+      sha256 = "649a89da0a928c8977218a76023044205b20f07af9b3abda042e46bc450bd00f";
+      name = "ksquares-19.08.0.tar.xz";
     };
   };
   ksudoku = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ksudoku-19.04.3.tar.xz";
-      sha256 = "608ffcde2d0bad3e2a19d7842c47b41627d009721a4e3161ccf2736f7777e922";
-      name = "ksudoku-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksudoku-19.08.0.tar.xz";
+      sha256 = "0f773ce70fbc05f30285b7123c5e28fe241ff56677c5b80c1201238bdbc375f8";
+      name = "ksudoku-19.08.0.tar.xz";
     };
   };
   ksystemlog = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ksystemlog-19.04.3.tar.xz";
-      sha256 = "7d155c91d57e253c00f038100e136e4bf6eb4d709549d689608ee0026354a965";
-      name = "ksystemlog-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksystemlog-19.08.0.tar.xz";
+      sha256 = "1231a9dd9a697fe2379a93a3a4d5c026aedf70a8f7e14d8a626ef6b782fb4259";
+      name = "ksystemlog-19.08.0.tar.xz";
     };
   };
   kteatime = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kteatime-19.04.3.tar.xz";
-      sha256 = "49a404223896bd3df976e0c155a6907936f52721fc7da14289998b9d1ea372ba";
-      name = "kteatime-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kteatime-19.08.0.tar.xz";
+      sha256 = "3be9667867ef41a638c8f97fefb213b078b0ba3171add881438588bc8afba342";
+      name = "kteatime-19.08.0.tar.xz";
     };
   };
   ktimer = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktimer-19.04.3.tar.xz";
-      sha256 = "c282a02019f7b1f69eae09b564481ed7526c7c836155b1eed2b22fb01fcaf563";
-      name = "ktimer-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktimer-19.08.0.tar.xz";
+      sha256 = "c7f684b9c7f0c92638153fabdfdb1082c900a8da2f660eeebe4b8b3b669f8c8d";
+      name = "ktimer-19.08.0.tar.xz";
     };
   };
   ktnef = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktnef-19.04.3.tar.xz";
-      sha256 = "ef0760dc31cad222f73a56d5098ffa9bff0e4c68a26f6f85ad542bb4f8dd3693";
-      name = "ktnef-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktnef-19.08.0.tar.xz";
+      sha256 = "54b2e09a872e8f8e4e8a1ef77975b1d063ef0d07999b1bf2a696675659e6d52f";
+      name = "ktnef-19.08.0.tar.xz";
     };
   };
   ktouch = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktouch-19.04.3.tar.xz";
-      sha256 = "dce3f72204f43ddde109a39fca65f2936e9d9db686e6b3edf8ae04bc9c1c0e55";
-      name = "ktouch-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktouch-19.08.0.tar.xz";
+      sha256 = "23ae45be76371fa40aac875551b5de8956a2d2b0980024bd788b8b7835b902ba";
+      name = "ktouch-19.08.0.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-accounts-kcm-19.04.3.tar.xz";
-      sha256 = "1c2f411bc161bbf08276bd3a12329f11f233e84e3e04cb632a2096c6e4d03afb";
-      name = "ktp-accounts-kcm-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-accounts-kcm-19.08.0.tar.xz";
+      sha256 = "f849b7a9b2cee5b328e726dd254b1e606b740e5b75cdc59a1ea18601e131c0b5";
+      name = "ktp-accounts-kcm-19.08.0.tar.xz";
     };
   };
   ktp-approver = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-approver-19.04.3.tar.xz";
-      sha256 = "40796bfd2644b1d43f6ecd3ce48298240af53967485283fa8d9cd330e8377b74";
-      name = "ktp-approver-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-approver-19.08.0.tar.xz";
+      sha256 = "8662a7b3e4f67a5ed2faa12187faef9dd7e056ee9f2d4b69d68f7a381e258e85";
+      name = "ktp-approver-19.08.0.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-auth-handler-19.04.3.tar.xz";
-      sha256 = "f65ceba1958b846f24894d57e180cf80f94ddad289713965f2abfd1ec8d91292";
-      name = "ktp-auth-handler-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-auth-handler-19.08.0.tar.xz";
+      sha256 = "5674ebf51565854262b5ae0a5fbf8d0837c87b016ea5b32f56f96aa8583a7e39";
+      name = "ktp-auth-handler-19.08.0.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-call-ui-19.04.3.tar.xz";
-      sha256 = "e747049eefe80f7fccf4639c2bb1ed294538dc79e17a2ed395003d213a64821c";
-      name = "ktp-call-ui-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-call-ui-19.08.0.tar.xz";
+      sha256 = "1f7922a1920770decfd3e17aaf42e46db60b5c3660efc544a9be743d9a85d08f";
+      name = "ktp-call-ui-19.08.0.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-common-internals-19.04.3.tar.xz";
-      sha256 = "43bcf817c3269251578e16fb9519668683e6efe4e33f453e13f5ef95fd96a9aa";
-      name = "ktp-common-internals-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-common-internals-19.08.0.tar.xz";
+      sha256 = "bdbf20e4e0ad7ba7bdc76a0087ff7307cf813c711da6fba3acb0104756ef1559";
+      name = "ktp-common-internals-19.08.0.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-contact-list-19.04.3.tar.xz";
-      sha256 = "c74903c4d099f4a138fa3cb4758460b2fdf49292070439e4da6194c0cc486c2f";
-      name = "ktp-contact-list-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-contact-list-19.08.0.tar.xz";
+      sha256 = "e6ba69a5a8a6b841e5babd8cb7ddb0a799d34b881ab4bdd0495062a23e59d3e1";
+      name = "ktp-contact-list-19.08.0.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-contact-runner-19.04.3.tar.xz";
-      sha256 = "30551ec0419e978f43d25f1a9b48d07429a14cde0feba58a08ad452a2f2d3b0e";
-      name = "ktp-contact-runner-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-contact-runner-19.08.0.tar.xz";
+      sha256 = "2a90784f7f266399c41a2b64cdb4ae748fca6739c026beed6bfef91b037c2b28";
+      name = "ktp-contact-runner-19.08.0.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-desktop-applets-19.04.3.tar.xz";
-      sha256 = "826dd1e28e3fc7f730dbbe465183fc5df3bc1be67c89ccc8615607de783cc91d";
-      name = "ktp-desktop-applets-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-desktop-applets-19.08.0.tar.xz";
+      sha256 = "56562f335767e1071b36e7e31474a371b862785babeb4f5181b48065f6513221";
+      name = "ktp-desktop-applets-19.08.0.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-filetransfer-handler-19.04.3.tar.xz";
-      sha256 = "a2408806c9a3a50a7f04bb9106d27ba62e4b0e670957e6630a7841a191b5ca9c";
-      name = "ktp-filetransfer-handler-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-filetransfer-handler-19.08.0.tar.xz";
+      sha256 = "a3a298058e5f6d135abac474a4cd788cea16ccfb4763948f007b6f769fd47de4";
+      name = "ktp-filetransfer-handler-19.08.0.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-kded-module-19.04.3.tar.xz";
-      sha256 = "dbbb1876c55e8bef22cde4bb59395ae6d4d01dd851368a5f293c5f7e2aed25e4";
-      name = "ktp-kded-module-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-kded-module-19.08.0.tar.xz";
+      sha256 = "a225a4e16cb18b19c5750d27c7a3834bbbe362c40c7cad8a9e500488682d67cc";
+      name = "ktp-kded-module-19.08.0.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-send-file-19.04.3.tar.xz";
-      sha256 = "1ef4f7099e571e2a1f5fbaaf802d1002f14f5a644d5054b4b850a292bbb676c6";
-      name = "ktp-send-file-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-send-file-19.08.0.tar.xz";
+      sha256 = "d69e48d1f69e04618c97f8e83e8909e97d3f1793fff41277bb883885a8c9da8f";
+      name = "ktp-send-file-19.08.0.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktp-text-ui-19.04.3.tar.xz";
-      sha256 = "cf21be1ee61e5b4703feacab093f89aa66f126aba248b71111281513ba65661a";
-      name = "ktp-text-ui-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-text-ui-19.08.0.tar.xz";
+      sha256 = "1858215d519efdcf4a0e4ef771e0d0a33f7c918ce2b70fbc95a56b61d240855a";
+      name = "ktp-text-ui-19.08.0.tar.xz";
     };
   };
   ktuberling = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/ktuberling-19.04.3.tar.xz";
-      sha256 = "7abc2254d7a5c594e021807172486dfd93cfbda827a1b41583f8b1977a1a4f21";
-      name = "ktuberling-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktuberling-19.08.0.tar.xz";
+      sha256 = "ca751ad3cc06475955fa9cb037a1a60539f59b7e3d22aa7d47e9fd4f2771cd5f";
+      name = "ktuberling-19.08.0.tar.xz";
     };
   };
   kturtle = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kturtle-19.04.3.tar.xz";
-      sha256 = "811df4d31b920a2b3a6a0420df68e97e68b4226defd97d264f0b0b05c775c469";
-      name = "kturtle-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kturtle-19.08.0.tar.xz";
+      sha256 = "0e7453e785344a792747b5d51d2c4a190d41e87ddf7e0a9ea49d107a2dd03db8";
+      name = "kturtle-19.08.0.tar.xz";
     };
   };
   kubrick = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kubrick-19.04.3.tar.xz";
-      sha256 = "ee2932136e6bb7c9b03d0014c6ec845fb789668035ef22b2235dad23e6a5e4c7";
-      name = "kubrick-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kubrick-19.08.0.tar.xz";
+      sha256 = "3a69a6d9a519db9fd25793d532da561a77e7033d71cd3dc67d0ee48c332b71c3";
+      name = "kubrick-19.08.0.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kwalletmanager-19.04.3.tar.xz";
-      sha256 = "b7eafd7ce252396bba0609d4114f88e0d1956e9f0f7f9703000eadda0cd7cc0e";
-      name = "kwalletmanager-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kwalletmanager-19.08.0.tar.xz";
+      sha256 = "aaf6c646cc8e7387dc034636fb94029fc0fda3c7fc89b6b633dc42349fd0a471";
+      name = "kwalletmanager-19.08.0.tar.xz";
     };
   };
   kwave = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kwave-19.04.3.tar.xz";
-      sha256 = "dc9ad96a59b4bab1cd8f04401b3d87883cf888711898fdfc20d96113faf92431";
-      name = "kwave-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kwave-19.08.0.tar.xz";
+      sha256 = "60f5408e9a67e934c67332b9a9643513f35946796d1ccf70369e411f804b1043";
+      name = "kwave-19.08.0.tar.xz";
     };
   };
   kwordquiz = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/kwordquiz-19.04.3.tar.xz";
-      sha256 = "fc1a5a4780f667a805c17bda05d7024702d20d0e6aa552a0b7b6840b6e6cb381";
-      name = "kwordquiz-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kwordquiz-19.08.0.tar.xz";
+      sha256 = "ed4278c1ca0e6e7da548e563a4248fa9e0ff0707b67e06e53ae26dbc2069fc71";
+      name = "kwordquiz-19.08.0.tar.xz";
     };
   };
   libgravatar = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libgravatar-19.04.3.tar.xz";
-      sha256 = "23f8d50c5831ec1df995d6d711a590eb4f7de2823971ea5692aea50707c54bea";
-      name = "libgravatar-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libgravatar-19.08.0.tar.xz";
+      sha256 = "f8dd753abdc868623b878433c0b2ed53d4d4ab2cb62c69cb94c433e51cb713a9";
+      name = "libgravatar-19.08.0.tar.xz";
     };
   };
   libkcddb = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkcddb-19.04.3.tar.xz";
-      sha256 = "6471261ffef0e1546317040c4275a6fc11c131fde7229b5d0c9358a40442bec3";
-      name = "libkcddb-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkcddb-19.08.0.tar.xz";
+      sha256 = "f97b90660bfd403aa64be8e6221a89087f74ab443431a9f692fe14cc90d82151";
+      name = "libkcddb-19.08.0.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkcompactdisc-19.04.3.tar.xz";
-      sha256 = "9294aa908f158437241e27d57f924a2b7a07aa4203a51b83566de8c9690e86bc";
-      name = "libkcompactdisc-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkcompactdisc-19.08.0.tar.xz";
+      sha256 = "cc940df2a1e499965fe05b466c60014082d205f0ae606562980e6088d714eac5";
+      name = "libkcompactdisc-19.08.0.tar.xz";
     };
   };
   libkdcraw = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkdcraw-19.04.3.tar.xz";
-      sha256 = "5017a47a76346e183e57617e093d5b61780bf564df55a07d02b1d75e2ff98c2d";
-      name = "libkdcraw-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkdcraw-19.08.0.tar.xz";
+      sha256 = "5c00a6f28445ba5a45284c3cee0ee3f158ad9e184fea5ee8adc83ac3000b26b1";
+      name = "libkdcraw-19.08.0.tar.xz";
     };
   };
   libkdegames = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkdegames-19.04.3.tar.xz";
-      sha256 = "187aa81539113bc6786d861e1f5302fa17533ae1108299bbd1a86be18accfbc4";
-      name = "libkdegames-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkdegames-19.08.0.tar.xz";
+      sha256 = "cb1135a86b373543410f3eb0677aed033bad2b8ef60130753c699338e0c22d1b";
+      name = "libkdegames-19.08.0.tar.xz";
     };
   };
   libkdepim = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkdepim-19.04.3.tar.xz";
-      sha256 = "d3719c533df0b0fe8800a7810ee39f108d8408b909e5fb583ee2ab7ed4b4a6e9";
-      name = "libkdepim-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkdepim-19.08.0.tar.xz";
+      sha256 = "4ff394bda799ebe700d12d60ab8171c64e054c6acb105870cd955b5ddce42eab";
+      name = "libkdepim-19.08.0.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkeduvocdocument-19.04.3.tar.xz";
-      sha256 = "e0e229607c47b5da028588b9a22ffe41cf3e35d7e4f849eb109d9ce6c537277d";
-      name = "libkeduvocdocument-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkeduvocdocument-19.08.0.tar.xz";
+      sha256 = "7b0314bc1f06a4ea4cbb4b4b203a9a0f4a0370f355f8def4398dc452075f6fcf";
+      name = "libkeduvocdocument-19.08.0.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkexiv2-19.04.3.tar.xz";
-      sha256 = "b0c5da0e23e93a218f7e96f98a753b36e2d608e74ac68c687ae868b6de99d1e6";
-      name = "libkexiv2-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkexiv2-19.08.0.tar.xz";
+      sha256 = "42bb1a8b69efbb4ab8b1d939279d3eb02b2d8030bcb917739f4f61fb5a10db15";
+      name = "libkexiv2-19.08.0.tar.xz";
     };
   };
   libkgapi = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkgapi-19.04.3.tar.xz";
-      sha256 = "0fa879280979775523f258c80ec17c58045f812cbc6961b994ab78974a75afac";
-      name = "libkgapi-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkgapi-19.08.0.tar.xz";
+      sha256 = "bc8a54e0997f4e3e0e840e350c6a9dee26582028415c5e9863d53a3280faa9f6";
+      name = "libkgapi-19.08.0.tar.xz";
     };
   };
   libkgeomap = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkgeomap-19.04.3.tar.xz";
-      sha256 = "9266af7950b4cd73b694d61cf7bc0d03fc27d2bde3015f4c698e6d5d480d17bd";
-      name = "libkgeomap-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkgeomap-19.08.0.tar.xz";
+      sha256 = "267c3bb6d033dcbcfabb6822eebc69410de2d13b792ce62af47034bbcf3a5e54";
+      name = "libkgeomap-19.08.0.tar.xz";
     };
   };
   libkipi = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkipi-19.04.3.tar.xz";
-      sha256 = "7da2a62e719b27221a74232375c907087be9a53b90fce0f7d36cbc11d7c13f7c";
-      name = "libkipi-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkipi-19.08.0.tar.xz";
+      sha256 = "94b184c3128fe7ded9e816e2a6124ee0dcf016b1325636dd41b157866b461989";
+      name = "libkipi-19.08.0.tar.xz";
     };
   };
   libkleo = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkleo-19.04.3.tar.xz";
-      sha256 = "6c4ad79234c8a3cbe5cb0b5a6e7a11ccec98c5c5058bd970e44419ccab8663de";
-      name = "libkleo-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkleo-19.08.0.tar.xz";
+      sha256 = "a0a022f3da4d8f73c020ab55221c74d5c1590b2cbdb3b754218be17622a59cc6";
+      name = "libkleo-19.08.0.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkmahjongg-19.04.3.tar.xz";
-      sha256 = "995f10fc62c506dbbb31bdab635fd52cb08e03eb09c859353aaf3423f48c7381";
-      name = "libkmahjongg-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkmahjongg-19.08.0.tar.xz";
+      sha256 = "b51aea6773b609cc1c3a297e72e15b7b504c2877938030e1afac86319e855694";
+      name = "libkmahjongg-19.08.0.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libkomparediff2-19.04.3.tar.xz";
-      sha256 = "35f45f48c9c6afb32ade11985ca9e886e8f77a7428e2ce6650e119c3f29ce9b7";
-      name = "libkomparediff2-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkomparediff2-19.08.0.tar.xz";
+      sha256 = "d86765e6514bdcf838ed36ae5968f9b2b7cb2e74f4fe884ae87f58b9bcc963fe";
+      name = "libkomparediff2-19.08.0.tar.xz";
     };
   };
   libksane = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libksane-19.04.3.tar.xz";
-      sha256 = "ec9c0a969806fefcefc0fda2e227bf0908e2b338fdf3377870a910d7f041e1e0";
-      name = "libksane-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libksane-19.08.0.tar.xz";
+      sha256 = "62c670c316a47facbd0beedb0fcc35247fbbd285892a90ab06ebb8f74b8a6329";
+      name = "libksane-19.08.0.tar.xz";
     };
   };
   libksieve = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/libksieve-19.04.3.tar.xz";
-      sha256 = "5853f1b3764872a26b21064f8c23dd4ec66e453648c1aefa510f22af780e3289";
-      name = "libksieve-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libksieve-19.08.0.tar.xz";
+      sha256 = "48d0925a8dd0adfa6ccd4945b14e2e562b8855faa6bed43de0442a273fd41966";
+      name = "libksieve-19.08.0.tar.xz";
     };
   };
   lokalize = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/lokalize-19.04.3.tar.xz";
-      sha256 = "ec8c552a176d131140273f975958e29f3a476c840cab0c470db072cc850e85c8";
-      name = "lokalize-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/lokalize-19.08.0.tar.xz";
+      sha256 = "bb51159c803890af82a38e5a4bd4df0895cc34ed68fa8ed3a4c66adafc9ea6b6";
+      name = "lokalize-19.08.0.tar.xz";
     };
   };
   lskat = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/lskat-19.04.3.tar.xz";
-      sha256 = "4e31cbad9534838c3fe380fd1326f56158dcc2b3a63a1e4c05529dcc9fc9b703";
-      name = "lskat-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/lskat-19.08.0.tar.xz";
+      sha256 = "b321f58772eab7f569c76ff4afb56b1e3324dc5febf45bf5ed90993cf38696b5";
+      name = "lskat-19.08.0.tar.xz";
     };
   };
   mailcommon = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/mailcommon-19.04.3.tar.xz";
-      sha256 = "b38a23d2d59fed22dfcabeb9430b962c021fd62fd7e48d12ad3610b4d3a162fa";
-      name = "mailcommon-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/mailcommon-19.08.0.tar.xz";
+      sha256 = "6c69b70356d9d96578c3fd472aaa36e33feb0677d7e65c36981c0596daf3aea3";
+      name = "mailcommon-19.08.0.tar.xz";
     };
   };
   mailimporter = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/mailimporter-19.04.3.tar.xz";
-      sha256 = "17483bf5d57936179f13abcee347aadadcc17d2cf40c1e2a3b5f2b6d85db87ec";
-      name = "mailimporter-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/mailimporter-19.08.0.tar.xz";
+      sha256 = "242f1a93b3521abc68ca8e1abfc75acd0b59e1e2d553df80a057645102246dd7";
+      name = "mailimporter-19.08.0.tar.xz";
     };
   };
   marble = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/marble-19.04.3.tar.xz";
-      sha256 = "b2451d338bf433d5a0211c954f48fb5c6c80fecbb8fa69d604276fecb45fe826";
-      name = "marble-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/marble-19.08.0.tar.xz";
+      sha256 = "c1c951a1357c94a61b38f0ae8a1235d194150cd351dbf25d2db3508b22b44cc1";
+      name = "marble-19.08.0.tar.xz";
     };
   };
   mbox-importer = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/mbox-importer-19.04.3.tar.xz";
-      sha256 = "68160ddd977c7f8f771b2934e57ec15042508a92461ca9d233312546d8d2c537";
-      name = "mbox-importer-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/mbox-importer-19.08.0.tar.xz";
+      sha256 = "e03fd814c70b15fca3b5dd2cde1dcece436b831ceb04323d7ffcca66daf3ce1c";
+      name = "mbox-importer-19.08.0.tar.xz";
     };
   };
   messagelib = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/messagelib-19.04.3.tar.xz";
-      sha256 = "c97f88152593a031415148daa31384c56964973d4291aa86a892b2776333e223";
-      name = "messagelib-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/messagelib-19.08.0.tar.xz";
+      sha256 = "0797b11452874a1d8264f92e8cc6d6977f3b0416dc66ff558b124bf2a52b118d";
+      name = "messagelib-19.08.0.tar.xz";
     };
   };
   minuet = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/minuet-19.04.3.tar.xz";
-      sha256 = "6d4614b7b42391c8b68627b879f61f59c22942ff1b340a25f75d90e296cdeb33";
-      name = "minuet-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/minuet-19.08.0.tar.xz";
+      sha256 = "3827a7e8dd3c48e12521fd0aa76eccbeaf9f2627935f19647f2147e87db63554";
+      name = "minuet-19.08.0.tar.xz";
     };
   };
   okular = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/okular-19.04.3.tar.xz";
-      sha256 = "87ab5ffd852109d549d021b8fe94b9a4de212b2f164e9cc796b144732ff94282";
-      name = "okular-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/okular-19.08.0.tar.xz";
+      sha256 = "721a0d02d5ff9277c4a9a13dbde0ede3528eff848622e83abc36d57d9759b3ec";
+      name = "okular-19.08.0.tar.xz";
     };
   };
   palapeli = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/palapeli-19.04.3.tar.xz";
-      sha256 = "7cbf7a1666e16a476de9bdab7155f17f2224baa7db9d80cd77c785dead6f2e10";
-      name = "palapeli-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/palapeli-19.08.0.tar.xz";
+      sha256 = "fcdefb41685728cd9e01cc3249d2676a589f61a611e32c2e1a2e3d4d30721dde";
+      name = "palapeli-19.08.0.tar.xz";
     };
   };
   parley = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/parley-19.04.3.tar.xz";
-      sha256 = "4c4aeaae4f1dd4193c422c5921d9cf02216fc6670f5077fcd92b4d48378fa720";
-      name = "parley-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/parley-19.08.0.tar.xz";
+      sha256 = "d3c8f8e7ceee62ffa9b95dbf539a509260b5f759fadd136a966d90a67e8a94a4";
+      name = "parley-19.08.0.tar.xz";
     };
   };
   picmi = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/picmi-19.04.3.tar.xz";
-      sha256 = "1e47527b49f8d94da0a6ea492d23215ae7ff3fcb403116abe43665efb567beab";
-      name = "picmi-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/picmi-19.08.0.tar.xz";
+      sha256 = "1d7a6152b05ad22f98762a5a6cd96edbc03ae63bdbc0154f387dc5cce31243eb";
+      name = "picmi-19.08.0.tar.xz";
     };
   };
   pimcommon = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/pimcommon-19.04.3.tar.xz";
-      sha256 = "b979ba19d0c5c7d4f218992bfe434fdc9b49bd8cfdee0d25e4c44bbddc793fee";
-      name = "pimcommon-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/pimcommon-19.08.0.tar.xz";
+      sha256 = "23be57010127831c3ad9b9475e467e8078ff92410c80609660498c5dc6fbaf9a";
+      name = "pimcommon-19.08.0.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/pim-data-exporter-19.04.3.tar.xz";
-      sha256 = "33bc76f798849b4421563d3d7989ae72182ad75573e176469e785d08a867b653";
-      name = "pim-data-exporter-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/pim-data-exporter-19.08.0.tar.xz";
+      sha256 = "f5ff68dcbad1df7ea132b409b70b9b4269badb26e28b4b7cd50239172507f7d8";
+      name = "pim-data-exporter-19.08.0.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/pim-sieve-editor-19.04.3.tar.xz";
-      sha256 = "331eff69a144cb7f71bba2533bd2690f26bfb56adb796dc1adaa9c5f41db4e09";
-      name = "pim-sieve-editor-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/pim-sieve-editor-19.08.0.tar.xz";
+      sha256 = "1ea0cc219d6776968d81ff1a606a9a11e1714f864fda9f00a13a5d7c84b45b46";
+      name = "pim-sieve-editor-19.08.0.tar.xz";
     };
   };
   poxml = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/poxml-19.04.3.tar.xz";
-      sha256 = "844ccecc8db4c6da4b84a4829cdd1961603a09fd5ee18dfda73a9def78addefe";
-      name = "poxml-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/poxml-19.08.0.tar.xz";
+      sha256 = "82393645a5f97890bba866554c0e05d7b216f0ed7eafea00fe1c2708ac12e0b2";
+      name = "poxml-19.08.0.tar.xz";
     };
   };
   print-manager = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/print-manager-19.04.3.tar.xz";
-      sha256 = "5ab32527d6916c1063bf175a1515a0cebb0dfb93844881c4339b2ee690697907";
-      name = "print-manager-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/print-manager-19.08.0.tar.xz";
+      sha256 = "56fe89f6bc3be64848adee20a22c712ba8f72602e28fb3288cd5328797e32c7b";
+      name = "print-manager-19.08.0.tar.xz";
     };
   };
   rocs = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/rocs-19.04.3.tar.xz";
-      sha256 = "eec0f7ab55f81946dafa2e31ee92a2bec5c1727e64bdeb8e7566c61f66e53d01";
-      name = "rocs-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/rocs-19.08.0.tar.xz";
+      sha256 = "2e9346781bb6198a3fb3c3357ef796c0e86fdd104146de87a481619d3cbe78fe";
+      name = "rocs-19.08.0.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/signon-kwallet-extension-19.04.3.tar.xz";
-      sha256 = "bddf5fe036b95769ad9ff02a9583b7f96280e9a48db4abc92f98e4d163f7daa9";
-      name = "signon-kwallet-extension-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/signon-kwallet-extension-19.08.0.tar.xz";
+      sha256 = "f8cd646365f82c82de6c9f2dda8250579a2e469504e4358a334786f8f8e8b61f";
+      name = "signon-kwallet-extension-19.08.0.tar.xz";
     };
   };
   spectacle = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/spectacle-19.04.3.tar.xz";
-      sha256 = "bbf2c17298608dc69139f1f0a07de05b724d83cf57e8fe085a376723d83d15d1";
-      name = "spectacle-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/spectacle-19.08.0.tar.xz";
+      sha256 = "8ada4f765f81ee496f9fd00b74764690df9c479e343a035e363f7159f93c35a4";
+      name = "spectacle-19.08.0.tar.xz";
     };
   };
   step = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/step-19.04.3.tar.xz";
-      sha256 = "a9b2daff1c9821e9c0fa79d39fc15b96753a3d0c61863d76d07e4e3222b0a4a2";
-      name = "step-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/step-19.08.0.tar.xz";
+      sha256 = "7a2dc38617822c8118c721ccaaa9907ec3e109eacf57e46b599c6731b325a993";
+      name = "step-19.08.0.tar.xz";
     };
   };
   svgpart = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/svgpart-19.04.3.tar.xz";
-      sha256 = "5dd870a24f275b6d8e0ec9593da713c29b521234d1eb07415726d57ae3fb8dc5";
-      name = "svgpart-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/svgpart-19.08.0.tar.xz";
+      sha256 = "7e1f4b3f8807e996b2acb496971bd7ebcb1e456ac090e269e42d15fce629858d";
+      name = "svgpart-19.08.0.tar.xz";
     };
   };
   sweeper = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/sweeper-19.04.3.tar.xz";
-      sha256 = "03b0ed0006da9a9ee02b9e3201e4974444fba00a5a59fc14ca179656eeb86aaf";
-      name = "sweeper-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/sweeper-19.08.0.tar.xz";
+      sha256 = "3cab8817b5c52bd0064e49e6062d3295328604d96e355779a766075d5ae10764";
+      name = "sweeper-19.08.0.tar.xz";
     };
   };
   umbrello = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/umbrello-19.04.3.tar.xz";
-      sha256 = "a507f31087c0103873e78004bc47b632d8cd7cdda2734e342a19da48d0c3780c";
-      name = "umbrello-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/umbrello-19.08.0.tar.xz";
+      sha256 = "8df6e0394670ee3f91f449a3110312a37876d3aa047442ed8439d8b876a6b0e2";
+      name = "umbrello-19.08.0.tar.xz";
+    };
+  };
+  yakuake = {
+    version = "19.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/19.08.0/src/yakuake-19.08.0.tar.xz";
+      sha256 = "f0931fffbcd6f17687f13ab766e628961c6caf6dcf8cad79f6e311a0b5692a49";
+      name = "yakuake-19.08.0.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "19.04.3";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.3/src/zeroconf-ioslave-19.04.3.tar.xz";
-      sha256 = "83c6fa651c6601c9b5e4f085e34fa0de5e88dda2420f95e88996ffad11303d7f";
-      name = "zeroconf-ioslave-19.04.3.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/zeroconf-ioslave-19.08.0.tar.xz";
+      sha256 = "0fbe1e0d1c30cc570d96e6a5aa12692bd8e5d11bfd4b9af5077f4c5e80c8f183";
+      name = "zeroconf-ioslave-19.08.0.tar.xz";
     };
   };
 }

From 2ac1e31aeaa6b9b6405091ea6bae3fc190a0af53 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 16 Aug 2019 10:16:18 +0200
Subject: [PATCH 070/794] kde_applications: disable obsolete patches

---
 pkgs/applications/kde/ark/default.nix | 10 +---------
 pkgs/applications/kde/kate.nix        | 10 +---------
 pkgs/applications/kde/kmail.nix       | 12 ++----------
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 96332cc9168..6015cb69d77 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, config, fetchpatch,
+  mkDerivation, lib, config,
 
   extra-cmake-modules, kdoctools,
 
@@ -27,14 +27,6 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
 
-  patches = [
-    # This patch should be backported in 19.04.4 KDE applications
-    (fetchpatch {
-      url = "https://cgit.kde.org/ark.git/patch/?id=7065c5390c78c2b18807721490f19c62761220e5";
-      sha256 = "0sipw5z60gk6l025rk4xsbc10n3bvv9743f4cbvf6hyy4mbm4p1m";
-    })
-  ];
-
   outputs = [ "out" "dev" ];
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ libarchive libzip ] ++ extraTools;
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index 7051bac404b..95ff6cf198b 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchpatch,
+  mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
@@ -14,14 +14,6 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
 
-  patches = [
-    # This patch should be backported in 19.04.4 KDE applications
-    (fetchpatch {
-      url = "https://cgit.kde.org/kate.git/patch/?id=76ec8b55a86a29a90125b2ff3f512df007789cb1";
-      sha256 = "1q0bkb6vl4xvh4aba1rlqii4a75pvl7vbcs4plny8lalzslnbzhj";
-    })
-  ];
-
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ libgit2 ];
   propagatedBuildInputs = [
diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
index b08444f18bb..a58b3b8c45d 100644
--- a/pkgs/applications/kde/kmail.nix
+++ b/pkgs/applications/kde/kmail.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, kdepimTeam, fetchpatch,
+  mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
   kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim,
@@ -26,13 +26,5 @@ mkDerivation {
     libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
   ];
   propagatedUserEnvPkgs = [ kdepim-runtime kwallet ];
-  patches = [
-    ./kmail.patch
-
-    # This patch should be backported in 19.04.4 KDE applications
-    (fetchpatch {
-      url = "https://cgit.kde.org/kmail.git/patch/?id=28a8cf907b3cd903aef0b963314df219afc6b66a";
-      sha256 = "1gr94zmxnyhhyqjhcmm8aykvmf15pmn751cvdh4ll59rzbra8h0n";
-    })
-  ];
+  patches = [ ./kmail.patch ];
 }

From fc7f5e7c5530844e6e28dd4cddb2d96314cac091 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 16 Aug 2019 10:31:50 +0200
Subject: [PATCH 071/794] yakuake: move to kde_applications

---
 pkgs/applications/kde/default.nix          |  1 +
 pkgs/applications/kde/yakuake.nix          | 32 ++++++++++
 pkgs/applications/misc/yakuake/default.nix | 69 ----------------------
 pkgs/top-level/all-packages.nix            |  6 +-
 4 files changed, 34 insertions(+), 74 deletions(-)
 create mode 100644 pkgs/applications/kde/yakuake.nix
 delete mode 100644 pkgs/applications/misc/yakuake/default.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 01df2bd2631..44d9293047f 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -171,6 +171,7 @@ let
       pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
       print-manager = callPackage ./print-manager.nix {};
       spectacle = callPackage ./spectacle.nix {};
+      yakuake = callPackage ./yakuake.nix {};
       # Okteta was removed from kde applications and will now be released independently
       # Lets keep an alias for compatibility reasons
       inherit okteta;
diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix
new file mode 100644
index 00000000000..6f9c8df3001
--- /dev/null
+++ b/pkgs/applications/kde/yakuake.nix
@@ -0,0 +1,32 @@
+{
+  mkDerivation, lib, kdoctools, extra-cmake-modules,
+  karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications,
+  knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras
+}:
+
+mkDerivation {
+  name = "yakuake";
+
+  buildInputs = [
+    karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
+    knotifyconfig kparts kwindowsystem qtx11extras
+  ];
+
+  propagatedBuildInputs = [
+    karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
+    knotifyconfig kparts kwindowsystem
+  ];
+
+  propagatedUserEnvPkgs = [ konsole ];
+
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools
+  ];
+
+  meta = {
+    homepage = https://yakuake.kde.org;
+    description = "Quad-style terminal emulator for KDE";
+    maintainers = with lib.maintainers; [ fridh ];
+    license = lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
deleted file mode 100644
index a3d32f1597f..00000000000
--- a/pkgs/applications/misc/yakuake/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ mkDerivation
-, lib
-, fetchurl
-, kdoctools
-, wrapGAppsHook
-, extra-cmake-modules
-, karchive
-, kcrash
-, kdbusaddons
-, ki18n
-, kiconthemes
-, knewstuff
-, knotifications
-, knotifyconfig
-, konsole
-, kparts
-, kwindowsystem
-, qtx11extras
-}:
-
-mkDerivation rec {
-  pname = "yakuake";
-  version = "3.0.5";
-
-    src = fetchurl {
-      url = "http://download.kde.org/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
-      sha256 = "021a9mnghffv2mrdl987mn7wbg8bk6bnf6xz8kn2nwsqxp9kpqh8";
-    };
-
-    buildInputs = [
-      karchive
-      kcrash
-      kdbusaddons
-      ki18n
-      kiconthemes
-      knewstuff
-      knotifications
-      knotifyconfig
-      kparts
-      kwindowsystem
-      qtx11extras
-    ];
-
-  propagatedBuildInputs = [
-    karchive
-    kcrash
-    kdbusaddons
-    ki18n
-    kiconthemes
-    knewstuff
-    knotifications
-    knotifyconfig
-    kparts
-    kwindowsystem
-  ];
-
-  propagatedUserEnvPkgs = [ konsole ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools wrapGAppsHook
-  ];
-
-  meta = {
-    homepage = https://yakuake.kde.org;
-    description = "Quad-style terminal emulator for KDE";
-    maintainers = with lib.maintainers; [ fridh ];
-    license = lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14e313e6c4c..de1d645fa3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18978,7 +18978,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b
     kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog
-    keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole
+    keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
@@ -21571,10 +21571,6 @@ in
 
   yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { };
 
-  yakuake = libsForQt5.callPackage ../applications/misc/yakuake {
-    inherit (kdeApplications) konsole;
-  };
-
   yarp = callPackage ../applications/science/robotics/yarp {};
 
   yarssr = callPackage ../applications/misc/yarssr { };

From 6d5a90a111912cb6e533ae05f0cf902c4dcbe5ff Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 16 Aug 2019 10:32:16 +0200
Subject: [PATCH 072/794] kipi-plugins: move to kde_applications

---
 .../graphics/kipi-plugins/default.nix         | 30 -------------------
 pkgs/applications/kde/default.nix             |  1 +
 pkgs/applications/kde/kipi-plugins.nix        | 23 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 24 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/applications/graphics/kipi-plugins/default.nix
 create mode 100644 pkgs/applications/kde/kipi-plugins.nix

diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
deleted file mode 100644
index de51422d1da..00000000000
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  stdenv, fetchurl,
-  extra-cmake-modules,
-  karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
-  libkipi, qtbase, qtsvg, qtxmlpatterns
-}:
-
-stdenv.mkDerivation rec {
-  pname    = "kipi-plugins";
-  version = "5.9.1";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0hjm05nkz0w926sn4lav5258rda6zkd6gfnqd8hh3fa2q0dd7cq4";
-  };
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
-    qtbase qtsvg qtxmlpatterns
-  ];
-
-  meta = {
-    description = "Plugins for KDE-based image applications";
-    license = stdenv.lib.licenses.gpl2;
-    homepage = https://www.digikam.org;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 44d9293047f..f21d14f94a1 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -116,6 +116,7 @@ let
       kidentitymanagement = callPackage ./kidentitymanagement.nix {};
       kig = callPackage ./kig.nix {};
       kimap = callPackage ./kimap.nix {};
+      kipi-plugins = callPackage ./kipi-plugins.nix {};
       kitinerary = callPackage ./kitinerary.nix {};
       kio-extras = callPackage ./kio-extras.nix {};
       kldap = callPackage ./kldap.nix {};
diff --git a/pkgs/applications/kde/kipi-plugins.nix b/pkgs/applications/kde/kipi-plugins.nix
new file mode 100644
index 00000000000..5fb953acbd6
--- /dev/null
+++ b/pkgs/applications/kde/kipi-plugins.nix
@@ -0,0 +1,23 @@
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
+  libkipi, qtbase, qtsvg, qtxmlpatterns
+}:
+
+mkDerivation {
+  name    = "kipi-plugins";
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
+    qtbase qtsvg qtxmlpatterns
+  ];
+
+  meta = {
+    description = "Plugins for KDE-based image applications";
+    license = lib.licenses.gpl2;
+    homepage = https://cgit.kde.org/kipi-plugins.git;
+    maintainers = with lib.maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de1d645fa3a..ef46b185dde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19031,8 +19031,6 @@ in
     ffmpeg = ffmpeg_2;
   };
 
-  kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { };
-
   kitty = callPackage ../applications/misc/kitty {
     harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;

From 3400620cc37aad3cabb37d68ae23e4481e425d77 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 16 Aug 2019 13:52:03 +0200
Subject: [PATCH 073/794] akonadi: update patch akonadi-paths

Version 19.08 introduce a new mPgUpgradePath variable.
I applied what was done for the mServerPath variable.
---
 ...adi-installation-properly-relocatabl.patch |  31 +++--
 .../kde/akonadi/akonadi-paths.patch           | 109 ++++++++----------
 .../kde/akonadi/akonadi-timestamps.patch      |   8 +-
 pkgs/applications/kde/akonadi/default.nix     |   1 +
 4 files changed, 67 insertions(+), 82 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
index 24ed20fd83f..c3964c5c05b 100644
--- a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
+++ b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
@@ -9,11 +9,11 @@ This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a.
  KF5AkonadiConfig.cmake.in | 6 +++---
  2 files changed, 3 insertions(+), 6 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9788bea94..15bad00fd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -285,9 +285,6 @@ configure_package_config_file(
+Index: akonadi-19.08.0/CMakeLists.txt
+===================================================================
+--- akonadi-19.08.0.orig/CMakeLists.txt
++++ akonadi-19.08.0/CMakeLists.txt
+@@ -306,9 +306,6 @@ configure_package_config_file(
      "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
      "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
      INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
@@ -23,13 +23,13 @@ index 9788bea94..15bad00fd 100644
  )
  
  install(FILES
-diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
-index 75abede50..10f039376 100644
---- a/KF5AkonadiConfig.cmake.in
-+++ b/KF5AkonadiConfig.cmake.in
-@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@")
- find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@")
- find_dependency(Qt5Network "@QT_REQUIRED_VERSION@")
+Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in
+===================================================================
+--- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in
++++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in
+@@ -26,8 +26,8 @@ if(BUILD_TESTING)
+     find_dependency(Qt5Test "@QT_REQUIRED_VERSION@")
+ endif()
  
 -set_and_check(AKONADI_DBUS_INTERFACES_DIR  "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
 -set_and_check(AKONADI_INCLUDE_DIR          "@PACKAGE_AKONADI_INCLUDE_DIR@")
@@ -38,15 +38,12 @@ index 75abede50..10f039376 100644
  
  find_dependency(Boost "@Boost_MINIMUM_VERSION@")
  
-@@ -22,7 +22,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
+@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako
  include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
  
  # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
 -set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
 +set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
-
+ 
  ####################################################################################
  # CMAKE_AUTOMOC
--- 
-2.15.1
-
diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index fcbbbbb72eb..ba6bbedeeae 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -1,8 +1,8 @@
-diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
-index d85c1a79b..8df02710c 100644
---- a/src/akonadicontrol/agentmanager.cpp
-+++ b/src/akonadicontrol/agentmanager.cpp
-@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent)
+Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp
++++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp
+@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose,
      mStorageController = new Akonadi::ProcessControl;
      mStorageController->setShutdownTimeout(15 * 1000);   // the server needs more time for shutdown if we are using an internal mysqld
      connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
@@ -17,11 +17,11 @@ index d85c1a79b..8df02710c 100644
      }
  }
  
-diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
-index be1cc4afb..6d0c1d7e5 100644
---- a/src/akonadicontrol/agentprocessinstance.cpp
-+++ b/src/akonadicontrol/agentprocessinstance.cpp
-@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
+Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp
++++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
+@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A
      } else {
          Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
          const QStringList arguments = QStringList() << executable << identifier();
@@ -30,11 +30,11 @@ index be1cc4afb..6d0c1d7e5 100644
          mController->start(agentLauncherExec, arguments);
      }
      return true;
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index dfff6fc29..419e54a5b 100644
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -82,7 +82,6 @@ bool DbConfigMysql::init(QSettings &settings)
+Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp
++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
+@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &sett
      // determine default settings depending on the driver
      QString defaultHostName;
      QString defaultOptions;
@@ -42,7 +42,7 @@ index dfff6fc29..419e54a5b 100644
      QString defaultCleanShutdownCommand;
  
  #ifndef Q_OS_WIN
-@@ -90,16 +89,7 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &sett
  #endif
  
      const bool defaultInternalServer = true;
@@ -59,8 +59,8 @@ index dfff6fc29..419e54a5b 100644
 +    const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
      if (!mysqladminPath.isEmpty()) {
  #ifndef Q_OS_WIN
-         defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
-@@ -109,10 +99,10 @@ bool DbConfigMysql::init(QSettings &settings)
+         defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
+@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &sett
  #endif
      }
  
@@ -73,7 +73,7 @@ index dfff6fc29..419e54a5b 100644
      qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
  
      mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
-@@ -129,7 +119,7 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &sett
      mUserName = settings.value(QStringLiteral("User")).toString();
      mPassword = settings.value(QStringLiteral("Password")).toString();
      mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -82,7 +82,7 @@ index dfff6fc29..419e54a5b 100644
      mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
      settings.endGroup();
  
-@@ -139,9 +129,6 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &sett
          // intentionally not namespaced as we are the only one in this db instance when using internal mode
          mDatabaseName = QStringLiteral("akonadi");
      }
@@ -92,7 +92,7 @@ index dfff6fc29..419e54a5b 100644
  
      qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
  
-@@ -150,9 +137,6 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &sett
      settings.setValue(QStringLiteral("Name"), mDatabaseName);
      settings.setValue(QStringLiteral("Host"), mHostName);
      settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@@ -102,7 +102,7 @@ index dfff6fc29..419e54a5b 100644
      settings.setValue(QStringLiteral("StartServer"), mInternalServer);
      settings.endGroup();
      settings.sync();
-@@ -206,7 +190,7 @@ bool DbConfigMysql::startInternalServer()
+@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer(
  #endif
  
      // generate config file
@@ -111,56 +111,35 @@ index dfff6fc29..419e54a5b 100644
      const QString localConfig  = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
      const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
      if (globalConfig.isEmpty()) {
-diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
-index 6b50ae50e..f94a8c5eb 100644
---- a/src/server/storage/dbconfigpostgresql.cpp
-+++ b/src/server/storage/dbconfigpostgresql.cpp
-@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
+Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/server/storage/dbconfigpostgresql.cpp
++++ akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
+@@ -140,9 +140,7 @@ bool DbConfigPostgresql::init(QSettings
      // determine default settings depending on the driver
      QString defaultHostName;
      QString defaultOptions;
 -    QString defaultServerPath;
      QString defaultInitDbPath;
+-    QString defaultPgUpgradePath;
      QString defaultPgData;
  
-@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
+ #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
+@@ -153,12 +151,8 @@ bool DbConfigPostgresql::init(QSettings
  
      mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
      if (mInternalServer) {
--        QStringList postgresSearchPath;
+-        const auto paths = postgresSearchPaths(QStringLiteral("/usr/lib/postgresql"));
 -
--#ifdef POSTGRES_PATH
--        const QString dir(QStringLiteral(POSTGRES_PATH));
--        if (QDir(dir).exists()) {
--            postgresSearchPath << QStringLiteral(POSTGRES_PATH);
--        }
--#endif
--        postgresSearchPath << QStringLiteral("/usr/bin")
--                           << QStringLiteral("/usr/sbin")
--                           << QStringLiteral("/usr/local/sbin");
--        // Locale all versions in /usr/lib/postgresql (i.e. /usr/lib/postgresql/X.Y) in reversed
--        // sorted order, so we search from the newest one to the oldest.
--        QStringList postgresVersionedSearchPaths;
--        QDir versionedDir(QStringLiteral("/usr/lib/postgresql"));
--        if (versionedDir.exists()) {
--            const auto versionedDirs = versionedDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed);
--            for (const auto &path : versionedDirs) {
--                // Don't break once PostgreSQL 10 is released, but something more future-proof will be needed
--                if (path.fileName().startsWith(QLatin1String("10."))) {
--                    postgresVersionedSearchPaths.prepend(path.absoluteFilePath() + QStringLiteral("/bin"));
--                } else {
--                    postgresVersionedSearchPaths.append(path.absoluteFilePath() + QStringLiteral("/bin"));
--                }
--            }
--        }
--        postgresSearchPath.append(postgresVersionedSearchPaths);
--        defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), postgresSearchPath);
--        defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), postgresSearchPath);
+-        defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), paths);
+-        defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), paths);
 +        defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
          defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
+-        defaultPgUpgradePath = QStandardPaths::findExecutable(QStringLiteral("pg_upgrade"), paths);
          defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
      }
-@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
+ 
+@@ -177,20 +171,14 @@ bool DbConfigPostgresql::init(QSettings
      mUserName = settings.value(QStringLiteral("User")).toString();
      mPassword = settings.value(QStringLiteral("Password")).toString();
      mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -172,7 +151,18 @@ index 6b50ae50e..f94a8c5eb 100644
      qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
      mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
      if (mInternalServer && mInitDbPath.isEmpty()) {
-@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
+         mInitDbPath = defaultInitDbPath;
+     }
+     qCDebug(AKONADISERVER_LOG) << "Found initdb:" << mServerPath;
+-    mPgUpgradePath = settings.value(QStringLiteral("UpgradePath"), defaultPgUpgradePath).toString();
+-    if (mInternalServer && mPgUpgradePath.isEmpty()) {
+-        mPgUpgradePath = defaultPgUpgradePath;
+-    }
++    mPgUpgradePath = QLatin1String(NIXPKGS_POSTGRES_PG_UPGRADE);
+     qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
+     mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
+     if (mPgData.isEmpty()) {
+@@ -206,7 +194,6 @@ bool DbConfigPostgresql::init(QSettings
          settings.setValue(QStringLiteral("Port"), mHostPort);
      }
      settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@@ -180,6 +170,3 @@ index 6b50ae50e..f94a8c5eb 100644
      settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
      settings.setValue(QStringLiteral("StartServer"), mInternalServer);
      settings.endGroup();
--- 
-2.18.1
-
diff --git a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
index 25a835f5ba2..e299a6991f0 100644
--- a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
@@ -1,8 +1,8 @@
-Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
+Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
 ===================================================================
---- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
-+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
-@@ -229,8 +229,7 @@ bool DbConfigMysql::startInternalServer(
+--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp
++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
+@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer(
      bool confUpdate = false;
      QFile actualFile(actualConfig);
      // update conf only if either global (or local) is newer than actual
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index cba0b1e59e3..b9a96394a67 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -25,6 +25,7 @@ mkDerivation {
     ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"''
     ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"''
     ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
+    ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
     ''-DNIXPKGS_POSTGRES_INITDB=\"\"''
   ];
   preConfigure = ''

From a4fc84de44c4edad7fcf303944bcb874180c1bf3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 15 Aug 2019 17:50:28 +0200
Subject: [PATCH 074/794] rustc: 1.36.0 -> 1.37.0

---
 .../rust/{binaryBuild.nix => binary.nix}       |  2 ++
 pkgs/development/compilers/rust/bootstrap.nix  | 18 +++++++++---------
 pkgs/development/compilers/rust/rustc.nix      |  5 ++---
 3 files changed, 13 insertions(+), 12 deletions(-)
 rename pkgs/development/compilers/rust/{binaryBuild.nix => binary.nix} (98%)

diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binary.nix
similarity index 98%
rename from pkgs/development/compilers/rust/binaryBuild.nix
rename to pkgs/development/compilers/rust/binary.nix
index cb2fba96e18..acccc749686 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -60,6 +60,8 @@ rec {
       # are very hard to track down. For details, see
       # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943
     '';
+
+    setupHooks = ./setup-hook.sh;
   };
 
   cargo = stdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 973d17e1c7b..5cf48715dae 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
 let
   # Note: the version MUST be one version prior to the version we're
   # building
-  version = "1.35.0";
+  version = "1.36.0";
 
-  # fetch hashes by running `print-hashes.sh 1.34.2`
+  # fetch hashes by running `print-hashes.sh 1.36.0`
   hashes = {
-    i686-unknown-linux-gnu = "05337776b3645e4b8c8c7ced0bcd1615cf9ad1b9c8b3d0f333620e5401e31aee";
-    x86_64-unknown-linux-gnu = "cf600e2273644d8629ed57559c70ca8db4023fd0156346facca9ab3ad3e8f86c";
-    armv7-unknown-linux-gnueabihf = "8f0f32d8ddc6fb7bcb8f50ec5e694078799d93facbf135eec5bd9a8c94d0c11e";
-    aarch64-unknown-linux-gnu = "31e6da56e67838fd2874211ae896a433badf67c13a7b68481f1d5f7dedcc5952";
-    i686-apple-darwin = "6a45ae8db094c5f6c57c5594a00f1a92b08c444a7347a657b4033186d4f08b19";
-    x86_64-apple-darwin = "ac14b1c7dc330dcb53d8641d74ebf9b32aa8b03b9d650bcb9258030d8b10dbd6";
+    i686-unknown-linux-gnu = "9f95c3e96622a792858c8a1c9274fa63e6992370493b27c1ac7299a3bec5156d";
+    x86_64-unknown-linux-gnu = "15e592ec52f14a0586dcebc87a957e472c4544e07359314f6354e2b8bd284c55";
+    armv7-unknown-linux-gnueabihf = "798181a728017068f9eddfa665771805d97846cd87bddcd67e0fe27c8d082ceb";
+    aarch64-unknown-linux-gnu = "db78c24d93756f9fe232f081dbc4a46d38f8eec98353a9e78b9b164f9628042d";
+    i686-apple-darwin = "3dbc34fdea8bc030badf9c8b2572c09fd3f5369b59ac099fc521064b390b9e60";
+    x86_64-apple-darwin = "91f151ec7e24f5b0645948d439fc25172ec4012f0584dd16c3fb1acb709aa325";
   };
 
   platform =
@@ -35,7 +35,7 @@ let
      sha256 = hashes."${platform}";
   };
 
-in callPackage ./binaryBuild.nix
+in callPackage ./binary.nix
   { inherit version src platform;
     versionType = "bootstrap";
   }
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index d7776958390..78d276c1f16 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -17,11 +17,11 @@ let
   llvmShared = llvm_7.override { enableSharedLibraries = true; };
 in stdenv.mkDerivation rec {
   pname = "rustc";
-  version = "1.36.0";
+  version = "1.37.0";
 
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04";
+    sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj";
   };
 
   __darwinAllowLocalNetworking = true;
@@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
   # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656
   stripDebugList = [ "bin" ];
 
-
   NIX_LDFLAGS =
        # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
        optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"

From d945117959745f456e71cc837ae7ca8a86eedae3 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 16 Aug 2019 14:11:09 +0200
Subject: [PATCH 075/794] kcalc: add new MPFR dependency

---
 pkgs/applications/kde/kcalc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 3cb89cb4daa..4e2a308b17f 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   gmp, kconfig, kconfigwidgets, kcrash, kguiaddons, ki18n, kinit,
-  knotifications, kxmlgui,
+  knotifications, kxmlgui, mpfr,
 }:
 
 mkDerivation {
@@ -14,6 +14,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     gmp kconfig kconfigwidgets kcrash kguiaddons ki18n kinit knotifications
-    kxmlgui
+    kxmlgui mpfr
   ];
 }

From 5d0acaa67734d531faf3c0bccd44cfe472f229ac Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 16 Aug 2019 14:54:13 +0200
Subject: [PATCH 076/794] kpurpose: add missing kirigami2 dependency

---
 pkgs/development/libraries/kde-frameworks/purpose.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix
index 147c4123a10..1484b2d0489 100644
--- a/pkgs/development/libraries/kde-frameworks/purpose.nix
+++ b/pkgs/development/libraries/kde-frameworks/purpose.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib, extra-cmake-modules, qtbase
-, qtdeclarative, kconfig, kcoreaddons, ki18n, kio
+, qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2
 }:
 
 mkDerivation {
@@ -9,6 +9,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     qtbase qtdeclarative kconfig kcoreaddons 
-    ki18n kio
+    ki18n kio kirigami2
   ];
 }

From 1b820c24e3301930c281b2b3bafcc9397cc8acce Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 16 Aug 2019 14:54:58 +0200
Subject: [PATCH 077/794] pimcommon: add new kpurpose dependency

---
 pkgs/applications/kde/pimcommon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
index bbbcca13d98..cd9ff2528fa 100644
--- a/pkgs/applications/kde/pimcommon.nix
+++ b/pkgs/applications/kde/pimcommon.nix
@@ -4,7 +4,7 @@
   akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
   kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
   kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
-  kwallet, kwindowsystem, libkdepim, qtwebengine
+  kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
 }:
 
 mkDerivation {
@@ -17,7 +17,7 @@ mkDerivation {
   buildInputs = [
     akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets
     kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit
-    kwallet kwindowsystem libkdepim qtwebengine
+    kpurpose kwallet kwindowsystem libkdepim qtwebengine
   ];
   propagatedBuildInputs = [
     akonadi akonadi-contacts kconfig kcontacts kimap

From b7a828031238b0962cd91131eba50844ef401b93 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 16 Aug 2019 15:05:14 +0200
Subject: [PATCH 078/794] rustc: Provide compiler-rt sources

This is needed to build libprofiler_builtins now.

https://github.com/rust-lang/rust/commit/e59f0cc0d33f3098a883661227c0c14def403cfd#diff-daf9539767b10f18e1517f65cdc2e0e2
https://github.com/rust-lang-nursery/compiler-builtins/issues/295
---
 pkgs/development/compilers/rust/rustc.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 78d276c1f16..daf7af1babd 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,6 +1,6 @@
 { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
 , fetchurl, file, python2, tzdata, ps
-, llvm_7, darwin, git, cmake, rustPlatform
+, llvmPackages_7, darwin, git, cmake, rustPlatform
 , which, libffi, gdb
 , withBundledLLVM ? false
 }:
@@ -9,13 +9,17 @@ let
   inherit (stdenv.lib) optional optionalString;
   inherit (darwin.apple_sdk.frameworks) Security;
 
-  llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; };
-  llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; };
-  llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; };
+  llvmPackages = llvmPackages_7;
+
+  llvmSharedForBuild = pkgsBuildBuild.llvmPackages.llvm.override { enableSharedLibraries = true; };
+  llvmSharedForHost = pkgsBuildHost.llvmPackages.llvm.override { enableSharedLibraries = true; };
+  llvmSharedForTarget = pkgsBuildTarget.llvmPackages.llvm.override { enableSharedLibraries = true; };
 
   # For use at runtime
-  llvmShared = llvm_7.override { enableSharedLibraries = true; };
-in stdenv.mkDerivation rec {
+  llvmShared = llvmPackages.llvm.override { enableSharedLibraries = true; };
+in
+
+stdenv.mkDerivation rec {
   pname = "rustc";
   version = "1.37.0";
 
@@ -24,6 +28,12 @@ in stdenv.mkDerivation rec {
     sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj";
   };
 
+  # Provide the compiler-rt sources needed for profiling.
+  preConfigure = ''
+    mkdir src/llvm-project/compiler-rt
+    tar xf ${llvmPackages.compiler-rt.src} -C src/llvm-project/compiler-rt --strip-components=1
+  '';
+
   __darwinAllowLocalNetworking = true;
 
   # rustc complains about modified source files otherwise

From d6ab8baa1bba68800fa6b7b743a96011d2633ab3 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 16 Aug 2019 15:28:31 +0200
Subject: [PATCH 079/794] kde: add myself as maintainer

---
 pkgs/applications/kde/default.nix                     | 2 +-
 pkgs/desktops/plasma-5/default.nix                    | 2 +-
 pkgs/development/libraries/kde-frameworks/default.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index f21d14f94a1..6027d8daa9d 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -60,7 +60,7 @@ let
         inherit mkDerivation;
 
         # Team of maintainers assigned to the KDE PIM suite
-        kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];
+        kdepimTeam = with lib.maintainers; [ ttuegel vandenoever nyanloutre ];
       };
     in {
       akonadi = callPackage ./akonadi {};
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index d1bd9e957f7..07c6805c689 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -86,7 +86,7 @@ let
                 lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
               ];
               platforms = lib.platforms.linux;
-              maintainers = with lib.maintainers; [ ttuegel ];
+              maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
               homepage = http://www.kde.org;
             } // (args.meta or {});
           in
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 7745d78f8fc..e8a7aa7322f 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -77,7 +77,7 @@ let
               license = with lib.licenses; [
                 lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
               ];
-              maintainers = [ lib.maintainers.ttuegel ];
+              maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
               platforms = lib.platforms.linux;
             } // (args.meta or {});
 

From c814d72b517bb201c8bbbfc64e386c7023352886 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 13 Aug 2019 21:52:01 +0000
Subject: [PATCH 080/794] treewide: name -> pname

---
 pkgs/applications/altcoins/aeon/default.nix   |  3 ++-
 pkgs/applications/audio/abcde/default.nix     |  3 ++-
 pkgs/applications/audio/caudec/default.nix    |  3 ++-
 .../applications/audio/clementine/default.nix |  6 ++++--
 pkgs/applications/audio/ekho/default.nix      |  5 +++--
 pkgs/applications/audio/faust/faust1.nix      |  3 ++-
 pkgs/applications/audio/faust/faust2.nix      |  3 ++-
 .../default.nix                               |  3 ++-
 pkgs/applications/audio/gradio/default.nix    |  3 ++-
 .../audio/midisheetmusic/default.nix          |  3 ++-
 pkgs/applications/audio/mpc123/default.nix    |  5 +++--
 .../applications/audio/openmpt123/default.nix |  3 ++-
 pkgs/applications/audio/pmidi/default.nix     |  3 ++-
 pkgs/applications/audio/rhvoice/default.nix   |  3 ++-
 pkgs/applications/audio/sayonara/default.nix  |  3 ++-
 pkgs/applications/audio/spotify/default.nix   |  3 ++-
 .../audio/tree-from-tags/default.nix          |  3 ++-
 pkgs/applications/audio/uade123/default.nix   |  3 ++-
 pkgs/applications/audio/vmpk/default.nix      |  5 +++--
 .../display-managers/lightdm/gtk-greeter.nix  |  5 +++--
 .../display-managers/sddm/default.nix         |  3 ++-
 .../editors/emacs-modes/d/default.nix         |  3 ++-
 .../editors/emacs-modes/haskell/default.nix   |  3 ++-
 .../editors/emacs-modes/hsc3/default.nix      |  3 ++-
 .../emacs-modes/ido-ubiquitous/default.nix    |  3 ++-
 .../emacs-modes/markdown-mode/default.nix     |  3 ++-
 .../editors/emacs-modes/ocaml/default.nix     |  3 ++-
 .../rainbow-delimiters/default.nix            |  3 ++-
 .../editors/emacs-modes/rudel/default.nix     |  3 ++-
 .../editors/emacs-modes/s/default.nix         |  3 ++-
 .../editors/emacs-modes/tuareg/default.nix    |  3 ++-
 .../editors/emacs-modes/writegood/default.nix |  3 ++-
 pkgs/applications/editors/geany/default.nix   |  5 +++--
 pkgs/applications/editors/jedit/default.nix   |  3 ++-
 .../editors/kodestudio/default.nix            |  3 ++-
 .../applications/editors/netbeans/default.nix |  3 ++-
 pkgs/applications/editors/rstudio/default.nix |  5 +++--
 .../editors/standardnotes/default.nix         |  3 ++-
 pkgs/applications/editors/texmacs/darwin.nix  |  3 ++-
 .../graphics/awesomebump/default.nix          |  3 ++-
 .../graphics/draftsight/default.nix           |  3 ++-
 .../applications/graphics/fig2dev/default.nix |  3 ++-
 .../applications/graphics/gcolor2/default.nix |  3 ++-
 .../applications/graphics/gcolor3/default.nix |  3 ++-
 .../applications/graphics/guetzli/default.nix |  3 ++-
 .../graphics/synfigstudio/default.nix         |  6 ++++--
 .../graphics/unigine-valley/default.nix       |  3 ++-
 pkgs/applications/graphics/xfig/default.nix   |  3 ++-
 .../misc/asciiquarium/default.nix             |  3 ++-
 .../misc/bashSnippets/default.nix             |  3 ++-
 .../misc/bitcoinarmory/default.nix            |  3 ++-
 pkgs/applications/misc/cardpeek/default.nix   |  3 ++-
 pkgs/applications/misc/confclerk/default.nix  |  3 ++-
 pkgs/applications/misc/cura/stable.nix        |  3 ++-
 pkgs/applications/misc/curaengine/stable.nix  |  3 ++-
 .../misc/dfilemanager/default.nix             |  3 ++-
 pkgs/applications/misc/fetchmail/default.nix  |  3 ++-
 pkgs/applications/misc/gmrun/default.nix      |  5 +++--
 pkgs/applications/misc/gmtp/default.nix       |  3 ++-
 .../applications/misc/googleearth/default.nix |  3 ++-
 pkgs/applications/misc/gpg-mdp/default.nix    |  3 ++-
 pkgs/applications/misc/hubstaff/default.nix   |  3 ++-
 .../misc/keepass-plugins/keeagent/default.nix |  3 ++-
 .../keepass-plugins/keepasshttp/default.nix   |  3 ++-
 .../keepass-plugins/keepassrpc/default.nix    |  3 ++-
 pkgs/applications/misc/krusader/default.nix   |  5 +++--
 pkgs/applications/misc/lxterminal/default.nix |  3 ++-
 .../misc/masterpdfeditor/default.nix          |  3 ++-
 pkgs/applications/misc/nrsc5/default.nix      |  3 ++-
 pkgs/applications/misc/opentx/default.nix     |  3 ++-
 .../applications/misc/playonlinux/default.nix |  3 ++-
 pkgs/applications/misc/qdirstat/default.nix   |  3 ++-
 .../misc/qtbitcointrader/default.nix          |  3 ++-
 .../misc/redshift-plasma-applet/default.nix   |  3 ++-
 pkgs/applications/misc/roxterm/default.nix    |  5 +++--
 pkgs/applications/misc/subsurface/default.nix |  6 ++++--
 pkgs/applications/misc/synapse/default.nix    |  5 +++--
 pkgs/applications/misc/teseq/default.nix      |  3 ++-
 pkgs/applications/misc/tomboy/default.nix     |  3 ++-
 .../networking/browsers/otter/default.nix     |  3 ++-
 .../networking/cluster/hadoop/default.nix     |  3 ++-
 .../networking/cluster/kops/default.nix       |  3 ++-
 .../networking/cluster/kubecfg/default.nix    |  3 ++-
 .../networking/cluster/spark/default.nix      |  7 ++++---
 pkgs/applications/networking/dropbox/cli.nix  |  3 ++-
 .../instant-messengers/franz/default.nix      |  3 ++-
 .../instant-messengers/hipchat/default.nix    |  3 ++-
 .../pidgin-plugins/pidgin-latex/default.nix   |  3 ++-
 .../pidgin-plugins/pidgin-mra/default.nix     |  3 ++-
 .../pidgin-xmpp-receipts/default.nix          |  3 ++-
 .../pidgin-plugins/purple-matrix/default.nix  |  3 ++-
 .../purple-vk-plugin/default.nix              |  3 ++-
 .../telegram-purple/default.nix               |  3 ++-
 .../instant-messengers/qtox/default.nix       |  3 ++-
 .../instant-messengers/quaternion/default.nix |  3 ++-
 .../skypeforlinux/default.nix                 |  3 ++-
 .../instant-messengers/slack/default.nix      |  3 ++-
 .../vk-messenger/default.nix                  |  3 ++-
 .../instant-messengers/wavebox/default.nix    |  3 ++-
 .../instant-messengers/zoom-us/default.nix    |  3 ++-
 .../networking/mailreaders/lumail/default.nix |  3 ++-
 .../notmuch-addrlookup/default.nix            |  3 ++-
 .../networking/newsreaders/pan/default.nix    |  3 ++-
 .../networking/p2p/freenet/default.nix        |  3 ++-
 .../networking/protonmail-bridge/default.nix  |  3 ++-
 .../networking/spideroak/default.nix          |  3 ++-
 .../networking/super-productivity/default.nix |  3 ++-
 .../networking/tcpkali/default.nix            |  3 ++-
 .../office/impressive/default.nix             |  3 ++-
 .../office/libreoffice/default.nix            |  3 ++-
 .../applications/office/libreoffice/still.nix |  3 ++-
 pkgs/applications/office/mendeley/default.nix |  3 ++-
 pkgs/applications/office/mmex/default.nix     |  3 ++-
 pkgs/applications/office/mytetra/default.nix  |  3 ++-
 pkgs/applications/office/planner/default.nix  |  3 ++-
 .../office/todo.txt-cli/default.nix           |  3 ++-
 .../applications/office/wpsoffice/default.nix |  5 +++--
 pkgs/applications/radio/airspy/default.nix    |  3 ++-
 pkgs/applications/radio/gnuradio/limesdr.nix  |  3 ++-
 pkgs/applications/radio/limesuite/default.nix |  3 ++-
 .../radio/multimon-ng/default.nix             |  3 ++-
 .../applications/radio/qradiolink/default.nix |  3 ++-
 .../radio/soapyairspy/default.nix             |  3 ++-
 .../radio/soapybladerf/default.nix            |  3 ++-
 .../radio/soapyhackrf/default.nix             |  3 ++-
 .../radio/soapyremote/default.nix             |  3 ++-
 .../radio/soapyrtlsdr/default.nix             |  3 ++-
 pkgs/applications/radio/soapysdr/default.nix  |  3 ++-
 pkgs/applications/radio/soapyuhd/default.nix  |  3 ++-
 pkgs/applications/radio/uhd/default.nix       |  3 ++-
 pkgs/applications/radio/welle-io/default.nix  |  3 ++-
 .../science/astronomy/gpredict/default.nix    |  3 ++-
 .../science/chemistry/gwyddion/default.nix    |  3 ++-
 .../science/chemistry/octopus/default.nix     |  3 ++-
 .../science/chemistry/openmolcas/default.nix  |  3 ++-
 .../science/geometry/tetgen/default.nix       |  3 ++-
 .../science/logic/coq/default.nix             |  3 ++-
 .../science/logic/coq2html/default.nix        |  3 ++-
 .../science/logic/logisim/default.nix         |  3 ++-
 .../science/logic/tlaplus/toolbox.nix         |  3 ++-
 .../science/math/ripser/default.nix           |  3 ++-
 .../science/misc/gephi/default.nix            |  3 ++-
 .../science/misc/megam/default.nix            |  3 ++-
 .../science/misc/tulip/default.nix            |  5 +++--
 .../science/programming/scyther/cli.nix       |  3 ++-
 .../science/programming/scyther/default.nix   |  3 ++-
 .../git-and-tools/git/default.nix             |  3 ++-
 .../git-and-tools/grv/default.nix             |  3 ++-
 .../svn-all-fast-export/default.nix           |  3 ++-
 .../git-and-tools/svn2git/default.nix         |  3 ++-
 .../version-management/guitone/default.nix    |  3 ++-
 .../version-management/monotone/default.nix   |  7 ++++---
 .../redmine/4.x/default.nix                   |  5 +++--
 .../version-management/redmine/default.nix    |  5 +++--
 .../version-management/yadm/default.nix       |  3 ++-
 .../video/subtitleeditor/default.nix          |  3 ++-
 .../applications/video/tivodecode/default.nix |  3 ++-
 .../virtualization/virtinst/default.nix       |  3 ++-
 .../virtualization/virtualbox/default.nix     |  3 ++-
 .../window-managers/windowlab/default.nix     |  3 ++-
 .../window-managers/yabar/build.nix           |  3 ++-
 pkgs/data/fonts/dejavu-fonts/default.nix      |  9 +++++---
 pkgs/data/fonts/kochi-substitute/default.nix  |  3 ++-
 pkgs/data/fonts/noto-fonts/default.nix        |  3 ++-
 pkgs/data/misc/shared-mime-info/default.nix   |  3 ++-
 .../gnome-3/apps/gnome-boxes/default.nix      |  5 +++--
 .../gnome-3/apps/gnome-notes/default.nix      |  3 ++-
 .../gnome-3/core/gnome-contacts/default.nix   |  5 +++--
 .../extensions/chrome-gnome-shell/default.nix |  5 +++--
 pkgs/desktops/gnustep/make/default.nix        |  3 ++-
 pkgs/development/compilers/as31/default.nix   |  3 ++-
 .../compilers/chicken/4/chicken.nix           |  3 ++-
 .../compilers/chicken/5/chicken.nix           |  3 ++-
 pkgs/development/compilers/cmucl/binary.nix   |  3 ++-
 .../development/compilers/crystal/default.nix |  3 ++-
 pkgs/development/compilers/dale/default.nix   |  3 ++-
 pkgs/development/compilers/gambit/build.nix   |  3 ++-
 .../compilers/gcc-arm-embedded/default.nix    |  3 ++-
 pkgs/development/compilers/gerbil/build.nix   |  3 ++-
 pkgs/development/compilers/gforth/default.nix |  3 ++-
 pkgs/development/compilers/haxe/default.nix   |  3 ++-
 .../development/compilers/inform7/default.nix |  3 ++-
 pkgs/development/compilers/ldc/default.nix    |  3 ++-
 pkgs/development/compilers/llvm/3.5/clang.nix |  3 ++-
 .../compilers/llvm/3.5/dragonegg.nix          |  7 ++++---
 .../compilers/llvm/3.5/libc++/default.nix     |  3 ++-
 .../compilers/llvm/3.5/libc++abi/default.nix  |  3 ++-
 pkgs/development/compilers/llvm/3.5/lld.nix   |  3 ++-
 pkgs/development/compilers/llvm/3.5/lldb.nix  |  3 ++-
 pkgs/development/compilers/llvm/3.5/llvm.nix  |  3 ++-
 pkgs/development/compilers/llvm/3.5/polly.nix |  3 ++-
 .../compilers/llvm/3.8/clang/default.nix      |  3 ++-
 .../compilers/llvm/3.8/libc++/default.nix     |  3 ++-
 .../compilers/llvm/3.8/libc++abi.nix          |  3 ++-
 pkgs/development/compilers/llvm/3.8/lldb.nix  |  3 ++-
 pkgs/development/compilers/llvm/3.8/llvm.nix  |  3 ++-
 .../compilers/llvm/3.9/clang/default.nix      |  3 ++-
 .../compilers/llvm/3.9/libc++/default.nix     |  3 ++-
 .../compilers/llvm/3.9/libc++abi.nix          |  3 ++-
 pkgs/development/compilers/llvm/3.9/lldb.nix  |  3 ++-
 pkgs/development/compilers/llvm/3.9/llvm.nix  |  3 ++-
 .../compilers/llvm/4/libc++/default.nix       |  3 ++-
 .../compilers/llvm/4/libc++abi.nix            |  3 ++-
 pkgs/development/compilers/llvm/4/lld.nix     |  3 ++-
 pkgs/development/compilers/llvm/4/lldb.nix    |  3 ++-
 pkgs/development/compilers/llvm/4/openmp.nix  |  3 ++-
 .../compilers/llvm/5/libc++/default.nix       |  3 ++-
 .../compilers/llvm/5/libc++abi.nix            |  3 ++-
 pkgs/development/compilers/llvm/5/lld.nix     |  3 ++-
 pkgs/development/compilers/llvm/5/lldb.nix    |  3 ++-
 pkgs/development/compilers/llvm/5/openmp.nix  |  3 ++-
 .../compilers/llvm/6/libc++/default.nix       |  3 ++-
 .../compilers/llvm/6/libc++abi.nix            |  3 ++-
 pkgs/development/compilers/llvm/6/lld.nix     |  3 ++-
 pkgs/development/compilers/llvm/6/lldb.nix    |  3 ++-
 pkgs/development/compilers/llvm/6/openmp.nix  |  3 ++-
 .../compilers/llvm/7/libc++/default.nix       |  3 ++-
 .../compilers/llvm/7/libc++abi.nix            |  3 ++-
 pkgs/development/compilers/llvm/7/lld.nix     |  3 ++-
 pkgs/development/compilers/llvm/7/lldb.nix    |  3 ++-
 pkgs/development/compilers/llvm/7/openmp.nix  |  3 ++-
 .../compilers/llvm/8/libc++/default.nix       |  3 ++-
 .../compilers/llvm/8/libc++abi.nix            |  3 ++-
 .../compilers/llvm/8/libunwind.nix            |  3 ++-
 pkgs/development/compilers/llvm/8/lld.nix     |  3 ++-
 pkgs/development/compilers/llvm/8/lldb.nix    |  3 ++-
 pkgs/development/compilers/llvm/8/openmp.nix  |  3 ++-
 pkgs/development/compilers/mlton/20130715.nix | 13 ++++++------
 .../compilers/mlton/from-git-source.nix       |  3 ++-
 pkgs/development/compilers/mono/generic.nix   |  5 +++--
 pkgs/development/compilers/mozart/binary.nix  |  3 ++-
 pkgs/development/compilers/polyml/5.6.nix     |  3 ++-
 pkgs/development/compilers/smlnj/default.nix  |  3 ++-
 .../compilers/swi-prolog/default.nix          |  3 ++-
 pkgs/development/compilers/teyjus/default.nix |  3 ++-
 .../interpreters/clojure/clooj.nix            |  3 ++-
 .../development/interpreters/dart/default.nix |  3 ++-
 pkgs/development/interpreters/eff/default.nix |  3 ++-
 .../interpreters/maude/default.nix            |  3 ++-
 .../interpreters/nix-exec/default.nix         |  3 ++-
 .../development/interpreters/ruby/default.nix |  3 ++-
 .../interpreters/spidermonkey/52.nix          |  3 ++-
 .../interpreters/spidermonkey/60.nix          |  3 ++-
 pkgs/development/interpreters/tcl/generic.nix |  3 ++-
 .../development/java-modules/jogl/default.nix |  3 ++-
 pkgs/development/libraries/adns/default.nix   |  3 ++-
 pkgs/development/libraries/asio/generic.nix   |  3 ++-
 .../libraries/audio/libgme/default.nix        |  3 ++-
 .../libraries/avro-c++/default.nix            |  3 ++-
 pkgs/development/libraries/avro-c/default.nix |  3 ++-
 .../libraries/bulletml/default.nix            |  3 ++-
 pkgs/development/libraries/cairo/default.nix  |  5 +++--
 pkgs/development/libraries/celt/generic.nix   |  3 ++-
 .../libraries/classads/default.nix            |  3 ++-
 pkgs/development/libraries/codec2/default.nix |  3 ++-
 pkgs/development/libraries/csfml/default.nix  |  3 ++-
 pkgs/development/libraries/eigen/default.nix  |  3 ++-
 pkgs/development/libraries/fltk/1.4.nix       |  3 ++-
 pkgs/development/libraries/fltk/default.nix   |  3 ++-
 .../libraries/fontconfig-ultimate/default.nix |  3 ++-
 pkgs/development/libraries/fox/fox-1.6.nix    |  5 +++--
 .../libraries/freeglut/default.nix            |  3 ++-
 pkgs/development/libraries/glib/default.nix   |  9 ++++----
 .../libraries/globalarrays/default.nix        |  3 ++-
 pkgs/development/libraries/gloox/default.nix  |  3 ++-
 .../libraries/gnutls-kdh/generic.nix          |  3 ++-
 pkgs/development/libraries/goocanvas/2.x.nix  |  5 +++--
 .../libraries/http-parser/default.nix         |  3 ++-
 .../libraries/ignition-math/default.nix       |  3 ++-
 .../libraries/ignition-transport/generic.nix  |  3 ++-
 .../libraries/java/rhino/default.nix          |  3 ++-
 pkgs/development/libraries/libav/default.nix  |  5 +++--
 .../libraries/libbladeRF/default.nix          |  3 ++-
 .../libraries/libbytesize/default.nix         |  3 ++-
 pkgs/development/libraries/libcec/default.nix |  3 ++-
 .../development/libraries/libcec/platform.nix |  3 ++-
 .../libraries/libdwarf/default.nix            |  6 ++++--
 .../development/libraries/libdynd/default.nix |  3 ++-
 .../development/libraries/libjson/default.nix |  3 ++-
 .../libraries/liblastfm/default.nix           |  5 +++--
 .../libraries/liblouis/default.nix            |  3 ++-
 .../libraries/libmodplug/default.nix          |  5 +++--
 pkgs/development/libraries/libmpc/default.nix |  3 ++-
 .../libraries/libmypaint/default.nix          |  3 ++-
 pkgs/development/libraries/libnih/default.nix |  3 ++-
 pkgs/development/libraries/libofa/default.nix |  5 +++--
 .../development/libraries/libopus/default.nix |  3 ++-
 .../libraries/libopusenc/default.nix          |  3 ++-
 .../libraries/libossp-uuid/default.nix        |  3 ++-
 .../development/libraries/libpar2/default.nix |  5 +++--
 pkgs/development/libraries/libpgf/default.nix |  3 ++-
 .../libraries/libqmatrixclient/default.nix    |  3 ++-
 .../libraries/libspatialindex/default.nix     |  3 ++-
 .../libraries/libspotify/default.nix          |  6 ++++--
 .../libtorrent-rasterbar/default.nix          |  3 ++-
 .../libraries/libtoxcore/default.nix          |  3 ++-
 .../libraries/libtxc_dxtn/default.nix         |  5 +++--
 .../libraries/libtxc_dxtn_s2tc/default.nix    |  3 ++-
 pkgs/development/libraries/libxc/default.nix  |  3 ++-
 .../libraries/libxklavier/default.nix         |  5 +++--
 .../development/libraries/msgpack/generic.nix |  3 ++-
 .../development/libraries/ndn-cxx/default.nix |  3 ++-
 pkgs/development/libraries/ndpi/default.nix   |  3 ++-
 .../libraries/nix-plugins/default.nix         |  3 ++-
 pkgs/development/libraries/nspr/default.nix   |  3 ++-
 pkgs/development/libraries/ntrack/default.nix |  5 +++--
 .../libraries/opencore-amr/default.nix        |  3 ++-
 .../libraries/openjpeg/generic.nix            |  3 ++-
 .../development/libraries/openmpi/default.nix |  5 +++--
 .../development/libraries/openssl/default.nix |  5 +++--
 .../libraries/openzwave/default.nix           |  3 ++-
 pkgs/development/libraries/physfs/default.nix |  5 +++--
 pkgs/development/libraries/ppl/default.nix    |  3 ++-
 .../libraries/protobuf/generic-v3.nix         |  3 ++-
 .../libraries/protobuf/generic.nix            |  3 ++-
 .../libraries/protobufc/generic.nix           |  3 ++-
 pkgs/development/libraries/qpdf/default.nix   |  5 +++--
 .../libraries/science/math/arpack/default.nix |  3 ++-
 .../libraries/science/math/fenics/default.nix | 18 ++++++++++------
 .../science/math/liblapack/default.nix        |  3 ++-
 .../libraries/science/math/magma/default.nix  |  3 ++-
 pkgs/development/libraries/sfml/default.nix   |  3 ++-
 .../startup-notification/default.nix          |  3 ++-
 pkgs/development/libraries/tinyxml/2.6.2.nix  |  3 ++-
 pkgs/development/libraries/uthash/default.nix |  3 ++-
 .../libraries/volume-key/default.nix          |  3 ++-
 pkgs/development/libraries/wt/default.nix     |  3 ++-
 .../libraries/wxwidgets/2.9/default.nix       |  3 ++-
 pkgs/development/libraries/xapian/default.nix |  3 ++-
 pkgs/development/libraries/xmlsec/default.nix |  3 ++-
 pkgs/development/misc/amdapp-sdk/default.nix  |  3 ++-
 pkgs/development/misc/avr/libc/default.nix    |  3 ++-
 pkgs/development/misc/msp430/mspdebug.nix     |  3 ++-
 pkgs/development/misc/newlib/default.nix      |  3 ++-
 .../development/misc/qmk_firmware/default.nix |  3 ++-
 .../misc/stm32/betaflight/default.nix         |  3 ++-
 pkgs/development/misc/stm32/inav/default.nix  |  3 ++-
 pkgs/development/mobile/abootimg/default.nix  |  3 ++-
 pkgs/development/ocaml-modules/base64/2.0.nix |  3 ++-
 .../ocaml-modules/dolog/default.nix           |  3 ++-
 .../ocaml-modules/iso8601/default.nix         |  3 ++-
 .../ocaml-modules/llvm/default.nix            |  3 ++-
 .../ocaml-modules/magic-mime/default.nix      |  3 ++-
 .../ocaml-modules/menhir/generic.nix          |  3 ++-
 .../ocaml-modules/ocamlmake/default.nix       |  3 ++-
 .../ocsigen-deriving/default.nix              |  3 ++-
 .../tools/analysis/radare2/default.nix        |  3 ++-
 .../tools/build-managers/apache-ant/1.9.nix   |  3 ++-
 .../build-managers/apache-ant/default.nix     |  3 ++-
 .../build-managers/apache-maven/default.nix   |  5 +++--
 .../tools/build-managers/bazel/default.nix    |  3 ++-
 .../build-managers/gnumake/4.2/default.nix    |  3 ++-
 .../tools/build-managers/rebar/default.nix    |  3 ++-
 pkgs/development/tools/buildah/default.nix    |  3 ++-
 pkgs/development/tools/casperjs/default.nix   |  3 ++-
 .../buildkite-agent/generic.nix               |  3 ++-
 .../tools/database/cdb/default.nix            |  3 ++-
 .../tools/database/squirrel-sql/default.nix   |  3 ++-
 .../tools/flatpak-builder/default.nix         |  5 +++--
 pkgs/development/tools/flyway/default.nix     |  3 ++-
 .../tools/java/fastjar/default.nix            |  3 ++-
 pkgs/development/tools/minizinc/default.nix   |  3 ++-
 pkgs/development/tools/minizinc/ide.nix       |  3 ++-
 .../tools/misc/dfu-programmer/default.nix     |  5 +++--
 .../tools/misc/nixbang/default.nix            |  3 ++-
 .../tools/misc/prelink/default.nix            |  3 ++-
 .../development/tools/misc/stlink/default.nix |  3 ++-
 .../tools/misc/teensy-loader-cli/default.nix  |  3 ++-
 pkgs/development/tools/nailgun/default.nix    |  3 ++-
 .../tools/ocaml/js_of_ocaml/default.nix       |  3 ++-
 .../tools/ocaml/obuild/default.nix            |  3 ++-
 pkgs/development/tools/ocaml/utop/default.nix |  3 ++-
 pkgs/development/tools/parsing/antlr/4.7.nix  |  6 ++++--
 .../tools/parsing/ragel/default.nix           |  5 +++--
 .../tools/profiling/systemtap/default.nix     |  3 ++-
 pkgs/development/tools/pypi2nix/default.nix   |  3 ++-
 pkgs/development/tools/skopeo/default.nix     |  3 ++-
 pkgs/games/anki/default.nix                   |  8 ++++---
 pkgs/games/armagetronad/default.nix           |  3 ++-
 pkgs/games/crrcsim/default.nix                |  5 +++--
 pkgs/games/dwarf-fortress/dfhack/default.nix  |  3 ++-
 pkgs/games/eduke32/default.nix                |  3 ++-
 pkgs/games/endless-sky/default.nix            |  3 ++-
 pkgs/games/flightgear/default.nix             |  3 ++-
 pkgs/games/freedink/default.nix               | 10 +++++----
 pkgs/games/freedroidrpg/default.nix           |  3 ++-
 pkgs/games/gogui/default.nix                  |  3 ++-
 .../games/linux-steam-integration/default.nix |  3 ++-
 pkgs/games/megaglest/default.nix              |  3 ++-
 pkgs/games/minetest/default.nix               |  3 ++-
 pkgs/games/nexuiz/default.nix                 |  3 ++-
 pkgs/games/openxcom/default.nix               |  3 ++-
 pkgs/games/quake3/content/demo.nix            |  3 ++-
 pkgs/games/quake3/content/pointrelease.nix    |  3 ++-
 pkgs/games/rrootage/default.nix               |  3 ++-
 pkgs/games/simutrans/default.nix              |  3 ++-
 pkgs/games/steam/steam.nix                    |  3 ++-
 pkgs/games/stockfish/default.nix              |  3 ++-
 pkgs/games/vdrift/default.nix                 |  3 ++-
 pkgs/misc/drivers/epson-201106w/default.nix   |  3 ++-
 pkgs/misc/drivers/epson-alc1100/default.nix   |  3 ++-
 pkgs/misc/drivers/epson_201207w/default.nix   |  3 ++-
 .../drivers/postscript-lexmark/default.nix    |  3 ++-
 pkgs/misc/drivers/sundtek/default.nix         |  3 ++-
 pkgs/misc/drivers/xboxdrv/default.nix         |  3 ++-
 pkgs/misc/emulators/ccemux/default.nix        |  3 ++-
 pkgs/misc/ghostscript/default.nix             |  5 +++--
 pkgs/misc/long-shebang/default.nix            |  3 ++-
 pkgs/misc/themes/kde2/default.nix             |  3 ++-
 pkgs/misc/themes/qtcurve/default.nix          |  3 ++-
 pkgs/os-specific/linux/beegfs/default.nix     |  3 ++-
 .../linux/firmware/b43-firmware/5.1.138.nix   |  3 ++-
 .../firmware/facetimehd-firmware/default.nix  |  3 ++-
 .../linux/firmware/fwupdate/default.nix       |  3 ++-
 pkgs/os-specific/linux/fuse/common.nix        |  5 +++--
 pkgs/os-specific/linux/hibernate/default.nix  |  3 ++-
 pkgs/os-specific/linux/iomelt/default.nix     |  3 ++-
 pkgs/os-specific/linux/kernel/generic.nix     |  3 ++-
 .../linux/kmod-blacklist-ubuntu/default.nix   |  3 ++-
 pkgs/os-specific/linux/ldm/default.nix        |  3 ++-
 pkgs/os-specific/linux/lsiutil/default.nix    |  3 ++-
 pkgs/os-specific/linux/lvm2/default.nix       |  3 ++-
 pkgs/os-specific/linux/ply/default.nix        |  3 ++-
 pkgs/os-specific/linux/rdma-core/default.nix  |  3 ++-
 pkgs/os-specific/linux/regionset/default.nix  |  3 ++-
 pkgs/os-specific/linux/util-linux/default.nix |  5 +++--
 pkgs/os-specific/windows/libgnurx/default.nix |  5 +++--
 .../os-specific/windows/mingw-w64/default.nix |  3 ++-
 .../windows/pthread-w32/default.nix           |  2 +-
 pkgs/servers/bird/default.nix                 |  5 +++--
 pkgs/servers/brickd/default.nix               |  3 ++-
 pkgs/servers/dns/bind/default.nix             |  5 +++--
 .../apache-modules/mod_fastcgi/default.nix    |  3 ++-
 pkgs/servers/http/gatling/default.nix         |  5 +++--
 pkgs/servers/http/myserver/default.nix        |  5 +++--
 pkgs/servers/http/nginx/generic.nix           |  3 ++-
 pkgs/servers/mail/postfix/pfixtools.nix       |  3 ++-
 pkgs/servers/mattermost/default.nix           |  6 ++++--
 pkgs/servers/monitoring/uchiwa/default.nix    |  6 ++++--
 pkgs/servers/nosql/mongodb/default.nix        |  3 ++-
 pkgs/servers/search/sphinxsearch/default.nix  |  3 ++-
 pkgs/servers/sql/monetdb/default.nix          |  3 ++-
 pkgs/servers/tvheadend/default.nix            |  3 ++-
 pkgs/servers/unifi/default.nix                |  3 ++-
 pkgs/servers/varnish/default.nix              |  5 +++--
 pkgs/servers/x11/quartz-wm/default.nix        |  3 ++-
 pkgs/servers/xmpp/ejabberd/default.nix        |  3 ++-
 pkgs/shells/es/default.nix                    |  3 ++-
 pkgs/shells/oil/default.nix                   |  3 ++-
 pkgs/shells/zsh/default.nix                   |  3 ++-
 .../zsh/nix-zsh-completions/default.nix       |  3 ++-
 pkgs/tools/X11/bumblebee/default.nix          |  5 +++--
 pkgs/tools/X11/nitrogen/default.nix           |  5 +++--
 pkgs/tools/X11/xautomation/default.nix        |  3 ++-
 pkgs/tools/X11/xbindkeys/default.nix          |  3 ++-
 pkgs/tools/X11/xwinwrap/default.nix           |  3 ++-
 pkgs/tools/archivers/fsarchiver/default.nix   |  3 ++-
 pkgs/tools/audio/dir2opus/default.nix         |  5 +++--
 pkgs/tools/audio/qastools/default.nix         |  3 ++-
 pkgs/tools/backup/bup/default.nix             |  3 ++-
 pkgs/tools/backup/znapzend/default.nix        |  3 ++-
 pkgs/tools/cd-dvd/lsdvd/default.nix           |  3 ++-
 pkgs/tools/compression/pbzip2/default.nix     |  5 +++--
 pkgs/tools/filesystems/ceph/generic.nix       |  3 ++-
 pkgs/tools/filesystems/dislocker/default.nix  |  3 ++-
 pkgs/tools/filesystems/jmtpfs/default.nix     |  3 ++-
 .../filesystems/reiser4progs/default.nix      |  5 +++--
 .../filesystems/reiserfsprogs/default.nix     |  5 +++--
 pkgs/tools/filesystems/zfstools/default.nix   |  3 ++-
 pkgs/tools/graphics/argyllcms/default.nix     |  3 ++-
 pkgs/tools/graphics/briss/default.nix         |  3 ++-
 pkgs/tools/graphics/gmic/default.nix          |  3 ++-
 pkgs/tools/graphics/gmic_krita_qt/default.nix |  3 ++-
 pkgs/tools/graphics/graphviz/base.nix         |  3 ++-
 pkgs/tools/graphics/mscgen/default.nix        |  3 ++-
 pkgs/tools/graphics/pgf/default.nix           |  3 ++-
 pkgs/tools/graphics/twilight/default.nix      |  3 ++-
 pkgs/tools/misc/aptly/default.nix             |  3 ++-
 pkgs/tools/misc/autorandr/default.nix         |  3 ++-
 pkgs/tools/misc/buildtorrent/default.nix      |  5 +++--
 pkgs/tools/misc/clasp/default.nix             |  3 ++-
 pkgs/tools/misc/ddccontrol/default.nix        |  3 ++-
 pkgs/tools/misc/edid-decode/default.nix       |  3 ++-
 pkgs/tools/misc/fortune/default.nix           |  3 ++-
 pkgs/tools/misc/gh-ost/default.nix            |  3 ++-
 pkgs/tools/misc/gringo/default.nix            |  3 ++-
 pkgs/tools/misc/grub/2.0x.nix                 |  5 +++--
 pkgs/tools/misc/grub/trusted.nix              |  3 ++-
 pkgs/tools/misc/hdaps-gl/default.nix          |  3 ++-
 pkgs/tools/misc/lbdb/default.nix              |  3 ++-
 pkgs/tools/misc/mdbtools/default.nix          |  3 ++-
 pkgs/tools/misc/mongodb-compass/default.nix   |  3 ++-
 pkgs/tools/misc/shallot/default.nix           |  3 ++-
 pkgs/tools/misc/ultrastar-manager/default.nix |  3 ++-
 pkgs/tools/misc/xburst-tools/default.nix      |  3 ++-
 pkgs/tools/networking/burpsuite/default.nix   |  3 ++-
 pkgs/tools/networking/bwm-ng/default.nix      |  5 +++--
 pkgs/tools/networking/djbdns/default.nix      |  3 ++-
 pkgs/tools/networking/easyrsa/default.nix     |  3 ++-
 .../networking/gmrender-resurrect/default.nix |  3 ++-
 pkgs/tools/networking/gnirehtet/default.nix   |  3 ++-
 pkgs/tools/networking/minidlna/default.nix    |  3 ++-
 pkgs/tools/networking/miniupnpc/default.nix   |  7 ++++---
 pkgs/tools/networking/nettee/default.nix      |  3 ++-
 pkgs/tools/networking/nfdump/default.nix      |  3 ++-
 pkgs/tools/networking/phodav/default.nix      |  5 +++--
 pkgs/tools/networking/zssh/default.nix        |  5 +++--
 pkgs/tools/package-management/nix/default.nix |  3 ++-
 pkgs/tools/security/fail2ban/default.nix      |  3 ++-
 pkgs/tools/security/haka/default.nix          |  3 ++-
 pkgs/tools/security/tpm-tools/default.nix     |  5 +++--
 pkgs/tools/security/vault/vault-bin.nix       |  3 ++-
 pkgs/tools/system/ior/default.nix             |  3 ++-
 pkgs/tools/system/smartmontools/default.nix   |  5 +++--
 pkgs/tools/system/tree/default.nix            |  3 ++-
 pkgs/tools/text/cconv/default.nix             |  3 ++-
 pkgs/tools/text/gnugrep/default.nix           |  3 ++-
 pkgs/tools/typesetting/kindlegen/default.nix  |  3 ++-
 pkgs/tools/typesetting/tex/texlive/bin.nix    | 21 ++++++++++++-------
 .../virtualization/cloud-init/default.nix     |  3 ++-
 520 files changed, 1164 insertions(+), 622 deletions(-)

diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix
index 5a09641c70d..d65889be3ac 100644
--- a/pkgs/applications/altcoins/aeon/default.nix
+++ b/pkgs/applications/altcoins/aeon/default.nix
@@ -7,7 +7,8 @@ let
   version = "0.12.9.0";
 in
 stdenv.mkDerivation {
-  name = "aeon-${version}";
+  pname = "aeon";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "aeonix";
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index b602707b392..adb38d4bbba 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -6,7 +6,8 @@
 let version = "2.9.3";
 in
   stdenv.mkDerivation {
-    name = "abcde-${version}";
+    pname = "abcde";
+    inherit version;
     src = fetchurl {
       url = "https://abcde.einval.com/download/abcde-${version}.tar.gz";
       sha256 = "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04";
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix
index 04f0f9d3025..9c2f17c5cc9 100644
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/pkgs/applications/audio/caudec/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "caudec-${version}";
+  pname = "caudec";
+  inherit version;
 
   src = fetchurl {
     url = "http://caudec.net/downloads/caudec-${version}.tar.gz";
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 1b0dfebe22c..f48a429b389 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -67,7 +67,8 @@ let
   '';
 
   free = stdenv.mkDerivation {
-    name = "clementine-free-${version}";
+    pname = "clementine-free";
+    inherit version;
     inherit src patches nativeBuildInputs postPatch;
 
     # gst_plugins needed for setup-hooks
@@ -95,7 +96,8 @@ let
 
   # Unfree Spotify blob for Clementine
   unfree = stdenv.mkDerivation {
-    name = "clementine-blob-${version}";
+    pname = "clementine-blob";
+    inherit version;
     # Use the same patches and sources as Clementine
     inherit src nativeBuildInputs postPatch;
 
diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix
index 209ffa05bf2..0e2c950051a 100644
--- a/pkgs/applications/audio/ekho/default.nix
+++ b/pkgs/applications/audio/ekho/default.nix
@@ -5,7 +5,8 @@
 let
   version = "5.8.2";
 in stdenv.mkDerivation rec {
-  name = "ekho-${version}";
+  pname = "ekho";
+  inherit version;
 
   meta = with stdenv.lib; {
     description = "Chinese text-to-speech software";
@@ -23,7 +24,7 @@ in stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${name}.tar.xz";
+    url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${pname}-${version}.tar.xz";
     sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj";
   };
 
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index 6e47d921d34..687608b4352 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -25,7 +25,8 @@ let
   };
 
   faust = stdenv.mkDerivation {
-    name = "faust-${version}";
+    pname = "faust";
+    inherit version;
 
     inherit src;
 
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 383d2deb10b..ad1239b22af 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -35,7 +35,8 @@ let
 
   faust = stdenv.mkDerivation {
 
-    name = "faust-${version}";
+    pname = "faust";
+    inherit version;
 
     inherit src;
 
diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 7716b1e0c35..b51b72f1c8a 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -43,7 +43,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "google-play-music-desktop-player-${version}";
+  pname = "google-play-music-desktop-player";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index 3aea07235d8..94d0f5eb50f 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -19,7 +19,8 @@ let
   version = "7.2";
 
 in stdenv.mkDerivation rec {
-  name = "gradio-${version}";
+  pname = "gradio";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "haecker-felix";
diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix
index dd8b28fc2d8..48052fc4ec8 100644
--- a/pkgs/applications/audio/midisheetmusic/default.nix
+++ b/pkgs/applications/audio/midisheetmusic/default.nix
@@ -5,7 +5,8 @@
 let
   version = "2.6";
 in stdenv.mkDerivation {
-  name = "midisheetmusic-${version}";
+  pname = "midisheetmusic";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz";
diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix
index efaef97257e..f024e5a6a1d 100644
--- a/pkgs/applications/audio/mpc123/default.nix
+++ b/pkgs/applications/audio/mpc123/default.nix
@@ -2,10 +2,11 @@
 
 let version = "0.2.4"; in
 stdenv.mkDerivation rec {
-  name = "mpc123-${version}";
+  pname = "mpc123";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/mpc123/version%20${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/mpc123/version%20${version}/${pname}-${version}.tar.gz";
     sha256 = "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1";
   };
 
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index f8f08369ab9..8116bcaf0bd 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -4,7 +4,8 @@
 let
   version = "0.4.1";
 in stdenv.mkDerivation rec {
-  name = "openmpt123-${version}";
+  pname = "openmpt123";
+  inherit version;
 
   src = fetchurl {
     url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix
index 9f51d300825..f9b3fbae213 100644
--- a/pkgs/applications/audio/pmidi/default.nix
+++ b/pkgs/applications/audio/pmidi/default.nix
@@ -3,7 +3,8 @@
 , sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055"
 }:
 stdenv.mkDerivation {
-  name = "pmidi-${version}";
+  pname = "pmidi";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/pmidi/${version}/pmidi-${version}.tar.gz";
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix
index 6516532df33..c34b27edd96 100644
--- a/pkgs/applications/audio/rhvoice/default.nix
+++ b/pkgs/applications/audio/rhvoice/default.nix
@@ -4,7 +4,8 @@
 let
   version = "unstable-2018-02-10";
 in stdenv.mkDerivation rec {
-  name = "rhvoice-${version}";
+  pname = "rhvoice";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "Olga-Yakovleva";
diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix
index fbe90c5377d..7776fa0c166 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/applications/audio/sayonara/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.1.1-git1-20180828";
 in
 stdenv.mkDerivation {
-  name = "sayonara-player-${version}";
+  pname = "sayonara-player";
+  inherit version;
 
   src = fetchurl {
     url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz";
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 77aa7994994..403075f9135 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -60,7 +60,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "spotify-${version}";
+  pname = "spotify";
+  inherit version;
 
   # fetch from snapcraft instead of the debian repository most repos fetch from.
   # That is a bit more cumbersome. But the debian repository only keeps the last
diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix
index cdee979768c..521133cb08f 100644
--- a/pkgs/applications/audio/tree-from-tags/default.nix
+++ b/pkgs/applications/audio/tree-from-tags/default.nix
@@ -7,7 +7,8 @@ let
     gemdir  = ./.;
   };
 in stdenv.mkDerivation {
-  name = "tree-from-tags-${version}";
+  pname = "tree-from-tags";
+  inherit version;
   src = fetchFromGitHub {
     owner  = "dbrock";
     repo   = "bongo";
diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix
index 7db3b7ec237..b5ff8e41fe0 100644
--- a/pkgs/applications/audio/uade123/default.nix
+++ b/pkgs/applications/audio/uade123/default.nix
@@ -3,7 +3,8 @@
 let
   version = "2.13";
 in stdenv.mkDerivation rec {
-  name = "uade123-${version}";
+  pname = "uade123";
+  inherit version;
   src = fetchurl {
     url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2";
     sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v";
diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix
index dde96764fe6..2bc40a78af4 100644
--- a/pkgs/applications/audio/vmpk/default.nix
+++ b/pkgs/applications/audio/vmpk/default.nix
@@ -5,7 +5,8 @@
 let
   version = "0.5.1";
 in stdenv.mkDerivation rec {
-  name = "vmpk-${version}";
+  pname = "vmpk";
+  inherit version;
 
   meta = with stdenv.lib; {
     description = "Virtual MIDI Piano Keyboard";
@@ -15,7 +16,7 @@ in stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://sourceforge/vmpk/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/vmpk/${version}/${pname}-${version}.tar.bz2";
     sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc";
   };
 
diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
index 61db182f744..f892a9da50b 100644
--- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
+++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
@@ -12,10 +12,11 @@ let
   version = "2.0.6";
 in
 stdenv.mkDerivation rec {
-  name = "lightdm-gtk-greeter-${version}";
+  pname = "lightdm-gtk-greeter";
+  inherit version;
 
   src = fetchurl {
-    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
+    url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15";
   };
 
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 63f241d9d1c..fc61d43436d 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -7,7 +7,8 @@ let
   version = "0.18.1";
 
 in mkDerivation rec {
-  name = "sddm-${version}";
+  pname = "sddm";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "sddm";
diff --git a/pkgs/applications/editors/emacs-modes/d/default.nix b/pkgs/applications/editors/emacs-modes/d/default.nix
index 28736acded2..779ba992686 100644
--- a/pkgs/applications/editors/emacs-modes/d/default.nix
+++ b/pkgs/applications/editors/emacs-modes/d/default.nix
@@ -4,7 +4,8 @@
 let version = "20150111";
 
 in stdenv.mkDerivation {
-  name = "emacs-d-${version}";
+  pname = "emacs-d";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz";
diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 6b10766bedb..b55cf998991 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -6,7 +6,8 @@ let
   version = "13.14-169-g0d3569d";      # git describe --tags
 in
 stdenv.mkDerivation {
-  name = "haskell-mode-${version}";
+  pname = "haskell-mode";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "haskell";
diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix
index 199a5886e1d..75b72516a3c 100644
--- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix
@@ -6,7 +6,8 @@
 let version = "0.15";
 
 in stdenv.mkDerivation {
-  name = "hsc3-mode-${version}";
+  pname = "hsc3-mode";
+  inherit version;
   src = fetchurl {
     url = mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz;
     sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6";
diff --git a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
index 3cc8156337e..eaa0f2c2a5b 100644
--- a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
@@ -4,7 +4,8 @@ let
   version = "3.6-4-gb659bf8";
 in
 stdenv.mkDerivation {
-  name = "ido-ubiquitous-${version}";
+  pname = "ido-ubiquitous";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "DarwinAwardWinner";
diff --git a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
index 7176b289b8b..4e79e9edda7 100644
--- a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
@@ -4,7 +4,8 @@ let
   version = "2.0-82-gfe30ef7";
 in
 stdenv.mkDerivation {
-  name = "markdown-mode-${version}";
+  pname = "markdown-mode";
+  inherit version;
 
   src = fetchFromGitHub {
     owner  = "defunkt";
diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
index 9f8d408dd5a..becc2dc5dc9 100644
--- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
@@ -5,7 +5,8 @@
 
 let version = stdenv.lib.removePrefix "ocaml-" ocaml.name;
 in stdenv.mkDerivation {
-  name = "ocaml-mode-${version}";
+  pname = "ocaml-mode";
+  inherit version;
   inherit (ocaml) prefixKey src;
 
   # a quick configure to get the Makefile generated. Since
diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
index 2b4223cdc1f..9dfe089fe29 100644
--- a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
+++ b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
@@ -3,7 +3,8 @@
 let version = "1.3.13";
 
 in stdenv.mkDerivation {
-  name = "emacs-rainbow-delimiters-${version}";
+  pname = "emacs-rainbow-delimiters";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz";
diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix
index 0031ffee4d4..8b9e08a5378 100644
--- a/pkgs/applications/editors/emacs-modes/rudel/default.nix
+++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix
@@ -5,7 +5,8 @@ let
 in
 stdenv.mkDerivation
 {
-  name = "rudel-${version}";
+  pname = "rudel";
+  inherit version;
   src = fetchurl
   {
     url = "mirror://sourceforge/rudel/rudel-${version}.tar.gz";
diff --git a/pkgs/applications/editors/emacs-modes/s/default.nix b/pkgs/applications/editors/emacs-modes/s/default.nix
index b818348939e..fc79ec46761 100644
--- a/pkgs/applications/editors/emacs-modes/s/default.nix
+++ b/pkgs/applications/editors/emacs-modes/s/default.nix
@@ -3,7 +3,8 @@
 let version = "1.9.0";
 
 in stdenv.mkDerivation {
-  name = "emacs-s-${version}";
+  pname = "emacs-s";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/magnars/s.el/archive/${version}.tar.gz";
diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix
index be03938f8a5..556b27e4cbf 100644
--- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix
+++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix
@@ -6,7 +6,8 @@
 let version = "2.0.9";
 
 in stdenv.mkDerivation {
-  name = "tuareg-mode-${version}";
+  pname = "tuareg-mode";
+  inherit version;
   src = fetchzip {
     url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz";
     sha256 = "13rh5ddwvwwz5jf0n3wagc5m9zq4cbaylnsknzjalryyvipwfyh3";
diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix
index 6d0631a4cb8..5f3041d22d4 100644
--- a/pkgs/applications/editors/emacs-modes/writegood/default.nix
+++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix
@@ -3,7 +3,8 @@
 let version = "2.0.2";
 
 in stdenv.mkDerivation {
-  name = "writegood-mode-${version}";
+  pname = "writegood-mode";
+  inherit version;
   src = fetchurl {
     url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz";
     sha256 = "1ilbqj24vzpfh9n1wph7idj0914ga290jkpv9kr1pff3a0v5hf6k";
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 0ff56e9145f..a30a8f70224 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -7,10 +7,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "geany-${version}";
+  pname = "geany";
+  inherit version;
 
   src = fetchurl {
-    url = "https://download.geany.org/${name}.tar.bz2";
+    url = "https://download.geany.org/${pname}-${version}.tar.bz2";
     sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim";
   };
 
diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index 11322e8240c..21a6a847518 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -13,7 +13,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "jedit-${version}";
+  pname = "jedit";
+  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2";
     sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x";
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
index b212773712c..df46cb12338 100644
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/pkgs/applications/editors/kodestudio/default.nix
@@ -21,7 +21,8 @@ let
 in
 
   stdenv.mkDerivation rec {
-    name = "kodestudio-${version}";
+    pname = "kodestudio";
+    inherit version;
 
     src = fetchurl {
         url = urlStr;
diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix
index 3d215b28856..ba01304f723 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@@ -15,7 +15,8 @@ let
   };
 in
 stdenv.mkDerivation {
-  name = "netbeans-${version}";
+  pname = "netbeans";
+  inherit version;
   src = fetchurl {
     url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip";
     sha512 = "15mv59njrnq3sjfzb0n7xcc79kpixygf37cxvbswnvm651cw6lb1i9w8wbjivh0z4zcf3f62vbmshxh5pkaxqpqsg0iyy6gddfbwzwx";
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index f90e17a6065..74e5460f529 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -13,7 +13,8 @@ let
   gwtVer = "2.8.1";
 in
 stdenv.mkDerivation rec {
-  name = "RStudio-${version}";
+  pname = "RStudio";
+  inherit version;
 
   nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
 
@@ -98,7 +99,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
 
   desktopItem = makeDesktopItem {
-    name = name;
+    name = "${pname}-${version}";
     exec = "rstudio %F";
     icon = "rstudio";
     desktopName = "RStudio";
diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix
index 2d52aedc831..629bd9d019d 100644
--- a/pkgs/applications/editors/standardnotes/default.nix
+++ b/pkgs/applications/editors/standardnotes/default.nix
@@ -15,7 +15,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "standardnotes-${version}";
+  pname = "standardnotes";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-${plat}.AppImage";
diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix
index dfb2e49e0c8..5d5843890e1 100644
--- a/pkgs/applications/editors/texmacs/darwin.nix
+++ b/pkgs/applications/editors/texmacs/darwin.nix
@@ -15,7 +15,8 @@ let
   };
 in
 stdenv.mkDerivation {
-  name = "TeXmacs-${version}";
+  pname = "TeXmacs";
+  inherit version;
 
   src= fetchurl {
     url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index df742645e86..43f8f561e2f 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -23,7 +23,8 @@ let
     '';
   };
 in stdenv.mkDerivation rec {
-  name = "awesomebump-${version}";
+  pname = "awesomebump";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index 30101bb9477..e59d14f7dd6 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -6,7 +6,8 @@
 
 let version = "2018SP2"; in
 stdenv.mkDerivation {
-  name = "draftsight-${version}";
+  pname = "draftsight";
+  inherit version;
 
   nativeBuildInputs = [ dpkg makeWrapper ];
 
diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix
index 1e54152fff4..ae38730226a 100644
--- a/pkgs/applications/graphics/fig2dev/default.nix
+++ b/pkgs/applications/graphics/fig2dev/default.nix
@@ -4,7 +4,8 @@ let
   version = "3.2.7a";
 
 in stdenv.mkDerivation {
-  name = "fig2dev-${version}";
+  pname = "fig2dev";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix
index 025b3ae65ec..103f40fc9c7 100644
--- a/pkgs/applications/graphics/gcolor2/default.nix
+++ b/pkgs/applications/graphics/gcolor2/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.4"; in
 stdenv.mkDerivation {
-  name = "gcolor2-${version}";
+  pname = "gcolor2";
+  inherit version;
   arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else "386";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
index 5ad7cb88b03..c7555b612f7 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -3,7 +3,8 @@
 let
   version = "2.3.1";
 in stdenv.mkDerivation {
-  name = "gcolor3-${version}";
+  pname = "gcolor3";
+  inherit version;
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix
index 061dc2b69a6..d7b96425968 100644
--- a/pkgs/applications/graphics/guetzli/default.nix
+++ b/pkgs/applications/graphics/guetzli/default.nix
@@ -3,7 +3,8 @@ let
   version = "1.0.1";
 in
 stdenv.mkDerivation {
-  name = "guetzli-${version}";
+  pname = "guetzli";
+  inherit version;
   src = fetchFromGitHub {
     owner = "google";
     repo = "guetzli";
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index b399dd2d228..34294d27129 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -22,7 +22,8 @@ let
   };
 
   synfig = stdenv.mkDerivation rec {
-    name = "synfig-${version}";
+    pname = "synfig";
+    inherit version;
 
     src = fetchFromGitHub {
        repo   = "synfig";
@@ -47,7 +48,8 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "synfigstudio-${version}";
+  pname = "synfigstudio";
+  inherit version;
 
   src = fetchFromGitHub {
      repo   = "synfig";
diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index 3a139f3740c..09abfc60a52 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -27,7 +27,8 @@ let
 
 in
   stdenv.mkDerivation rec {
-    name = "unigine-valley-${version}";
+    pname = "unigine-valley";
+    inherit version;
 
     src = fetchurl {
       url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run";
diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix
index 429af12b9bb..fe5a1370332 100644
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/pkgs/applications/graphics/xfig/default.nix
@@ -6,7 +6,8 @@ let
   version = "3.2.7a";
 
 in stdenv.mkDerivation {
-  name = "xfig-${version}";
+  pname = "xfig";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz";
diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix
index 3c18d70d6c2..0e524ede091 100644
--- a/pkgs/applications/misc/asciiquarium/default.nix
+++ b/pkgs/applications/misc/asciiquarium/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.1";
 in stdenv.mkDerivation {
-  name = "asciiquarium-${version}";
+  pname = "asciiquarium";
+  inherit version;
   src = fetchurl {
     url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz";
     sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v";
diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix
index fc5fa4d0300..b0af34ec760 100644
--- a/pkgs/applications/misc/bashSnippets/default.nix
+++ b/pkgs/applications/misc/bashSnippets/default.nix
@@ -12,7 +12,8 @@ let
   ];
 in
 stdenv.mkDerivation {
-  name = "bashSnippets-${version}";
+  pname = "bashSnippets";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "alexanderepstein";
diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix
index 9c99dcee2b3..090cb2f519e 100644
--- a/pkgs/applications/misc/bitcoinarmory/default.nix
+++ b/pkgs/applications/misc/bitcoinarmory/default.nix
@@ -10,7 +10,8 @@ let
 
 in buildPythonApplication {
 
-  name = "bitcoinarmory-${version}";
+  pname = "bitcoinarmory";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "goatpig";
diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix
index a0e5c814996..40dbfea9801 100644
--- a/pkgs/applications/misc/cardpeek/default.nix
+++ b/pkgs/applications/misc/cardpeek/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.8.4";
 in
   stdenv.mkDerivation {
-    name = "cardpeek-${version}";
+    pname = "cardpeek";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "L1L1";
diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix
index 3851730c459..b07e0fb8c52 100644
--- a/pkgs/applications/misc/confclerk/default.nix
+++ b/pkgs/applications/misc/confclerk/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.6.4"; in
 stdenv.mkDerivation {
-  name = "confclerk-${version}";
+  pname = "confclerk";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";
diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix
index a53b001b0e9..1972042f805 100644
--- a/pkgs/applications/misc/cura/stable.nix
+++ b/pkgs/applications/misc/cura/stable.nix
@@ -4,7 +4,8 @@ let
   version = "15.04";
 in
 stdenv.mkDerivation rec {
-  name = "cura-${version}";
+  pname = "cura";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix
index ce743a00879..41f110e9ee1 100644
--- a/pkgs/applications/misc/curaengine/stable.nix
+++ b/pkgs/applications/misc/curaengine/stable.nix
@@ -3,7 +3,8 @@ let
   version = "15.04.6";
 in
 stdenv.mkDerivation {
-  name = "curaengine-${version}";
+  pname = "curaengine";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index eeb7a8ccf52..5df7c0b0672 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -4,7 +4,8 @@ let
   version = "git-2016-01-10";
 in
 stdenv.mkDerivation {
-  name = "dfilemanager-${version}";
+  pname = "dfilemanager";
+  inherit version;
   src = fetchgit {
     url = "git://git.code.sf.net/p/dfilemanager/code";
     rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4";
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index e9d19466609..bbbf1a0aff9 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -4,7 +4,8 @@ let
   version = "6.3.26";
 in
 stdenv.mkDerivation {
-  name="fetchmail-${version}";
+  pname = "fetchmail";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/fetchmail.berlios/fetchmail-${version}.tar.bz2";
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 47fb50242c1..8a54cefaab0 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -5,10 +5,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gmrun-${version}";
+  pname = "gmrun";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/gmrun/${name}.tar.gz";
+    url = "mirror://sourceforge/gmrun/${pname}-${version}.tar.gz";
     sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p";
   };
 
diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix
index bb1556c7c4d..c8bbcf2aa7f 100644
--- a/pkgs/applications/misc/gmtp/default.nix
+++ b/pkgs/applications/misc/gmtp/default.nix
@@ -5,7 +5,8 @@
 let version = "1.3.11"; in
 
 stdenv.mkDerivation {
-  name = "gmtp-${version}";
+  pname = "gmtp";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz";
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index 0fccf83acf7..961efe4b057 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -40,7 +40,8 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  name = "googleearth-${version}";
+  pname = "googleearth";
+  inherit version;
   src = fetchurl {
     url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb";
     inherit sha256;
diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix
index 4143f6fde55..9954ff660ad 100644
--- a/pkgs/applications/misc/gpg-mdp/default.nix
+++ b/pkgs/applications/misc/gpg-mdp/default.nix
@@ -3,7 +3,8 @@
 let version = "0.7.4";
 in stdenv.mkDerivation {
   # mdp renamed to gpg-mdp because there is a mdp package already.
-  name = "gpg-mdp-${version}";
+  pname = "gpg-mdp";
+  inherit version;
   meta = {
     homepage = https://tamentis.com/projects/mdp/;
     license = [stdenv.lib.licenses.isc];
diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix
index acdeec10d30..b2997ece5d5 100644
--- a/pkgs/applications/misc/hubstaff/default.nix
+++ b/pkgs/applications/misc/hubstaff/default.nix
@@ -17,7 +17,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "hubstaff-${version}";
+  pname = "hubstaff";
+  inherit version;
 
   src = fetchurl { inherit sha256 url; };
 
diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
index 80bf5deceb1..c3d26077443 100644
--- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
@@ -3,7 +3,8 @@
 let
   version = "0.10.1";
   drv = stdenv.mkDerivation {
-    name = "keeagent-${version}";
+    pname = "keeagent";
+    inherit version;
 
     src = fetchzip {
       url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip";
diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
index e64632d529b..76ea9df78c2 100644
--- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.8.4.2";
   drv = stdenv.mkDerivation {
-    name = "keepasshttp-${version}";
+    pname = "keepasshttp";
+    inherit version;
     src = fetchFromGitHub {
       owner = "pfn";
       repo = "keepasshttp";
diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
index b45cb24b1b5..562835159eb 100644
--- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.8.0";
   drv = stdenv.mkDerivation {
-    name = "keepassrpc-${version}";
+    pname = "keepassrpc";
+    inherit version;
     src = fetchurl {
       url    = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
       sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd";
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 70915ca8707..cf81d572c61 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -8,10 +8,11 @@ let
   pname = "krusader";
   version = "2.7.1";
 in mkDerivation rec {
-  name = "krusader-${version}";
+  pname = "krusader";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
     sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm";
   };
 
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
index 4fd86a5a4f5..8ce353e85b9 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -5,7 +5,8 @@
 let version = "0.3.2"; in
 
 stdenv.mkDerivation rec {
-  name = "lxterminal-${version}";
+  pname = "lxterminal";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index eb0e61ba6d7..1474ea2fc4f 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -4,7 +4,8 @@ let
   version = "5.4.10";
 
 in stdenv.mkDerivation {
-  name = "masterpdfeditor-${version}";
+  pname = "masterpdfeditor";
+  inherit version;
 
   src = fetchurl {
     url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix
index 69f74d66dd0..3ad83776842 100644
--- a/pkgs/applications/misc/nrsc5/default.nix
+++ b/pkgs/applications/misc/nrsc5/default.nix
@@ -13,7 +13,8 @@ let
   version = "1.0";
 
 in stdenv.mkDerivation {
-  name = "nrsc5-${version}";
+  pname = "nrsc5";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "theori-io";
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index cd9a86e7fac..585c85cbd2c 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -10,7 +10,8 @@ let
 
 in stdenv.mkDerivation {
 
-  name = "opentx-${version}";
+  pname = "opentx";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "opentx";
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index e5c096fd2ae..48188574ad4 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -55,7 +55,8 @@ let
   libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ];
 
 in stdenv.mkDerivation {
-  name = "playonlinux-${version}";
+  pname = "playonlinux";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index 4d204021247..48a05091ca8 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -5,7 +5,8 @@
 let
   version = "1.6";
 in mkDerivation rec {
-  name = "qdirstat-${version}";
+  pname = "qdirstat";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "shundhammer";
diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix
index 7586669218d..d942f999f69 100644
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.40.41";
 in
 stdenv.mkDerivation {
-  name = "qtbitcointrader-${version}";
+  pname = "qtbitcointrader";
+  inherit version;
 
   src = fetchzip {
     url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 03b8d709fce..2eebe67c46d 100644
--- a/pkgs/applications/misc/redshift-plasma-applet/default.nix
+++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix
@@ -3,7 +3,8 @@
 let version = "1.0.18"; in
 
 stdenv.mkDerivation {
-  name = "redshift-plasma-applet-${version}";
+  pname = "redshift-plasma-applet";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "kotelnik";
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index aa0ebc29a55..1cff3635bf9 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -11,10 +11,11 @@
 
 let version = "3.3.2";
 in stdenv.mkDerivation rec {
-  name = "roxterm-${version}";
+  pname = "roxterm";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/roxterm/${name}.tar.xz";
+    url = "mirror://sourceforge/roxterm/${pname}-${version}.tar.xz";
     sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k";
   };
 
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 5967fa3ad77..a29dad2c444 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -7,7 +7,8 @@ let
   version = "4.8.2";
 
   libdc = stdenv.mkDerivation rec {
-    name = "libdivecomputer-ssrf-${version}";
+    pname = "libdivecomputer-ssrf";
+    inherit version;
 
     src = fetchurl {
       url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
@@ -66,7 +67,8 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "subsurface-${version}";
+  pname = "subsurface";
+  inherit version;
 
   src = fetchurl {
     url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index 3e7983c667f..c314e8ffe5a 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -5,10 +5,11 @@
 let
   version = "0.2.99.4";
 in stdenv.mkDerivation rec {
-  name = "synapse-${version}";
+  pname = "synapse";
+  inherit version;
 
   src = fetchurl {
-    url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz";
+    url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${pname}-${version}.tar.xz";
     sha256 = "1g6x9knb4jy1d8zgssjhzkgac583137pibisy9whjs8mckaj4k1j";
   };
 
diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix
index 9502b3a0abe..b1764591982 100644
--- a/pkgs/applications/misc/teseq/default.nix
+++ b/pkgs/applications/misc/teseq/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.1.1";
 in
 stdenv.mkDerivation {
-  name = "teseq-${version}";
+  pname = "teseq";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://gnu/teseq/teseq-${version}.tar.gz";
diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix
index ba6e97d61fb..d8a6f86f104 100644
--- a/pkgs/applications/misc/tomboy/default.nix
+++ b/pkgs/applications/misc/tomboy/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "tomboy-${version}";
+  pname = "tomboy";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz";
diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix
index b7118b49dae..d41f8440420 100644
--- a/pkgs/applications/networking/browsers/otter/default.nix
+++ b/pkgs/applications/networking/browsers/otter/default.nix
@@ -4,7 +4,8 @@
 , sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb"
 }:
 stdenv.mkDerivation {
-  name = "otter-browser-${version}";
+  pname = "otter-browser";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "OtterBrowser";
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 42c043d0007..7522307032e 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -64,7 +64,8 @@ let
       };
     in
       stdenv.mkDerivation rec {
-        name = "hadoop-${version}";
+        pname = "hadoop";
+        inherit version;
 
         src = binary-distributon;
 
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 6a721ef14c1..c8b95baf2f3 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -6,7 +6,8 @@ let
   generic = { version, sha256, ...}@attrs:
     let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in
       buildGoPackage {
-        name = "kops-${version}";
+        pname = "kops";
+        inherit version;
 
         inherit goPackagePath;
 
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index cf0116ba856..e1b5a4425d5 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -3,7 +3,8 @@
 let version = "0.12.0"; in
 
 buildGoPackage {
-  name = "kubecfg-${version}";
+  pname = "kubecfg";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "bitnami";
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 3572bfe7f5b..e675d17491a 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -15,18 +15,19 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
 
-  name = "spark-${version}";
+  pname = "spark";
+  inherit version;
 
   src = fetchzip {
     inherit sha256;
-    url    = "mirror://apache/spark/${name}/${name}-bin-without-hadoop.tgz";
+    url    = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
   };
 
   buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
     ++ optional RSupport R
     ++ optional mesosSupport mesos;
 
-  untarDir = "${name}-bin-without-hadoop";
+  untarDir = "${pname}-${version}-bin-without-hadoop";
   installPhase = ''
     mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java}
     mv * $out/lib/${untarDir}
diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix
index ae0643669dc..54ed0f2eea0 100644
--- a/pkgs/applications/networking/dropbox/cli.nix
+++ b/pkgs/applications/networking/dropbox/cli.nix
@@ -15,7 +15,8 @@ let
   dropboxd = "${dropbox}/bin/dropbox";
 in
 stdenv.mkDerivation {
-  name = "dropbox-cli-${version}";
+  pname = "dropbox-cli";
+  inherit version;
 
   outputs = [ "out" "nautilusExtension" ];
 
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 97a4341dc4d..f04afb6f1f7 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -5,7 +5,8 @@
 let
   version = "5.2.0";
 in stdenv.mkDerivation rec {
-  name = "franz-${version}";
+  pname = "franz";
+  inherit version;
   src = fetchurl {
     url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
     sha256 = "1wlfd1ja38vbjy8y5pg95cpvf5ixkkq53m7v3c24q473jax4ynvg";
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index 9e1b9fe9c39..47854683e0e 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -39,7 +39,8 @@ let
     libGL
   ] + ":${stdenv.cc.cc.lib}/lib64";
 in stdenv.mkDerivation {
-  name = "hipchat-${version}";
+  pname = "hipchat";
+  inherit version;
 
   src = fetchurl {
     url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
index 59b1d463c9d..eb6d954eb33 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
@@ -3,7 +3,8 @@
 let version = "1.5.0";
 in
 stdenv.mkDerivation {
-  name = "pidgin-latex-${version}";
+  pname = "pidgin-latex";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
index 18bf89a5f2e..9a1e46e5ac5 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
@@ -4,7 +4,8 @@ let
   version = "54b2992";
 in
 stdenv.mkDerivation rec {
-  name = "pidgin-mra-${version}";
+  pname = "pidgin-mra";
+  inherit version;
 
   src = fetchgit {
     url = "https://github.com/dreadatour/pidgin-mra";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
index f482e12a4bc..936974a1a88 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.8";
 in
 stdenv.mkDerivation rec {
-  name = "pidgin-xmpp-receipts-${version}";
+  pname = "pidgin-xmpp-receipts";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "noonien-d";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
index 0b2cba64920..3c416927487 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
@@ -4,7 +4,8 @@ let
   version = "2018-08-03";
 in
 stdenv.mkDerivation rec {
-  name = "purple-matrix-unstable-${version}";
+  pname = "purple-matrix-unstable";
+  inherit version;
 
   src = fetchgit {
     url = "https://github.com/matrix-org/purple-matrix";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
index e54af933a08..22554a4abf8 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
@@ -4,7 +4,8 @@ let
   version = "40ddb6d";
 in
 stdenv.mkDerivation rec {
-  name = "purple-vk-plugin-${version}";
+  pname = "purple-vk-plugin";
+  inherit version;
 
   src = fetchhg {
     url = "https://bitbucket.org/olegoandreev/purple-vk-plugin";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
index 8527593c1a2..df2665d8ce8 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.3.0";
 in
 stdenv.mkDerivation rec {
-  name = "telegram-purple-${version}";
+  pname = "telegram-purple";
+  inherit version;
 
   src = fetchgit {
     url = "https://github.com/majn/telegram-purple";
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 4ab3c64d16d..6a43344fbd3 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -11,7 +11,8 @@ let
   rev = "v${version}";
 
 in mkDerivation rec {
-  name = "qtox-${version}";
+  pname = "qtox";
+  inherit version;
 
   src = fetchFromGitHub {
     owner  = "qTox";
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 1c58ae353bb..111efb182e5 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -4,7 +4,8 @@
 
 let
   generic = version: sha256: prefix: library: stdenv.mkDerivation rec {
-    name = "quaternion-${version}";
+    pname = "quaternion";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "QMatrixClient";
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index ab84ee6ec0f..dd76063a0fa 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -64,7 +64,8 @@ let
       throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
 
 in stdenv.mkDerivation {
-  name = "skypeforlinux-${version}";
+  pname = "skypeforlinux";
+  inherit version;
 
   system = "x86_64-linux";
 
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 94c02ab0226..fab9c28ec97 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -57,7 +57,8 @@ let
       throw "Slack is not supported on ${stdenv.hostPlatform.system}";
 
 in stdenv.mkDerivation {
-  name = "slack-${version}";
+  pname = "slack";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index b992263e215..03bf3b3bbdd 100644
--- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
@@ -4,7 +4,8 @@
 let
   version = "4.0.1";
 in stdenv.mkDerivation {
-  name = "vk-messenger-${version}";
+  pname = "vk-messenger";
+  inherit version;
   src = {
     i686-linux = fetchurl {
       url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm";
diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index 9f704e52721..da4c5073000 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -22,7 +22,8 @@ let
   tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz";
 
 in stdenv.mkDerivation rec {
-  name = "wavebox-${version}";
+  pname = "wavebox";
+  inherit version;
   src = fetchurl {
     url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
     sha256 = "1yg2lib4h5illz0ss4hvr78s4v1cjbxlczjzaw6bqigyk95smm23";
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 8aa732fd6ba..e822b023f54 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -31,7 +31,8 @@ let
   };
 
 in mkDerivation {
-  name = "zoom-us-${version}";
+  pname = "zoom-us";
+  inherit version;
 
   src = srcs.${stdenv.hostPlatform.system};
 
diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix
index bc0918737dd..0a670b2b9a6 100644
--- a/pkgs/applications/networking/mailreaders/lumail/default.nix
+++ b/pkgs/applications/networking/mailreaders/lumail/default.nix
@@ -25,7 +25,8 @@ let
   luaCPath = getPath "so";
 in
 stdenv.mkDerivation {
-  name = "lumail-${version}";
+  pname = "lumail";
+  inherit version;
 
   src = fetchurl {
     url = "https://lumail.org/download/lumail-${version}.tar.gz";
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index 126e2854574..67c673bc913 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -4,7 +4,8 @@ let
   version = "9";
 in
 stdenv.mkDerivation rec {
-  name = "notmuch-addrlookup-${version}";
+  pname = "notmuch-addrlookup";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "aperezdc";
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index e88936dc072..34ebf4364ce 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -10,7 +10,8 @@ assert spellChecking -> gtkspell3 != null;
 let version = "0.145"; in
 
 stdenv.mkDerivation {
-  name = "pan-${version}";
+  pname = "pan";
+  inherit version;
 
   src = fetchurl {
     url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index d674c70e4c2..24435288488 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -18,7 +18,8 @@ let
   version = "build01475";
 
   freenet-jars = stdenv.mkDerivation {
-    name = "freenet-jars-${version}";
+    pname = "freenet-jars";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "freenet";
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index c685a270586..bf8e7a16a4f 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -22,7 +22,8 @@ let
   };
 
 in mkDerivation rec {
-  name = "protonmail-bridge-${version}";
+  pname = "protonmail-bridge";
+  inherit version;
 
   src = fetchurl {
     url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index d96a810ee05..11c8af368b9 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -14,7 +14,8 @@ let
   version = "7.5.0";
 
 in stdenv.mkDerivation {
-  name = "spideroak-${version}";
+  pname = "spideroak";
+  inherit version;
 
   src = fetchurl {
     name = "SpiderOakONE-${version}-slack_tar_x64.tgz";
diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix
index 3f87c8558e1..c5ff090a807 100644
--- a/pkgs/applications/networking/super-productivity/default.nix
+++ b/pkgs/applications/networking/super-productivity/default.nix
@@ -53,7 +53,8 @@ let
       throw "super-productivity is not supported on ${stdenv.hostPlatform.system}";
 
 in stdenv.mkDerivation {
-  name = "super-productivity-${version}";
+  pname = "super-productivity";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix
index 8a056e21692..a7142542238 100644
--- a/pkgs/applications/networking/tcpkali/default.nix
+++ b/pkgs/applications/networking/tcpkali/default.nix
@@ -3,7 +3,8 @@
 let version = "1.1.1"; in
 
 stdenv.mkDerivation rec {
-  name = "tcpkali-${version}";
+  pname = "tcpkali";
+  inherit version;
   src = fetchFromGitHub {
     owner = "machinezone";
     repo = "tcpkali";
diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix
index 8946bbab931..5065a1cb9bc 100644
--- a/pkgs/applications/office/impressive/default.nix
+++ b/pkgs/applications/office/impressive/default.nix
@@ -8,7 +8,8 @@ in stdenv.mkDerivation {
     # This project was formerly known as KeyJNote.
     # See http://keyj.emphy.de/apple-lawsuit/ for details.
 
-    name = "impressive-${version}";
+    pname = "impressive";
+    inherit version;
 
     src = fetchurl {
       url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz";
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index a8299936662..6acd692a95b 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -60,7 +60,8 @@ let
 
   };
 in stdenv.mkDerivation rec {
-  name = "libreoffice-${version}";
+  pname = "libreoffice";
+  inherit version;
 
   inherit (primary-src) src;
 
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index efcc4407842..77109a61fcb 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -60,7 +60,8 @@ let
 
   };
 in stdenv.mkDerivation rec {
-  name = "libreoffice-${version}";
+  pname = "libreoffice";
+  inherit version;
 
   inherit (primary-src) src;
 
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 3c4434f0098..655a10d3a94 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -91,7 +91,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "mendeley-${version}";
+  pname = "mendeley";
+  inherit version;
 
   src = fetchurl {
     url = url;
diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index 3ddca8fe762..99824cd19ec 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -5,7 +5,8 @@ let
   version = "1.3.3";
 in
   stdenv.mkDerivation {
-    name = "money-manager-ex-${version}";
+    pname = "money-manager-ex";
+    inherit version;
 
     src = fetchgit {
       url = "https://github.com/moneymanagerex/moneymanagerex.git";
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index a7887357cd3..324cdd5cc42 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.44.55";
 in stdenv.mkDerivation rec {
-  name = "mytetra-${version}";
+  pname = "mytetra";
+  inherit version;
   src = fetchurl {
     url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz";
     sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l";
diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix
index d8765d2fa61..41cc3d94016 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/pkgs/applications/office/planner/default.nix
@@ -13,7 +13,8 @@
 let version = "unstable-2019-02-13";
 
 in stdenv.mkDerivation {
-  name = "planner-${version}";
+  pname = "planner";
+  inherit version;
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix
index 77a60295443..edb2c778a0a 100644
--- a/pkgs/applications/office/todo.txt-cli/default.nix
+++ b/pkgs/applications/office/todo.txt-cli/default.nix
@@ -2,7 +2,8 @@
 let
   version = "2.11.0";
 in stdenv.mkDerivation {
-  name = "todo.txt-cli-${version}";
+  pname = "todo.txt-cli";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz";
diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index 4c83d67f7cd..1f21ec60ae2 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -8,10 +8,11 @@ let
 
   version = "10.1.0.5672";
 in stdenv.mkDerivation rec{
-  name = "wpsoffice-${version}";
+  pname = "wpsoffice";
+  inherit version;
 
   src = fetchurl {
-    name = "${name}.tar.xz";
+    name = "${pname}-${version}.tar.xz";
     url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_${version}~a21_${bits}.tar.xz";
     sha256 = if bits == "x86_64" then
       "0mi3n9kplf82gd0g2m0np957agy53p4g1qh81pbban49r4n0ajcz" else
diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix
index 2042f1047b2..0a313c35a18 100644
--- a/pkgs/applications/radio/airspy/default.nix
+++ b/pkgs/applications/radio/airspy/default.nix
@@ -6,7 +6,8 @@ let
   version = "1.0.9";
 in
   stdenv.mkDerivation {
-    name = "airspy-${version}";
+    pname = "airspy";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "airspy";
diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix
index af3cabac9ef..d56994e46ff 100644
--- a/pkgs/applications/radio/gnuradio/limesdr.nix
+++ b/pkgs/applications/radio/gnuradio/limesdr.nix
@@ -8,7 +8,8 @@ let
   version = "2.0.0";
 
 in stdenv.mkDerivation rec {
-  name = "gr-limesdr-${version}";
+  pname = "gr-limesdr";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "myriadrf";
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index 3ff73c4ef2a..4e69b11efbf 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -7,7 +7,8 @@ let
   version = "19.04.0";
 
 in stdenv.mkDerivation {
-  name = "limesuite-${version}";
+  pname = "limesuite";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "myriadrf";
diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix
index 13755b88c65..f624359c163 100644
--- a/pkgs/applications/radio/multimon-ng/default.nix
+++ b/pkgs/applications/radio/multimon-ng/default.nix
@@ -3,7 +3,8 @@ let
   version = "1.1.8";
 in
 stdenv.mkDerivation {
-  name = "multimon-ng-${version}";
+  pname = "multimon-ng";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "EliasOenal";
diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix
index 40a168675f6..a1c1f625bea 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/pkgs/applications/radio/qradiolink/default.nix
@@ -8,7 +8,8 @@ let
   version = "0.5.0";
 
 in stdenv.mkDerivation {
-  name = "qradiolink-${version}";
+  pname = "qradiolink";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "kantooon";
diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix
index 1d8056ca1e8..eacbe66e5e5 100644
--- a/pkgs/applications/radio/soapyairspy/default.nix
+++ b/pkgs/applications/radio/soapyairspy/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.1.2";
 
 in stdenv.mkDerivation {
-  name = "soapyairspy-${version}";
+  pname = "soapyairspy";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix
index 5472254b19d..0bb05a204da 100644
--- a/pkgs/applications/radio/soapybladerf/default.nix
+++ b/pkgs/applications/radio/soapybladerf/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.4.1";
 
 in stdenv.mkDerivation {
-  name = "soapybladerf-${version}";
+  pname = "soapybladerf";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix
index 2c5dd058ced..5ab4c3363f4 100644
--- a/pkgs/applications/radio/soapyhackrf/default.nix
+++ b/pkgs/applications/radio/soapyhackrf/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.3.3";
 
 in stdenv.mkDerivation {
-  name = "soapyhackrf-${version}";
+  pname = "soapyhackrf";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix
index a0057978ea3..2f73403a168 100644
--- a/pkgs/applications/radio/soapyremote/default.nix
+++ b/pkgs/applications/radio/soapyremote/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.5.1";
 
 in stdenv.mkDerivation {
-  name = "soapyremote-${version}";
+  pname = "soapyremote";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix
index d85fe347cd7..8bf473cb36a 100644
--- a/pkgs/applications/radio/soapyrtlsdr/default.nix
+++ b/pkgs/applications/radio/soapyrtlsdr/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.3.0";
 
 in stdenv.mkDerivation {
-  name = "soapyrtlsdr-${version}";
+  pname = "soapyrtlsdr";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix
index 6754e8f2a55..5e4a78cfbd2 100644
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/pkgs/applications/radio/soapysdr/default.nix
@@ -13,7 +13,8 @@ let
   extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages;
 
 in stdenv.mkDerivation {
-  name = "soapysdr-${version}";
+  pname = "soapysdr";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix
index 6ed88e0431e..9e910584158 100644
--- a/pkgs/applications/radio/soapyuhd/default.nix
+++ b/pkgs/applications/radio/soapyuhd/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.3.6";
 
 in stdenv.mkDerivation {
-  name = "soapyuhd-${version}";
+  pname = "soapyuhd";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix
index fd0bd8d5d75..b3ff0f51f11 100644
--- a/pkgs/applications/radio/uhd/default.nix
+++ b/pkgs/applications/radio/uhd/default.nix
@@ -21,7 +21,8 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "uhd-${version}";
+  pname = "uhd";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "EttusResearch";
diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix
index acf0226c0db..c6b09595c20 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/applications/radio/welle-io/default.nix
@@ -7,7 +7,8 @@ let
 
 in stdenv.mkDerivation {
 
-  name = "welle-io-${version}";
+  pname = "welle-io";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "AlbrechtL";
diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix
index 9bacf6d9041..ff273ab8e95 100644
--- a/pkgs/applications/science/astronomy/gpredict/default.nix
+++ b/pkgs/applications/science/astronomy/gpredict/default.nix
@@ -6,7 +6,8 @@
 let
   version = "2.2.1";
 in stdenv.mkDerivation {
-  name = "gpredict-${version}";
+  pname = "gpredict";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2";
diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix
index 92f997900d5..12007c940b3 100644
--- a/pkgs/applications/science/chemistry/gwyddion/default.nix
+++ b/pkgs/applications/science/chemistry/gwyddion/default.nix
@@ -4,7 +4,8 @@ with stdenv.lib;
 
 let version = "2.48"; in
 stdenv.mkDerivation {
-  name = "gwyddion-${version}";
+  pname = "gwyddion";
+  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/gwyddion/files/gwyddion/${version}/gwyddion-${version}.tar.xz";
     sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx";
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
index 4b580a6cf52..dfb04ccd1de 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -7,7 +7,8 @@ let
   fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
 
 in stdenv.mkDerivation {
-  name = "octopus-${version}";
+  pname = "octopus";
+  inherit version;
 
   src = fetchurl {
     url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix
index bc6301e1fd4..487558a23c1 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -11,7 +11,8 @@ let
   python = python3.withPackages (ps : with ps; [ six pyparsing ]);
 
 in stdenv.mkDerivation {
-  name = "openmolcas-${version}";
+  pname = "openmolcas";
+  inherit version;
 
   src = fetchFromGitLab {
     owner = "Molcas";
diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix
index b655cc48c73..7be0103304a 100644
--- a/pkgs/applications/science/geometry/tetgen/default.nix
+++ b/pkgs/applications/science/geometry/tetgen/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.5.0"; in
 stdenv.mkDerivation {
-  name = "tetgen-${version}";
+  pname = "tetgen";
+  inherit version;
 
   src = fetchurl {
     url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz";
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 10fe722d7e9..dfe1277d5ac 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -39,7 +39,8 @@ let
     substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
   '' else "";
 self = stdenv.mkDerivation {
-  name = "coq-${version}";
+  pname = "coq";
+  inherit version;
 
   passthru = {
     inherit coq-version;
diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix
index d76462ca938..bebf81b030d 100644
--- a/pkgs/applications/science/logic/coq2html/default.nix
+++ b/pkgs/applications/science/logic/coq2html/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "coq2html-${version}";
+  pname = "coq2html";
+  inherit version;
 
   src = fetchgit {
     url = "https://github.com/xavierleroy/coq2html";
diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix
index db784237ea9..d6a1207b5d6 100644
--- a/pkgs/applications/science/logic/logisim/default.nix
+++ b/pkgs/applications/science/logic/logisim/default.nix
@@ -3,7 +3,8 @@
 let version = "2.7.1"; in
 
 stdenv.mkDerivation {
-  name = "logisim-${version}";
+  pname = "logisim";
+  inherit version;
   
   src = fetchurl {
     url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar";
diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix
index f1116a27c0b..1566719084c 100644
--- a/pkgs/applications/science/logic/tlaplus/toolbox.nix
+++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix
@@ -21,7 +21,8 @@ let
 
 
 in stdenv.mkDerivation {
-  name = "tla-toolbox-${version}";
+  pname = "tla-toolbox";
+  inherit version;
   src = fetchzip {
     url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip";
     sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q";
diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix
index 5e0b7fc300b..a42a5b710ce 100644
--- a/pkgs/applications/science/math/ripser/default.nix
+++ b/pkgs/applications/science/math/ripser/default.nix
@@ -17,7 +17,8 @@ let
   version = "1.0";
 in
 stdenv.mkDerivation {
-  name = "ripser-${version}";
+  pname = "ripser";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "Ripser";
diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix
index b81f188a91b..17b2fe27f29 100644
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@@ -28,7 +28,8 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "gephi-${version}";
+  pname = "gephi";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix
index 8cd119c7b7b..59f5afb2f43 100644
--- a/pkgs/applications/science/misc/megam/default.nix
+++ b/pkgs/applications/science/misc/megam/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.92"; in
 stdenv.mkDerivation rec {
-  name = "megam-${version}";
+  pname = "megam";
+  inherit version;
 
   src = fetchurl {
     url = "http://hal3.name/megam/megam_src.tgz";
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 7db2e6a12c2..82e3136b8f0 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -3,10 +3,11 @@
 
 let version = "5.1.0"; in
 stdenv.mkDerivation rec {
-  name = "tulip-${version}";
+  pname = "tulip";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/auber/${name}_src.tar.gz";
+    url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz";
     sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h";
   };
 
diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix
index 152b7121774..6623f5def4c 100644
--- a/pkgs/applications/science/programming/scyther/cli.nix
+++ b/pkgs/applications/science/programming/scyther/cli.nix
@@ -1,7 +1,8 @@
 { stdenv, glibc, flex, bison, cmake
 , version, src, meta }:
 stdenv.mkDerivation {
-  name = "scyther-cli-${version}";
+  pname = "scyther-cli";
+  inherit version;
 
   inherit src meta;
 
diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix
index e0993a58019..b4daae1afc0 100644
--- a/pkgs/applications/science/programming/scyther/default.nix
+++ b/pkgs/applications/science/programming/scyther/default.nix
@@ -25,7 +25,8 @@ let
   };
 
   gui = stdenv.mkDerivation {
-    name = "scyther-gui-${version}";
+    pname = "scyther-gui";
+    inherit version;
     inherit src meta;
     buildInputs = [
       python27Packages.wrapPython
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 87059634752..9a2e2484d7a 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -28,7 +28,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "git-${version}";
+  pname = "git";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index b7828418db0..e6b746233fe 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -3,7 +3,8 @@ let
   version = "0.3.1";
 in
 buildGoPackage {
-  name = "grv-${version}";
+  pname = "grv";
+  inherit version;
 
   buildInputs = [ ncurses readline curl libgit2 ];
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 34c367b20a4..3c7784e8506 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.0.16";
 in
 stdenv.mkDerivation {
-  name = "svn-all-fast-export-${version}";
+  pname = "svn-all-fast-export";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "svn-all-fast-export";
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index d00fdd0c29e..821ecf3e3d8 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -4,7 +4,8 @@ let
   version = "2.4.0";
 in
 stdenv.mkDerivation {
-  name = "svn2git-${version}";
+  pname = "svn2git";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index 33d2eb89ad0..0aa8afa9361 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.0-mtn-head"; in
 stdenv.mkDerivation rec {
-  name = "guitone-${version}";
+  pname = "guitone";
+  inherit version;
 
   #src = fetchurl {
   #  url = "${meta.homepage}/count.php/from=default/${version}/${name}.tgz";
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 010d4d2f86a..7081e1a0899 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -11,7 +11,8 @@ in
 assert perlVersion != "";
 
 stdenv.mkDerivation rec {
-  name = "monotone-${version}";
+  pname = "monotone";
+  inherit version;
 
   src = fetchurl {
     url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
@@ -25,8 +26,8 @@ stdenv.mkDerivation rec {
     openssl gmp bzip2 ];
 
   postInstall = ''
-    mkdir -p $out/share/${name}
-    cp -rv contrib/ $out/share/${name}/contrib
+    mkdir -p $out/share/${pname}-${version}
+    cp -rv contrib/ $out/share/${pname}-${version}/contrib
     mkdir -p $out/${perl.libPrefix}/${perlVersion}
     cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion}
   '';
diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix
index 1fbc22f8776..a3ba418a146 100644
--- a/pkgs/applications/version-management/redmine/4.x/default.nix
+++ b/pkgs/applications/version-management/redmine/4.x/default.nix
@@ -11,10 +11,11 @@ let
   };
 in
   stdenv.mkDerivation rec {
-    name = "redmine-${version}";
+    pname = "redmine";
+    inherit version;
 
     src = fetchurl {
-      url = "https://www.redmine.org/releases/${name}.tar.gz";
+      url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
       sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a";
     };
 
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index ba1980c3d14..0b1f64b58a1 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -11,10 +11,11 @@ let
   };
 in
   stdenv.mkDerivation rec {
-    name = "redmine-${version}";
+    pname = "redmine";
+    inherit version;
 
     src = fetchurl {
-      url = "https://www.redmine.org/releases/${name}.tar.gz";
+      url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
       sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r";
     };
 
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index 6baeb5279c2..aed5cb807dc 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.12.0"; in
 stdenv.mkDerivation {
-  name = "yadm-${version}";
+  pname = "yadm";
+  inherit version;
 
   src = fetchFromGitHub {
     owner  = "TheLocehiliosan";
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index ea51471d9aa..03fc1f5399a 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "subtitleeditor-${version}";
+  pname = "subtitleeditor";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "kitone";
diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix
index 83ca41e201c..bc6561a0bbd 100644
--- a/pkgs/applications/video/tivodecode/default.nix
+++ b/pkgs/applications/video/tivodecode/default.nix
@@ -6,7 +6,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "tivodecode-${version}";
+  pname = "tivodecode";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/tivodecode/tivodecode/${version}/tivodecode-${version}.tar.gz";
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 8222fb50a8f..6931e492e99 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -5,7 +5,8 @@ with stdenv.lib;
 let version = "0.600.4"; in
 
 stdenv.mkDerivation rec {
-  name = "virtinst-${version}";
+  pname = "virtinst";
+  inherit version;
 
   src = fetchurl {
     url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz";
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 1a6ba5ac527..20930b86537 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -24,7 +24,8 @@ let
   main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv";
   version = "6.0.8";
 in stdenv.mkDerivation {
-  name = "virtualbox-${version}";
+  pname = "virtualbox";
+  inherit version;
 
   src = fetchurl {
     url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix
index caf97c6510d..d0a1de7f600 100644
--- a/pkgs/applications/window-managers/windowlab/default.nix
+++ b/pkgs/applications/window-managers/windowlab/default.nix
@@ -3,7 +3,8 @@
 
 let version = "1.40"; in
 stdenv.mkDerivation {
-  name = "windowlab-${version}";
+  pname = "windowlab";
+  inherit version;
 
   src = fetchurl {
     url = "http://nickgravgaard.com/windowlab/windowlab-${version}.tar";
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix
index 678ebad75dd..f7867882d22 100644
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ b/pkgs/applications/window-managers/yabar/build.nix
@@ -5,7 +5,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "yabar-${version}";
+  pname = "yabar";
+  inherit version;
 
   src = fetchFromGitHub {
     inherit rev sha256;
diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index e563d201ff3..38a2d8fe56c 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -24,7 +24,8 @@ let
   };
 
   full-ttf = stdenv.mkDerivation {
-    name = "dejavu-fonts-full-${version}";
+    pname = "dejavu-fonts-full";
+    inherit version;
     nativeBuildInputs = [fontforge perl perlPackages.IOString perlPackages.FontTTF];
 
     src = fetchFromGitHub {
@@ -44,14 +45,16 @@ let
   };
 
   minimal = stdenv.mkDerivation {
-    name = "dejavu-fonts-minimal-${version}";
+    pname = "dejavu-fonts-minimal";
+    inherit version;
     buildCommand = ''
       install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf
     '';
     inherit meta;
   };
 in stdenv.mkDerivation {
-  name = "dejavu-fonts-${version}";
+  pname = "dejavu-fonts";
+  inherit version;
   buildCommand = ''
     install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/*.ttf
     ln -s --relative --force --target-directory=$out/share/fonts/truetype ${minimal}/share/fonts/truetype/DejaVuSans.ttf
diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix
index 6ed540121a2..cf89a8fcb8f 100644
--- a/pkgs/data/fonts/kochi-substitute/default.nix
+++ b/pkgs/data/fonts/kochi-substitute/default.nix
@@ -3,7 +3,8 @@
 let version = "20030809";
 in
 stdenv.mkDerivation {
-  name = "kochi-substitute-${version}";
+  pname = "kochi-substitute";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb";
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 5043e031c08..0acb8e2c7be 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -90,7 +90,8 @@ rec {
     };
   };
   noto-fonts-emoji = let version = "2018-08-10-unicode11"; in stdenv.mkDerivation {
-    name = "noto-fonts-emoji-${version}";
+    pname = "noto-fonts-emoji";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "googlei18n";
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 6d29d876073..79924c4832f 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -3,7 +3,8 @@
 
 let version = "1.12"; in
 stdenv.mkDerivation rec {
-  name = "shared-mime-info-${version}";
+  pname = "shared-mime-info";
+  inherit version;
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz";
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 2a308a2da45..27ce5d0f078 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -11,10 +11,11 @@
 let
   version = "3.32.1";
 in stdenv.mkDerivation rec {
-  name = "gnome-boxes-${version}";
+  pname = "gnome-boxes";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index 2941d629f8f..a729a924f6b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -7,7 +7,8 @@
 let
   version = "3.32.2";
 in stdenv.mkDerivation rec {
-  name = "gnome-notes-${version}";
+  pname = "gnome-notes";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 57cb90c7c45..75a15a41f97 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -7,10 +7,11 @@
 let
   version = "3.32.1";
 in stdenv.mkDerivation rec {
-  name = "gnome-contacts-${version}";
+  pname = "gnome-contacts";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy";
   };
 
diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
index 755c8e1b02f..b4b184d4fa0 100644
--- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
@@ -5,10 +5,11 @@ let
 
   inherit (python3.pkgs) python pygobject3 requests;
 in stdenv.mkDerivation rec {
-  name = "chrome-gnome-shell-${version}";
+  pname = "chrome-gnome-shell";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz";
     sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban";
   };
 
diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix
index 6ef87cece4e..5e7db35a727 100644
--- a/pkgs/desktops/gnustep/make/default.nix
+++ b/pkgs/desktops/gnustep/make/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gnustep-make-${version}";
+  pname = "gnustep-make";
+  inherit version;
 
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz";
diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix
index 519992fd8c2..b70fde00e15 100644
--- a/pkgs/development/compilers/as31/default.nix
+++ b/pkgs/development/compilers/as31/default.nix
@@ -5,7 +5,8 @@ let
   version = "2.3.1";
 
 in stdenv.mkDerivation {
-  name = "as31-${version}";
+  pname = "as31";
+  inherit version;
   src = fetchurl {
     name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL
     url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz";
diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix
index ceeff56330b..34512fc8ef0 100644
--- a/pkgs/development/compilers/chicken/4/chicken.nix
+++ b/pkgs/development/compilers/chicken/4/chicken.nix
@@ -11,7 +11,8 @@ let
   lib = stdenv.lib;
 in
 stdenv.mkDerivation {
-  name = "chicken-${version}";
+  pname = "chicken";
+  inherit version;
 
   binaryVersion = 8;
 
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index 74f71181190..5fefce12dbf 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -11,7 +11,8 @@ let
   lib = stdenv.lib;
 in
 stdenv.mkDerivation {
-  name = "chicken-${version}";
+  pname = "chicken";
+  inherit version;
 
   binaryVersion = 11;
 
diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix
index 9e3184c42eb..3f93ea9e1ba 100644
--- a/pkgs/development/compilers/cmucl/binary.nix
+++ b/pkgs/development/compilers/cmucl/binary.nix
@@ -19,7 +19,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "cmucl-binary-${version}";
+  pname = "cmucl-binary";
+  inherit version;
 
   buildCommand = ''
     mkdir -p $out
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 2e823fe1f0f..90355896064 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -23,7 +23,8 @@ let
 
   genericBinary = { version, sha256s, rel ? 1 }:
   stdenv.mkDerivation rec {
-    name = "crystal-binary-${version}";
+    pname = "crystal-binary";
+    inherit version;
 
     src = fetchurl {
       url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz";
diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix
index 8bae6e2363f..128c245d277 100644
--- a/pkgs/development/compilers/dale/default.nix
+++ b/pkgs/development/compilers/dale/default.nix
@@ -11,7 +11,8 @@
 let version = "20170519";
 
 in stdenv.mkDerivation {
-  name = "dale-${version}";
+  pname = "dale";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "tomhrr";
diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix
index 65d16c48a61..7a3324d7560 100644
--- a/pkgs/development/compilers/gambit/build.nix
+++ b/pkgs/development/compilers/gambit/build.nix
@@ -1,7 +1,8 @@
 { stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, src }:
 
 stdenv.mkDerivation rec {
-  name    = "gambit-${version}";
+  pname = "gambit";
+  inherit version;
   inherit src;
 
   bootstrap = import ./bootstrap.nix ( pkgs );
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
index 350eed2fedd..b86b35525a6 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -14,7 +14,8 @@ let
     else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update
 in
 stdenv.mkDerivation {
-  name = "gcc-arm-embedded-${version}";
+  pname = "gcc-arm-embedded";
+  inherit version;
 
   src = fetchurl {
     url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2";
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index b20d6f9c47e..9ef650c330f 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -7,7 +7,8 @@
 # TODO: make static compilation work
 
 stdenv.mkDerivation rec {
-  name    = "gerbil-${version}";
+  pname = "gerbil";
+  inherit version;
   inherit src;
 
   # Use makeStaticLibraries to enable creation of statically linked binaries
diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix
index 675522d54ea..e90e0dc3d98 100644
--- a/pkgs/development/compilers/gforth/default.nix
+++ b/pkgs/development/compilers/gforth/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.7.3";
 in
 stdenv.mkDerivation {
-  name = "gforth-${version}";
+  pname = "gforth";
+  inherit version;
   src = fetchurl {
     url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz";
     sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig";
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 0a974fccc88..7e11c75e07d 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -3,7 +3,8 @@
 let
   generic = { version, sha256, prePatch }:
     stdenv.mkDerivation rec {
-      name = "haxe-${version}";
+      pname = "haxe";
+      inherit version;
 
       buildInputs = [ocaml zlib pcre neko camlp4];
 
diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix
index a6955c03051..2a6551aad18 100644
--- a/pkgs/development/compilers/inform7/default.nix
+++ b/pkgs/development/compilers/inform7/default.nix
@@ -2,7 +2,8 @@
 let
   version = "6M62";
 in stdenv.mkDerivation {
-  name = "inform7-${version}";
+  pname = "inform7";
+  inherit version;
   buildInputs = [ perl coreutils gnutar gzip ];
   src = fetchzip {
     url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz";
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index e4ef37e4721..787a9352e22 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -21,7 +21,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ldc-${version}";
+  pname = "ldc";
+  inherit version;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index 132cd67a4ae..9a602c62777 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -2,7 +2,8 @@
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation {
-  name = "clang-${version}";
+  pname = "clang";
+  inherit version;
 
   src = fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg";
 
diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
index d54ffd96382..e327fa79c6f 100644
--- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
@@ -1,7 +1,8 @@
 {stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
 
 stdenv.mkDerivation rec {
-  name = "dragonegg-${version}";
+  pname = "dragonegg";
+  inherit version;
 
   src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw";
 
@@ -11,9 +12,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ];
 
   installPhase = ''
-    mkdir -p $out/lib $out/share/doc/${name}
+    mkdir -p $out/lib $out/share/doc/${pname}-${version}
     cp -d dragonegg.so $out/lib
-    cp README COPYING $out/share/doc/${name}
+    cp README COPYING $out/share/doc/${pname}-${version}
   '';
 
   meta = {
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index 6edd5e9798c..4f766e5f9a5 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -3,7 +3,8 @@
 let version = "3.5.2"; in
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetchurl {
     url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz";
diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
index 268f2702a23..d295ddbf8a4 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
@@ -8,7 +8,8 @@ let
     sha256 = "10idgcbs4pcx6mjsbq1vjm8hzqqdk2p7k86cw9f473jmfyfwgf5j";
   };
 in stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetchurl {
     url    = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz";
diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix
index 4a398bd96a0..8fe4dd6f1d5 100644
--- a/pkgs/development/compilers/llvm/3.5/lld.nix
+++ b/pkgs/development/compilers/llvm/3.5/lld.nix
@@ -1,7 +1,8 @@
 { stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89";
 
diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix
index a5161333b28..b4823e9d8c2 100644
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.5/lldb.nix
@@ -13,7 +13,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7";
 
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 6eec9971778..95632a45999 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -18,7 +18,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "llvm-${version}";
+  pname = "llvm";
+  inherit version;
 
   src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4";
 
diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix
index bacf4d30556..06bc7490c7b 100644
--- a/pkgs/development/compilers/llvm/3.5/polly.nix
+++ b/pkgs/development/compilers/llvm/3.5/polly.nix
@@ -1,7 +1,8 @@
 { stdenv, fetch, cmake, isl, python, gmp, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "polly-${version}";
+  pname = "polly";
+  inherit version;
 
   src =  fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx";
 
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index 47a1bed126d..0276393d840 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -3,7 +3,8 @@
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
   self = stdenv.mkDerivation {
-    name = "clang-${version}";
+    pname = "clang";
+    inherit version;
 
     src = fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc";
 
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
index 5a0410302f2..b66284152d4 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp";
 
diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix
index 8b25681c2db..80b069fff75 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1";
 
diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix
index d27786464c0..985cd666385 100644
--- a/pkgs/development/compilers/llvm/3.8/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.8/lldb.nix
@@ -13,7 +13,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l";
 
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index a73b73137dd..5fe681185b2 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -17,7 +17,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "llvm-${version}";
+  pname = "llvm";
+  inherit version;
 
   src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf";
 
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index e2cf437e19e..3d09277ad4c 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -3,7 +3,8 @@
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
   self = stdenv.mkDerivation {
-    name = "clang-${version}";
+    pname = "clang";
+    inherit version;
 
     src = fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76";
 
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
index bd2cc19d2e0..af65fd6388e 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "0qbl3afl2p2h87p977lsqr5kykl6cgjpkzczs0g6a3pn53j1bri5";
 
diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
index dffb207a32b..f799199d449 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj";
 
diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix
index 52f27de8cdb..1a7c9aeead8 100644
--- a/pkgs/development/compilers/llvm/3.9/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.9/lldb.nix
@@ -13,7 +13,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "1z30ljmcpp261bjng1i5k3bb9jkrs1cr97z04qs4s3zql6r12cvy";
 
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index c8d819cc963..4dde3be277a 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -27,7 +27,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "llvm-${version}";
+  pname = "llvm";
+  inherit version;
 
   src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z";
 
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 2b543b9d793..74e9b8719d1 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj";
 
diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
index 735c5e9e743..8e36c5ad53a 100644
--- a/pkgs/development/compilers/llvm/4/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g";
 
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
index cf6de26a9e8..3ab56677d72 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/pkgs/development/compilers/llvm/4/lld.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3";
 
diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index 325149fc19b..8adf11abddd 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -15,7 +15,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4";
 
diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix
index a8a6b3dfea8..a69fe286ecc 100644
--- a/pkgs/development/compilers/llvm/4/openmp.nix
+++ b/pkgs/development/compilers/llvm/4/openmp.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "openmp-${version}";
+  pname = "openmp";
+  inherit version;
 
   src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc";
 
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index b182f1250e7..e3015ae8448 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf";
 
diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix
index 227ecbeda19..1b891af09ed 100644
--- a/pkgs/development/compilers/llvm/5/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/5/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv";
 
diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix
index bf23f80ef10..bfee91d91bf 100644
--- a/pkgs/development/compilers/llvm/5/lld.nix
+++ b/pkgs/development/compilers/llvm/5/lld.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6";
 
diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix
index 5e670d4de15..cce44c7e50f 100644
--- a/pkgs/development/compilers/llvm/5/lldb.nix
+++ b/pkgs/development/compilers/llvm/5/lldb.nix
@@ -15,7 +15,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq";
 
diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix
index 901015bf2ff..559377bcc1b 100644
--- a/pkgs/development/compilers/llvm/5/openmp.nix
+++ b/pkgs/development/compilers/llvm/5/openmp.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "openmp-${version}";
+  pname = "openmp";
+  inherit version;
 
   src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir";
 
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 3a165e9da7b..906baa4ae64 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n";
 
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix
index df9c784a10f..ac1f4f653e6 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0";
 
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
index 1e68276945e..58b9b8060fa 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "04afcfq2h7ysyqxxhyhb7ig4p0vdw7mi63kh8mffl74j0rc781p7";
 
diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix
index 9571e7ab5a6..d3db8082c96 100644
--- a/pkgs/development/compilers/llvm/6/lldb.nix
+++ b/pkgs/development/compilers/llvm/6/lldb.nix
@@ -15,7 +15,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb";
 
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
index 908a5f1218f..447904b9ad5 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "openmp-${version}";
+  pname = "openmp";
+  inherit version;
 
   src = fetch "openmp" "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6";
 
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index e2ec4e274f4..fc9e3714db0 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4";
 
diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
index 2fe6f1c58f6..b5e6e0e7048 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2";
 
diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix
index 63ad43e62cd..823e9640cf4 100644
--- a/pkgs/development/compilers/llvm/7/lld.nix
+++ b/pkgs/development/compilers/llvm/7/lld.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1";
 
diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix
index 1b2dff2c76c..44687ead4d1 100644
--- a/pkgs/development/compilers/llvm/7/lldb.nix
+++ b/pkgs/development/compilers/llvm/7/lldb.nix
@@ -16,7 +16,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v";
 
diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix
index e55f4aa5ba1..7adc2aa588e 100644
--- a/pkgs/development/compilers/llvm/7/openmp.nix
+++ b/pkgs/development/compilers/llvm/7/openmp.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "openmp-${version}";
+  pname = "openmp";
+  inherit version;
 
   src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy";
 
diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix
index f8a07de0722..e0bc9e816f5 100644
--- a/pkgs/development/compilers/llvm/8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/8/libc++/default.nix
@@ -2,7 +2,8 @@
 , enableShared ? true }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz";
 
diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix
index 1ee6d069f4b..58a1241d823 100644
--- a/pkgs/development/compilers/llvm/8/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/8/libc++abi.nix
@@ -2,7 +2,8 @@
 , enableShared ? true }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";
 
diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix
index 75edd1fff54..646cd3c3ca4 100644
--- a/pkgs/development/compilers/llvm/8/libunwind.nix
+++ b/pkgs/development/compilers/llvm/8/libunwind.nix
@@ -1,7 +1,8 @@
 { stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
 
 stdenv.mkDerivation {
-  name = "libunwind-${version}";
+  pname = "libunwind";
+  inherit version;
 
   src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q";
 
diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix
index aec1b14b994..fc52d691d03 100644
--- a/pkgs/development/compilers/llvm/8/lld.nix
+++ b/pkgs/development/compilers/llvm/8/lld.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz";
 
diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix
index f31da000bb8..254933c82a0 100644
--- a/pkgs/development/compilers/llvm/8/lldb.nix
+++ b/pkgs/development/compilers/llvm/8/lldb.nix
@@ -15,7 +15,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8";
 
diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix
index 8cf55173561..166e7f68eb3 100644
--- a/pkgs/development/compilers/llvm/8/openmp.nix
+++ b/pkgs/development/compilers/llvm/8/openmp.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "openmp-${version}";
+  pname = "openmp";
+  inherit version;
 
   src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y";
 
diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix
index f495be8a93e..207ed8f29bc 100644
--- a/pkgs/development/compilers/mlton/20130715.nix
+++ b/pkgs/development/compilers/mlton/20130715.nix
@@ -9,32 +9,33 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "mlton-${version}";
+  pname = "mlton";
+  inherit version;
 
   binSrc =
     if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
-      url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz";
+      url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.x86-linux.tgz";
       sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
     })
     else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
-        url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz";
+        url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-linux.tgz";
         sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
     })
     else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
-        url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
+        url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-darwin.gmp-macports.tgz";
         sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
     })
     else throw "Architecture not supported";
 
   codeSrc =
     fetchurl {
-      url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz";
+      url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}.src.tgz";
       sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
     };
 
   srcs = [ binSrc codeSrc ];
 
-  sourceRoot = name;
+  sourceRoot = "${pname}-${version}";
 
   buildInputs = [ gmp ];
   nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix
index 3a3538a7ea4..2585b599caf 100644
--- a/pkgs/development/compilers/mlton/from-git-source.nix
+++ b/pkgs/development/compilers/mlton/from-git-source.nix
@@ -9,7 +9,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "mlton-${version}";
+  pname = "mlton";
+  inherit version;
 
   src = fetchgit {
     inherit url rev sha256;
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index 43ef5d4b62d..ecb687e96e5 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -4,11 +4,12 @@ let
   llvm     = callPackage ./llvm.nix { };
 in
 stdenv.mkDerivation rec {
-  name = "mono-${version}";
+  pname = "mono";
+  inherit version;
 
   src = fetchurl {
     inherit sha256;
-    url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2";
+    url = "https://download.mono-project.com/sources/mono/${pname}-${version}.tar.bz2";
   };
 
   buildInputs =
diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index ef6cd1160b3..2067184a5b0 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -16,7 +16,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "mozart-binary-${version}";
+  pname = "mozart-binary";
+  inherit version;
 
   preferLocalBuild = true;
 
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
index 7f22f4de624..370c08f001a 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "polyml-${version}";
+  pname = "polyml";
+  inherit version;
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure.ac --replace stdc++ c++
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index dce46ade459..89912ac9ad6 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -29,7 +29,8 @@ let
     { url = "${baseurl}/asdl.tgz";                sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; }
   ];
 in stdenv.mkDerivation {
-  name = "smlnj-${version}";
+  pname = "smlnj";
+  inherit version;
 
   inherit sources;
 
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index bf452d21d1d..9245e59553f 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -13,7 +13,8 @@ let
     '';
 in
 stdenv.mkDerivation {
-  name = "swi-prolog-${version}";
+  pname = "swi-prolog";
+  inherit version;
 
   src = fetchgit {
     url = "https://github.com/SWI-Prolog/swipl-devel";
diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix
index 04efe1a9134..41cc9b38606 100644
--- a/pkgs/development/compilers/teyjus/default.nix
+++ b/pkgs/development/compilers/teyjus/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "teyjus-${version}";
+  pname = "teyjus";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/teyjus/teyjus/archive/v${version}.tar.gz";
diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix
index 57ced325aad..369d84708dc 100644
--- a/pkgs/development/interpreters/clojure/clooj.nix
+++ b/pkgs/development/interpreters/clojure/clooj.nix
@@ -3,7 +3,8 @@
 let version = "0.4.4"; in
 
 stdenv.mkDerivation {
-  name = "clooj-${version}";
+  pname = "clooj";
+  inherit version;
 
   jar = fetchurl {
     # mirrored as original mediafire.com source does not work without user interaction
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index fa8996f0fb5..02ac6bfbcde 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -47,7 +47,8 @@ in
 
 stdenv.mkDerivation {
 
-  name = "dart-${version}";
+  pname = "dart";
+  inherit version;
 
   nativeBuildInputs = [
     unzip
diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix
index 258aebe8172..7c7cd9abb7e 100644
--- a/pkgs/development/interpreters/eff/default.nix
+++ b/pkgs/development/interpreters/eff/default.nix
@@ -4,7 +4,8 @@ let version = "5.0"; in
 
 stdenv.mkDerivation {
 
-  name = "eff-${version}";
+  pname = "eff";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "matijapretnar";
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 30013946886..afd2627d20e 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -14,7 +14,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "maude-${version}";
+  pname = "maude";
+  inherit version;
 
   src = fetchurl {
     url = "http://maude.cs.illinois.edu/w/images/d/d8/Maude-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 277993339e2..bde2f5d9fa9 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
   version = "4.1.6";
 in stdenv.mkDerivation {
-  name = "nix-exec-${version}";
+  pname = "nix-exec";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 4e617ce67eb..a7009097a60 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -46,7 +46,8 @@ let
       , libiconv, libobjc, libunwind, Foundation
       }:
       stdenv.mkDerivation rec {
-        name = "ruby-${version}";
+        pname = "ruby";
+        inherit version;
 
         src = if useRailsExpress then fetchFromGitHub {
           owner  = "ruby";
diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 2ec5923b0e1..1e1ea10ef6d 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -3,7 +3,8 @@
 let
   version = "52.9.0";
 in stdenv.mkDerivation rec {
-  name = "spidermonkey-${version}";
+  pname = "spidermonkey";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix
index 518fc5f77b7..175b2f2e767 100644
--- a/pkgs/development/interpreters/spidermonkey/60.nix
+++ b/pkgs/development/interpreters/spidermonkey/60.nix
@@ -6,7 +6,8 @@ with stdenv.lib;
 let
   version = "60.4.0";
 in stdenv.mkDerivation rec {
-  name = "spidermonkey-${version}";
+  pname = "spidermonkey";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index cd377e70cd9..d4ec1677bfb 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tcl-${version}";
+  pname = "tcl";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index 36c4af5f496..abb549110a8 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -16,7 +16,8 @@ in
         fetchSubmodules = true;
       };
     in stdenv.mkDerivation rec {
-      name = "jogl-${version}";
+      pname = "jogl";
+      inherit version;
 
       src = fetchgit {
         url = git://jogamp.org/srv/scm/jogl.git;
diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index 76e49768d53..c9797b31eaa 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.5.1";
 in
 stdenv.mkDerivation {
-  name = "adns-${version}";
+  pname = "adns";
+  inherit version;
 
   src = fetchurl {
     urls = [
diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix
index 72305cb633f..b8d166507a9 100644
--- a/pkgs/development/libraries/asio/generic.nix
+++ b/pkgs/development/libraries/asio/generic.nix
@@ -5,7 +5,8 @@
 with stdenv.lib;
 
 stdenv.mkDerivation {
-  name = "asio-${version}";
+  pname = "asio";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/asio/asio-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix
index ac6f0470a0a..b8f1a5c088a 100644
--- a/pkgs/development/libraries/audio/libgme/default.nix
+++ b/pkgs/development/libraries/audio/libgme/default.nix
@@ -2,7 +2,8 @@
 let
   version = "0.6.2";
 in stdenv.mkDerivation {
-  name = "libgme-${version}";
+  pname = "libgme";
+  inherit version;
 
   meta = with stdenv.lib; {
     description = "A collection of video game music chip emulators";
diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix
index 11c66db7075..a2fdb66d7e9 100644
--- a/pkgs/development/libraries/avro-c++/default.nix
+++ b/pkgs/development/libraries/avro-c++/default.nix
@@ -3,7 +3,8 @@
 let version = "1.8.2"; in
 
 stdenv.mkDerivation {
-  name = "avro-c++-${version}";
+  pname = "avro-c++";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix
index cbd29a095d4..9582e54ffac 100644
--- a/pkgs/development/libraries/avro-c/default.nix
+++ b/pkgs/development/libraries/avro-c/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.9.0";
 in stdenv.mkDerivation rec {
-  name = "avro-c-${version}";
+  pname = "avro-c";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix
index b61ac1dcb09..f64090bd53a 100644
--- a/pkgs/development/libraries/bulletml/default.nix
+++ b/pkgs/development/libraries/bulletml/default.nix
@@ -10,7 +10,8 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "bulletml-${version}";
+  pname = "bulletml";
+  inherit version;
 
   srcs = [
     (fetchurl {
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index e388b3af5f6..82570fbf7b4 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -16,10 +16,11 @@ let
   version = "1.16.0";
   inherit (stdenv.lib) optional optionals;
 in stdenv.mkDerivation rec {
-  name = "cairo-${version}";
+  pname = "cairo";
+  inherit version;
 
   src = fetchurl {
-    url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
+    url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
     sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
   };
 
diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix
index 6bf7975034b..d9e69b8e751 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/pkgs/development/libraries/celt/generic.nix
@@ -7,7 +7,8 @@
 # The celt codec has been deprecated and is now a part of the opus codec
 
 stdenv.mkDerivation rec {
-  name = "celt-${version}";
+  pname = "celt";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix
index d329b1945fc..ff8e1ca6759 100644
--- a/pkgs/development/libraries/classads/default.nix
+++ b/pkgs/development/libraries/classads/default.nix
@@ -3,7 +3,8 @@
 let version = "1.0.10"; in
 
 stdenv.mkDerivation {
-  name = "classads-${version}";
+  pname = "classads";
+  inherit version;
 
   src = fetchurl {
     url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz";
diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix
index 9f4c4c3b6b3..7c42a7479b1 100644
--- a/pkgs/development/libraries/codec2/default.nix
+++ b/pkgs/development/libraries/codec2/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.8";
 
 in stdenv.mkDerivation {
-  name = "codec2-${version}";
+  pname = "codec2";
+  inherit version;
 
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/freetel/code/codec2/branches/${version}";
diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix
index 9b74ecdb0f7..506aa5f475d 100644
--- a/pkgs/development/libraries/csfml/default.nix
+++ b/pkgs/development/libraries/csfml/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "csfml-${version}";
+  pname = "csfml";
+  inherit version;
   src = fetchFromGitHub {
     owner = "SFML";
     repo  = "CSFML";
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 6aec15f976b..63e2707917a 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -4,7 +4,8 @@ let
   version = "3.3.7";
 in
 stdenv.mkDerivation {
-  name = "eigen-${version}";
+  pname = "eigen";
+  inherit version;
 
   src = fetchurl {
     url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix
index cad4419a26c..eebe119d142 100644
--- a/pkgs/development/libraries/fltk/1.4.nix
+++ b/pkgs/development/libraries/fltk/1.4.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "fltk-${version}";
+  pname = "fltk";
+  inherit version;
 
   src = fetchurl {
     url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index bb9f8fe76c9..a22b5eef8d2 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "fltk-${version}";
+  pname = "fltk";
+  inherit version;
 
   src = fetchurl {
     url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix
index 9aeb12344ec..b95d6dd559d 100644
--- a/pkgs/development/libraries/fontconfig-ultimate/default.nix
+++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix
@@ -2,7 +2,8 @@
 
 let version = "2016-04-23"; in
 stdenv.mkDerivation {
-  name = "fontconfig-ultimate-${version}";
+  pname = "fontconfig-ultimate";
+  inherit version;
 
   src = fetchFromGitHub {
     sha256 = "1rd2n60l8bamx84q3l91pd9a0wz9h7p6ajvx1dw22qn8rah4h498";
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index 4f1e0eaee7f..af387b7232f 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -7,10 +7,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "fox-${version}";
+  pname = "fox";
+  inherit version;
 
   src = fetchurl {
-    url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
+    url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz";
     sha256 = "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5";
   };
 
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index c34d9591d38..8412248b617 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -2,7 +2,8 @@
 
 let version = "3.0.0";
 in stdenv.mkDerivation {
-  name = "freeglut-${version}";
+  pname = "freeglut";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz";
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 269c41df797..48e65cc063b 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -50,10 +50,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "glib-${version}";
+  pname = "glib";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz";
   };
 
@@ -139,7 +140,7 @@ stdenv.mkDerivation rec {
     sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
 
     # This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
-    sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
+    sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
       -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
   '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     cp -r ${buildPackages.glib.devdoc} $devdoc
@@ -148,7 +149,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ];
 
   preCheck = optionalString doCheck ''
-    export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs:$LD_LIBRARY_PATH"
     export TZDIR="${tzdata}/share/zoneinfo"
     export XDG_CACHE_HOME="$TMP"
     export XDG_RUNTIME_HOME="$TMP"
diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix
index 269071434d5..9cb5dda507d 100644
--- a/pkgs/development/libraries/globalarrays/default.nix
+++ b/pkgs/development/libraries/globalarrays/default.nix
@@ -6,7 +6,8 @@ let
   version = "5.7";
 
 in stdenv.mkDerivation {
-  name = "globalarrays-${version}";
+  pname = "globalarrays";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "GlobalArrays";
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index d532e906a51..d44bcdda9ae 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -14,7 +14,8 @@ let
   version = "1.0.22";
 in
 stdenv.mkDerivation rec {
-  name = "gloox-${version}";
+  pname = "gloox";
+  inherit version;
 
   src = fetchurl {
     url = "https://camaya.net/download/gloox-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix
index 75c71632aeb..cb81b52b730 100644
--- a/pkgs/development/libraries/gnutls-kdh/generic.nix
+++ b/pkgs/development/libraries/gnutls-kdh/generic.nix
@@ -15,7 +15,8 @@ let
   doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4";
 in
 stdenv.mkDerivation {
-  name = "gnutls-kdh-${version}";
+  pname = "gnutls-kdh";
+  inherit version;
 
   inherit src patches;
 
diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index 99b1307179a..c7556276dc3 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -3,12 +3,13 @@
 let
   version = "2.0.4";
 in stdenv.mkDerivation rec {
-  name = "goocanvas-${version}";
+  pname = "goocanvas";
+  inherit version;
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/goocanvas/2.0/${name}.tar.xz";
+    url = "mirror://gnome/sources/goocanvas/2.0/${pname}-${version}.tar.xz";
     sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";
   };
 
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 68bf4ebec34..76173bc5b99 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -3,7 +3,8 @@
 let
   version = "2.9.2";
 in stdenv.mkDerivation {
-  name = "http-parser-${version}";
+  pname = "http-parser";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "nodejs";
diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix
index 867ce024d2f..297365be874 100644
--- a/pkgs/development/libraries/ignition-math/default.nix
+++ b/pkgs/development/libraries/ignition-math/default.nix
@@ -4,7 +4,8 @@ let
   version = "2.6.0";
 in
 stdenv.mkDerivation rec {
-  name = "ign-math2-${version}";
+  pname = "ign-math2";
+  inherit version;
 
   src = fetchurl {
     url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix
index 8abff4c5f05..31b9a4b0e9f 100644
--- a/pkgs/development/libraries/ignition-transport/generic.nix
+++ b/pkgs/development/libraries/ignition-transport/generic.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ign-transport-${version}";
+  pname = "ign-transport";
+  inherit version;
   inherit src;
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index 544f0f4c4e9..0fdce1bceed 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -10,7 +10,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "rhino-${version}";
+  pname = "rhino";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://mozilla/js/rhino1_7R2.zip";
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 1ef453f24cd..feeb4de15e1 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -33,10 +33,11 @@ let
   };
 
   libavFun = version : sha1 : stdenv.mkDerivation rec {
-    name = "libav-${version}";
+    pname = "libav";
+    inherit version;
 
     src = fetchurl {
-      url = "${meta.homepage}/releases/${name}.tar.xz";
+      url = "${meta.homepage}/releases/${pname}-${version}.tar.xz";
       inherit sha1; # upstream directly provides sha1 of releases over https
     };
 
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index d22518e96d4..c8c58315b64 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -13,7 +13,8 @@ let
   version = "2.2.0";
 
 in stdenv.mkDerivation {
-  name = "libbladeRF-${version}";
+  pname = "libbladeRF";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "Nuand";
diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix
index 18593f80799..4fea84723f9 100644
--- a/pkgs/development/libraries/libbytesize/default.nix
+++ b/pkgs/development/libraries/libbytesize/default.nix
@@ -6,7 +6,8 @@
 let
   version = "2.1";
 in stdenv.mkDerivation rec {
-  name = "libbytesize-${version}";
+  pname = "libbytesize";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "storaged-project";
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index e016484e677..2688881e66d 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -3,7 +3,8 @@
 let version = "4.0.4"; in
 
 stdenv.mkDerivation {
-  name = "libcec-${version}";
+  pname = "libcec";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
index 0005525a7cd..e43cfb10a37 100644
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -3,7 +3,8 @@
 let version = "2.1.0.1"; in
 
 stdenv.mkDerivation {
-  name = "p8-platform-${version}";
+  pname = "p8-platform";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 1a4da7713af..3fd2a328558 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -17,7 +17,8 @@ let
 
 in rec {
   libdwarf = stdenv.mkDerivation rec {
-    name = "libdwarf-${version}";
+    pname = "libdwarf";
+    inherit version;
 
     configureFlags = [ "--enable-shared" "--disable-nonshared" ];
 
@@ -37,7 +38,8 @@ in rec {
   };
 
   dwarfdump = stdenv.mkDerivation rec {
-    name = "dwarfdump-${version}";
+    pname = "dwarfdump";
+    inherit version;
 
     preConfigure = ''
       cd dwarfdump
diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix
index 93ece69cf05..f8baa347914 100644
--- a/pkgs/development/libraries/libdynd/default.nix
+++ b/pkgs/development/libraries/libdynd/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.7.2"; in
 stdenv.mkDerivation {
-  name = "libdynd-${version}";
+  pname = "libdynd";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "libdynd";
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index c83143dd6b1..ba92bdd5165 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -2,7 +2,8 @@
 let
   version = "7.6.1";
 in stdenv.mkDerivation rec {
-  name = "libjson-${version}";
+  pname = "libjson";
+  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/libjson/libjson_${version}.zip";
     sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index 767485a7515..ff1a39fc204 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -4,12 +4,13 @@
 let version = "1.1.0"; in
 
 stdenv.mkDerivation rec {
-  name = "liblastfm-${version}";
+  pname = "liblastfm";
+  inherit version;
 
   # Upstream does not package git tags as tarballs. Get tarball from github.
   src = fetchurl {
     url = "https://github.com/lastfm/liblastfm/tarball/${version}";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x";
   };
 
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index c2731e44efb..a61c21ffec5 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -5,7 +5,8 @@
 let
   version = "3.10.0";
 in stdenv.mkDerivation rec {
-  name = "liblouis-${version}";
+  pname = "liblouis";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "liblouis";
diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix
index 85800491016..231f18377e4 100644
--- a/pkgs/development/libraries/libmodplug/default.nix
+++ b/pkgs/development/libraries/libmodplug/default.nix
@@ -3,7 +3,8 @@
 let
   version = "0.8.9.0";
 in stdenv.mkDerivation rec {
-  name = "libmodplug-${version}";
+  pname = "libmodplug";
+  inherit version;
 
   meta = with stdenv.lib; {
     description = "MOD playing library";
@@ -14,7 +15,7 @@ in stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${pname}-${version}.tar.gz";
     sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25";
   };
 }
diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix
index 106f6fe6c37..e4010280f4b 100644
--- a/pkgs/development/libraries/libmpc/default.nix
+++ b/pkgs/development/libraries/libmpc/default.nix
@@ -6,7 +6,8 @@ let
   version = "1.1.0";
 in
 stdenv.mkDerivation rec {
-  name = "libmpc-${version}"; # to avoid clash with the MPD client
+  pname = "libmpc";
+  inherit version; # to avoid clash with the MPD client
 
   src = fetchurl {
     url = "mirror://gnu/mpc/mpc-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index 8719f19acc1..cde4251e2c6 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.3.0";
 in stdenv.mkDerivation rec {
-  name = "libmypaint-${version}";
+  pname = "libmypaint";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "mypaint";
diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix
index a4b0b26a345..c0c66bc1a4a 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/pkgs/development/libraries/libnih/default.nix
@@ -3,7 +3,8 @@
 let version = "1.0.3"; in
 
 stdenv.mkDerivation rec {
-  name = "libnih-${version}";
+  pname = "libnih";
+  inherit version;
 
   src = fetchurl {
     url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index 8131420cfd6..7dc23aa1e8a 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -5,10 +5,11 @@ let
   deb_patch = "5";
 in
 stdenv.mkDerivation rec {
-  name = "libofa-${version}";
+  pname = "libofa";
+  inherit version;
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz";
     sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2";
   };
 
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 10d438500a6..752be52963c 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -5,7 +5,8 @@ let
   version = "1.3.1";
 in
 stdenv.mkDerivation rec {
-  name = "libopus-${version}";
+  pname = "libopus";
+  inherit version;
 
   src = fetchurl {
     url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix
index 4ca0849447f..e1d70bee6c4 100644
--- a/pkgs/development/libraries/libopusenc/default.nix
+++ b/pkgs/development/libraries/libopusenc/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.2.1";
 in
 stdenv.mkDerivation rec {
-  name = "libopusenc-${version}";
+  pname = "libopusenc";
+  inherit version;
 
   src = fetchurl {
     url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index 952509acc2e..47d9c4215fd 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -3,7 +3,8 @@
 let version = "1.6.2"; in
 
 stdenv.mkDerivation {
-  name = "libossp-uuid-${version}";
+  pname = "libossp-uuid";
+  inherit version;
 
   src = fetchurl {
     url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix
index cf97744069b..bbdce71bad6 100644
--- a/pkgs/development/libraries/libpar2/default.nix
+++ b/pkgs/development/libraries/libpar2/default.nix
@@ -3,10 +3,11 @@
 let version = "0.4"; in
 
 stdenv.mkDerivation rec {
-  name = "libpar2-${version}";
+  pname = "libpar2";
+  inherit version;
 
   src = fetchurl {
-    url = "https://launchpad.net/libpar2/trunk/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i";
   };
 
diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix
index f8c91df6468..b3dae0c60ea 100644
--- a/pkgs/development/libraries/libpgf/default.nix
+++ b/pkgs/development/libraries/libpgf/default.nix
@@ -6,7 +6,8 @@ let
   version = "6.14.12";
 in
 stdenv.mkDerivation {
-  name = "libpgf-${version}";
+  pname = "libpgf";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix
index f175bb6ea6d..f1c7874e313 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/pkgs/development/libraries/libqmatrixclient/default.nix
@@ -3,7 +3,8 @@
 
 let
   generic = version: sha256: prefix: stdenv.mkDerivation rec {
-    name = "libqmatrixclient-${version}";
+    pname = "libqmatrixclient";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "QMatrixClient";
diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix
index 8018b84a52b..bdca44dc7d0 100644
--- a/pkgs/development/libraries/libspatialindex/default.nix
+++ b/pkgs/development/libraries/libspatialindex/default.nix
@@ -3,7 +3,8 @@
 let version = "1.8.5"; in
 
 stdenv.mkDerivation rec {
-  name = "libspatialindex-${version}";
+  pname = "libspatialindex";
+  inherit version;
 
   src = fetchurl {
     url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index 5bae04a88f9..9ef3d665413 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -8,7 +8,8 @@ in
 if (stdenv.hostPlatform.system != "x86_64-linux" && stdenv.hostPlatform.system != "x86_64-darwin" && stdenv.hostPlatform.system != "i686-linux")
 then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here"
 else stdenv.mkDerivation {
-  name = "libspotify-${version}";
+  pname = "libspotify";
+  inherit version;
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -61,7 +62,8 @@ else stdenv.mkDerivation {
       then throw ''
         Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly
       '' else stdenv.mkDerivation {
-        name = "libspotify-samples-${version}";
+        pname = "libspotify-samples";
+        inherit version;
         src = libspotify.src;
   nativeBuildInputs = [ pkgconfig ];
         buildInputs = [ libspotify readline ]
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 046229e8f1d..26605eb41db 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -11,7 +11,8 @@ let
   boostPython = boost.override { enablePython = true; inherit python; };
 
 in stdenv.mkDerivation {
-  name = "libtorrent-rasterbar-${version}";
+  pname = "libtorrent-rasterbar";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "arvidn";
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 50fdbf2a81f..9bccff49b54 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -4,7 +4,8 @@
 let
   generic = { version, sha256 }:
   stdenv.mkDerivation rec {
-    name = "libtoxcore-${version}";
+    pname = "libtoxcore";
+    inherit version;
 
     src = fetchFromGitHub {
       owner  = "TokTok";
diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix
index b0be3cb3c12..5ac456a60f6 100644
--- a/pkgs/development/libraries/libtxc_dxtn/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn/default.nix
@@ -3,10 +3,11 @@
 let version = "1.0.1"; in
 
 stdenv.mkDerivation rec {
-  name = "libtxc_dxtn-${version}";
+  pname = "libtxc_dxtn";
+  inherit version;
 
   src = fetchurl {
-    url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
+    url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${pname}-${version}.tar.bz2";
     sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
   };
 
diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
index aad8ae00c11..9a3671c3258 100644
--- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
@@ -3,7 +3,8 @@
 let version = "1.0"; in
 
 stdenv.mkDerivation rec {
-  name = "libtxc_dxtn_s2tc-${version}";
+  pname = "libtxc_dxtn_s2tc";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/divVerent/s2tc/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix
index 7bd89b44d88..fede13fcd9b 100644
--- a/pkgs/development/libraries/libxc/default.nix
+++ b/pkgs/development/libraries/libxc/default.nix
@@ -4,7 +4,8 @@ let
   version = "4.3.4";
 
 in stdenv.mkDerivation {
-  name = "libxc-${version}";
+  pname = "libxc";
+  inherit version;
   src = fetchurl {
     url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz";
     sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8";
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index 773389e60f5..9408b0c4587 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -5,11 +5,12 @@ let
   version = "5.4";
 in
 stdenv.mkDerivation rec {
-  name = "libxklavier-${version}";
+  pname = "libxklavier";
+  inherit version;
 
   src = fetchgit {
     url = "git://anongit.freedesktop.org/git/libxklavier";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a";
   };
 
diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix
index 29ec205d7a1..04f84d49f84 100644
--- a/pkgs/development/libraries/msgpack/generic.nix
+++ b/pkgs/development/libraries/msgpack/generic.nix
@@ -4,7 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "msgpack-${version}";
+  pname = "msgpack";
+  inherit version;
 
   inherit src patches;
 
diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix
index cbe1f984059..7f08d0a7535 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.6.3";
 in
 stdenv.mkDerivation {
-  name = "ndn-cxx-${version}";
+  pname = "ndn-cxx";
+  inherit version;
   src = fetchFromGitHub {
     owner = "named-data";
     repo = "ndn-cxx";
diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix
index 913a4a087a9..83d01f85d0a 100644
--- a/pkgs/development/libraries/ndpi/default.nix
+++ b/pkgs/development/libraries/ndpi/default.nix
@@ -3,7 +3,8 @@
 let version = "2.8"; in
 
 stdenv.mkDerivation rec {
-  name = "ndpi-${version}";
+  pname = "ndpi";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "ntop";
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index cc5a115ed71..442fcf2e761 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
 let version = "6.0.0"; in
 stdenv.mkDerivation {
-  name = "nix-plugins-${version}";
+  pname = "nix-plugins";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "shlevy";
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 4772f1111ac..b62fa1cb704 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -5,7 +5,8 @@
 let version = "4.21"; in
 
 stdenv.mkDerivation {
-  name = "nspr-${version}";
+  pname = "nspr";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index c0a73fa984e..b79f940affa 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -5,10 +5,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ntrack-${version}";
+  pname = "ntrack";
+  inherit version;
 
   src = fetchurl {
-    url = "https://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w";
   };
 
diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix
index 9a8787ad7f4..e2d34ae5f07 100644
--- a/pkgs/development/libraries/opencore-amr/default.nix
+++ b/pkgs/development/libraries/opencore-amr/default.nix
@@ -4,7 +4,8 @@ let
     version = "0.1.5";
 in 
 stdenv.mkDerivation {
-  name = "opencore-amr-${version}";
+  pname = "opencore-amr";
+  inherit version;
   src = fetchurl {
     url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz";
     sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c";
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index e26f4160921..55d003d2d92 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -24,7 +24,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openjpeg-${version}";
+  pname = "openjpeg";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "uclouvain";
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 760fc3e3232..06e4726054e 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -12,10 +12,11 @@ let
   version = "4.0.1";
 
 in stdenv.mkDerivation rec {
-  name = "openmpi-${version}";
+  pname = "openmpi";
+  inherit version;
 
   src = with stdenv.lib.versions; fetchurl {
-    url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2";
+    url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
     sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc";
   };
 
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 67b903970d3..bd4802b8775 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -8,10 +8,11 @@ with stdenv.lib;
 
 let
   common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec {
-    name = "openssl-${version}";
+    pname = "openssl";
+    inherit version;
 
     src = fetchurl {
-      url = "https://www.openssl.org/source/${name}.tar.gz";
+      url = "https://www.openssl.org/source/${pname}-${version}.tar.gz";
       inherit sha256;
     };
 
diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix
index 5a5e8ffaef7..c3407289f02 100644
--- a/pkgs/development/libraries/openzwave/default.nix
+++ b/pkgs/development/libraries/openzwave/default.nix
@@ -6,7 +6,8 @@ let
   version = "2018-11-13";
 
 in stdenv.mkDerivation rec {
-  name = "openzwave-${version}";
+  pname = "openzwave";
+  inherit version;
 
   # Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw.
   # See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference.
diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix
index 6edea7f5141..cf9e201b3f6 100644
--- a/pkgs/development/libraries/physfs/default.nix
+++ b/pkgs/development/libraries/physfs/default.nix
@@ -4,10 +4,11 @@
 let
   generic = version: sha256:
   stdenv.mkDerivation rec {
-    name = "physfs-${version}";
+    pname = "physfs";
+    inherit version;
 
     src = fetchurl {
-      url = "${meta.homepage}/downloads/${name}.tar.bz2";
+      url = "${meta.homepage}/downloads/${pname}-${version}.tar.bz2";
       inherit sha256;
     };
 
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index 566d88dcdb5..8f6adaf03d9 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -3,7 +3,8 @@
 let version = "1.2"; in
 
 stdenv.mkDerivation rec {
-  name = "ppl-${version}";
+  pname = "ppl";
+  inherit version;
 
   src = fetchurl {
     url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index a98521a2d1e..957b59a6f66 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -7,7 +7,8 @@
 
 let
 mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
-  name = "protobuf-${version}";
+  pname = "protobuf";
+  inherit version;
 
   # make sure you test also -A pythonPackages.protobuf
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 1a20d806b96..773e3139175 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -4,7 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "protobuf-${version}";
+  pname = "protobuf";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix
index e0c5d4db930..91c0ae5624e 100644
--- a/pkgs/development/libraries/protobufc/generic.nix
+++ b/pkgs/development/libraries/protobufc/generic.nix
@@ -4,7 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "protobuf-c-${version}";
+  pname = "protobuf-c";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 5bccbf74965..789a63bef74 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -3,10 +3,11 @@
 let version = "8.4.2";
 in
 stdenv.mkDerivation rec {
-  name = "qpdf-${version}";
+  pname = "qpdf";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz";
     sha256 = "1hrys6zmia8fw6f6ih3ckgsc1jr12fizdwaiy7dyd64kxxjhm8v9";
   };
 
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 05373cd1cbd..36576de0563 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -7,7 +7,8 @@ let
   version = "3.7.0";
 in
 stdenv.mkDerivation {
-  name = "arpack-${version}";
+  pname = "arpack";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "opencollab";
diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix
index 4ae5ea52255..a93ede63a26 100644
--- a/pkgs/development/libraries/science/math/fenics/default.nix
+++ b/pkgs/development/libraries/science/math/fenics/default.nix
@@ -30,7 +30,8 @@ let
   version = "2017.1.0";
 
   dijitso = pythonPackages.buildPythonPackage {
-    name = "dijitso-${version}";
+    pname = "dijitso";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz";
       sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg";
@@ -54,7 +55,8 @@ let
   };
 
   fiat = pythonPackages.buildPythonPackage {
-    name = "fiat-${version}";
+    pname = "fiat";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz";
       sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l";
@@ -72,7 +74,8 @@ let
   };
 
   ufl = pythonPackages.buildPythonPackage {
-    name = "ufl-${version}";
+    pname = "ufl";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz";
       sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg";
@@ -90,7 +93,8 @@ let
   };
 
   ffc = pythonPackages.buildPythonPackage {
-    name = "ffc-${version}";
+    pname = "ffc";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz";
       sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0";
@@ -109,7 +113,8 @@ let
   };
 
   instant = pythonPackages.buildPythonPackage {
-    name = "instant-${version}";
+    pname = "instant";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz";
       sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q";
@@ -125,7 +130,8 @@ let
 
 in
 stdenv.mkDerivation {
-  name = "dolfin-${version}";
+  pname = "dolfin";
+  inherit version;
   src = fetchurl {
     url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz";
     sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds";
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 46538d0022e..2e5bb5e371f 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -12,7 +12,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "liblapack-${version}";
+  pname = "liblapack";
+  inherit version;
   src = fetchurl {
     url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz";
     sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny";
diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix
index 8444d88809a..d036e39d01a 100644
--- a/pkgs/development/libraries/science/math/magma/default.nix
+++ b/pkgs/development/libraries/science/math/magma/default.nix
@@ -5,7 +5,8 @@ with stdenv.lib;
 let version = "2.0.2";
 
 in stdenv.mkDerivation {
-  name = "magma-${version}";
+  pname = "magma";
+  inherit version;
   src = fetchurl {
     url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz";
     sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk";
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 1b043d33ad6..cf73e205830 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "sfml-${version}";
+  pname = "sfml";
+  inherit version;
 
   src = fetchzip {
     url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix
index fc771a493b6..82cbce8055e 100644
--- a/pkgs/development/libraries/startup-notification/default.nix
+++ b/pkgs/development/libraries/startup-notification/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.12";
 in
 stdenv.mkDerivation {
-  name = "libstartup-notification-${version}";
+  pname = "libstartup-notification";
+  inherit version;
   src = fetchurl {
     url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz";
     sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index d61076e569b..cc7c996f7c3 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -4,7 +4,8 @@ let
   version = "2.6.2";
   SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary;
 in stdenv.mkDerivation {
-  name = "tinyxml-${version}";
+  pname = "tinyxml";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip";
diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix
index b80984303d7..e1f3c0bd39c 100644
--- a/pkgs/development/libraries/uthash/default.nix
+++ b/pkgs/development/libraries/uthash/default.nix
@@ -4,7 +4,8 @@ let
   version = "2.1.0";
 in
 stdenv.mkDerivation rec {
-  name = "uthash-${version}";
+  pname = "uthash";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
index f6669f2f8fe..77cd3be0cbd 100644
--- a/pkgs/development/libraries/volume-key/default.nix
+++ b/pkgs/development/libraries/volume-key/default.nix
@@ -7,7 +7,8 @@
 let
   version = "0.3.11";
 in stdenv.mkDerivation rec {
-  name = "volume_key-${version}";
+  pname = "volume_key";
+  inherit version;
 
   src = fetchgit {
     url = https://pagure.io/volume_key.git;
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index ba77189b2a5..60f91176599 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -7,7 +7,8 @@ let
   generic =
     { version, sha256 }:
     stdenv.mkDerivation rec {
-      name = "wt-${version}";
+      pname = "wt";
+      inherit version;
 
       src = fetchFromGitHub {
         owner = "emweb";
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index 369d011f9b3..02367e18a95 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -15,7 +15,8 @@ let
   version = "2.9.4";
 in
 stdenv.mkDerivation {
-  name = "wxwidgets-${version}";
+  pname = "wxwidgets";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 271c7adf3d9..362f704a05d 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -3,7 +3,8 @@
 
 let
   generic = version: sha256: stdenv.mkDerivation rec {
-    name = "xapian-${version}";
+    pname = "xapian";
+    inherit version;
     passthru = { inherit version; };
 
     src = fetchurl {
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index b19bf000b0d..3e54944a377 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -5,7 +5,8 @@ let
   version = "1.2.28";
 in
 stdenv.mkDerivation rec {
-  name = "xmlsec-${version}";
+  pname = "xmlsec";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix
index 79651db23ea..ba6d5559f26 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@@ -36,7 +36,8 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "amdapp-sdk-${version}";
+  pname = "amdapp-sdk";
+  inherit version;
 
   src = fetchurl {
     url = stdenv.lib.getAttrFromPath [version "url"] src_info;
diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix
index 4527a8700f6..48ea088a73c 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/pkgs/development/misc/avr/libc/default.nix
@@ -4,7 +4,8 @@ let
   version = "2.0.0";
 in
 stdenv.mkDerivation {
-  name = "avr-libc-${version}";
+  pname = "avr-libc";
+  inherit version;
 
   src = fetchurl {
     url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix
index 0456c8eae76..b84f358cbee 100644
--- a/pkgs/development/misc/msp430/mspdebug.nix
+++ b/pkgs/development/misc/msp430/mspdebug.nix
@@ -3,7 +3,8 @@
 let
   version = "0.25";
 in stdenv.mkDerivation {
-  name = "mspdebug-${version}";
+  pname = "mspdebug";
+  inherit version;
   src = fetchFromGitHub {
     owner = "dlbeer";
     repo = "mspdebug";
diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
index 4230672e12f..df0ef999dd6 100644
--- a/pkgs/development/misc/newlib/default.nix
+++ b/pkgs/development/misc/newlib/default.nix
@@ -2,7 +2,8 @@
 
 let version = "3.1.0";
 in stdenv.mkDerivation {
-  name = "newlib-${version}";
+  pname = "newlib";
+  inherit version;
   src = fetchurl {
     url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";
     sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv";
diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix
index 0ec8664dac9..8abe4b2550e 100644
--- a/pkgs/development/misc/qmk_firmware/default.nix
+++ b/pkgs/development/misc/qmk_firmware/default.nix
@@ -6,7 +6,8 @@
 let version = "0.6.144";
 
 in stdenv.mkDerivation {
-  name = "qmk_firmware-${version}";
+  pname = "qmk_firmware";
+  inherit version;
   src = fetchFromGitHub {
     owner = "qmk";
     repo = "qmk_firmware";
diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix
index e66bb6fe211..bc806410b1e 100644
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/pkgs/development/misc/stm32/betaflight/default.nix
@@ -15,7 +15,8 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "betaflight-${version}";
+  pname = "betaflight";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "betaflight";
diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix
index 683883ddbce..5014cdce8f3 100644
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ b/pkgs/development/misc/stm32/inav/default.nix
@@ -8,7 +8,8 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "inav-${version}";
+  pname = "inav";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "iNavFlight";
diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix
index a2ddda34347..eed4b43d6a3 100644
--- a/pkgs/development/mobile/abootimg/default.nix
+++ b/pkgs/development/mobile/abootimg/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.6";
 in
 stdenv.mkDerivation {
-  name = "abootimg-${version}";
+  pname = "abootimg";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "ggrandou";
diff --git a/pkgs/development/ocaml-modules/base64/2.0.nix b/pkgs/development/ocaml-modules/base64/2.0.nix
index 8128dc1cb6f..4606ebd5172 100644
--- a/pkgs/development/ocaml-modules/base64/2.0.nix
+++ b/pkgs/development/ocaml-modules/base64/2.0.nix
@@ -3,7 +3,8 @@
 let version = "2.0.0"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-base64-${version}";
+  pname = "ocaml-base64";
+  inherit version;
 
   src = fetchzip {
     url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix
index 31835316833..9239d2543ee 100644
--- a/pkgs/development/ocaml-modules/dolog/default.nix
+++ b/pkgs/development/ocaml-modules/dolog/default.nix
@@ -3,7 +3,8 @@
 let version = "3.0"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-dolog-${version}";
+  pname = "ocaml-dolog";
+  inherit version;
   src = fetchzip {
     url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz";
     sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb";
diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix
index 8a11d22c2c1..40db8246f4a 100644
--- a/pkgs/development/ocaml-modules/iso8601/default.nix
+++ b/pkgs/development/ocaml-modules/iso8601/default.nix
@@ -3,7 +3,8 @@
 let version = "0.2.4"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-iso8601-${version}";
+  pname = "ocaml-iso8601";
+  inherit version;
   src = fetchzip {
     url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz";
     sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi";
diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix
index 3bced92cc3e..c91a5712137 100644
--- a/pkgs/development/ocaml-modules/llvm/default.nix
+++ b/pkgs/development/ocaml-modules/llvm/default.nix
@@ -3,7 +3,8 @@
 let version = stdenv.lib.getVersion llvm; in
 
 stdenv.mkDerivation {
-  name = "ocaml-llvm-${version}";
+  pname = "ocaml-llvm";
+  inherit version;
 
   inherit (llvm) src;
 
diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix
index 9a8a6259a77..65acbd6cc42 100644
--- a/pkgs/development/ocaml-modules/magic-mime/default.nix
+++ b/pkgs/development/ocaml-modules/magic-mime/default.nix
@@ -3,7 +3,8 @@
 let version = "1.0.0"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-magic-mime-${version}";
+  pname = "ocaml-magic-mime";
+  inherit version;
 
   src = fetchzip {
     url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix
index e69b9dabeab..d767c20f638 100644
--- a/pkgs/development/ocaml-modules/menhir/generic.nix
+++ b/pkgs/development/ocaml-modules/menhir/generic.nix
@@ -1,7 +1,8 @@
 { version, src, stdenv, ocaml, findlib, ocamlbuild, ... }:
 
 stdenv.mkDerivation {
-  name = "menhir-${version}";
+  pname = "menhir";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix
index d6d0c3292bb..8063f284728 100644
--- a/pkgs/development/ocaml-modules/ocamlmake/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix
@@ -6,7 +6,8 @@ let
   sha256 = "99ff58080ed154cc4bd70f915fe4760dffb026a1c0447caa0b3bdb982b24b0a8";
 
 in stdenv.mkDerivation {
-  name = "ocaml-make-${version}";
+  pname = "ocaml-make";
+  inherit version;
 
   src = fetchurl {
     url = "https://bitbucket.org/mmottl/ocaml-makefile/downloads/ocaml-makefile-${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
index 569f5081355..0263d3284ff 100644
--- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
@@ -17,7 +17,8 @@ in
 let inherit (param) version; in
 
 stdenv.mkDerivation {
-  name = "ocsigen-deriving-${version}";
+  pname = "ocsigen-deriving";
+  inherit version;
   src = fetchzip {
     url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz";
     inherit (param) sha256;
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 39cd6417542..2db6b821b4e 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -32,7 +32,8 @@ let
     cs_sha256
   }:
     stdenv.mkDerivation rec {
-      name = "radare2-${version}";
+      pname = "radare2";
+      inherit version;
 
       src = fetchFromGitHub {
         owner = "radare";
diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
index 8816a005ca0..0a86aaeb6ca 100644
--- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
@@ -3,7 +3,8 @@
 let version = "1.9.6"; in
 
 stdenv.mkDerivation {
-  name = "ant-${version}";
+  pname = "ant";
+  inherit version;
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index b6c2702485b..8d1e09eeb33 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -3,7 +3,8 @@
 let version = "1.10.2"; in
 
 stdenv.mkDerivation {
-  name = "ant-${version}";
+  pname = "ant";
+  inherit version;
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index cde6ea2f7a8..ef339e658c1 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -4,12 +4,13 @@ assert jdk != null;
 
 let version = "3.6.1"; in
 stdenv.mkDerivation rec {
-  name = "apache-maven-${version}";
+  pname = "apache-maven";
+  inherit version;
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
+    url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "1rv97g9qr6sifl88rxbsqnz5i79m6ifs36srri08j3y3k5dc6a15";
   };
 
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 1007f4df8ca..df8ccfc0e4a 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -121,7 +121,8 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "bazel-${version}";
+  pname = "bazel";
+  inherit version;
 
   meta = with lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index 47f800c67be..b543565758c 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -6,7 +6,8 @@ let
   version = "4.2.1";
 in
 stdenv.mkDerivation {
-  name = "gnumake-${version}";
+  pname = "gnumake";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://gnu/make/make-${version}.tar.bz2";
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index 98cd7e136d2..0b858f6f20d 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -5,7 +5,8 @@ let
   version = "2.5.1";
 in
 stdenv.mkDerivation {
-  name = "rebar-${version}";
+  pname = "rebar";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 3c04f8a12af..0472f412f71 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -15,7 +15,8 @@ let
   goPackagePath = "github.com/containers/buildah";
 
 in buildGoPackage rec {
-  name = "buildah-${version}";
+  pname = "buildah";
+  inherit version;
   inherit src;
 
   outputs = [ "bin" "man" "out" ];
diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix
index e07b3cd9db7..001f87b3b27 100644
--- a/pkgs/development/tools/casperjs/default.nix
+++ b/pkgs/development/tools/casperjs/default.nix
@@ -4,7 +4,8 @@ let version = "1.1.1";
 
 in stdenv.mkDerivation rec {
 
-  name = "casperjs-${version}";
+  pname = "casperjs";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "casperjs";
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
index ba0be89abf3..d9f7237d289 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
@@ -5,7 +5,8 @@ let
   goPackagePath = "github.com/buildkite/agent";
 in
 buildGoPackage {
-  name = "buildkite-agent-${version}";
+  pname = "buildkite-agent";
+  inherit version;
 
   inherit goPackagePath src postPatch;
 
diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix
index 553d622a83c..47f62573675 100644
--- a/pkgs/development/tools/database/cdb/default.nix
+++ b/pkgs/development/tools/database/cdb/default.nix
@@ -16,7 +16,8 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "cdb-${version}";
+  pname = "cdb";
+  inherit version;
 
   src = fetchurl {
     url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz";
diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index 5eb7651f199..ca04d209fab 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -7,7 +7,8 @@
 let
   version = "3.9.1";
 in stdenv.mkDerivation rec {
-  name = "squirrel-sql-${version}";
+  pname = "squirrel-sql";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 7eb05765428..d190ee32fca 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -45,12 +45,13 @@ let
   installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
   version = "1.0.8";
 in stdenv.mkDerivation rec {
-  name = "flatpak-builder-${version}";
+  pname = "flatpak-builder";
+  inherit version;
 
   outputs = [ "out" "doc" "man" "installedTests" ];
 
   src = fetchurl {
-    url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "0ns1vv2phhd3vsi2749cajwapapx7xa841kkvssixwgfa575d912";
   };
 
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 4ad04ae0e43..b57c9841978 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -3,7 +3,8 @@
     version = "5.2.4";
   in
     stdenv.mkDerivation {
-      name = "flyway-${version}";
+      pname = "flyway";
+      inherit version;
       src = fetchurl {
         url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
         sha256 = "16ia6nlvj4cgmdkn66bjg73h5vah82hpzk9mf0n5kmqnwcaa8hmc";
diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix
index 403bfeabfd0..9791cd56ea1 100644
--- a/pkgs/development/tools/java/fastjar/default.nix
+++ b/pkgs/development/tools/java/fastjar/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.98"; in
   stdenv.mkDerivation {
-    name = "fastjar-${version}";
+    pname = "fastjar";
+    inherit version;
 
     src = fetchurl {
       url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index 14f42ed9d40..53e2920c68d 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -3,7 +3,8 @@ let
   version = "2.2.3";
 in
 stdenv.mkDerivation {
-  name = "minizinc-${version}";
+  pname = "minizinc";
+  inherit version;
 
   buildInputs = [ cmake flex bison ];
 
diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix
index 799623d34cc..284ad4a5a67 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/development/tools/minizinc/ide.nix
@@ -3,7 +3,8 @@ let
   version = "2.3.1";
 in
 stdenv.mkDerivation {
-  name = "minizinc-ide-${version}";
+  pname = "minizinc-ide";
+  inherit version;
 
   nativeBuildInputs = [ qmake makeWrapper ];
   buildInputs = [ qtbase qtwebengine qtwebkit ];
diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix
index ba95889b5a8..1dd53f62cec 100644
--- a/pkgs/development/tools/misc/dfu-programmer/default.nix
+++ b/pkgs/development/tools/misc/dfu-programmer/default.nix
@@ -3,12 +3,13 @@ let
   version = "0.7.2";
 in
 stdenv.mkDerivation rec {
-  name="dfu-programmer-${version}";
+  pname = "dfu-programmer";
+  inherit version;
 
   buildInputs = [ libusb ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz";
+    url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz";
     sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x";
   };
 
diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix
index ade9954021a..164e0e80b60 100644
--- a/pkgs/development/tools/misc/nixbang/default.nix
+++ b/pkgs/development/tools/misc/nixbang/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.1.2"; in
 pythonPackages.buildPythonApplication {
-  name = "nixbang-${version}";
+  pname = "nixbang";
+  inherit version;
   namePrefix = "";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix
index f99c904ed01..c0e7a3653a8 100644
--- a/pkgs/development/tools/misc/prelink/default.nix
+++ b/pkgs/development/tools/misc/prelink/default.nix
@@ -4,7 +4,8 @@ let
   version = "20130503";
 in
 stdenv.mkDerivation rec {
-  name = "prelink-${version}";
+  pname = "prelink";
+  inherit version;
 
   buildInputs = [
     libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc)
diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index fdacdaef20f..98c400d5285 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -7,7 +7,8 @@ let
   version = "1.5.1";
 in
 stdenv.mkDerivation {
-  name = "stlink-${version}";
+  pname = "stlink";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "texane";
diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
index 82d0ec6119e..2975d64113e 100644
--- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix
+++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
@@ -3,7 +3,8 @@ let
   version = "2.1";
 in
 stdenv.mkDerivation {
-  name = "teensy-loader-cli-${version}";
+  pname = "teensy-loader-cli";
+  inherit version;
   src = fetchgit {
     url = "git://github.com/PaulStoffregen/teensy_loader_cli.git";
     rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2";
diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix
index 07005131fb5..689b7da8802 100644
--- a/pkgs/development/tools/nailgun/default.nix
+++ b/pkgs/development/tools/nailgun/default.nix
@@ -10,7 +10,8 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "nailgun-${version}";
+  pname = "nailgun";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "facebook";
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index f88811855a2..e6fb1b353d2 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -7,7 +7,8 @@ let version = if stdenv.lib.versionAtLeast ocaml.version "4.02"
 in
 
 stdenv.mkDerivation {
-  name = "js_of_ocaml-${version}";
+  pname = "js_of_ocaml";
+  inherit version;
   src = fetchurl {
     url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz";
     sha256 = {
diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix
index 41cde6f8ab7..61e8e77f384 100644
--- a/pkgs/development/tools/ocaml/obuild/default.nix
+++ b/pkgs/development/tools/ocaml/obuild/default.nix
@@ -3,7 +3,8 @@
 let version = "0.1.10"; in
 
 stdenv.mkDerivation {
-  name = "obuild-${version}";
+  pname = "obuild";
+  inherit version;
 
   src = fetchzip {
     url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz";
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 1dcea0da4cb..b10b7bdae57 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
      # derivation of just runtime deps so env vars created by
      # setup-hooks can be saved for use at runtime
      runtime = stdenv.mkDerivation rec {
-       name = "utop-runtime-env-${version}";
+       pname = "utop-runtime-env";
+       inherit version;
 
        buildInputs = [ findlib ] ++ propagatedBuildInputs;
 
diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix
index e6e54f8dab9..fcd7e445b8a 100644
--- a/pkgs/development/tools/parsing/antlr/4.7.nix
+++ b/pkgs/development/tools/parsing/antlr/4.7.nix
@@ -12,7 +12,8 @@ let
 
   runtime = {
     cpp = stdenv.mkDerivation {
-      name = "antlr-runtime-cpp-${version}";
+      pname = "antlr-runtime-cpp";
+      inherit version;
       src = source;
 
       outputs = [ "out" "dev" "doc" ];
@@ -35,7 +36,8 @@ let
   };
 
   antlr = stdenv.mkDerivation {
-    name = "antlr-${version}";
+    pname = "antlr";
+    inherit version;
     src = fetchurl {
       url ="https://www.antlr.org/download/antlr-${version}-complete.jar";
       sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl";
diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index d08df8265b0..2f4db7982b7 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -5,10 +5,11 @@
 let
   generic = { version, sha256, license }:
     stdenv.mkDerivation rec {
-      name = "ragel-${version}";
+      pname = "ragel";
+      inherit version;
 
       src = fetchurl {
-        url = "https://www.colm.net/files/ragel/${name}.tar.gz";
+        url = "https://www.colm.net/files/ragel/${pname}-${version}.tar.gz";
         inherit sha256;
       };
 
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index 8f711e14654..3f0b37a7175 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -14,7 +14,8 @@ let
 
   ## stap binaries
   stapBuild = stdenv.mkDerivation {
-    name = "systemtap-${version}";
+    pname = "systemtap";
+    inherit version;
     src = fetchgit { inherit url rev sha256; };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ elfutils gettext python2 python2Packages.setuptools ];
diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 0f1482d7953..6a709cf8f9b 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -24,7 +24,8 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "pypi2nix-${version}";
+  pname = "pypi2nix";
+  inherit version;
   srcs = [
     src
     click
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index d8899de205f..786cac68425 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -20,7 +20,8 @@ let
 
 in
 buildGoPackage rec {
-  name = "skopeo-${version}";
+  pname = "skopeo";
+  inherit version;
   inherit src goPackagePath;
 
   outputs = [ "bin" "man" "out" ];
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 2530202a565..1e2a60566d4 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -37,7 +37,8 @@ let
     sha256-manual = "12j4x1bh8x6yinym4d1ard32vfl22iq2wz1lfwz6s3ljhggkc52h";
 
     manual = stdenv.mkDerivation {
-      name = "anki-manual-${version}";
+      pname = "anki-manual";
+      inherit version;
       src = fetchFromGitHub {
         owner = "dae";
         repo = "ankidocs";
@@ -68,11 +69,12 @@ let
 
 in
 buildPythonApplication rec {
-    name = "anki-${version}";
+    pname = "anki";
+    inherit version;
 
     src = fetchurl {
       urls = [
-        "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
+        "https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz"
         # "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
         # "http://ankisrs.net/download/mirror/${name}.tgz"
         # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix
index 5318108c491..70c23664dc0 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/pkgs/games/armagetronad/default.nix
@@ -7,7 +7,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "armagetron-${version}";
+  pname = "armagetron";
+  inherit version;
   src = fetchurl {
     url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2";
     sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3";
diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix
index 98baafbb2fd..b9d3a69d87b 100644
--- a/pkgs/games/crrcsim/default.nix
+++ b/pkgs/games/crrcsim/default.nix
@@ -3,10 +3,11 @@ let
   version = "0.9.13";
 in
 stdenv.mkDerivation rec {
-  name = "crrcsim-${version}";
+  pname = "crrcsim";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/crrcsim/${name}.tar.gz";
+    url = "mirror://sourceforge/crrcsim/${pname}-${version}.tar.gz";
     sha256 = "abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698";
   };
 
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index a7725054310..0b25af645cf 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -84,7 +84,8 @@ let
   '';
 
   dfhack = stdenv.mkDerivation rec {
-    name = "dfhack-base-${version}";
+    pname = "dfhack-base";
+    inherit version;
 
     # Beware of submodules
     src = fetchFromGitHub {
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 3407659d977..2999da8fcaa 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -18,7 +18,8 @@ let
   wrapper = "eduke32-wrapper";
 
 in stdenv.mkDerivation {
-  name = "eduke32-${version}";
+  pname = "eduke32";
+  inherit version;
 
   src = fetchurl {
     url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}.tar.xz";
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index 447724a2043..a138b46f81b 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -7,7 +7,8 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "endless-sky-${version}";
+  pname = "endless-sky";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "endless-sky";
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index 5a04e75030f..19851341da0 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -9,7 +9,8 @@ let
   version = "2019.1.1";
   shortVersion = builtins.substring 0 6 version;
   data = stdenv.mkDerivation rec {
-    name = "flightgear-base-${version}";
+    pname = "flightgear-base";
+    inherit version;
 
     src = fetchurl {
       url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix
index d5efe2b3ebd..3b8bc1288ef 100644
--- a/pkgs/games/freedink/default.nix
+++ b/pkgs/games/freedink/default.nix
@@ -5,10 +5,11 @@ let
   version = "1.08.20121209";
 
   freedink_data = stdenv.mkDerivation rec {
-    name = "freedink-data-${version}";
+    pname = "freedink-data";
+    inherit version;
 
     src = fetchurl {
-      url = "mirror://gnu/freedink/${name}.tar.gz";
+      url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
       sha256 = "1mhns09l1s898x18ahbcy9gabrmgsr8dv7pm0a2ivid8mhxahn1j";
     };
 
@@ -16,10 +17,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "freedink-${version}";
+  pname = "freedink";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnu/freedink/${name}.tar.gz";
+    url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
     sha256 = "19xximbcm6506kvpf3s0q96697kmzca3yrjdr6dgphklp33zqsqr";
   };
 
diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix
index 2ebb60f3d5d..b269a5d12d6 100644
--- a/pkgs/games/freedroidrpg/default.nix
+++ b/pkgs/games/freedroidrpg/default.nix
@@ -3,7 +3,8 @@
 let
   version = "0.16.1";
 in stdenv.mkDerivation rec {
-  name = "freedroidrpg-${version}";
+  pname = "freedroidrpg";
+  inherit version;
 
   src = fetchurl {
     url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${stdenv.lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz";
diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix
index e89d16b788a..f9ae137bb62 100644
--- a/pkgs/games/gogui/default.nix
+++ b/pkgs/games/gogui/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.4.9";
 in stdenv.mkDerivation {
-  name = "gogui-${version}";
+  pname = "gogui";
+  inherit version;
   buildInputs = [ unzip makeWrapper ];
   src = fetchurl {
     url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip";
diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix
index 1fcf9c9527b..f57571b2a2c 100644
--- a/pkgs/games/linux-steam-integration/default.nix
+++ b/pkgs/games/linux-steam-integration/default.nix
@@ -5,7 +5,8 @@ let
   version = "0.7.3";
 
 in stdenv.mkDerivation rec {
-  name = "linux-steam-integration-${version}";
+  pname = "linux-steam-integration";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "clearlinux";
diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix
index de67afe45a9..df613bb4447 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/pkgs/games/megaglest/default.nix
@@ -17,7 +17,8 @@ let
   };
 in
 stdenv.mkDerivation {
-  name = "megaglest-${version}";
+  pname = "megaglest";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "MegaGlest";
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 17366ae9904..52a91165537 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -24,7 +24,8 @@ let
       };
     };
   in stdenv.mkDerivation {
-    name = "minetest-${version}";
+    pname = "minetest";
+    inherit version;
 
     src = sources.src;
 
diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix
index 39b3ae36f50..72d60eae7f6 100644
--- a/pkgs/games/nexuiz/default.nix
+++ b/pkgs/games/nexuiz/default.nix
@@ -13,7 +13,8 @@ let
 
   version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}";
 in stdenv.mkDerivation {
-  name = "nexuiz-${version}";
+  pname = "nexuiz";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/nexuiz/nexuiz-${version_short}.zip";
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 211172cee20..9b3d92a350d 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -3,7 +3,8 @@
 
 let version = "1.0.0.2018.10.08"; in
 stdenv.mkDerivation {
-  name = "openxcom-${version}";
+  pname = "openxcom";
+  inherit version;
   src = fetchFromGitHub {
     owner = "SupSuper";
     repo = "OpenXcom";
diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix
index 88ba8679e8a..0d8a64f14cd 100644
--- a/pkgs/games/quake3/content/demo.nix
+++ b/pkgs/games/quake3/content/demo.nix
@@ -3,7 +3,8 @@
 let
   version = "1.11-6";
 in stdenv.mkDerivation {
-  name = "quake3-demodata-${version}";
+  pname = "quake3-demodata";
+  inherit version;
 
   src = fetchurl {
     url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh";
diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix
index f35aaaad352..e34064d93b0 100644
--- a/pkgs/games/quake3/content/pointrelease.nix
+++ b/pkgs/games/quake3/content/pointrelease.nix
@@ -3,7 +3,8 @@
 let
   version = "1.32b-3";
 in stdenv.mkDerivation {
-  name = "quake3-pointrelease-${version}";
+  pname = "quake3-pointrelease";
+  inherit version;
 
   src = fetchurl {
     url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run";
diff --git a/pkgs/games/rrootage/default.nix b/pkgs/games/rrootage/default.nix
index 8b07a38c7bb..459ff238b4a 100644
--- a/pkgs/games/rrootage/default.nix
+++ b/pkgs/games/rrootage/default.nix
@@ -10,7 +10,8 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "rrootage-${version}";
+  pname = "rrootage";
+  inherit version;
   src = fetchurl {
     url = "http://downloads.sourceforge.net/rrootage/rRootage-${version}.tar.gz";
     sha256 = "01zzg4ih3kmbhsn1p9zr7g8srv1d2dhrp8cdd86y9qq233idnkln";
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 5cbb3c1796f..e6889731619 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -107,7 +107,8 @@ let
   };
 
   binaries = stdenv.mkDerivation rec {
-    name = "simutrans-${version}";
+    pname = "simutrans";
+    inherit version;
 
     src = binary_src;
 
diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index 3e29ceb5b01..63c7e4675b7 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -5,7 +5,8 @@ let
   version = "1.0.0.59";
 
 in stdenv.mkDerivation rec {
-  name = "steam-original-${version}";
+  pname = "steam-original";
+  inherit version;
 
   src = fetchurl {
     url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index 13033c7f9f0..eea92b43b52 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -9,7 +9,8 @@ in
 
 stdenv.mkDerivation {
 
-  name = "stockfish-${version}";
+  pname = "stockfish";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz";
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
index 6c571da561c..e018dfd664d 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@@ -10,7 +10,8 @@
 let
   version = "git";
   bin = stdenv.mkDerivation {
-    name = "vdrift-${version}";
+    pname = "vdrift";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "vdrift";
diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix
index c61bfb806c5..0fa637e040e 100644
--- a/pkgs/misc/drivers/epson-201106w/default.nix
+++ b/pkgs/misc/drivers/epson-201106w/default.nix
@@ -6,7 +6,8 @@ let
 in
   stdenv.mkDerivation {
 
-    name = "epson-201106w-${version}";
+    pname = "epson-201106w";
+    inherit version;
 
     src = fetchurl {
       url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm";
diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix
index 1dac6034fda..fe52b104a52 100644
--- a/pkgs/misc/drivers/epson-alc1100/default.nix
+++ b/pkgs/misc/drivers/epson-alc1100/default.nix
@@ -9,7 +9,8 @@ let
   };
 in
   stdenv.mkDerivation {
-    name = "epson-alc1100-${version}";
+    pname = "epson-alc1100";
+    inherit version;
 
     src = fetchurl {
       url = "http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/01/58/65/cd71929d2bf41ebf7e96f68fa9f1279556545ef1/Epson-ALC1100-filter-1.2.tar.gz";
diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix
index 2a92f8a59d9..9da1a8269ab 100644
--- a/pkgs/misc/drivers/epson_201207w/default.nix
+++ b/pkgs/misc/drivers/epson_201207w/default.nix
@@ -5,7 +5,8 @@ let
 in
   stdenv.mkDerivation {
 
-    name = "epson_201207w-${version}";
+    pname = "epson_201207w";
+    inherit version;
 
     src = fetchurl {
       url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm";
diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix
index a7d5710a279..cd322bf8fdb 100644
--- a/pkgs/misc/drivers/postscript-lexmark/default.nix
+++ b/pkgs/misc/drivers/postscript-lexmark/default.nix
@@ -3,7 +3,8 @@ let
   version = "20160218";
 in
 stdenv.mkDerivation {
-  name = "postscript-lexmark-${version}";
+  pname = "postscript-lexmark";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm";
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix
index 35a9bd2e384..be199936426 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/pkgs/misc/drivers/sundtek/default.nix
@@ -17,7 +17,8 @@ in
       url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz";
       sha256 = "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp";
     };
-    name = "sundtek-${version}";
+    pname = "sundtek";
+    inherit version;
 
     phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix
index c942ec59f37..1ed279d2998 100644
--- a/pkgs/misc/drivers/xboxdrv/default.nix
+++ b/pkgs/misc/drivers/xboxdrv/default.nix
@@ -4,7 +4,8 @@
 let
   version = "0.8.8";
 in stdenv.mkDerivation {
-  name = "xboxdrv-${version}";
+  pname = "xboxdrv";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/xboxdrv/xboxdrv/archive/v${version}.tar.gz";
diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix
index a560ecd0a21..13cd21391f1 100644
--- a/pkgs/misc/emulators/ccemux/default.nix
+++ b/pkgs/misc/emulators/ccemux/default.nix
@@ -34,7 +34,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ccemux-${version}";
+  pname = "ccemux";
+  inherit version;
 
   src = jar;
   dontUnpack = true;
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 446aac62982..5b80a553625 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -36,10 +36,11 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "ghostscript-${version}";
+  pname = "ghostscript";
+  inherit version;
 
   src = fetchurl {
-    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${name}.tar.xz";
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${pname}-${version}.tar.xz";
     inherit sha512;
   };
 
diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix
index 1a064e8c627..5af75be690c 100644
--- a/pkgs/misc/long-shebang/default.nix
+++ b/pkgs/misc/long-shebang/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl }: let
   version = "1.2.0";
 in stdenv.mkDerivation {
-  name = "long-shebang-${version}";
+  pname = "long-shebang";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz";
diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix
index 91584bfa1fe..7f3aa11c3f0 100644
--- a/pkgs/misc/themes/kde2/default.nix
+++ b/pkgs/misc/themes/kde2/default.nix
@@ -5,7 +5,8 @@
 let
   version = "2017-03-15";
 in stdenv.mkDerivation rec {
-  name = "kde2-decoration-${version}";
+  pname = "kde2-decoration";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "repos-holder";
diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix
index 54715c01a9e..0d4655186eb 100644
--- a/pkgs/misc/themes/qtcurve/default.nix
+++ b/pkgs/misc/themes/qtcurve/default.nix
@@ -8,7 +8,8 @@
 let
   version = "1.9";
 in stdenv.mkDerivation {
-  name = "qtcurve-${version}";
+  pname = "qtcurve";
+  inherit version;
   src = fetchurl {
     url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz";
     sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8";
diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix
index 50c48098ab0..205d788da6e 100644
--- a/pkgs/os-specific/linux/beegfs/default.nix
+++ b/pkgs/os-specific/linux/beegfs/default.nix
@@ -27,7 +27,8 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "beegfs-${version}";
+  pname = "beegfs";
+  inherit version;
 
   src = fetchurl {
     url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}";
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
index 1cc0e7ae4ca..58cd88b4dce 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
@@ -3,7 +3,8 @@
 let version = "5.100.138"; in
 
 stdenv.mkDerivation {
-  name = "b43-firmware-${version}";
+  pname = "b43-firmware";
+  inherit version;
 
   src = fetchurl {
     url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2";
diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
index 5f8f6c54252..c9723c944ab 100644
--- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
@@ -35,7 +35,8 @@ in
 
 stdenv.mkDerivation {
 
-  name = "facetimehd-firmware-${version}";
+  pname = "facetimehd-firmware";
+  inherit version;
   src = fetchurl {
     url = dmgUrl;
     sha256 = "0xqkl4yds0n9fdjvnk0v5mj382q02crry6wm2q7j3ncdqwsv02sv";
diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
index 5b14546c90f..70a0bdbe240 100644
--- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
@@ -2,7 +2,8 @@
 let
   version = "12";
 in stdenv.mkDerivation {
-  name = "fwupdate-${version}";
+  pname = "fwupdate";
+  inherit version;
   src = fetchurl {
     url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";
     sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1";
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index f829f1da424..35c91c5ec07 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -10,12 +10,13 @@
 let
   isFuse3 = stdenv.lib.hasPrefix "3" version;
 in stdenv.mkDerivation rec {
-  name = "fuse-${version}";
+  pname = "fuse";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "libfuse";
     repo = "libfuse";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = sha256Hash;
   };
 
diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix
index 15bdabcc3dc..d2319fdcf5c 100644
--- a/pkgs/os-specific/linux/hibernate/default.nix
+++ b/pkgs/os-specific/linux/hibernate/default.nix
@@ -3,7 +3,8 @@
 let version = "2.0";
 in
   stdenv.mkDerivation rec {
-    name = "hibernate-${version}";
+    pname = "hibernate";
+    inherit version;
     src = fetchurl {
       url = "http://tuxonice.nigelcunningham.com.au/files/hibernate-script-${version}.tar.gz";
       sha256 = "0ib5bac3spbcwmhf8f9apjbll8x7fgqj4k1s5q3srijh793rfifh";
diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix
index 932b8143898..7b41b095091 100644
--- a/pkgs/os-specific/linux/iomelt/default.nix
+++ b/pkgs/os-specific/linux/iomelt/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.7";
 in stdenv.mkDerivation {
-  name = "iomelt-${version}";
+  pname = "iomelt";
+  inherit version;
   src = fetchurl {
     url = "http://iomelt.com/s/iomelt-${version}.tar.gz";
     sha256 = "1jhrdm5b7f1bcbrdwcc4yzg26790jxl4d2ndqiwd9brl2g5537im";
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 527811c2b8d..2c01dcb9731 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -93,7 +93,8 @@ let
 
   configfile = stdenv.mkDerivation {
     inherit ignoreConfigErrors autoModules preferBuiltin kernelArch;
-    name = "linux-config-${version}";
+    pname = "linux-config";
+    inherit version;
 
     generateConfig = ./generate-config.pl;
 
diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 266c94fd8c8..55ae78219d1 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -4,7 +4,8 @@ let
   version = "22-1.1ubuntu1"; # Zesty
 
 in stdenv.mkDerivation {
-  name = "kmod-blacklist-${version}";
+  pname = "kmod-blacklist";
+  inherit version;
 
   src = fetchurl {
     url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";
diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix
index 0c333feab1c..96bb91175dc 100644
--- a/pkgs/os-specific/linux/ldm/default.nix
+++ b/pkgs/os-specific/linux/ldm/default.nix
@@ -7,7 +7,8 @@ let
   git = https://github.com/LemonBoy/ldm.git;
 in
 stdenv.mkDerivation rec {
-  name = "ldm-${version}";
+  pname = "ldm";
+  inherit version;
 
   # There is a stable release, but we'll use the lvm branch, which
   # contains important fixes for LVM setups.
diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix
index 93cab433c9c..b2d1ca4791a 100644
--- a/pkgs/os-specific/linux/lsiutil/default.nix
+++ b/pkgs/os-specific/linux/lsiutil/default.nix
@@ -13,7 +13,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "lsiutils-${version}";
+  pname = "lsiutils";
+  inherit version;
   
   srcs = [ src "Source/lsiutil.tar.gz" ];
 
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 469096d014d..9944250bf30 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -7,7 +7,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "lvm2-${version}";
+  pname = "lvm2";
+  inherit version;
 
   src = fetchgit {
     url = "git://sourceware.org/git/lvm2.git";
diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 43f184f384d..24213cd2fb5 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -5,7 +5,8 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0";
 let
   version = "1.0.beta1-9e810b1";
 in stdenv.mkDerivation {
-  name = "ply-${version}";
+  pname = "ply";
+  inherit version;
   nativeBuildInputs = [ autoreconfHook flex yacc p7zip ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index e604f73de2d..ce0e8707ff5 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -7,7 +7,8 @@ let
   version = "25.0";
 
 in stdenv.mkDerivation {
-  name = "rdma-core-${version}";
+  pname = "rdma-core";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "linux-rdma";
diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix
index ee7325edbe7..3cb964f364d 100644
--- a/pkgs/os-specific/linux/regionset/default.nix
+++ b/pkgs/os-specific/linux/regionset/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.2"; in
 stdenv.mkDerivation {
-  name = "regionset-${version}";
+  pname = "regionset";
+  inherit version;
 
   src = fetchurl {
     url = "http://linvdr.org/download/regionset/regionset-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 0962bd91132..b79a2cd342a 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -8,10 +8,11 @@ let
   patchVersion = "2";
 
 in stdenv.mkDerivation rec {
-  name = "util-linux-${version}";
+  pname = "util-linux";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
+    url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${pname}-${version}.tar.xz";
     sha256 = "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3";
   };
 
diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix
index 88af53dd046..fedfea15ccb 100644
--- a/pkgs/os-specific/windows/libgnurx/default.nix
+++ b/pkgs/os-specific/windows/libgnurx/default.nix
@@ -3,9 +3,10 @@
 let
   version = "2.5.1";
 in stdenv.mkDerivation rec {
-  name = "libgnurx-${version}";
+  pname = "libgnurx";
+  inherit version;
   src = fetchurl {
-    url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz";
+    url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${pname}-${version}-src.tar.gz";
     sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi";
   };
 
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index a7d4f09b90e..022aaffe596 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -3,7 +3,8 @@
 let
   version = "5.0.4";
 in stdenv.mkDerivation {
-  name = "mingw-w64-${version}";
+  pname = "mingw-w64";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index de0f36dac5f..286f4a0d41f 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "pthreads-w32-${version}";
+  pname = "pthreads-w32";
   version = "2.9.1";
 
   src = fetchzip {
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 7fdbfb6472c..df4a9f85de6 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -6,11 +6,12 @@ let
 
   generic = { version, sha256, enableIPv6 ? false }:
     stdenv.mkDerivation rec {
-      name = "bird-${version}";
+      pname = "bird";
+      inherit version;
 
       src = fetchurl {
         inherit sha256;
-        url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
+        url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz";
       };
 
       nativeBuildInputs = [ flex bison ];
diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index 4b71aaeca3a..e21ad5723b0 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -12,7 +12,8 @@ daemonlib = fetchgit {
 in
 
 stdenv.mkDerivation rec {
-  name = "brickd-${version}";
+  pname = "brickd";
+  inherit version;
 
   src = fetchgit {
     url = "git://github.com/Tinkerforge/brickd.git";
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 74d0d1341d6..369bcb5d2cd 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -11,10 +11,11 @@ assert enablePython -> python3 != null;
 let version = "9.14.4"; in
 
 stdenv.mkDerivation rec {
-  name = "bind-${version}";
+  pname = "bind";
+  inherit version;
 
   src = fetchurl {
-    url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
+    url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
     sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii";
   };
 
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index ff767d9ad43..a6f4f992671 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -10,7 +10,8 @@ let
     };
 in
 stdenv.mkDerivation {
-  name = "mod_fastcgi-${version}";
+  pname = "mod_fastcgi";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz";
diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix
index 19b2d01f5be..395504e4970 100644
--- a/pkgs/servers/http/gatling/default.nix
+++ b/pkgs/servers/http/gatling/default.nix
@@ -4,10 +4,11 @@ let
   version = "0.15";
 in
 stdenv.mkDerivation rec {
-  name = "gatling-${version}";
+  pname = "gatling";
+  inherit version;
 
   src = fetchurl {
-    url = "https://www.fefe.de/gatling/${name}.tar.xz";
+    url = "https://www.fefe.de/gatling/${pname}-${version}.tar.xz";
     sha256 = "194srqyja3pczpbl6l169zlvx179v7ln0m6yipmhvj6hrv82k8vg";
   };
 
diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix
index b18e1ea162f..3c29ddb8e0a 100644
--- a/pkgs/servers/http/myserver/default.nix
+++ b/pkgs/servers/http/myserver/default.nix
@@ -4,10 +4,11 @@
 let version = "0.11"; in
 
 stdenv.mkDerivation rec {
-  name = "myserver-${version}";
+  pname = "myserver";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnu/myserver/${version}/${name}.tar.xz";
+    url = "mirror://gnu/myserver/${version}/${pname}-${version}.tar.xz";
     sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax";
   };
 
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 12b873df6a4..7292efd2f71 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -21,7 +21,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "nginx-${version}";
+  pname = "nginx";
+  inherit version;
 
   src = fetchurl {
     url = "https://nginx.org/download/nginx-${version}.tar.gz";
diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix
index 8c00bcdbee2..890cd188053 100644
--- a/pkgs/servers/mail/postfix/pfixtools.nix
+++ b/pkgs/servers/mail/postfix/pfixtools.nix
@@ -22,7 +22,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "pfixtools-${version}";
+  pname = "pfixtools";
+  inherit version;
 
   src = pfixtoolsSrc;
 
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 2fc8232f0a2..2919647e573 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -4,7 +4,8 @@ let
   version = "5.9.0";
 
   mattermost-server = buildGoPackage rec {
-    name = "mattermost-server-${version}";
+    pname = "mattermost-server";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "mattermost";
@@ -23,7 +24,8 @@ let
   };
 
   mattermost-webapp = stdenv.mkDerivation {
-    name = "mattermost-webapp-${version}";
+    pname = "mattermost-webapp";
+    inherit version;
 
     src = fetchurl {
       url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix
index 1de1edfa8e1..c1f4746fadf 100644
--- a/pkgs/servers/monitoring/uchiwa/default.nix
+++ b/pkgs/servers/monitoring/uchiwa/default.nix
@@ -11,7 +11,8 @@ let
   };
 
   backend = buildGoPackage {
-    name = "uchiwa-backend-${version}";
+    pname = "uchiwa-backend";
+    inherit version;
     goPackagePath = "github.com/${owner}/${repo}";
     inherit src;
     postInstall = ''
@@ -27,7 +28,8 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "uchiwa-${version}";
+  pname = "uchiwa";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 842c988d9b3..2864449267a 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -21,7 +21,8 @@ let version = "3.4.10";
     ] ++ optionals stdenv.isLinux [ "tcmalloc" ];
 
 in stdenv.mkDerivation rec {
-  name = "mongodb-${version}";
+  pname = "mongodb";
+  inherit version;
 
   src = fetchurl {
     url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz";
diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index 7ba23f61fed..1238778658a 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sphinxsearch-${version}";
+  pname = "sphinxsearch";
+  inherit version;
   src = mainSrc;
 
   configureFlags = [
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 287054a750b..0770191c1b9 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -6,7 +6,8 @@ let
   version = "11.33.3";
 in stdenv.mkDerivation rec {
 
-  name = "monetdb-${version}";
+  pname = "monetdb";
+  inherit version;
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index e05d9e919d1..c996d7c0c8b 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -6,7 +6,8 @@ let
   version = "4.2.8";
 
 in stdenv.mkDerivation rec {
-  name = "tvheadend-${version}";
+  pname = "tvheadend";
+  inherit version;
 
   src = fetchFromGitHub {
     owner  = "tvheadend";
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 76c4bfc428e..b0fa2861dbc 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -3,7 +3,8 @@
 let
   generic = { version, sha256, suffix ? "" }:
   stdenv.mkDerivation rec {
-    name = "unifi-controller-${version}";
+    pname = "unifi-controller";
+    inherit version;
 
     src = fetchurl {
       url = "https://dl.ubnt.com/unifi/${version}${suffix}/unifi_sysvinit_all.deb";
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 4ee23e68265..2375e81ff9e 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -4,10 +4,11 @@
 let
   common = { version, sha256, extraBuildInputs ? [] }:
     stdenv.mkDerivation rec {
-      name = "varnish-${version}";
+      pname = "varnish";
+      inherit version;
 
       src = fetchurl {
-        url = "https://varnish-cache.org/_downloads/${name}.tgz";
+        url = "https://varnish-cache.org/_downloads/${pname}-${version}.tgz";
         inherit sha256;
       };
 
diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix
index 92350595dd8..84904d48b1e 100644
--- a/pkgs/servers/x11/quartz-wm/default.nix
+++ b/pkgs/servers/x11/quartz-wm/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.3.1";
 in stdenv.mkDerivation {
-  name = "quartz-wm-${version}";
+  pname = "quartz-wm";
+  inherit version;
   src = fetchurl {
     url = "http://xquartz-dl.macosforge.org/src/quartz-wm-${version}.tar.xz";
     sha256 = "1j8zd3p7rhay1s3sxq6anw78k5s59mx44xpqla2ianl62346a5g9";
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 2fa31fff299..ed41976e1ac 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -45,7 +45,8 @@ in stdenv.mkDerivation rec {
   LANG = "en_US.UTF-8";
 
   deps = stdenv.mkDerivation {
-    name = "ejabberd-deps-${version}";
+    pname = "ejabberd-deps";
+    inherit version;
 
     inherit src;
 
diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix
index 789ddaf4d9b..446f28ba652 100644
--- a/pkgs/shells/es/default.nix
+++ b/pkgs/shells/es/default.nix
@@ -5,7 +5,8 @@ let
 in
 stdenv.mkDerivation {
 
-  name = "es-${version}";
+  pname = "es";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz";
diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index 48c8fd0815e..05e9a0c757e 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -3,7 +3,8 @@ let
   version = "0.6.0";
 in
 stdenv.mkDerivation {
-  name = "oil-${version}";
+  pname = "oil";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index e9458520bb4..0a26b8a7821 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -10,7 +10,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "zsh-${version}";
+  pname = "zsh";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 0a5c3ef666e..3ce32a5e436 100644
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "nix-zsh-completions-${version}";
+  pname = "nix-zsh-completions";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "spwhitt";
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 0d764a4cbd1..f5a8fd24f5e 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -56,10 +56,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "bumblebee-${version}";
+  pname = "bumblebee";
+  inherit version;
 
   src = fetchurl {
-    url = "https://bumblebee-project.org/${name}.tar.gz";
+    url = "https://bumblebee-project.org/${pname}-${version}.tar.gz";
     sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h";
   };
 
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index eda5703d6a8..95aa15840da 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -3,10 +3,11 @@
 let version = "1.6.1";
 in
 stdenv.mkDerivation rec {
-  name = "nitrogen-${version}";
+  pname = "nitrogen";
+  inherit version;
 
   src = fetchurl {
-    url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz";
+    url = "http://projects.l3ib.org/nitrogen/files/${pname}-${version}.tar.gz";
     sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl";
   };
 
diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix
index 79ef4cb56dc..a648eefcdde 100644
--- a/pkgs/tools/X11/xautomation/default.nix
+++ b/pkgs/tools/X11/xautomation/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.09"; in
 stdenv.mkDerivation {
-  name = "xautomation-${version}";
+  pname = "xautomation";
+  inherit version;
   src = fetchurl {
     url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz";
     sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf";
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix
index 4e4e49bd946..23e0ce63e5b 100644
--- a/pkgs/tools/X11/xbindkeys/default.nix
+++ b/pkgs/tools/X11/xbindkeys/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.8.6"; in
 stdenv.mkDerivation {
-  name = "xbindkeys-${version}";
+  pname = "xbindkeys";
+  inherit version;
   src = fetchurl {
     url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz";
     sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc";
diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix
index dbbdb0c04e9..b9d48f54574 100644
--- a/pkgs/tools/X11/xwinwrap/default.nix
+++ b/pkgs/tools/X11/xwinwrap/default.nix
@@ -4,7 +4,8 @@ let
   version = "4";
 in
 stdenv.mkDerivation {
-  name = "xwinwrap-${version}";
+  pname = "xwinwrap";
+  inherit version;
 
   src = fetchbzr {
     url = https://code.launchpad.net/~shantanu-goel/xwinwrap/devel;
diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix
index cb73233dcb4..3f958f7f958 100644
--- a/pkgs/tools/archivers/fsarchiver/default.nix
+++ b/pkgs/tools/archivers/fsarchiver/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.8.5";
 
 in stdenv.mkDerivation {
-  name = "fsarchiver-${version}";
+  pname = "fsarchiver";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "fdupoux";
diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix
index 169f419cd67..d6c988ef0be 100644
--- a/pkgs/tools/audio/dir2opus/default.nix
+++ b/pkgs/tools/audio/dir2opus/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.12.2"; in
 stdenv.mkDerivation rec {
-  name = "dir2opus-${version}";
+  pname = "dir2opus";
+  inherit version;
 
   pythonPath = [ mutagen ];
   buildInputs = [ wrapPython ];
@@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d";
   };
 
diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
index d86a0b09c26..bdc431bcb92 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 mkDerivation {
-  name = "qastools-${version}";
+  pname = "qastools";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2";
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index bf10f556b6b..8f4cd60e1ee 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -10,7 +10,8 @@ let version = "0.29.2"; in
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "bup-${version}";
+  pname = "bup";
+  inherit version;
 
   src = fetchFromGitHub {
     repo = "bup";
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index 05792ecbb12..973e9217644 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -24,7 +24,8 @@ let
   checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd";
 in
 stdenv.mkDerivation rec {
-  name = "znapzend-${version}";
+  pname = "znapzend";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "oetiker";
diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix
index 56ec8e19f54..09fbc8b38c8 100644
--- a/pkgs/tools/cd-dvd/lsdvd/default.nix
+++ b/pkgs/tools/cd-dvd/lsdvd/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.17";
 in
 stdenv.mkDerivation {
-  name = "lsdvd-${version}";
+  pname = "lsdvd";
+  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz";
     sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x";
diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix
index 1d5cd85a62e..94ca5eb58b1 100644
--- a/pkgs/tools/compression/pbzip2/default.nix
+++ b/pkgs/tools/compression/pbzip2/default.nix
@@ -4,10 +4,11 @@ let major = "1.1";
     version = "${major}.13";
 in
 stdenv.mkDerivation rec {
-  name = "pbzip2-${version}";
+  pname = "pbzip2";
+  inherit version;
 
   src = fetchurl {
-    url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1rnvgcdixjzbrmcr1nv9b6ccrjfrhryaj7jwz28yxxv6lam3xlcg";
   };
 
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 6ecc65149c4..e8a4917be99 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -96,7 +96,8 @@ let
 
 in
 stdenv.mkDerivation {
-  name="ceph-${version}";
+  pname = "ceph";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix
index 2e4ea88df7f..e6c4474765c 100644
--- a/pkgs/tools/filesystems/dislocker/default.nix
+++ b/pkgs/tools/filesystems/dislocker/default.nix
@@ -7,7 +7,8 @@ let
   version = "0.7.1";
 in
 stdenv.mkDerivation rec {
-  name = "dislocker-${version}";
+  pname = "dislocker";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "aorimn";
diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix
index 6044806a34b..58963753a51 100644
--- a/pkgs/tools/filesystems/jmtpfs/default.nix
+++ b/pkgs/tools/filesystems/jmtpfs/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.5"; in
 stdenv.mkDerivation {
-  name = "jmtpfs-${version}";
+  pname = "jmtpfs";
+  inherit version;
 
   src = fetchFromGitHub {
     sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1";
diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix
index 967a8ee43be..c9af30f873b 100644
--- a/pkgs/tools/filesystems/reiser4progs/default.nix
+++ b/pkgs/tools/filesystems/reiser4progs/default.nix
@@ -2,10 +2,11 @@
 
 let version = "1.2.1"; in
 stdenv.mkDerivation rec {
-  name = "reiser4progs-${version}";
+  pname = "reiser4progs";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz";
+    url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz";
     sha256 = "03vdqvpyd48wxrpqpb9kg76giaffw9b8k334kr4wc0zxgybknhl7";
   };
 
diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix
index 345974bed58..a89ea065750 100644
--- a/pkgs/tools/filesystems/reiserfsprogs/default.nix
+++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix
@@ -2,10 +2,11 @@
 
 let version = "3.6.24"; in
 stdenv.mkDerivation rec {
-  name = "reiserfsprogs-${version}";
+  pname = "reiserfsprogs";
+  inherit version;
 
   src = fetchurl {
-    url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${name}.tar.xz";
+    url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz";
     sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y";
   };
 
diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix
index 518e92814a4..476d8065312 100644
--- a/pkgs/tools/filesystems/zfstools/default.nix
+++ b/pkgs/tools/filesystems/zfstools/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.3.6"; in
 stdenv.mkDerivation rec {
-  name = "zfstools-${version}";
+  pname = "zfstools";
+  inherit version;
 
   src = fetchFromGitHub {
     sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg";
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index b66257f442e..1b2425fa71a 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -5,7 +5,8 @@ let
   version = "2.1.1";
  in
 stdenv.mkDerivation rec {
-  name = "argyllcms-${version}";
+  pname = "argyllcms";
+  inherit version;
 
   src = fetchzip {
     # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix
index 57a6c8c9673..e57f80f738f 100644
--- a/pkgs/tools/graphics/briss/default.nix
+++ b/pkgs/tools/graphics/briss/default.nix
@@ -8,7 +8,8 @@ let
   sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9";
 
 in stdenv.mkDerivation {
-  name = "briss-${version}";
+  pname = "briss";
+  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/briss/briss-${version}.tar.gz";
     inherit sha256;
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 51212a3ea94..848d804bb38 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -13,7 +13,8 @@ let
     sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg";
   };
 in stdenv.mkDerivation rec {
-  name = "gmic-${version}";
+  pname = "gmic";
+  inherit version;
 
   outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin";
 
diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix
index 7ea73ab8db8..e5bdf6f3177 100644
--- a/pkgs/tools/graphics/gmic_krita_qt/default.nix
+++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix
@@ -7,7 +7,8 @@ let
   version = "2.3.6";
 
 in stdenv.mkDerivation rec {
-  name = "gmic_krita_qt-${version}";
+  pname = "gmic_krita_qt";
+  inherit version;
 
   gmic-community = fetchFromGitHub {
     owner = "dtschump";
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index db21df9b5d0..6cdd6dd71c1 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -25,7 +25,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "graphviz-${version}";
+  pname = "graphviz";
+  inherit version;
 
   src = fetchFromGitLab {
     owner = "graphviz";
diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix
index 666cdae131e..832a48baab7 100644
--- a/pkgs/tools/graphics/mscgen/default.nix
+++ b/pkgs/tools/graphics/mscgen/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.20";
 in
 stdenv.mkDerivation {
-  name = "mscgen-${version}";
+  pname = "mscgen";
+  inherit version;
 
   src = fetchurl {
     url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";
diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix
index c91c18e3f0b..b65962ee7ba 100644
--- a/pkgs/tools/graphics/pgf/default.nix
+++ b/pkgs/tools/graphics/pgf/default.nix
@@ -6,7 +6,8 @@ let
   version = "6.14.12";
 in
 stdenv.mkDerivation {
-  name = "pgf-${version}";
+  pname = "pgf";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz";
diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix
index 3769860d469..42a86187a72 100644
--- a/pkgs/tools/graphics/twilight/default.nix
+++ b/pkgs/tools/graphics/twilight/default.nix
@@ -4,7 +4,8 @@
 let
   version = "2018-04-19";
 in stdenv.mkDerivation rec {
-  name = "twilight-${version}";
+  pname = "twilight";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "tweakoz";
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index 2dac9bd60c9..55cfa09aa24 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -22,7 +22,8 @@ let
 in
 
 buildGoPackage {
-  name = "aptly-${version}";
+  pname = "aptly";
+  inherit version;
 
   src = aptlySrc;
 
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 423fc9d8535..3c0d42e832e 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -9,7 +9,8 @@ let
   version = "1.8.1";
 in
   stdenv.mkDerivation {
-    name = "autorandr-${version}";
+    pname = "autorandr";
+    inherit version;
 
     buildInputs = [ python ];
 
diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix
index 90fc68dcc5c..b86bc38cb26 100644
--- a/pkgs/tools/misc/buildtorrent/default.nix
+++ b/pkgs/tools/misc/buildtorrent/default.nix
@@ -3,10 +3,11 @@
 let version = "0.8"; in
 
 stdenv.mkDerivation rec {
-  name = "buildtorrent-${version}";
+  pname = "buildtorrent";
+  inherit version;
 
   src = fetchurl {
-    url = "https://mathr.co.uk/blog/code/${name}.tar.gz";
+    url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz";
     sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
   };
 
diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix
index 135eda554b3..31c35af8118 100644
--- a/pkgs/tools/misc/clasp/default.nix
+++ b/pkgs/tools/misc/clasp/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "clasp-${version}";
+  pname = "clasp";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz";
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index 8453aa67747..0d5efb2ca22 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -5,7 +5,8 @@
 
 let version = "0.4.4"; in
 stdenv.mkDerivation rec {
-  name = "ddccontrol-${version}";
+  pname = "ddccontrol";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "ddccontrol";
diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix
index 5eb4055d5b9..bcd3ec6d8f7 100644
--- a/pkgs/tools/misc/edid-decode/default.nix
+++ b/pkgs/tools/misc/edid-decode/default.nix
@@ -2,7 +2,8 @@
 let
   version = "2018-12-06";
 in stdenv.mkDerivation rec {
-  name = "edid-decode-unstable-${version}";
+  pname = "edid-decode-unstable";
+  inherit version;
 
   src = fetchgit {
     url = "git://linuxtv.org/edid-decode.git";
diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix
index 45d27e7b7c8..871f113a41d 100644
--- a/pkgs/tools/misc/fortune/default.nix
+++ b/pkgs/tools/misc/fortune/default.nix
@@ -13,7 +13,8 @@ let srcs = {
     version = "2.6.2";
 in
 stdenv.mkDerivation {
-  name = "fortune-mod-${version}";
+  pname = "fortune-mod";
+  inherit version;
 
   src = srcs.fortune;
 
diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
index b79388c6f29..e5c0997c8e3 100644
--- a/pkgs/tools/misc/gh-ost/default.nix
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -7,7 +7,8 @@ let
 
 in
 buildGoPackage ({
-    name = "gh-ost-${version}";
+    pname = "gh-ost";
+    inherit version;
     inherit goPackagePath;
 
     src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix
index 6c5bac11e73..51c6d9c2075 100644
--- a/pkgs/tools/misc/gringo/default.nix
+++ b/pkgs/tools/misc/gringo/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gringo-${version}";
+  pname = "gringo";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz";
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index ec1c5897ed7..a176ef13fcc 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -40,11 +40,12 @@ assert zfsSupport -> zfs != null;
 assert !(efiSupport && xenSupport);
 
 stdenv.mkDerivation rec {
-  name = "grub-${version}";
+  pname = "grub";
+  inherit version;
 
   src = fetchgit {
     url = "git://git.savannah.gnu.org/grub.git";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0";
   };
 
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index ca4e477adce..7b432df3e8b 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -29,7 +29,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "trustedGRUB2-${version}";
+  pname = "trustedGRUB2";
+  inherit version;
 
   src = if for_HP_laptop
         then fetchgit {
diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix
index 8b19cd03895..af4d4228c2c 100644
--- a/pkgs/tools/misc/hdaps-gl/default.nix
+++ b/pkgs/tools/misc/hdaps-gl/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.0.5"; in
 stdenv.mkDerivation {
-      name = "hdaps-gl-${version}";
+      pname = "hdaps-gl";
+      inherit version;
       src = fetchzip {
             url = "mirror://sourceforge/project/hdaps/hdaps-gl/hdaps-gl-${version}/hdaps-gl-${version}.tar.gz";
             sha256 = "16fk4k0lvr4c95vd6c7qdylcqa1h5yjp3xm4xwipdjbp0bvsgxq4";
diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
index e48d6354eb5..6624eb5102d 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/pkgs/tools/misc/lbdb/default.nix
@@ -12,7 +12,8 @@ in
 with stdenv.lib;
 with perlPackages;
 stdenv.mkDerivation {
-  name = "lbdb-${version}";
+  pname = "lbdb";
+  inherit version;
   src = fetchurl {
     url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz";
     sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh";
diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix
index 8a3842322f9..b365086c46d 100644
--- a/pkgs/tools/misc/mdbtools/default.nix
+++ b/pkgs/tools/misc/mdbtools/default.nix
@@ -4,7 +4,8 @@
 
 let version = "0.7.1";
 in stdenv.mkDerivation {
-  name = "mdbtools-${version}";
+  pname = "mdbtools";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "brianb";
diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix
index 16762d243db..25d7eaba55e 100644
--- a/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/pkgs/tools/misc/mongodb-compass/default.nix
@@ -52,7 +52,8 @@ let
       throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
 
 in stdenv.mkDerivation {
-  name = "mongodb-compass-${version}";
+  pname = "mongodb-compass";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix
index 6c757ca224a..a22799b2073 100644
--- a/pkgs/tools/misc/shallot/default.nix
+++ b/pkgs/tools/misc/shallot/default.nix
@@ -6,7 +6,8 @@
 let 
   version = "0.0.3";
 in stdenv.mkDerivation {
-  name = "shallot-${version}";
+  pname = "shallot";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "katmagic";
diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix
index 3ab404d0207..0a3bb19d14b 100644
--- a/pkgs/tools/misc/ultrastar-manager/default.nix
+++ b/pkgs/tools/misc/ultrastar-manager/default.nix
@@ -83,7 +83,8 @@ let
     };
 
 in stdenv.mkDerivation {
-  name = "ultrastar-manager-${version}";
+  pname = "ultrastar-manager";
+  inherit version;
   src = patchedSrc;
 
   postPatch = ''
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index aad5b35c79f..62e2b31fa15 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -6,7 +6,8 @@ let
   version = "2011-12-26";
 in
 stdenv.mkDerivation {
-  name = "xburst-tools-${version}";
+  pname = "xburst-tools";
+  inherit version;
 
   src = fetchgit {
     url = git://projects.qi-hardware.com/xburst-tools.git;
diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index 993e9ad7469..12885982d26 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -12,7 +12,8 @@ let
     exec ${jre}/bin/java -jar ${jar} "$@"
   '';
 in stdenv.mkDerivation {
-  name = "burpsuite-${version}";
+  pname = "burpsuite";
+  inherit version;
   buildCommand = ''
     mkdir -p $out/bin
     echo "${launcher}" > $out/bin/burpsuite
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix
index a06b409ca49..4637a39e6e9 100644
--- a/pkgs/tools/networking/bwm-ng/default.nix
+++ b/pkgs/tools/networking/bwm-ng/default.nix
@@ -4,10 +4,11 @@ let
   version = "0.6.1";
 in
 stdenv.mkDerivation rec {
-  name = "bwm-ng-${version}";
+  pname = "bwm-ng";
+  inherit version;
 
   src = fetchurl {
-    url = "https://www.gropp.org/bwm-ng/${name}.tar.gz";
+    url = "https://www.gropp.org/bwm-ng/${pname}-${version}.tar.gz";
     sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02";
   };
 
diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix
index b8a7133e7bc..974f8a1f346 100644
--- a/pkgs/tools/networking/djbdns/default.nix
+++ b/pkgs/tools/networking/djbdns/default.nix
@@ -11,7 +11,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "djbdns-${version}";
+  pname = "djbdns";
+  inherit version;
 
   src = fetchurl {
     url = "https://cr.yp.to/djbdns/djbdns-${version}.tar.gz";
diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index d7ff19612eb..b5d4d5e6dcb 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -3,7 +3,8 @@
 let
   version = "3.0.0";
 in stdenv.mkDerivation rec {
-  name = "easyrsa-${version}";
+  pname = "easyrsa";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "OpenVPN";
diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix
index 6fdcfaa70db..354288b3ce6 100644
--- a/pkgs/tools/networking/gmrender-resurrect/default.nix
+++ b/pkgs/tools/networking/gmrender-resurrect/default.nix
@@ -4,7 +4,8 @@
 let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in
 
 stdenv.mkDerivation {
-  name = "gmrender-resurrect-${version}";
+  pname = "gmrender-resurrect";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "hzeller";
diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix
index db63b16415b..8261ba6e284 100644
--- a/pkgs/tools/networking/gnirehtet/default.nix
+++ b/pkgs/tools/networking/gnirehtet/default.nix
@@ -2,7 +2,8 @@
 let
 version = "2.3";
 apk = stdenv.mkDerivation {
-  name = "gnirehtet.apk-${version}";
+  pname = "gnirehtet.apk";
+  inherit version;
   src = fetchzip {
     url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
     sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz";
diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix
index 56a101b3157..49cc5710e59 100644
--- a/pkgs/tools/networking/minidlna/default.nix
+++ b/pkgs/tools/networking/minidlna/default.nix
@@ -3,7 +3,8 @@
 let version = "1.2.1"; in
 
 stdenv.mkDerivation {
-  name = "minidlna-${version}";
+  pname = "minidlna";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz";
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 84b31bd5d40..dc0a4457dde 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -3,10 +3,11 @@
 let
   generic = { version, sha256 }:
     stdenv.mkDerivation rec {
-      name = "miniupnpc-${version}";
+      pname = "miniupnpc";
+      inherit version;
       src = fetchurl {
-        name = "${name}.tar.gz";
-        url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+        name = "${pname}-${version}.tar.gz";
+        url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
         inherit sha256;
       };
 
diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix
index fdfa446907c..d95171807df 100644
--- a/pkgs/tools/networking/nettee/default.nix
+++ b/pkgs/tools/networking/nettee/default.nix
@@ -5,7 +5,8 @@ let
   sha256 = "00xbkp99x9v07r34w7m2p8gak5hdsdbka36n7a733rdrrkgf5z7r";
 
 in stdenv.mkDerivation {
-  name = "nettee-${version}";
+  pname = "nettee";
+  inherit version;
 
   src = fetchurl {
     url = "http://saf.bio.caltech.edu/pub/software/linux_or_unix_tools/beta-nettee-${version}.tar.gz";
diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix
index 5ad3adfc915..bfd2c035cdb 100644
--- a/pkgs/tools/networking/nfdump/default.nix
+++ b/pkgs/tools/networking/nfdump/default.nix
@@ -5,7 +5,8 @@
 let version = "1.6.17"; in
 
 stdenv.mkDerivation {
-  name = "nfdump-${version}";
+  pname = "nfdump";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "phaag";
diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix
index e585af81991..320e7614c7c 100644
--- a/pkgs/tools/networking/phodav/default.nix
+++ b/pkgs/tools/networking/phodav/default.nix
@@ -4,10 +4,11 @@
 let
   version = "2.2";
 in stdenv.mkDerivation rec {
-  name = "phodav-${version}";
+  pname = "phodav";
+  inherit version;
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${name}.tar.xz";
+    url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz";
     sha256 = "1hap0lncbcmivnflh0fbx7y58ry78p9wgj7z03r64ic0kvf0a0q8";
   };
 
diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix
index ac64e135c2f..b2016fe9452 100644
--- a/pkgs/tools/networking/zssh/default.nix
+++ b/pkgs/tools/networking/zssh/default.nix
@@ -3,10 +3,11 @@
 let
   version = "1.5c";
 in stdenv.mkDerivation rec {
-  name = "zssh-${version}";
+  pname = "zssh";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/zssh/${name}.tgz";
+    url = "mirror://sourceforge/zssh/${pname}-${version}.tgz";
     sha256 = "06z73iq59lz8ibjrgs7d3xl39vh9yld1988yx8khssch4pw41s52";
   };
 
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index aa212d655f8..a5e0e7f2e79 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -124,7 +124,8 @@ common =
         inherit fromGit;
 
         perl-bindings = if includesPerl then nix else stdenv.mkDerivation {
-          name = "nix-perl-${version}";
+          pname = "nix-perl";
+          inherit version;
 
           inherit src;
 
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 296080cbd8e..324ac46b084 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -3,7 +3,8 @@
 let version = "0.10.4"; in
 
 pythonPackages.buildPythonApplication {
-  name = "fail2ban-${version}";
+  pname = "fail2ban";
+  inherit version;
 
   src = fetchFromGitHub {
     owner  = "fail2ban";
diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix
index 2b1708c9243..c4b96f04dc2 100644
--- a/pkgs/tools/security/haka/default.nix
+++ b/pkgs/tools/security/haka/default.nix
@@ -3,7 +3,8 @@
 let version = "0.3.0"; in
 
 stdenv.mkDerivation rec {
-  name = "haka-${version}";
+  pname = "haka";
+  inherit version;
 
   src = fetchurl {
     name = "haka_${version}_source.tar.gz";
diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix
index 1944cf236e1..1812b2645fe 100644
--- a/pkgs/tools/security/tpm-tools/default.nix
+++ b/pkgs/tools/security/tpm-tools/default.nix
@@ -4,10 +4,11 @@ let
   version = "1.3.9.1";
 in
 stdenv.mkDerivation rec {
-  name = "tpm-tools-${version}";
+  pname = "tpm-tools";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/trousers/tpm-tools/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/trousers/tpm-tools/${version}/${pname}-${version}.tar.gz";
     sha256 = "0s7srgghykxnlb1g4izabzf2gfb1knxc0nzn6bly49h8cpi19dww";
   };
 
diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index b58e41d850d..d33cdeb1c56 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -29,7 +29,8 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "vault-bin-${version}";
+  pname = "vault-bin";
+  inherit version;
 
   src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 
diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix
index ad7715f0fe6..83c0a287533 100644
--- a/pkgs/tools/system/ior/default.nix
+++ b/pkgs/tools/system/ior/default.nix
@@ -6,7 +6,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ior-${version}";
+  pname = "ior";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/LLNL/ior/archive/${version}.tar.gz";
diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 05d96afded1..2da76cce0cd 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -13,10 +13,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "smartmontools-${version}";
+  pname = "smartmontools";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
+    url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz";
     sha256 = "077nx2rn9szrg6isdh0938zbp7vr3dsyxl4jdyyzv1xwhqksrqg5";
   };
 
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index a69a527f68f..0163d550217 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -24,7 +24,8 @@ let
     ""; # use linux flags by default
 in
 stdenv.mkDerivation {
-  name = "tree-${version}";
+  pname = "tree";
+  inherit version;
 
   src = fetchurl {
     url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz";
diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix
index 9f6b7a7f122..3b80af365f6 100644
--- a/pkgs/tools/text/cconv/default.nix
+++ b/pkgs/tools/text/cconv/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, autoreconfHook }:
 let version = "0.6.3"; in
   stdenv.mkDerivation {
-  name = "cconv-${version}";
+  pname = "cconv";
+  inherit version;
   
   src = fetchurl {
     url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 702d1b4d89f..87c8fdfd890 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -3,7 +3,8 @@
 let version = "3.3"; in
 
 stdenv.mkDerivation {
-  name = "gnugrep-${version}";
+  pname = "gnugrep";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://gnu/grep/grep-${version}.tar.xz";
diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix
index fc43ed0abe2..2c0e2f29d24 100644
--- a/pkgs/tools/typesetting/kindlegen/default.nix
+++ b/pkgs/tools/typesetting/kindlegen/default.nix
@@ -23,7 +23,8 @@ let
   }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported");
 
 in stdenv.mkDerivation rec {
-  name = "kindlegen-${version}";
+  pname = "kindlegen";
+  inherit version;
 
   src = fetchurl {
     inherit url;
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 5aab4c80d27..7c2543f7219 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -91,7 +91,8 @@ texliveYear = year;
 
 
 core = stdenv.mkDerivation rec {
-  name = "texlive-bin-${version}";
+  pname = "texlive-bin";
+  inherit version;
 
   inherit (common) src patches postPatch preAutoreconf postAutoreconf;
 
@@ -183,7 +184,8 @@ core = stdenv.mkDerivation rec {
 
 inherit (core-big) metafont metapost luatex xetex;
 core-big = stdenv.mkDerivation { #TODO: upmendex
-  name = "texlive-core-big.bin-${version}";
+  pname = "texlive-core-big.bin";
+  inherit version;
 
   inherit (common) src patches postPatch preAutoreconf postAutoreconf;
 
@@ -246,7 +248,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
 
 
 dvisvgm = stdenv.mkDerivation {
-  name = "texlive-dvisvgm.bin-${version}";
+  pname = "texlive-dvisvgm.bin";
+  inherit version;
 
   inherit (common) src;
 
@@ -263,7 +266,8 @@ dvisvgm = stdenv.mkDerivation {
 
 
 dvipng = stdenv.mkDerivation {
-  name = "texlive-dvipng.bin-${version}";
+  pname = "texlive-dvipng.bin";
+  inherit version;
 
   inherit (common) src;
 
@@ -315,7 +319,8 @@ latexindent = perlPackages.buildPerlPackage rec {
 inherit biber;
 bibtexu = bibtex8;
 bibtex8 = stdenv.mkDerivation {
-  name = "texlive-bibtex-x.bin-${version}";
+  pname = "texlive-bibtex-x.bin";
+  inherit version;
 
   inherit (common) src;
 
@@ -332,7 +337,8 @@ bibtex8 = stdenv.mkDerivation {
 
 
 xdvi = stdenv.mkDerivation {
-  name = "texlive-xdvi.bin-${version}";
+  pname = "texlive-xdvi.bin";
+  inherit version;
 
   inherit (common) src;
 
@@ -360,7 +366,8 @@ xdvi = stdenv.mkDerivation {
 {
 
 xindy = stdenv.mkDerivation {
-  name = "texlive-xindy.bin-${version}";
+  pname = "texlive-xindy.bin";
+  inherit version;
 
   inherit (common) src;
 
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 178720436a6..76813f4f246 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -3,7 +3,8 @@
 let version = "0.7.9";
 
 in pythonPackages.buildPythonApplication rec {
-  name = "cloud-init-${version}";
+  pname = "cloud-init";
+  inherit version;
   namePrefix = "";
 
   src = fetchurl {

From eb8e9736604f69b9366dc2bfbc15d4902099b8c7 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 17 Aug 2019 20:24:46 +0000
Subject: [PATCH 081/794] pyqtwebengine: passthru wrapQtAppsHook

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

diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix
index 7d745aa9e10..b48f21b9e78 100644
--- a/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -1,5 +1,6 @@
 { lib, fetchurl, pythonPackages, pkgconfig
 , qmake, qtbase, qtsvg, qtwebengine
+, wrapQtAppsHook
 }:
 
 let
@@ -77,9 +78,12 @@ in buildPythonPackage rec {
 
   doCheck = true;
 
-
   enableParallelBuilding = true;
 
+  passthru = {
+    inherit wrapQtAppsHook;
+  };
+
   meta = with lib; {
     description = "Python bindings for Qt5";
     homepage    = http://www.riverbankcomputing.co.uk;

From 2326319b388f9c2511a2cfd392455593bdd479ba Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 17 Aug 2019 20:25:31 +0000
Subject: [PATCH 082/794] anki: use wrapQtAppsHook from pyqtwebengine

---
 pkgs/games/anki/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 2530202a565..8016aea9fd5 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -92,6 +92,7 @@ buildPythonApplication rec {
 
     checkInputs = [ pytest glibcLocales nose ];
 
+    nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
     buildInputs = [ lame mplayer libpulseaudio  ];
 
     makeWrapperArgs = [
@@ -131,6 +132,8 @@ buildPythonApplication rec {
       env HOME=$TMP pytest --ignore tests/test_sync.py
     '';
 
+    dontWrapQtApps = true;
+
     installPhase = ''
       pp=$out/lib/${python.libPrefix}/site-packages
 
@@ -158,6 +161,9 @@ buildPythonApplication rec {
       cp -rv anki aqt web $pp/
 
       wrapPythonPrograms
+      for program in $out/bin/*; do
+        wrapQtApp "$program"
+      done
 
       # copy the manual into $doc
       cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki
@@ -167,7 +173,7 @@ buildPythonApplication rec {
       inherit manual;
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://apps.ankiweb.net/";
       description = "Spaced repetition flashcard program";
       longDescription = ''

From 1a11eb34a1053127fbb5daba38e631dbae564055 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 17 Aug 2019 20:25:45 +0000
Subject: [PATCH 083/794] anki: add myself as a maintainer

(Adding to the front of the list because it was I who added this expression to
nixpkgs in e00c03101f8d052473fee17e5f7a6a975dc5edb4 7 years ago. :])
---
 pkgs/games/anki/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 8016aea9fd5..a316708ad4e 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -191,6 +191,6 @@ buildPythonApplication rec {
       license = licenses.agpl3Plus;
       broken = stdenv.hostPlatform.isAarch64;
       platforms = platforms.mesaPlatforms;
-      maintainers = with maintainers; [ the-kenny Profpatsch enzime ];
+      maintainers = with maintainers; [ oxij the-kenny Profpatsch enzime ];
     };
 }

From 637e80506ab287fd3a36d9609033f705d8a1e2ad Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Sat, 17 Aug 2019 22:38:14 +0200
Subject: [PATCH 084/794] mumble_overlay: fixing the library path

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

diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix
index 185672a21f8..babb3812bb9 100644
--- a/pkgs/applications/networking/mumble/overlay.nix
+++ b/pkgs/applications/networking/mumble/overlay.nix
@@ -12,10 +12,10 @@ in stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/lib
-    ln -s ${mumble}/lib/libmumble.so.1.* $out/lib/libmumble.so.1
+    ln -s ${mumble}/lib/libmumble.so.1.2.* $out/lib/libmumble.so.1
     ${lib.optionalString (mumble_i686 != null) ''
       mkdir -p $out/lib32
-      ln -s ${mumble_i686}/lib/libmumble.so.1.* $out/lib32/libmumble.so.1
+      ln -s ${mumble_i686}/lib/libmumble.so.1.2.* $out/lib32/libmumble.so.1
     ''}
     install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay
     sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay

From 5fe81bf372036ae15ca6aa57c839d0715a0d18b6 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 16 Jul 2019 16:24:12 -0700
Subject: [PATCH 085/794] pythonPackages.sqlalchemy: remove pytest_xdist and
 fix the tests

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

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 480ee6a67a0..beb19b64f5f 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -2,7 +2,6 @@
 , mock
 , pysqlite
 , pytest
-, pytest_xdist
 }:
 
 buildPythonPackage rec {
@@ -17,9 +16,16 @@ buildPythonPackage rec {
   checkInputs = [
     pytest
     mock
-    pytest_xdist
   ] ++ lib.optional (!isPy3k) pysqlite;
 
+  postInstall = ''
+    sed -e 's:--max-worker-restart=5::g' -i setup.cfg
+  '';
+
+  checkPhase = ''
+    pytest test
+  '';
+
   meta = with lib; {
     homepage = http://www.sqlalchemy.org/;
     description = "A Python SQL toolkit and Object Relational Mapper";

From a21661b3295049110520d7d6c7206cefa225e838 Mon Sep 17 00:00:00 2001
From: Sean Haugh <sean@lfo.team>
Date: Thu, 15 Aug 2019 08:33:42 -0500
Subject: [PATCH 086/794] pythonPackages.typing: 3.6.6 -> 3.7.4

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

diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix
index 5c5ecd8949a..51e634d2439 100644
--- a/pkgs/development/python-modules/typing/default.nix
+++ b/pkgs/development/python-modules/typing/default.nix
@@ -5,11 +5,11 @@ let
 
 in buildPythonPackage rec {
   pname = "typing";
-  version = "3.6.6";
+  version = "3.7.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d";
+    sha256 = "1kj4kvkh89psajxlyb72rm5fr7w70yb32zkj2h174arsz325wxjk";
   };
 
   # Error for Python3.6: ImportError: cannot import name 'ann_module'

From e60f51e9b4f9386773dedbb6837bdf024d1d32aa Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sun, 11 Aug 2019 16:24:18 +0900
Subject: [PATCH 087/794] botocore, boto3, awscli: 1.12.160->1.12.205,
 1.9.160->1.9.205, 1.16.170->1.16.215

---
 pkgs/development/python-modules/boto3/default.nix    | 4 ++--
 pkgs/development/python-modules/botocore/default.nix | 4 ++--
 pkgs/tools/admin/awscli/default.nix                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 203ef9a4355..34178befebe 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.9.160"; # N.B: if you change this, change botocore too
+  version = "1.9.205"; # N.B: if you change this, change botocore too
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qxhdmv58k2ipk47fbnpdg6jmbp7dca86s6c6gdm3d79aw17391f";
+    sha256 = "1zxz1d6w3f4ip04bm26xplpxjhblc2vfmqcs5n63a9y1h43mk171";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index e3bbdf22ddf..5c8b00fc6c1 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.12.160"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.12.205"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18jhc6v2xcd20hlq69ykapmxgd9k7szjbp1ndmgxi4g8w37fvcqp";
+    sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index b07db447262..33526ba11df 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
 
 in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.16.170"; # N.B: if you change this, change botocore to a matching version too
+  version = "1.16.215"; # N.B: if you change this, change botocore to a matching version too
 
   src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "12kh62imdfy8whvqzdrmdq4zw70gj1g3smqldf4lqpjfzss7cy92";
+    sha256 = "13r32z8iyza4gvpf81l6l2ywv37yxi4bb08ry7cli5m6ny9xqlq8";
   };
 
   # No tests included

From c23ccccd102a8362d73972ad869d7f835785c503 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 15 Aug 2019 19:18:16 +0900
Subject: [PATCH 088/794] pythonPackages.moto: 1.3.10 -> 1.3.13

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

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 04381d73834..876b57dd01f 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch
 , aws-xray-sdk
 , backports_tempfile
 , boto
@@ -26,13 +26,21 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "1.3.10";
+  version = "1.3.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0vlq015irqqwdknk1an7qqkg1zjk18c7jd89r7zbxxfwy3bgzwwj";
+    sha256 = "0rhbjvqi1khp80gfnl3x632kwlpq3k7m8f13nidznixdpa78vm4m";
   };
 
+  # Backported fix from 1.3.14.dev for compatibility with botocore >= 1.9.198.
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/spulec/moto/commit/e4a4e6183560489e98b95e815b439c7a1cf3566c.diff";
+      sha256 = "1fixr7riimnldiikv33z4jwjgcsccps0c6iif40x8wmpvgcfs0cb";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace "jsondiff==1.1.2" "jsondiff~=1.1"

From 37652735163d9004093e9d78efc18e4291cb56e0 Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio+git@lunesu.com>
Date: Thu, 8 Aug 2019 21:00:34 +0800
Subject: [PATCH 089/794] pythonPackages.pygments: 2.3.1 -> 2.4.2

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

diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix
index 75fceb7deed..cb0986e1d7f 100644
--- a/pkgs/development/python-modules/Pygments/default.nix
+++ b/pkgs/development/python-modules/Pygments/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "Pygments";
-  version = "2.3.1";
+  version = "2.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a";
+    sha256 = "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748";
   };
 
   propagatedBuildInputs = [ docutils ];

From d06cc8a6ae81f5102acd49733d2e706b7b74152f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 1 Aug 2019 11:05:55 -0700
Subject: [PATCH 090/794] pythonPackages.py: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix
index 20d3eb31b0f..e54fd1521b3 100644
--- a/pkgs/development/python-modules/py/default.nix
+++ b/pkgs/development/python-modules/py/default.nix
@@ -1,11 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, setuptools_scm }:
+
 buildPythonPackage rec {
   pname = "py";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694";
+    sha256 = "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw";
   };
 
   # Circular dependency on pytest

From 9e6693954aef5515233ee2c8c07cacf19c25aaf0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 08:15:14 -0700
Subject: [PATCH 091/794] python37Packages.pyrsistent: 0.14.11 -> 0.15.2

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

diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index a2b614ba3b8..cabb96d2256 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pyrsistent";
-  version = "0.14.11";
+  version = "0.15.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2";
+    sha256 = "0fjwnxg7q1b02j7hk1wqm5xdn7wck9j2g3ggkkizab6l77kjws8n";
   };
 
   propagatedBuildInputs = [ six ];

From fcd2858063ae98eb266a73f921130aa976c35554 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 5 Aug 2019 18:45:12 -0700
Subject: [PATCH 092/794] pythonPackages.delegator-py: init at 0.1.1

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

diff --git a/pkgs/development/python-modules/delegator-py/default.nix b/pkgs/development/python-modules/delegator-py/default.nix
new file mode 100644
index 00000000000..3521e8ce129
--- /dev/null
+++ b/pkgs/development/python-modules/delegator-py/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage
+, lib
+, fetchFromGitHub
+, pexpect
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "0.1.1";
+  pname = "delegator.py";
+
+  src = fetchFromGitHub {
+    owner = "amitt001";
+    repo = "delegator.py";
+    rev = "v${version}";
+    sha256 = "17n9h3xzjsfxmwclh33vc4yg3c9yzh9hfhaj12kv5ah3fy8rklwb";
+  };
+
+  propagatedBuildInputs = [ pexpect ];
+
+  # no tests in github or pypi
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Subprocesses for Humans 2.0";
+    homepage = "https://github.com/amitt001/delegator.py";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 454e497ad1d..0024e698248 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1384,6 +1384,8 @@ in {
     gui = false;
   };
 
+  delegator-py = callPackage ../development/python-modules/delegator-py { };
+
   deluge-client = callPackage ../development/python-modules/deluge-client { };
 
   arrow = callPackage ../development/python-modules/arrow { };

From d5d628f35cd837924d468d1fc0432684ddf2793b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 5 Aug 2019 18:46:56 -0700
Subject: [PATCH 093/794] pythonPackages.num2words: init at 0.5.10

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

diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix
new file mode 100644
index 00000000000..bce4c0426e4
--- /dev/null
+++ b/pkgs/development/python-modules/num2words/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+, docopt
+, delegator-py
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "0.5.10";
+  pname = "num2words";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0myc27k087rhgpwn1a1dffzl32rwz6ngdbf3rm2i0zlgcxh4zk9p";
+  };
+
+  propagatedBuildInputs = [ docopt ];
+
+  checkInputs = [ delegator-py pytest ];
+
+  checkPhase = ''
+    pytest -k 'not cli_with_lang'
+  '';
+
+  meta = with lib; {
+    description = "Modules to convert numbers to words. 42 --> forty-two";
+    homepage = "https://github.com/savoirfairelinux/num2words";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ jonringer ];
+
+    longDescription =
+    "num2words is a library that converts numbers like 42 to words like forty-two. It supports multiple languages (see the list below for full list of languages) and can even generate ordinal numbers like forty-second";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0024e698248..d0f7e299177 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3899,6 +3899,8 @@ in {
 
   ntplib = callPackage ../development/python-modules/ntplib { };
 
+  num2words = callPackage ../development/python-modules/num2words { };
+
   numba = callPackage ../development/python-modules/numba { };
 
   numcodecs = callPackage ../development/python-modules/numcodecs { };

From 00a4b9d3390defe455ed311234012c2b89180793 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 5 Aug 2019 19:06:12 -0700
Subject: [PATCH 094/794] pythonPackages.bid-validator: init at 1.2.4

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

diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix
new file mode 100644
index 00000000000..ec66124e3c7
--- /dev/null
+++ b/pkgs/development/python-modules/bids-validator/default.nix
@@ -0,0 +1,23 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  version = "1.2.4";
+  pname = "bids-validator";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mvp1mi1k6yqgyj7rxij8mlwclqlyfzq08s67v0qaycw44l68ifg";
+  };
+
+  propagatedBuildInputs = [ ];
+
+  meta = with lib; {
+    description = "Validator for the Brain Imaging Data Structure";
+    homepage = "https://github.com/bids-standard/bids-validator";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d0f7e299177..a74f73275ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1482,6 +1482,8 @@ in {
 
   bidict = callPackage ../development/python-modules/bidict { };
 
+  bids-validator = callPackage ../development/python-modules/bids-validator { };
+
   binwalk = callPackage ../development/python-modules/binwalk { };
 
   binwalk-full = appendToName "full" (self.binwalk.override {

From 70127bd216c0a0f4ef8c65972ab8056fbb6b643a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 5 Aug 2019 19:07:10 -0700
Subject: [PATCH 095/794] pythonPackages.pybids: init at 0.9.2

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

diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
new file mode 100644
index 00000000000..8779ad36ca2
--- /dev/null
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -0,0 +1,49 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+, isPy27
+, num2words
+, numpy
+, scipy
+, pandas
+, nibabel
+, patsy
+, bids-validator
+, sqlalchemy
+, pytest
+, pathlib
+}:
+
+buildPythonPackage rec {
+  version = "0.9.2";
+  pname = "pybids";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16c0v800yklp043prbrx1357vx1mq5gddxz5zqlcnf4akhzcqrxs";
+  };
+
+  propagatedBuildInputs = [
+    num2words
+    numpy
+    scipy
+    pandas
+    nibabel
+    patsy
+    bids-validator
+    sqlalchemy
+  ];
+
+  checkInputs = [ pytest ] ++ lib.optionals isPy27 [ pathlib ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with lib; {
+    description = "Python tools for querying and manipulating BIDS datasets";
+    homepage = https://github.com/bids-standard/pybids;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a74f73275ff..2acad155128 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -839,6 +839,8 @@ in {
 
   pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { };
 
+  pybids = callPackage ../development/python-modules/pybids { };
+
   pybind11 = callPackage ../development/python-modules/pybind11 { };
 
   pybullet = callPackage ../development/python-modules/pybullet { };

From 2087bc4bc2c0feda84dfc5114235034186bfc685 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 5 Aug 2019 19:08:14 -0700
Subject: [PATCH 096/794] pythonPackages.nibabel: 2.4.1 -> 2.5.0

---
 .../python-modules/nibabel/default.nix        | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index 76494c70b2e..365f741c57f 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -2,20 +2,20 @@
 , buildPythonPackage
 , fetchPypi
 , isPy3k
+, bz2file
+, mock
+, nose
 , numpy
 , six
-, bz2file
-, nose
-, mock
 }:
 
 buildPythonPackage rec {
   pname = "nibabel";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f165ff1cb4464902d6594eb2694e2cfb6f8b9fe233b856c976c3cff623ee0e17";
+    sha256 = "07v1gsq1v43v0z06cnp82ij9sqx3972c9bc6vsdj7pa9ddpa2yjw";
   };
 
   propagatedBuildInputs = [
@@ -25,16 +25,8 @@ buildPythonPackage rec {
 
   checkInputs = [ nose mock ];
 
-  checkPhase = let
-    excludeTests = lib.optionals isPy3k [
-      # https://github.com/nipy/nibabel/issues/691
-      "nibabel.gifti.tests.test_giftiio.test_read_deprecated"
-      "nibabel.gifti.tests.test_parse_gifti_fast.test_parse_dataarrays"
-      "nibabel.tests.test_minc1.test_old_namespace"
-    ];
-  # TODO: Add --with-doctest once all doctests pass
-  in ''
-    nosetests ${lib.concatMapStrings (test: "-e '${test}' ") excludeTests}
+  checkPhase = ''
+    nosetests
   '';
 
   meta = with lib; {

From f40a1ef0cc07b08b4d481bf9528fdaad717d5a17 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 5 Aug 2019 19:09:01 -0700
Subject: [PATCH 097/794] pythonPackages.nipype: 1.1.9 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 42fb2de9dca..5f33a5fe63c 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -16,6 +16,7 @@
 , packaging
 , prov
 , psutil
+, pybids
 , pydot
 , pytest
 , pytest_xdist
@@ -44,11 +45,11 @@ in
 
 buildPythonPackage rec {
   pname = "nipype";
-  version = "1.1.9";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f80096ec6cfd7cffc05764bba1749e424877140ef1373193f076bdd843f19016";
+    sha256 = "09azgfmb0992c3xqmi7n93pz95i4v37vc9kqmjh8c9jjxjzszdd5";
   };
 
   postPatch = ''
@@ -79,6 +80,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    pybids
     codecov
     glibcLocales
     mock
@@ -89,13 +91,11 @@ buildPythonPackage rec {
     which
   ];
 
+  # ignore tests which incorrect fail to detect xvfb
   checkPhase = ''
-    LC_ALL="en_US.UTF-8" pytest -v --doctest-modules nipype
+    LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display'
   '';
 
-  # See: https://github.com/nipy/nipype/issues/2839
-  doCheck = false;
-
   meta = with stdenv.lib; {
     homepage = https://nipy.org/nipype/;
     description = "Neuroimaging in Python: Pipelines and Interfaces";

From dcf786eb232273f1ba9a7eb2e5efb3ecb0b33ea6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 17 Aug 2019 16:33:48 +0200
Subject: [PATCH 098/794] pythonPackages.pytest: remove old version

Follow-up to c0dc032e42b42222c82f4ad75e1b1832d91dc6b2
---
 .../python-modules/pytest/3.10.nix            | 47 -------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pytest/3.10.nix

diff --git a/pkgs/development/python-modules/pytest/3.10.nix b/pkgs/development/python-modules/pytest/3.10.nix
deleted file mode 100644
index 2b4dd41bc2e..00000000000
--- a/pkgs/development/python-modules/pytest/3.10.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
-, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
-, atomicwrites, mock, writeText, pathlib2
-}:
-buildPythonPackage rec {
-  version = "3.10.1";
-  pname = "pytest";
-
-  preCheck = ''
-    # don't test bash builtins
-    rm testing/test_argcomplete.py
-  '';
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660";
-  };
-
-  checkInputs = [ hypothesis mock ];
-  buildInputs = [ setuptools_scm ];
-  propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
-    ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
-    ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
-
-  checkPhase = ''
-    runHook preCheck
-    $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" --ignore testing/test_assertion.py --ignore testing/test_config.py
-    runHook postCheck
-  '';
-
-  # Remove .pytest_cache when using py.test in a Nix build
-  setupHook = writeText "pytest-hook" ''
-    pytestcachePhase() {
-        find $out -name .pytest_cache -type d -exec rm -rf {} +
-    }
-
-    preDistPhases+=" pytestcachePhase"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://docs.pytest.org;
-    description = "Framework for writing tests";
-    maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
-    license = licenses.mit;
-    platforms = platforms.unix;
-  };
-}

From 1615ce80b151f534c2f1807d288ca785c4b2dd21 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 17 Aug 2019 16:34:01 +0200
Subject: [PATCH 099/794] pythonPackages.pytest: 4.6.3 -> 4.6.5

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

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 96001a2d952..7a43a2e2517 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -3,7 +3,7 @@
 , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
 }:
 buildPythonPackage rec {
-  version = "4.6.3";
+  version = "4.6.5";
   pname = "pytest";
 
   preCheck = ''
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4a784f1d4f2ef198fe9b7aef793e9fa1a3b2f84e822d9b3a64a181293a572d45";
+    sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347";
   };
 
   checkInputs = [ hypothesis mock ];

From b3ddab852a5229331553e07be6055fb015966b42 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 17 Aug 2019 17:16:43 +0200
Subject: [PATCH 100/794] pythonPackages.pytest: 4.6.5 -> 5.1.0 in case of
 Python 3

---
 pkgs/development/python-modules/pytest/2.nix  | 48 +++++++++++++++++++
 .../python-modules/pytest/default.nix         |  7 +--
 pkgs/top-level/python-packages.nix            | 15 +++---
 3 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytest/2.nix

diff --git a/pkgs/development/python-modules/pytest/2.nix b/pkgs/development/python-modules/pytest/2.nix
new file mode 100644
index 00000000000..7a43a2e2517
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/2.nix
@@ -0,0 +1,48 @@
+{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
+, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
+, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
+}:
+buildPythonPackage rec {
+  version = "4.6.5";
+  pname = "pytest";
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347";
+  };
+
+  checkInputs = [ hypothesis mock ];
+  buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
+    ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
+    ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+
+  doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
+  checkPhase = ''
+    runHook preCheck
+    $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths"
+    runHook postCheck
+  '';
+
+  # Remove .pytest_cache when using py.test in a Nix build
+  setupHook = writeText "pytest-hook" ''
+    pytestcachePhase() {
+        find $out -name .pytest_cache -type d -exec rm -rf {} +
+    }
+
+    preDistPhases+=" pytestcachePhase"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://docs.pytest.org;
+    description = "Framework for writing tests";
+    maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 7a43a2e2517..7866454a62f 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -3,7 +3,7 @@
 , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
 }:
 buildPythonPackage rec {
-  version = "4.6.5";
+  version = "5.1.0";
   pname = "pytest";
 
   preCheck = ''
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347";
+    sha256 = "3805d095f1ea279b9870c3eeae5dddf8a81b10952c8835cd628cf1875b0ef031";
   };
 
   checkInputs = [ hypothesis mock ];
@@ -23,9 +23,10 @@ buildPythonPackage rec {
     ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
   doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
+  # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929
   checkPhase = ''
     runHook preCheck
-    $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths"
+    $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py
     runHook postCheck
   '';
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2acad155128..1ea3d6adfb2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1949,12 +1949,15 @@ in {
 
   pyhepmc = callPackage ../development/python-modules/pyhepmc { };
 
-  pytest = self.pytest_4;
-
-  pytest_4 = callPackage ../development/python-modules/pytest {
-    # hypothesis tests require pytest that causes dependency cycle
-    hypothesis = self.hypothesis.override { doCheck = false; };
-  };
+  pytest = if isPy3k then
+    callPackage ../development/python-modules/pytest {
+      # hypothesis tests require pytest that causes dependency cycle
+      hypothesis = self.hypothesis.override { doCheck = false; };
+    }
+  else callPackage ../development/python-modules/pytest/2.nix {
+      # hypothesis tests require pytest that causes dependency cycle
+      hypothesis = self.hypothesis.override { doCheck = false; };
+    };
 
   pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
 

From 18a3973448bf66072e9e6be325a635bced7c2e0b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 17 Aug 2019 17:24:18 +0200
Subject: [PATCH 101/794] pythonPackages.pathpy: 11.5.2 -> 12.0.1 in case of
 Python 3

---
 pkgs/development/python-modules/path.py/2.nix | 42 +++++++++++++++++++
 .../python-modules/path.py/default.nix        | 13 +++++-
 pkgs/top-level/python-packages.nix            |  5 ++-
 3 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/path.py/2.nix

diff --git a/pkgs/development/python-modules/path.py/2.nix b/pkgs/development/python-modules/path.py/2.nix
new file mode 100644
index 00000000000..318642a393a
--- /dev/null
+++ b/pkgs/development/python-modules/path.py/2.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytest
+, pytest-flake8
+, glibcLocales
+, packaging
+, isPy27
+, backports_os
+, importlib-metadata
+}:
+
+buildPythonPackage rec {
+  pname = "path.py";
+  version = "11.5.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa";
+  };
+
+  checkInputs = [ pytest pytest-flake8 glibcLocales packaging ];
+  buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [
+    importlib-metadata
+  ] ++ lib.optional isPy27 backports_os
+  ;
+
+  LC_ALL = "en_US.UTF-8";
+
+  meta = {
+    description = "A module wrapper for os.path";
+    homepage = https://github.com/jaraco/path.py;
+    license = lib.licenses.mit;
+  };
+
+  checkPhase = ''
+    # ignore performance test which may fail when the system is under load
+    py.test -v -k 'not TestPerformance'
+  '';
+}
diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix
index 318642a393a..d3c3206faba 100644
--- a/pkgs/development/python-modules/path.py/default.nix
+++ b/pkgs/development/python-modules/path.py/default.nix
@@ -9,15 +9,16 @@
 , isPy27
 , backports_os
 , importlib-metadata
+, fetchpatch
 }:
 
 buildPythonPackage rec {
   pname = "path.py";
-  version = "11.5.2";
+  version = "12.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa";
+    sha256 = "9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f";
   };
 
   checkInputs = [ pytest pytest-flake8 glibcLocales packaging ];
@@ -39,4 +40,12 @@ buildPythonPackage rec {
     # ignore performance test which may fail when the system is under load
     py.test -v -k 'not TestPerformance'
   '';
+
+  patches = [
+    (fetchpatch {
+      url = https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch;
+      sha256 = "0bqa8vjwil7jn35a6984adcm24pvv3pjkhszv10qv6yr442d1mk9";
+    })
+  ];
+
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ea3d6adfb2..2853583e3b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4086,7 +4086,10 @@ in {
 
   pathlib2 = callPackage ../development/python-modules/pathlib2 { };
 
-  pathpy = callPackage ../development/python-modules/path.py { };
+  pathpy = if isPy3k then
+    callPackage ../development/python-modules/path.py { }
+  else
+    callPackage ../development/python-modules/path.py/2.nix { };
 
   paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { };
 

From a97728543c948ca2aa42f86a4f750dc9a78f5dc4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 17 Aug 2019 17:35:33 +0200
Subject: [PATCH 102/794] python2Packages.scipy: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2853583e3b2..8cc0d980318 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4763,10 +4763,10 @@ in {
   scipy = let
     scipy_ = callPackage ../development/python-modules/scipy { };
     scipy_1_2 = scipy_.overridePythonAttrs(oldAttrs: rec {
-      version = "1.2.1";
+      version = "1.2.2";
       src = oldAttrs.src.override {
         inherit version;
-        sha256 = "0g5a03jkjiqlh6h9yz508p5c9ni43735m01fivjvn6dlpjxd31g0";
+        sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1";
       };
     });
   in if pythonOlder "3.5" then scipy_1_2 else scipy_;

From 2c8ed5fd7d84754440d499f97f3ca119314b39b3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 17 Aug 2019 17:35:44 +0200
Subject: [PATCH 103/794] python3Packages.scipy: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index a69ab0d27a3..93488917017 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "scipy";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c3bb4bd2aca82fb498247deeac12265921fe231502a6bc6edea3ee7fe6c40a7a";
+    sha256 = "2643cfb46d97b7797d1dbdb6f3c23fe3402904e3c90e6facfe6a9b98d808c1b5";
   };
 
   checkInputs = [ nose pytest ];

From 0cae5859c2cb62c8440d4a3dc66694e481af4f68 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 08:41:11 +0200
Subject: [PATCH 104/794] python3Packages.apipkg: disable several tests

---
 .../python-modules/apipkg/default.nix            | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index a2a026e74d5..22bddb252c8 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytest, setuptools_scm }:
+, pytest, setuptools_scm, isPy3k }:
 
 buildPythonPackage rec {
   pname = "apipkg";
@@ -19,8 +19,18 @@ buildPythonPackage rec {
       --replace "py.test.ensuretemp('test_apipkg')" "py.path.local('test_apipkg')"
   '';
 
-  checkPhase = ''
-    py.test
+  # Failing tests on Python 3
+  # https://github.com/pytest-dev/apipkg/issues/17
+  checkPhase = let
+    disabledTests = stdenv.lib.optionals isPy3k [
+      "test_error_loading_one_element"
+      "test_aliasmodule_proxy_methods"
+      "test_eagerload_on_bython"
+    ];
+    testExpression = stdenv.lib.optionalString (disabledTests != [])
+    "-k 'not ${stdenv.lib.concatStringsSep " and not " disabledTests}'";
+  in ''
+    py.test ${testExpression}
   '';
 
   meta = with stdenv.lib; {

From 33f2b5cc6f2a6a517b672392f87316354f1ac46f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 09:16:47 +0200
Subject: [PATCH 105/794] python: execnet: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix
index 4e1b78f80be..c7766802e4e 100644
--- a/pkgs/development/python-modules/execnet/default.nix
+++ b/pkgs/development/python-modules/execnet/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "execnet";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm";
+    sha256 = "3839f3c1e9270926e7b3d9b0a52a57be89c302a3826a2b19c8d6e6c3d2b506d2";
   };
 
   checkInputs = [ pytest ];

From f3a74b9c994a6dd56f2f46b72d3d6c32f44d46d3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 09:19:08 +0200
Subject: [PATCH 106/794] python3Packages.pytest_xdist: disable tests

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

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index b61bc8d5fa5..a2796fba5d8 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock, six }:
+{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest
+, setuptools_scm, pytest-forked, filelock, six, isPy3k }:
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
@@ -13,6 +14,10 @@ buildPythonPackage rec {
   checkInputs = [ pytest filelock ];
   propagatedBuildInputs = [ execnet pytest-forked six ];
 
+  # Encountered a memory leak
+  # https://github.com/pytest-dev/pytest-xdist/issues/462
+  doCheck = !isPy3k;
+
   checkPhase = ''
     # Excluded tests access file system
     py.test testing -k "not test_distribution_rsyncdirs_example \

From 78559b5a161b39e29612f086d58017d7b0654f26 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 09:20:39 +0200
Subject: [PATCH 107/794] python: autobahn: 19.1.1 -> 19.8.1

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

diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 0ccf3da7bec..1a050537b22 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -4,11 +4,11 @@
 }:
 buildPythonPackage rec {
   pname = "autobahn";
-  version = "19.1.1";
+  version = "19.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff";
+    sha256 = "294e7381dd54e73834354832604ae85567caf391c39363fed0ea2bfa86aa4304";
   };
 
   propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++

From 556248d35ffa5f55809603515713a3d6442bcc4a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 10:08:15 +0200
Subject: [PATCH 108/794] pythonPackages.autobahn: disable tests

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

diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 1a050537b22..7d1e365b243 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k,
   six, txaio, twisted, zope_interface, cffi, trollius, futures,
-  mock, pytest
+  mock, pytest, cryptography, pynacl
 }:
 buildPythonPackage rec {
   pname = "autobahn";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "294e7381dd54e73834354832604ae85567caf391c39363fed0ea2bfa86aa4304";
   };
 
-  propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++
+  propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++
     (lib.optionals (!isPy3k) [ trollius futures ]);
 
   checkInputs = [ mock pytest ];
@@ -21,6 +21,10 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
+  # Tests do no seem to be compatible yet with pytest 5.1
+  # https://github.com/crossbario/autobahn-python/issues/1235
+  doCheck = false;
+
   meta = with lib; {
     description = "WebSocket and WAMP in Python for Twisted and asyncio.";
     homepage    = "https://crossbar.io/autobahn";

From f4a296912f1d0fd2208bb7f7614c0274a95c9fb4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 10:08:31 +0200
Subject: [PATCH 109/794] pythonPackages.pynacl: disable a failing test

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

diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index fb2e9abe065..1561c3c4d6d 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -35,6 +35,9 @@ buildPythonPackage rec {
     py.test
   '';
 
+  # https://github.com/pyca/pynacl/issues/550
+  PYTEST_ADDOPTS = "-k 'not test_wrong_types'";
+
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ va1entin ];
     description = "Python binding to the Networking and Cryptography (NaCl) library";

From ea299c926f5b33ac4a7686155e6c606b470f0e92 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 10:33:13 +0200
Subject: [PATCH 110/794] python: Werkzeug: 0.15.4 -> 0.15.5

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

diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index cbf82ca7ca3..b3d397b97b4 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "Werkzeug";
-  version = "0.15.4";
+  version = "0.15.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a0b915f0815982fb2a09161cb8f31708052d0951c3ba433ccc5e1aa276507ca6";
+    sha256 = "a13b74dd3c45f758d4ebdb224be8f1ab8ef58b3c0ffc1783a8c7d9f4f50227e6";
   };
 
   propagatedBuildInputs = [ itsdangerous ];

From 25ad6d0f0f5fc73fbdf168a074f17fd57614b0c7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 10:47:55 +0200
Subject: [PATCH 111/794] pythonPackages.python-jose: disable several tests

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

diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 4eb2daaf26d..a9377c4a1c2 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -25,6 +25,9 @@ buildPythonPackage rec {
     py.test
   '';
 
+  # https://github.com/mpdavis/python-jose/issues/149
+  PYTEST_ADDOPTS = "-k 'not test_invalid_claims_json and not test_invalid_claims'";
+
   propagatedBuildInputs = [ future six ecdsa rsa ];
 
   meta = with stdenv.lib; {

From 9f6df9d960452ee31bc4c1c83f0ff55c3692e328 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 10:51:24 +0200
Subject: [PATCH 112/794] pythonPackages.datashape: disable several tests

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

diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix
index bb2e65125b7..27665c689c4 100644
--- a/pkgs/development/python-modules/datashape/default.nix
+++ b/pkgs/development/python-modules/datashape/default.nix
@@ -38,6 +38,9 @@ in buildPythonPackage rec {
            --ignore datashape/tests/test_user.py
   '';
 
+  # https://github.com/blaze/datashape/issues/238
+  PYTEST_ADDOPTS = "-k 'not test_record and not test_tuple'";
+
   meta = {
     homepage = https://github.com/ContinuumIO/datashape;
     description = "A data description language";

From 57ef737629c3b88606345f51d5b87ef34158123a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 10:54:46 +0200
Subject: [PATCH 113/794] pythonPackages.bleach: disable a test

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

diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index c2b0db61cbb..7de124267f0 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -23,6 +23,12 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace ",<3dev" ""
   '';
 
+  # Disable a test
+  # https://github.com/mozilla/bleach/issues/467
+  checkPhase = ''
+    pytest -k "not test_only_text_is_cleaned"
+  '';
+
   meta = {
     description = "An easy, HTML5, whitelisting HTML sanitizer";
     longDescription = ''

From fb1be839e46223dd1d4ecc2e51c6ac35d1cb4564 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 11:00:56 +0200
Subject: [PATCH 114/794] pythonPackages.pyjwt: remove pytest constraints

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

diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index c02c0361cf2..10bfb0d72b6 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -15,6 +15,10 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestrunner pytestcov pytest ];
 
+  postPatch = ''
+    substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest"
+  '';
+
   meta = with lib; {
     description = "JSON Web Token implementation in Python";
     homepage = https://github.com/jpadilla/pyjwt;

From 7272b0feba25e47727c965b4dc726c7a718bb0b0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 11:06:23 +0200
Subject: [PATCH 115/794] pythonPackages.lz4: 2.1.6 -> 2.1.10

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

diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix
index c7709c4886d..e967ba9934d 100644
--- a/pkgs/development/python-modules/python-lz4/default.nix
+++ b/pkgs/development/python-modules/python-lz4/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "python-lz4";
-  version = "2.1.6";
+  version = "2.1.10";
 
   # get full repository inorder to run tests
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1gx228946c2w645sh190m7ixfd0zfkdl3i8ybga77jz2sn1chzdi";
+    sha256 = "02cadqfdmw4vc94px18dh4hcybpsa2lr6jz6j5phwc0jjaavh3wr";
   };
 
   buildInputs = [ setuptools_scm pkgconfig pytestrunner ];

From 8ea496330bc91b22c6150513fd9875c1a13c9bbb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 11:35:14 +0200
Subject: [PATCH 116/794] pythonPackages.gunicorn: disable tests

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

diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index 85c5c011dfd..58d5c414cf0 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -17,6 +17,10 @@ buildPythonPackage rec {
       --replace "coverage>=4.0,<4.4" "coverage"
   '';
 
+  # Test failures but patch does not apply cleanly
+  # https://github.com/benoitc/gunicorn/commit/f38f717539b1b7296720805b8ae3969c3509b9c1
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://pypi.python.org/pypi/gunicorn;
     description = "WSGI HTTP Server for UNIX";

From 33263a7efb1df45edab92d97d7f4ad45aedcc1cd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 11:35:45 +0200
Subject: [PATCH 117/794] python3Packages.aiohttp: fix tests

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

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 5769109f774..049ceb124ea 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -40,14 +40,10 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
     ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ];
 
-  # Don't error on cryptography deprecation warning
-  postPatch = ''
-    substituteInPlace pytest.ini --replace "filterwarnings = error" ""
+  checkPhase = ''
+    pytest -k "not test__get_valid_log_format_exc and not test_access_logger_atoms"
   '';
 
-  # coroutine 'noop2' was never awaited
-  doCheck = false;
-
   meta = with lib; {
     description = "Asynchronous HTTP Client/Server for Python and asyncio";
     license = licenses.asl20;

From d92d210c84c566b2d2083584b93ce092fb214154 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 11:46:49 +0200
Subject: [PATCH 118/794] appdaemon: fix build

---
 pkgs/servers/home-assistant/appdaemon.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 5f8884cbd3b..5d4d88e1cda 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -58,6 +58,10 @@ in python.pkgs.buildPythonApplication rec {
   # no tests implemented
   doCheck = false;
 
+  postPatch = ''
+    substituteInPlace setup.py --replace "pyyaml==5.1" "pyyaml"
+  '';
+
   meta = with lib; {
     description = "Sandboxed python execution environment for writing automation apps for Home Assistant";
     homepage = https://github.com/home-assistant/appdaemon;

From 6ff8958beff01de79240170cacfd9ac2d9c7c30b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 17 Aug 2019 13:32:50 +0200
Subject: [PATCH 119/794] openblas: 0.3.6 -> 0.3.7

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

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index d5ba7053de8..f8d392691ab 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -87,12 +87,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openblas";
-  version = "0.3.6";
+  version = "0.3.7";
   src = fetchFromGitHub {
     owner = "xianyi";
     repo = "OpenBLAS";
     rev = "v${version}";
-    sha256 = "12vg0g3s4m49fr8z04j15yrgscqnaaflnkckjbffqxnrf90fcav1";
+    sha256 = "0vs1dlzyla02wajpkfzz8x3lfpgmwiaaizq2nmdjbkzkb7jnxhhz";
   };
 
   inherit blas64;

From c7bf103599fcc6d6f658693b02503c5f7b25d33d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 18 Aug 2019 13:01:45 +0200
Subject: [PATCH 120/794] icestorm: fix eval

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

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index b7b302fe08c..851acd17b7e 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -9,13 +9,13 @@
 , usePyPy ? stdenv.isx86_64 /* pypy3 seems broken on i686 */
 }:
 
-let
-  pythonPkg = if usePyPy then pypy3 else python3;
-  pythonInterp = pythonPkg.interpreter;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "icestorm";
   version = "2019.08.08";
 
+  pythonPkg = if usePyPy then pypy3 else python3;
+  pythonInterp = pythonPkg.interpreter;
+
   src = fetchFromGitHub {
     owner  = "cliffordwolf";
     repo   = "icestorm";

From 39028ee8a760bcd02d0c6a545cd63baf2a2dc41a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 18 Aug 2019 17:40:42 +0000
Subject: [PATCH 121/794] anki: simplify the expression, elide superfluous
 wappers

As suggested by @worldofpeace.
---
 pkgs/games/anki/default.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index a316708ad4e..b0efc54db36 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -95,10 +95,6 @@ buildPythonApplication rec {
     nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
     buildInputs = [ lame mplayer libpulseaudio  ];
 
-    makeWrapperArgs = [
-        ''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"''
-    ];
-
     patches = [
       # Disable updated version check.
       ./no-version-check.patch
@@ -132,8 +128,6 @@ buildPythonApplication rec {
       env HOME=$TMP pytest --ignore tests/test_sync.py
     '';
 
-    dontWrapQtApps = true;
-
     installPhase = ''
       pp=$out/lib/${python.libPrefix}/site-packages
 
@@ -160,15 +154,18 @@ buildPythonApplication rec {
       cp -rv locale $out/share/
       cp -rv anki aqt web $pp/
 
-      wrapPythonPrograms
-      for program in $out/bin/*; do
-        wrapQtApp "$program"
-      done
-
       # copy the manual into $doc
       cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki
     '';
 
+    dontWrapQtApps = true;
+    makeWrapperArgs = [
+        ''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"''
+        "\${qtWrapperArgs[@]}"
+    ];
+
+    # now wrapPythonPrograms from postFixup will add both python and qt env variables
+
     passthru = {
       inherit manual;
     };

From 0ad3568114382c0f50e83a13991370a13a6aab06 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 25 Jul 2019 13:38:50 +0200
Subject: [PATCH 122/794] _3llo: init at 0.3.0

Simple CLI client for `trello.com`. It can be used like this:

```
$ export TRELLO_USER=your_username
$ export TRELLO_KEY=your_key
$ export TRELLO_TOKEN=your_token
$ ./result/bin/3llo
```

I didn't create a module for this as I don't think that those secrets
should live in the Nix store. Ideally `3llo` can be used from a script
which retrieves secrets from some kind of password store like this:

```
export TRELLO_KEY=$(pass show trello/key)
export TRELLO_TOKEN=$(pass show trello/token)
3llo $@
```
---
 pkgs/tools/misc/3llo/Gemfile      |  2 +
 pkgs/tools/misc/3llo/Gemfile.lock | 27 ++++++++++
 pkgs/tools/misc/3llo/default.nix  | 31 +++++++++++
 pkgs/tools/misc/3llo/gemset.nix   | 85 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +
 5 files changed, 147 insertions(+)
 create mode 100644 pkgs/tools/misc/3llo/Gemfile
 create mode 100644 pkgs/tools/misc/3llo/Gemfile.lock
 create mode 100644 pkgs/tools/misc/3llo/default.nix
 create mode 100644 pkgs/tools/misc/3llo/gemset.nix

diff --git a/pkgs/tools/misc/3llo/Gemfile b/pkgs/tools/misc/3llo/Gemfile
new file mode 100644
index 00000000000..17a1086d78f
--- /dev/null
+++ b/pkgs/tools/misc/3llo/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem '3llo', '0.3.0'
diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/tools/misc/3llo/Gemfile.lock
new file mode 100644
index 00000000000..0696ba34165
--- /dev/null
+++ b/pkgs/tools/misc/3llo/Gemfile.lock
@@ -0,0 +1,27 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    3llo (0.3.0)
+      tty-prompt (~> 0.12.0)
+    equatable (0.6.1)
+    necromancer (0.4.0)
+    pastel (0.7.3)
+      equatable (~> 0.6)
+      tty-color (~> 0.5)
+    tty-color (0.5.0)
+    tty-cursor (0.4.0)
+    tty-prompt (0.12.0)
+      necromancer (~> 0.4.0)
+      pastel (~> 0.7.0)
+      tty-cursor (~> 0.4.0)
+      wisper (~> 1.6.1)
+    wisper (1.6.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  3llo (= 0.3.0)
+
+BUNDLED WITH
+   1.17.2
diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/tools/misc/3llo/default.nix
new file mode 100644
index 00000000000..1f59d1f16a7
--- /dev/null
+++ b/pkgs/tools/misc/3llo/default.nix
@@ -0,0 +1,31 @@
+{ lib, ruby, bundlerApp, fetchpatch }:
+
+bundlerApp {
+  pname = "3llo";
+
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+
+  gemset = lib.recursiveUpdate (import ./gemset.nix) ({
+    "3llo" = {
+      dontBuild = false;
+      patches = [
+        (fetchpatch {
+          url = https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch;
+          sha256 = "0ahp19igj77x23b2j9zk3znlmm7q7nija7mjgsmgqkgfbz2r1y7v";
+        })
+      ];
+    };
+  });
+
+  inherit ruby;
+
+  exes = [ "3llo" ];
+
+  meta = with lib; {
+    description = "Trello interactive CLI on terminal";
+    license = licenses.mit;
+    homepage = https://github.com/qcam/3llo;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/tools/misc/3llo/gemset.nix
new file mode 100644
index 00000000000..5c50ea9b212
--- /dev/null
+++ b/pkgs/tools/misc/3llo/gemset.nix
@@ -0,0 +1,85 @@
+{
+  "3llo" = {
+    dependencies = ["tty-prompt"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "082g42lkkynnb2piz37ih696zm2ms63mz2q9rnfzjsd149ig39yy";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  equatable = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fzx2ishipnp6c124ka6fiw5wk42s7c7gxid2c4c1mb55b30dglf";
+      type = "gem";
+    };
+    version = "0.6.1";
+  };
+  necromancer = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  pastel = {
+    dependencies = ["equatable" "tty-color"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m43wk7gswwkl6lfxwlliqc9v1qp8arfygihyz91jc9icf270xzm";
+      type = "gem";
+    };
+    version = "0.7.3";
+  };
+  tty-color = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zpp6zixkkchrc2lqnabrsy24pxikz2px87ggz5ph6355fs803da";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  tty-cursor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  tty-prompt = {
+    dependencies = ["necromancer" "pastel" "tty-cursor" "wisper"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0";
+      type = "gem";
+    };
+    version = "0.12.0";
+  };
+  wisper = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s";
+      type = "gem";
+    };
+    version = "1.6.1";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4c044e5312..9a2a4e04820 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -435,6 +435,8 @@ in
 
   _0x0 = callPackage ../tools/misc/0x0 { };
 
+  _3llo = callPackage ../tools/misc/3llo { };
+
   _1password = callPackage ../applications/misc/1password { };
 
   _9pfs = callPackage ../tools/filesystems/9pfs { };

From ebc4a417d0be3853577d095f25947563bea405e1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 28 Jul 2019 15:52:54 +0200
Subject: [PATCH 123/794] ruby/bundlerApp: ignore `gemset` in env attribute set

The `gemset` field can be an attribute set as well in `buildRubyGem`,
however attribute sets can't be coerced to strings for the environment
set.

The impact should be relatively small as the environment variables are
only used by the `runCommand` script for `bunlderApp` which doesn't
refer to `gemset` at all.
---
 pkgs/development/ruby-modules/bundler-app/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index f8843c61582..10ddde0c1ff 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -36,7 +36,7 @@
 let
   basicEnv = (callPackage ../bundled-common {}) args;
 
-  cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" ] // {
+  cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" ] // {
     inherit preferLocalBuild allowSubstitutes; # pass the defaults
 
     buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;

From 6d4c69e6404a964dc921db3a376a49d2b0c3ec69 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Mon, 19 Aug 2019 14:57:41 +0200
Subject: [PATCH 124/794] netdata: enable cgroup accounting

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

diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index f9b7550af23..463b1b882ac 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -156,6 +156,8 @@ in {
       };
     };
 
+    systemd.enableCgroupAccounting = true;
+
     security.wrappers."apps.plugin" = {
       source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin.org";
       capabilities = "cap_dac_read_search,cap_sys_ptrace+ep";

From f71fd79ff0759f6e85b386e6ae212b15047a6813 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 25 Jun 2019 16:08:58 +0200
Subject: [PATCH 125/794] nixos/installation-device.nix: explain sshd usage

---
 nixos/modules/profiles/installation-device.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 1a6e0699560..fd30220ce1c 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -55,13 +55,16 @@ with lib;
     services.mingetty.autologinUser = "nixos";
 
     # Some more help text.
-    services.mingetty.helpLine =
-      ''
+    services.mingetty.helpLine = ''
+      The "nixos" and "root" accounts have empty passwords.
 
-        The "nixos" and "root" account have empty passwords.  ${
-          optionalString config.services.xserver.enable
-            "Type `sudo systemctl start display-manager' to\nstart the graphical user interface."}
-      '';
+      Type `sudo systemctl start sshd` to start the SSH daemon.
+      You then must set a password for either "root" or "nixos"
+      with `passwd` to be able to login.
+    '' + optionalString config.services.xserver.enable ''
+      Type `sudo systemctl start display-manager' to
+      start the graphical user interface.
+    '';
 
     # Allow sshd to be started manually through "systemctl start sshd".
     services.openssh = {

From 0aa5e3165ca074ce55318cfddcf28e96b84828e3 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 17 Aug 2019 23:57:52 +0200
Subject: [PATCH 126/794] sd-image.nix: set installer.cloneConfig to false

As SD Card images are both installation media and installation target,
don't copy over a /etc/nixos/configuration.nix

Closes #63576.
---
 nixos/modules/installer/cd-dvd/sd-image.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 7f355a13249..07f6f627e6c 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -194,5 +194,9 @@ in
         rm -f /nix-path-registration
       fi
     '';
+
+    # the installation media is also the installation target,
+    # so we don't want to provide the installation configuration.nix.
+    installer.cloneConfig = false;
   };
 }

From 1515afe8796c28d9c5ec6bbd359edd60fc5e382e Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 18 Aug 2019 00:57:19 +0200
Subject: [PATCH 127/794] nixos/doc: update installation-device.nix

This got quite outdated. We now have both the nixos and root user
available for example.
---
 .../profiles/installation-device.xml          | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/nixos/doc/manual/configuration/profiles/installation-device.xml b/nixos/doc/manual/configuration/profiles/installation-device.xml
index 3dcdf403d89..192ae955b68 100644
--- a/nixos/doc/manual/configuration/profiles/installation-device.xml
+++ b/nixos/doc/manual/configuration/profiles/installation-device.xml
@@ -6,33 +6,31 @@
  <title>Installation Device</title>
 
  <para>
-  Provides a basic configuration for installation devices like CDs. This means
-  enabling hardware scans, using the <link linkend="sec-profile-clone-config">
-  Clone Config profile</link> to guarantee
-  <filename>/etc/nixos/configuration.nix</filename> exists (for
-  <command>nixos-rebuild</command> to work), a copy of the Nixpkgs channel
-  snapshot used to create the install media.
+  Provides a basic configuration for installation devices like CDs.
+  This enables redistributable firmware, includes the
+  <link linkend="sec-profile-clone-config">Clone Config profile</link>
+  and a copy of the Nixpkgs channel, so <command>nixos-install</command>
+  works out of the box.
  </para>
-
  <para>
-  Additionally, documentation for <link linkend="opt-documentation.enable">
-  Nixpkgs</link> and <link linkend="opt-documentation.nixos.enable">NixOS
-  </link> are forcefully enabled (to override the
+  Documentation for <link linkend="opt-documentation.enable">Nixpkgs</link>
+  and <link linkend="opt-documentation.nixos.enable">NixOS</link> are
+  forcefully enabled (to override the
   <link linkend="sec-profile-minimal">Minimal profile</link> preference); the
-  NixOS manual is shown automatically on TTY 8, sudo and udisks are disabled.
-  Autologin is enabled as root.
+  NixOS manual is shown automatically on TTY 8, udisks is disabled.
+  Autologin is enabled as <literal>nixos</literal> user, while passwordless
+  login as both <literal>root</literal> and <literal>nixos</literal> is possible.
+  Passwordless <command>sudo</command> is enabled too.
+  <link linkend="opt-networking.wireless.enable">wpa_supplicant</link> is
+  enabled, but configured to not autostart.
+ </para>
+ <para>
+  It is explained how to login, start the ssh server, and if available,
+  how to start the display manager.
  </para>
 
  <para>
-  A message is shown to the user to start a display manager if needed, ssh with
-  <xref linkend="opt-services.openssh.permitRootLogin"/> are enabled (but
-  doesn't autostart). WPA Supplicant is also enabled without autostart.
- </para>
-
- <para>
-  Finally, vim is installed, root is set to not have a password, the kernel is
-  made more silent for remote public IP installs, and several settings are
-  tweaked so that the installer has a better chance of succeeding under
-  low-memory environments.
+  Several settings are tweaked so that the installer has a better chance of
+  succeeding under low-memory environments.
  </para>
 </section>

From d6eb5b068fa893a5e5c571d8c94d15d12ebabf63 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 18 Aug 2019 02:03:58 +0200
Subject: [PATCH 128/794] nixos/doc/clone-config.xml: add line about
 installation media = installation target

---
 nixos/doc/manual/configuration/profiles/clone-config.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml
index 234835845e2..21c4ea75d6d 100644
--- a/nixos/doc/manual/configuration/profiles/clone-config.xml
+++ b/nixos/doc/manual/configuration/profiles/clone-config.xml
@@ -11,4 +11,11 @@
   creating the image in the first place. As a result it allows users to edit
   and rebuild the live-system.
  </para>
+
+ <para>
+  On images where the installation media also becomes an installation target,
+  copying over <literal>configuration.nix</literal> should be disabled by
+  setting <literal>installer.cloneConfig</literal> to <literal>false</literal>.
+  This is already done in <literal>sd-image.nix</literal>.
+ </para>
 </section>

From 13d5fc4232b00dd9f86007e52d400102915ef3e1 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Tue, 13 Aug 2019 11:50:57 -0400
Subject: [PATCH 129/794] kernelPatches: mac nvme t2 support

---
 .../linux/kernel/mac-nvme-t2.patch            | 283 ++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix     |   6 +
 2 files changed, 289 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/mac-nvme-t2.patch

diff --git a/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch b/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch
new file mode 100644
index 00000000000..2f1fa6a0dae
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch
@@ -0,0 +1,283 @@
+diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
+index dd10cf78f2d3..8f006638452b 100644
+--- a/drivers/nvme/host/pci.c
++++ b/drivers/nvme/host/pci.c
+@@ -28,8 +28,8 @@
+ #include "trace.h"
+ #include "nvme.h"
+ 
+-#define SQ_SIZE(depth)		(depth * sizeof(struct nvme_command))
+-#define CQ_SIZE(depth)		(depth * sizeof(struct nvme_completion))
++#define SQ_SIZE(q)	((q)->q_depth * sizeof(struct nvme_command))
++#define CQ_SIZE(q)	((q)->q_depth * sizeof(struct nvme_completion))
+ 
+ #define SGES_PER_PAGE	(PAGE_SIZE / sizeof(struct nvme_sgl_desc))
+ 
+@@ -1344,16 +1344,16 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
+ 
+ static void nvme_free_queue(struct nvme_queue *nvmeq)
+ {
+-	dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq->q_depth),
++	dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq),
+ 				(void *)nvmeq->cqes, nvmeq->cq_dma_addr);
+ 	if (!nvmeq->sq_cmds)
+ 		return;
+ 
+ 	if (test_and_clear_bit(NVMEQ_SQ_CMB, &nvmeq->flags)) {
+ 		pci_free_p2pmem(to_pci_dev(nvmeq->dev->dev),
+-				nvmeq->sq_cmds, SQ_SIZE(nvmeq->q_depth));
++				nvmeq->sq_cmds, SQ_SIZE(nvmeq));
+ 	} else {
+-		dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq->q_depth),
++		dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq),
+ 				nvmeq->sq_cmds, nvmeq->sq_dma_addr);
+ 	}
+ }
+@@ -1433,12 +1433,12 @@ static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues,
+ }
+ 
+ static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq,
+-				int qid, int depth)
++				int qid)
+ {
+ 	struct pci_dev *pdev = to_pci_dev(dev->dev);
+ 
+ 	if (qid && dev->cmb_use_sqes && (dev->cmbsz & NVME_CMBSZ_SQS)) {
+-		nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(depth));
++		nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(nvmeq));
+ 		if (nvmeq->sq_cmds) {
+ 			nvmeq->sq_dma_addr = pci_p2pmem_virt_to_bus(pdev,
+ 							nvmeq->sq_cmds);
+@@ -1447,11 +1447,11 @@ static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq,
+ 				return 0;
+ 			}
+ 
+-			pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(depth));
++			pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(nvmeq));
+ 		}
+ 	}
+ 
+-	nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(depth),
++	nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(nvmeq),
+ 				&nvmeq->sq_dma_addr, GFP_KERNEL);
+ 	if (!nvmeq->sq_cmds)
+ 		return -ENOMEM;
+@@ -1465,12 +1465,13 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth)
+ 	if (dev->ctrl.queue_count > qid)
+ 		return 0;
+ 
+-	nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(depth),
++	nvmeq->q_depth = depth;
++	nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq),
+ 					 &nvmeq->cq_dma_addr, GFP_KERNEL);
+ 	if (!nvmeq->cqes)
+ 		goto free_nvmeq;
+ 
+-	if (nvme_alloc_sq_cmds(dev, nvmeq, qid, depth))
++	if (nvme_alloc_sq_cmds(dev, nvmeq, qid))
+ 		goto free_cqdma;
+ 
+ 	nvmeq->dev = dev;
+@@ -1479,15 +1480,14 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth)
+ 	nvmeq->cq_head = 0;
+ 	nvmeq->cq_phase = 1;
+ 	nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride];
+-	nvmeq->q_depth = depth;
+ 	nvmeq->qid = qid;
+ 	dev->ctrl.queue_count++;
+ 
+ 	return 0;
+ 
+  free_cqdma:
+-	dma_free_coherent(dev->dev, CQ_SIZE(depth), (void *)nvmeq->cqes,
+-							nvmeq->cq_dma_addr);
++	dma_free_coherent(dev->dev, CQ_SIZE(nvmeq), (void *)nvmeq->cqes,
++			  nvmeq->cq_dma_addr);
+  free_nvmeq:
+ 	return -ENOMEM;
+ }
+@@ -1515,7 +1515,7 @@ static void nvme_init_queue(struct nvme_queue *nvmeq, u16 qid)
+ 	nvmeq->cq_head = 0;
+ 	nvmeq->cq_phase = 1;
+ 	nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride];
+-	memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq->q_depth));
++	memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq));
+ 	nvme_dbbuf_init(dev, nvmeq, qid);
+ 	dev->online_queues++;
+ 	wmb(); /* ensure the first interrupt sees the initialization */
+diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
+index cc09b81fc7f4..716ebe87a2b8 100644
+--- a/drivers/nvme/host/core.c
++++ b/drivers/nvme/host/core.c
+@@ -1986,6 +1986,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap)
+ 	ctrl->ctrl_config = NVME_CC_CSS_NVM;
+ 	ctrl->ctrl_config |= (page_shift - 12) << NVME_CC_MPS_SHIFT;
+ 	ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE;
++	/* Use default IOSQES. We'll update it later if needed */
+ 	ctrl->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES;
+ 	ctrl->ctrl_config |= NVME_CC_ENABLE;
+ 
+@@ -2698,6 +2699,30 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
+ 		ctrl->hmmin = le32_to_cpu(id->hmmin);
+ 		ctrl->hmminds = le32_to_cpu(id->hmminds);
+ 		ctrl->hmmaxd = le16_to_cpu(id->hmmaxd);
++
++		/* Grab required IO queue size */
++		ctrl->iosqes = id->sqes & 0xf;
++		if (ctrl->iosqes < NVME_NVM_IOSQES) {
++			dev_err(ctrl->device,
++				"unsupported required IO queue size %d\n", ctrl->iosqes);
++			ret = -EINVAL;
++			goto out_free;
++		}
++		/*
++		 * If our IO queue size isn't the default, update the setting
++		 * in CC:IOSQES.
++		 */
++		if (ctrl->iosqes != NVME_NVM_IOSQES) {
++			ctrl->ctrl_config &= ~(0xfu << NVME_CC_IOSQES_SHIFT);
++			ctrl->ctrl_config |= ctrl->iosqes << NVME_CC_IOSQES_SHIFT;
++			ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC,
++						     ctrl->ctrl_config);
++			if (ret) {
++				dev_err(ctrl->device,
++					"error updating CC register\n");
++				goto out_free;
++			}
++		}
+ 	}
+ 
+ 	ret = nvme_mpath_init(ctrl, id);
+diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
+index 716a876119c8..34ef35fcd8a5 100644
+--- a/drivers/nvme/host/nvme.h
++++ b/drivers/nvme/host/nvme.h
+@@ -244,6 +244,7 @@ struct nvme_ctrl {
+ 	u32 hmmin;
+ 	u32 hmminds;
+ 	u16 hmmaxd;
++	u8 iosqes;
+ 
+ 	/* Fabrics only */
+ 	u16 sqsize;
+diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
+index 8f006638452b..54b35ea4af88 100644
+--- a/drivers/nvme/host/pci.c
++++ b/drivers/nvme/host/pci.c
+@@ -28,7 +28,7 @@
+ #include "trace.h"
+ #include "nvme.h"
+ 
+-#define SQ_SIZE(q)	((q)->q_depth * sizeof(struct nvme_command))
++#define SQ_SIZE(q)	((q)->q_depth << (q)->sqes)
+ #define CQ_SIZE(q)	((q)->q_depth * sizeof(struct nvme_completion))
+ 
+ #define SGES_PER_PAGE	(PAGE_SIZE / sizeof(struct nvme_sgl_desc))
+@@ -162,7 +162,7 @@ static inline struct nvme_dev *to_nvme_dev(struct nvme_ctrl *ctrl)
+ struct nvme_queue {
+ 	struct nvme_dev *dev;
+ 	spinlock_t sq_lock;
+-	struct nvme_command *sq_cmds;
++	void *sq_cmds;
+ 	 /* only used for poll queues: */
+ 	spinlock_t cq_poll_lock ____cacheline_aligned_in_smp;
+ 	volatile struct nvme_completion *cqes;
+@@ -178,6 +178,7 @@ struct nvme_queue {
+ 	u16 last_cq_head;
+ 	u16 qid;
+ 	u8 cq_phase;
++	u8 sqes;
+ 	unsigned long flags;
+ #define NVMEQ_ENABLED		0
+ #define NVMEQ_SQ_CMB		1
+@@ -488,7 +489,8 @@ static void nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd,
+ 			    bool write_sq)
+ {
+ 	spin_lock(&nvmeq->sq_lock);
+-	memcpy(&nvmeq->sq_cmds[nvmeq->sq_tail], cmd, sizeof(*cmd));
++	memcpy(nvmeq->sq_cmds + (nvmeq->sq_tail << nvmeq->sqes),
++	       cmd, sizeof(*cmd));
+ 	if (++nvmeq->sq_tail == nvmeq->q_depth)
+ 		nvmeq->sq_tail = 0;
+ 	nvme_write_sq_db(nvmeq, write_sq);
+@@ -1465,6 +1467,7 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth)
+ 	if (dev->ctrl.queue_count > qid)
+ 		return 0;
+ 
++	nvmeq->sqes = qid ? dev->ctrl.iosqes : NVME_NVM_ADMSQES;
+ 	nvmeq->q_depth = depth;
+ 	nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq),
+ 					 &nvmeq->cq_dma_addr, GFP_KERNEL);
+diff --git a/include/linux/nvme.h b/include/linux/nvme.h
+index 01aa6a6c241d..7af18965fb57 100644
+--- a/include/linux/nvme.h
++++ b/include/linux/nvme.h
+@@ -141,6 +141,7 @@ enum {
+  * (In bytes and specified as a power of two (2^n)).
+  */
+ #define NVME_NVM_IOSQES		6
++#define NVME_NVM_ADMSQES	6
+ #define NVME_NVM_IOCQES		4
+ 
+ enum {
+diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
+index 716ebe87a2b8..480ea24d8cf4 100644
+--- a/drivers/nvme/host/core.c
++++ b/drivers/nvme/host/core.c
+@@ -2701,7 +2701,10 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
+ 		ctrl->hmmaxd = le16_to_cpu(id->hmmaxd);
+ 
+ 		/* Grab required IO queue size */
+-		ctrl->iosqes = id->sqes & 0xf;
++		if (ctrl->quirks & NVME_QUIRK_128_BYTES_SQES)
++			ctrl->iosqes = 7;
++		else
++			ctrl->iosqes = id->sqes & 0xf;
+ 		if (ctrl->iosqes < NVME_NVM_IOSQES) {
+ 			dev_err(ctrl->device,
+ 				"unsupported required IO queue size %d\n", ctrl->iosqes);
+diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
+index 34ef35fcd8a5..b2a78d08b984 100644
+--- a/drivers/nvme/host/nvme.h
++++ b/drivers/nvme/host/nvme.h
+@@ -92,6 +92,16 @@ enum nvme_quirks {
+ 	 * Broken Write Zeroes.
+ 	 */
+ 	NVME_QUIRK_DISABLE_WRITE_ZEROES		= (1 << 9),
++
++	/*
++	 * Use only one interrupt vector for all queues
++	 */
++	NVME_QUIRK_SINGLE_VECTOR		= (1 << 10),
++
++	/*
++	 * Use non-standard 128 bytes SQEs.
++	 */
++	NVME_QUIRK_128_BYTES_SQES		= (1 << 11),
+ };
+ 
+ /*
+diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
+index 54b35ea4af88..ab2358137419 100644
+--- a/drivers/nvme/host/pci.c
++++ b/drivers/nvme/host/pci.c
+@@ -2080,6 +2080,9 @@ static int nvme_setup_irqs(struct nvme_dev *dev, unsigned int nr_io_queues)
+ 	dev->io_queues[HCTX_TYPE_DEFAULT] = 1;
+ 	dev->io_queues[HCTX_TYPE_READ] = 0;
+ 
++	if (dev->ctrl.quirks & NVME_QUIRK_SINGLE_VECTOR)
++		irq_queues = 1;
++
+ 	return pci_alloc_irq_vectors_affinity(pdev, 1, irq_queues,
+ 			      PCI_IRQ_ALL_TYPES | PCI_IRQ_AFFINITY, &affd);
+ }
+@@ -3037,6 +3040,9 @@ static const struct pci_device_id nvme_id_table[] = {
+ 	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2005),
++		.driver_data = NVME_QUIRK_SINGLE_VECTOR |
++				NVME_QUIRK_128_BYTES_SQES },
+ 	{ 0, }
+ };
+ MODULE_DEVICE_TABLE(pci, nvme_id_table);
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index e941cd4ea41..edca017b3c7 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -62,4 +62,10 @@ rec {
     name = "export_kernel_fpu_functions";
     patch = ./export_kernel_fpu_functions.patch;
   };
+
+  # patches from https://lkml.org/lkml/2019/7/15/1748
+  mac_nvme_t2 = rec {
+    name = "mac_nvme_t2";
+    patch = ./mac-nvme-t2.patch;
+  };
 }

From 1e2ad9e6bc55a399396809fc0685c148efd371ae Mon Sep 17 00:00:00 2001
From: Paul TREHIOU <paul@nyanlout.re>
Date: Tue, 20 Aug 2019 23:05:19 +0200
Subject: [PATCH 130/794] networkmanager: hardcode parts of the source URL
 (#67100)

Broke the build as the pname variable was used to create the URL
Introduced by 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6
---
 pkgs/tools/networking/network-manager/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 28ba97d70c5..5de8490f96a 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -7,14 +7,13 @@
 , openconnect, curl, meson, ninja, libpsl }:
 
 let
-  pname = "NetworkManager";
   pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
 in stdenv.mkDerivation rec {
   pname = "network-manager";
   version = "1.18.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
     sha256 = "1hx5dx5dgdqh3p8fq7q1pxy2bx2iymc74lj60ycrf7ydfjlprnad";
   };
 

From f996fa509ce1fac66c781216e90f9279484cf96d Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Tue, 20 Aug 2019 23:03:40 +0000
Subject: [PATCH 131/794] maintainers: add dump_stack

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7f70963723d..9fee3a54628 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1706,6 +1706,16 @@
       fingerprint = "389A 78CB CD88 5E0C 4701  DEB9 FD42 C7D0 D414 94C8";
     }];
   };
+  dump_stack = {
+    email = "root@dumpstack.io";
+    github = "jollheef";
+    githubId = 1749762;
+    name = "Mikhail Klementev";
+    keys = [{
+      longkeyid = "rsa4096/0x1525585D1B43C62A";
+      fingerprint = "5DD7 C6F6 0630 F08E DAE7  4711 1525 585D 1B43 C62A";
+    }];
+  };
   dxf = {
     email = "dingxiangfei2009@gmail.com";
     github = "dingxiangfei2009";

From ed29145155492d74a447a1a2d296b3c3800f3bd3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 21 Aug 2019 13:30:05 +0800
Subject: [PATCH 132/794] dynamic-colors: 0.2.2.1 -> 0.2.2.2

---
 pkgs/tools/misc/dynamic-colors/default.nix | 26 ++++++----------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix
index e2f2f51ccfb..6cb01f14a2c 100644
--- a/pkgs/tools/misc/dynamic-colors/default.nix
+++ b/pkgs/tools/misc/dynamic-colors/default.nix
@@ -1,38 +1,26 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "dynamic-colors-${version}";
-  version = "0.2.2.1";
+  pname = "dynamic-colors";
+  version = "0.2.2.2";
 
   src = fetchFromGitHub {
     owner  = "peterhoeg";
     repo   = "dynamic-colors";
     rev    = "v${version}";
-    sha256 = "0qz76n5sspgpz6bz66jfkyr42da3skbpw9wbvxgm3ha343azfaiw";
+    sha256 = "0i63570z9aqbxa8ixh4ayb3akgjdnlqyl2sbf9d7x8f1pxhk5kd5";
   };
 
-  dontBuild = true;
-  dontStrip = true;
+  PREFIX = placeholder "out";
 
-  installPhase = ''
-    mkdir -p \
-      $out/bin \
-      $out/share/dynamic-colors/colorschemes \
-      $out/share/bash-completion/completions \
-      $out/share/zsh/site-packages
-
-    install -m755 bin/dynamic-colors              $out/bin/
-    install -m644 completions/dynamic-colors.bash $out/share/bash-completion/completions/dynamic-colors
-    install -m644 completions/dynamic-colors.zsh  $out/share/zsh/site-packages/_dynamic-colors
-    install -m644 colorschemes/*               -t $out/share/dynamic-colors/colorschemes
-
-    substituteInPlace $out/bin/dynamic-colors \
+  postPatch = ''
+    substituteInPlace bin/dynamic-colors \
       --replace /usr/share/dynamic-colors $out/share/dynamic-colors
   '';
 
   meta = with stdenv.lib; {
     description = "Change terminal colors on the fly";
-    homepage    = https://github.com/peterhoeg/dynamic-colors;
+    homepage    = "https://github.com/peterhoeg/dynamic-colors";
     license     = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];
     platforms   = platforms.unix;

From abb41a1111ea120660c1ce55332e04208fc84bc7 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 20 Aug 2019 14:27:02 +0800
Subject: [PATCH 133/794] owl-lisp: 0.1.16 -> 0.1.19

---
 .../compilers/owl-lisp/default.nix            | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix
index ccd149bbb40..80ea9eb4c0b 100644
--- a/pkgs/development/compilers/owl-lisp/default.nix
+++ b/pkgs/development/compilers/owl-lisp/default.nix
@@ -1,33 +1,31 @@
-{ stdenv, fetchFromGitHub, coreutils, which }:
+{ stdenv, fetchFromGitLab, coreutils, which }:
 
 stdenv.mkDerivation rec {
-  name    = "owl-lisp-${version}";
-  version = "0.1.16";
+  pname = "owl-lisp";
+  version = "0.1.19";
 
-  src = fetchFromGitHub {
-    owner  = "aoh";
-    repo   = "owl-lisp";
+  src = fetchFromGitLab {
+    owner  = "owl-lisp";
+    repo   = "owl";
     rev    = "v${version}";
-    sha256 = "1qp6p48bmlyn83rqi6k3d098dg4cribavg5rd4x17z37i181vxvj";
+    sha256 = "1bgjd2gkr5risfcc401rlr5fc82gwm4r2gpp9gzkg9h64acivkjx";
   };
 
   nativeBuildInputs = [ which ];
 
   prePatch = ''
-    substituteInPlace Makefile --replace /usr $out
-
-    for f in tests/run tests/exec.sh ; do
-      substituteInPlace $f --replace /bin/echo ${coreutils}/bin/echo
-    done
+    substituteInPlace Makefile \
+      --replace /usr $out
   '';
 
   # tests are run as part of the compilation process
   doCheck = false;
 
   meta = with stdenv.lib; {
-    description = "A functional lisp";
-    homepage    = https://github.com/aoh/owl-lisp;
+    description = "A functional Scheme for world domination";
+    homepage    = "https://gitlab.com/owl-lisp/owl";
     license     = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.linux;
   };
 }

From ae1cb0bdf98a325062eb9c5bd6af350ca9cf6bf2 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 18 Aug 2019 20:18:37 -0400
Subject: [PATCH 134/794] nixos/xfce4-14: init

---
 .../services/x11/desktop-managers/default.nix |   2 +-
 .../x11/desktop-managers/xfce4-14.nix         | 157 ++++++++++++++++++
 2 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/x11/desktop-managers/xfce4-14.nix

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 671a959cdde..dfb84113e13 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -18,7 +18,7 @@ in
   # determines the default: later modules (if enabled) are preferred.
   # E.g., if Plasma 5 is enabled, it supersedes xterm.
   imports = [
-    ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
+    ./none.nix ./xterm.nix ./xfce.nix ./xfce4-14.nix ./plasma5.nix ./lumina.nix
     ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
     ./mate.nix ./pantheon.nix ./surf-display.nix
   ];
diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
new file mode 100644
index 00000000000..16329c093f9
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
@@ -0,0 +1,157 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.desktopManager.xfce4-14;
+in
+
+{
+  # added 2019-08-18
+  # needed to preserve some semblance of UI familarity
+  # with original XFCE module
+  imports = [
+    (mkRenamedOptionModule
+      [ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ]
+      [ "services" "xserver" "displayManager" "sessionCommands" ])
+  ];
+
+  options = {
+    services.xserver.desktopManager.xfce4-14 = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable the Xfce desktop environment.";
+      };
+
+    # TODO: support thunar plugins
+    #   thunarPlugins = mkOption {
+    #     default = [];
+    #     type = types.listOf types.package;
+    #     example = literalExample "[ pkgs.xfce4-14.thunar-archive-plugin ]";
+    #     description = ''
+    #       A list of plugin that should be installed with Thunar.
+    #     '';
+    #  };
+
+      noDesktop = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon).";
+      };
+
+      enableXfwm = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Enable the XFWM (default) window manager.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs.xfce4-14 // pkgs; [
+      glib # for gsettings
+      gtk3.out # gtk-update-icon-cache
+
+      gnome3.adwaita-icon-theme
+      hicolor-icon-theme
+      tango-icon-theme
+      xfce4-icon-theme
+
+      desktop-file-utils
+      shared-mime-info # for update-mime-database
+
+      # For a polkit authentication agent
+      polkit_gnome
+
+      # Needed by Xfce's xinitrc script
+      xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
+
+      exo
+      garcon
+      gtk-xfce-engine
+      libxfce4ui
+      xfconf
+
+      mousepad
+      ristretto
+      xfce4-appfinder
+      xfce4-screenshooter
+      xfce4-session
+      xfce4-settings
+      xfce4-terminal
+
+      # TODO: resync patch for plugins
+      #(thunar.override { thunarPlugins = cfg.thunarPlugins; })
+      thunar
+    ] # TODO: NetworkManager doesn't belong here
+      ++ optional config.networking.networkmanager.enable networkmanagerapplet
+      ++ optional config.hardware.pulseaudio.enable xfce4-pulseaudio-plugin
+      ++ optional config.powerManagement.enable xfce4-power-manager
+      ++ optional cfg.enableXfwm xfwm4
+      ++ optionals (!cfg.noDesktop) [
+        xfce4-panel
+        xfce4-notifyd
+        xfdesktop
+      ];
+
+    environment.pathsToLink = [
+      "/share/xfce4"
+      "/lib/xfce4"
+      "/share/gtksourceview-3.0"
+      "/share/gtksourceview-4.0"
+    ];
+
+    # Use the correct gnome3 packageSet
+    networking.networkmanager.basePackages = mkIf config.networking.networkmanager.enable {
+      inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
+      inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
+      networkmanager-openconnect networkmanager-fortisslvpn
+      networkmanager-iodine networkmanager-l2tp;
+    };
+
+    services.xserver.desktopManager.session = [{
+      name = "xfce4-14";
+      bgSupport = true;
+      start = ''
+        # Set GTK_PATH so that GTK+ can find the theme engines.
+        export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0"
+
+        # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
+        export GTK_DATA_PREFIX=${config.system.path}
+
+        ${pkgs.runtimeShell} ${pkgs.xfce4-14.xinitrc} &
+        waitPID=$!
+      '';
+    }];
+
+    services.xserver.updateDbusEnvironment = true;
+    services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
+
+    # Enable helpful DBus services.
+    services.udisks2.enable = true;
+    security.polkit.enable = true;
+    services.accounts-daemon.enable = true;
+    services.upower.enable = config.powerManagement.enable;
+    services.gnome3.glib-networking.enable = true;
+    services.gvfs.enable = true;
+    services.gvfs.package = pkgs.xfce.gvfs;
+    services.tumbler.enable = true;
+    services.dbus.packages =
+      optional config.services.printing.enable pkgs.system-config-printer;
+    services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
+
+    # Enable default programs
+    programs.dconf.enable = true;
+
+    # Shell integration for VTE terminals
+    programs.bash.vteIntegration = mkDefault true;
+    programs.zsh.vteIntegration = mkDefault true;
+
+    # Systemd services
+    systemd.packages = with pkgs.xfce4-14; [
+      thunar
+    ] ++ optional (!cfg.noDesktop) xfce4-notifyd;
+
+  };
+}

From de89ad124d0ccf8c1dfaa5edeac84be03173ce48 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 18 Aug 2019 20:24:09 -0400
Subject: [PATCH 135/794] xfce4-14.xfce4-mixer: drop

obsoleted by xfce4-pulseaudio-plugin / dead package
---
 pkgs/desktops/xfce4-14/default.nix            |  8 +++--
 .../desktops/xfce4-14/xfce4-mixer/default.nix | 32 -------------------
 2 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/desktops/xfce4-14/xfce4-mixer/default.nix

diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix
index d3e46cf2365..e72aa97d9db 100644
--- a/pkgs/desktops/xfce4-14/default.nix
+++ b/pkgs/desktops/xfce4-14/default.nix
@@ -58,8 +58,6 @@ makeScope newScope (self: with self; {
 
   xfce4-dict = callPackage ./xfce4-dict { };
 
-  xfce4-mixer = callPackage ./xfce4-mixer { };
-
   xfce4-netload-plugin = callPackage ./xfce4-netload-plugin { };
 
   xfce4-notifyd = callPackage ./xfce4-notifyd { };
@@ -110,4 +108,10 @@ makeScope newScope (self: with self; {
   xfce4-namebar-plugin = callPackage ../xfce/panel-plugins/xfce4-namebar-plugin.nix { };
 
   xfce4-windowck-plugin = callPackage ../xfce/panel-plugins/xfce4-windowck-plugin.nix { };
+
+
+  ## ALIASES
+
+  # added 2019-08-18
+  xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin";
 })
diff --git a/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix
deleted file mode 100644
index a4bc0a3eadd..00000000000
--- a/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkXfceDerivation, automakeAddFlags, dbus-glib, gtk2, libxfce4ui, libxfce4util, xfce4-panel, xfconf, gst-plugins-base, libunique }:
-
-let
-  gst_plugins_minimal = gst-plugins-base.override {
-    minimalDeps = true;
-  };
-in
-mkXfceDerivation rec {
-  category = "apps";
-  pname = "xfce4-mixer";
-  version = "4.11.0";
-
-  sha256 = "1kiz5ysn4rqkjfzz4dvbsfj64kqqayg7bqakcys3rw28g2q5qyys";
-
-  nativeBuildInputs = [ automakeAddFlags ];
-
-  postPatch = ''
-    automakeAddFlags panel-plugin/Makefile.am libmixer_la_CFLAGS DBUS_GLIB_CFLAGS
-    automakeAddFlags xfce4-mixer/Makefile.am xfce4_mixer_CFLAGS DBUS_GLIB_CFLAGS
-  '';
-
-  buildInputs = [
-    dbus-glib
-    gst_plugins_minimal
-    gtk2
-    libunique
-    libxfce4ui
-    libxfce4util
-    xfce4-panel
-    xfconf
-  ];
-}

From fd7d31b50e087e790443cd57eaf52f41c3f99af1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 21 Aug 2019 22:04:29 -0400
Subject: [PATCH 136/794] nixosTests.xfce4-14: init

This is pretty much identical to the xfce test we currently have.
---
 nixos/release-combined.nix |  1 +
 nixos/tests/all-tests.nix  |  1 +
 nixos/tests/xfce4-14.nix   | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 nixos/tests/xfce4-14.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 7146aebf54b..ffa087bb6f2 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -136,6 +136,7 @@ in rec {
         (all nixos.tests.switchTest)
         (all nixos.tests.udisks2)
         (all nixos.tests.xfce)
+        (all nixos.tests.xfce4-14)
 
         nixpkgs.tarball
         (all allSupportedNixpkgs.emacs)
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 4eeee9c35c0..47eaec7c783 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -273,6 +273,7 @@ in
   xautolock = handleTest ./xautolock.nix {};
   xdg-desktop-portal = handleTest ./xdg-desktop-portal.nix {};
   xfce = handleTest ./xfce.nix {};
+  xfce4-14 = handleTest ./xfce4-14.nix {};
   xmonad = handleTest ./xmonad.nix {};
   xrdp = handleTest ./xrdp.nix {};
   xss-lock = handleTest ./xss-lock.nix {};
diff --git a/nixos/tests/xfce4-14.nix b/nixos/tests/xfce4-14.nix
new file mode 100644
index 00000000000..d9b10aabaa1
--- /dev/null
+++ b/nixos/tests/xfce4-14.nix
@@ -0,0 +1,33 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "xfce4-14";
+
+  machine =
+    { pkgs, ... }:
+
+    { imports = [ ./common/user-account.nix ];
+
+      services.xserver.enable = true;
+
+      services.xserver.displayManager.auto.enable = true;
+      services.xserver.displayManager.auto.user = "alice";
+
+      services.xserver.desktopManager.xfce4-14.enable = true;
+    };
+
+  testScript =
+    ''
+      $machine->waitForX;
+      $machine->waitForFile("/home/alice/.Xauthority");
+      $machine->succeed("xauth merge ~alice/.Xauthority");
+      $machine->waitForWindow(qr/xfce4-panel/);
+      $machine->sleep(10);
+
+      # Check that logging in has given the user ownership of devices.
+      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+
+      $machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'");
+      $machine->waitForWindow(qr/Terminal/);
+      $machine->sleep(10);
+      $machine->screenshot("screen");
+    '';
+})

From 620331c294c8c8a30fd73818f4e4633325e47194 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Thu, 22 Aug 2019 12:19:13 +0200
Subject: [PATCH 137/794] kdeFramework.kdewebkit: disable new designer plugin
 option

---
 pkgs/development/libraries/kde-frameworks/kdewebkit.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
index b7dcfb7fe64..9f682b44975 100644
--- a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
@@ -8,4 +8,7 @@ mkDerivation {
   buildInputs = [ kconfig kcoreaddons kio kparts ];
   propagatedBuildInputs = [ qtwebkit ];
   outputs = [ "out" "dev" ];
+  cmakeFlags = [
+    "-DBUILD_DESIGNERPLUGIN=OFF"
+  ];
 }

From e841edacc5dc50cdf004c9e2cbf934bc978bdedb Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Thu, 22 Aug 2019 13:55:11 +0200
Subject: [PATCH 138/794] grantlee5: remove extra grantleeCompatVersion var

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

diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 3b14efe8a5f..45096e031d3 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -3,8 +3,7 @@
 mkDerivation rec {
   pname = "grantlee";
   version = "5.1.0";
-  grantleeCompatVersion = "5.1";
-  grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}";
+  grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
 
   src = fetchurl {
     url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";

From 9f5f9ab7e97b068c23eb66621a16c0f69740c90e Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Thu, 22 Aug 2019 14:03:49 +0200
Subject: [PATCH 139/794] grantlee5: fix build with recent CMake versions

---
 .../libraries/grantlee/5/grantlee-cxx11.patch | 24 +++++++++++++++++++
 pkgs/development/libraries/grantlee/5/series  |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch

diff --git a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
new file mode 100644
index 00000000000..d049d6c96f8
--- /dev/null
+++ b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
@@ -0,0 +1,24 @@
+From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sat, 20 Jul 2019 17:35:30 +0200
+Subject: [PATCH] Fix compile with newer Qt/cmake combination
+
+Without this i get huge errors about Qt needing C++11 support
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6d51110..0859788 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,9 @@ endif()
+ 
+ project(Grantlee)
+ 
++set (CMAKE_CXX_STANDARD 11)
++set (CMAKE_CXX_EXTENSIONS OFF)
++
+ # Workaround for http://public.kitware.com/Bug/view.php?id=12301
+ if (MINGW)
+   if(NOT CMAKE_BUILD_TYPE)
diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series
index 9c4015a1c19..19850b2e7e4 100644
--- a/pkgs/development/libraries/grantlee/5/series
+++ b/pkgs/development/libraries/grantlee/5/series
@@ -1,2 +1,3 @@
 grantlee-nix-profiles.patch
 grantlee-no-canonicalize-filepath.patch
+grantlee-cxx11.patch

From 405f6a29cac459ad879d851e01291131058e7d54 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Thu, 22 Aug 2019 14:17:12 +0200
Subject: [PATCH 140/794] ktouch: add missing Qt5QuickControls2 dependency

---
 pkgs/applications/kde/ktouch.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix
index 64179f2e64d..7e300ea7157 100644
--- a/pkgs/applications/kde/ktouch.nix
+++ b/pkgs/applications/kde/ktouch.nix
@@ -3,7 +3,8 @@
 , kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n
 , kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons
 , kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts
-, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg
+, qtx11extras, qtgraphicaleffects, qtxmlpatterns, qtquickcontrols2
+, xorg
 }:
 
 
@@ -19,7 +20,7 @@
       kconfig kconfigwidgets kcoreaddons kdeclarative ki18n
       kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons
       kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts
-      qtx11extras qtgraphicaleffects qtxmlpatterns
+      qtx11extras qtgraphicaleffects qtxmlpatterns qtquickcontrols2
       xorg.libxkbfile xorg.libxcb
     ];
 

From 034f322343e672b5c141e6a71f484fd4d48d5e1c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Aug 2019 09:05:21 -0500
Subject: [PATCH 141/794] yubikey-manager: 2.1.1 -> 3.1.0

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

diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
index 939191b5c8f..ee555637474 100644
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@@ -3,11 +3,11 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "yubikey-manager";
-  version = "2.1.1";
+  version = "3.1.0";
 
   srcs = fetchurl {
     url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
-    sha256 = "1jmczk6r6609kzbq4ixispkm4qpvw94wdyfps7q3r96x75si1p1s";
+    sha256 = "0nb3qzpggyp61lchvprnklby5mf5n0xpn9z8vlhh99pz1k9sqdq1";
   };
 
   propagatedBuildInputs =

From 58d383a5dc35ae45db927b0bd22b302f8a0a9c07 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Fri, 23 Aug 2019 14:25:12 -0600
Subject: [PATCH 142/794] wine{,-mono,-unstable,-staging}: update

wine: 4.0.1 -> 4.0.2
wine-mono: 4.9.0 -> 4.9.2
wine-unstable: 4.12.1 -> 4.14
wine-staging: 4.12.1 -> 4.14
---
 pkgs/misc/emulators/wine/sources.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 4ccdb254daa..023e48fc991 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "4.0.1";
+    version = "4.0.2";
     url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz";
-    sha256 = "0j29df0px6dzin4j0cbxgza4msvf9spmwranv25krq1g9kq959nk";
+    sha256 = "0x5x9pvhryzhq1m7i8gx5wwwj341zz05zymadlhfw5w45xlm0h4r";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
@@ -31,24 +31,24 @@ in rec {
 
     ## see http://wiki.winehq.org/Mono
     mono = fetchurl rec {
-      version = "4.9.0";
+      version = "4.9.2";
       url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
-      sha256 = "04y7w57cgay74227qci1bjbzwvclkawwljqvgd7a5yhhdz7cfblf";
+      sha256 = "0x7z0216j21bzc9v1q283qlsvbfzn92yiaf26ilh6bd7zib4c7xr";
     };
   };
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "4.12.1";
+    version = "4.14";
     url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz";
-    sha256 = "09yjfb2k14y11k19lm8dqmb8qwxyhh67d5q1gqv480y64mljvkx0";
+    sha256 = "1rl1a3k5sr0hyxc61d68kwandhxcnxwv6b77vh7x2rkl1h4nxmfs";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "1bvpvj6vcw2p6vcjm6mw5maarbs4lfw1ix3pj020w4n3kg4nmmc4";
+    sha256 = "1s17hcrp1aa0v99y5iav2s0lxdx2rzgm7z0c4zhxyydqxj399f5j";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From 441f10cdaf89eaac92d1b991185e324e4dd6eb1e Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Sat, 24 Aug 2019 18:11:18 +0200
Subject: [PATCH 143/794] maintainers: add sgo

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 64836b746e0..17e39e2dc4c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5656,6 +5656,12 @@
     githubId = 918365;
     name = "Stefan Frijters";
   };
+  sgo = {
+    email = "stig@stig.io";
+    github = "stigtsp";
+    githubId = 75371;
+    name = "Stig Palmquist";
+  };
   sgraf = {
     email = "sgraf1337@gmail.com";
     github = "sgraf812";

From 4d3493c11f14080fa9d99c7732efeba778eda36a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 25 Aug 2019 03:47:25 +0800
Subject: [PATCH 144/794] crystal: init at 0.30.1

---
 pkgs/development/compilers/crystal/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix                | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 2e823fe1f0f..db57bc3e9df 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -199,5 +199,12 @@ in rec {
     binary = binaryCrystal_0_29;
   };
 
-  crystal = crystal_0_29;
+  crystal_0_30 = generic {
+    version = "0.30.1";
+    sha256  = "0fbk784zjflsl3hys5a1xmn8mda8kb2z7ql58wpyfavivswxanbs";
+    doCheck = false; # 6 checks are failing now
+    binary = binaryCrystal_0_29;
+  };
+
+  crystal = crystal_0_30;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74706fc3ebf..172344c8fbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7388,6 +7388,7 @@ in
     crystal_0_26
     crystal_0_27
     crystal_0_29
+    crystal_0_30
     crystal;
 
   icr = callPackage ../development/tools/icr {};

From 7de221d5e0947b4189ff35544152bd7382610695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 25 Aug 2019 10:31:03 +0200
Subject: [PATCH 145/794] nano: fix version, fallout from merge f65aa21bb

Fortunately the issue was caught as a hash mismatch.
---
 pkgs/applications/editors/nano/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index f24fbb65e55..0ce0e011ae6 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,7 +20,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "nano";
-  version = "3.2";
+  version = "4.3";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${pname}-${version}.tar.xz";

From ac9d14c5ff41aa3128a4daae3f12d242b00ea756 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Fri, 23 Aug 2019 15:45:46 +0200
Subject: [PATCH 146/794] pythonPackages.dogtail: fix sniff

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

diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix
index 804267268d7..deeb8ce0642 100644
--- a/pkgs/development/python-modules/dogtail/default.nix
+++ b/pkgs/development/python-modules/dogtail/default.nix
@@ -11,6 +11,7 @@
 , fetchurl
 , dbus
 , xvfb_run
+, wrapGAppsHook
 # , fetchPypi
 }:
 
@@ -32,8 +33,9 @@ buildPythonPackage rec {
     ./nix-support.patch
   ];
 
-  nativeBuildInputs = [ gobject-introspection dbus xvfb_run ]; # for setup hooks
+  nativeBuildInputs = [ gobject-introspection dbus xvfb_run wrapGAppsHook ]; # for setup hooks
   propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ];
+  strictDeps = false; # issue 56943
 
   checkPhase = ''
     runHook preCheck

From 95b3b635553d48032a45092714c9acbc401a56ab Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 19 Jun 2019 06:23:43 -0400
Subject: [PATCH 147/794] moodle: init at 3.7.1

---
 pkgs/servers/web-apps/moodle/default.nix | 40 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/servers/web-apps/moodle/default.nix

diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix
new file mode 100644
index 00000000000..4f47890cc87
--- /dev/null
+++ b/pkgs/servers/web-apps/moodle/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, writeText }:
+
+let
+  version = "3.7.1";
+  stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
+in
+
+stdenv.mkDerivation rec {
+  pname = "moodle";
+  inherit version;
+
+  src = fetchurl {
+    url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
+    sha256 = "0xfriw0nfaf9hlcjviwg2acwpd192jf2ahw8sw3s6bj3pr1isxmd";
+  };
+
+  phpConfig = writeText "config.php" ''
+  <?php
+    return require(getenv('MOODLE_CONFIG'));
+  ?>
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/moodle
+    cp -r . $out/share/moodle
+    cp ${phpConfig} $out/share/moodle/config.php
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Free and open-source learning management system (LMS) written in PHP";
+    license = licenses.gpl3Plus;
+    homepage = "https://moodle.org/";
+    maintainers = with maintainers; [ aanderse ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ec34dab22b..7e7f3c3ca09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14715,6 +14715,8 @@ in
 
   mlmmj = callPackage ../servers/mail/mlmmj { };
 
+  moodle = callPackage ../servers/web-apps/moodle { };
+
   morty = callPackage ../servers/web-apps/morty { };
 
   mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { };

From 3bd03d2c0aa46036019d257f710b54c3e628ab7e Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 21 Jun 2019 10:09:15 -0400
Subject: [PATCH 148/794] nixos/moodle: init service

---
 nixos/modules/module-list.nix              |   1 +
 nixos/modules/services/web-apps/moodle.nix | 300 +++++++++++++++++++++
 nixos/tests/all-tests.nix                  |   1 +
 nixos/tests/moodle.nix                     |  22 ++
 4 files changed, 324 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/moodle.nix
 create mode 100644 nixos/tests/moodle.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 388f4788b59..9da9e0970ff 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -790,6 +790,7 @@
   ./services/web-apps/mattermost.nix
   ./services/web-apps/mediawiki.nix
   ./services/web-apps/miniflux.nix
+  ./services/web-apps/moodle.nix
   ./services/web-apps/nextcloud.nix
   ./services/web-apps/nexus.nix
   ./services/web-apps/pgpkeyserver-lite.nix
diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix
new file mode 100644
index 00000000000..f2516c67c6b
--- /dev/null
+++ b/nixos/modules/services/web-apps/moodle.nix
@@ -0,0 +1,300 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types;
+  inherit (lib) concatStringsSep literalExample mapAttrsToList optional optionalString;
+
+  cfg = config.services.moodle;
+  fpm = config.services.phpfpm.pools.moodle;
+
+  user = "moodle";
+  group = config.services.httpd.group;
+  stateDir = "/var/lib/moodle";
+
+  moodleConfig = pkgs.writeText "config.php" ''
+  <?php  // Moodle configuration file
+
+  unset($CFG);
+  global $CFG;
+  $CFG = new stdClass();
+
+  $CFG->dbtype    = '${ { "mysql" = "mariadb"; "pgsql" = "pgsql"; }.${cfg.database.type} }';
+  $CFG->dblibrary = 'native';
+  $CFG->dbhost    = '${cfg.database.host}';
+  $CFG->dbname    = '${cfg.database.name}';
+  $CFG->dbuser    = '${cfg.database.user}';
+  ${optionalString (cfg.database.passwordFile != null) "$CFG->dbpass = file_get_contents('${cfg.database.passwordFile}');"}
+  $CFG->prefix    = 'mdl_';
+  $CFG->dboptions = array (
+    'dbpersist' => 0,
+    'dbport' => '${toString cfg.database.port}',
+    ${optionalString (cfg.database.socket != null) "'dbsocket' => '${cfg.database.socket}',"}
+    'dbcollation' => 'utf8mb4_unicode_ci',
+  );
+
+  $CFG->wwwroot   = '${if cfg.virtualHost.enableSSL then "https" else "http"}://${cfg.virtualHost.hostName}';
+  $CFG->dataroot  = '${stateDir}';
+  $CFG->admin     = 'admin';
+
+  $CFG->directorypermissions = 02777;
+  $CFG->disableupdateautodeploy = true;
+
+  $CFG->pathtogs = '${pkgs.ghostscript}/bin/gs';
+  $CFG->pathtophp = '${pkgs.php}/bin/php';
+  $CFG->pathtodu = '${pkgs.coreutils}/bin/du';
+  $CFG->aspellpath = '${pkgs.aspell}/bin/aspell';
+  $CFG->pathtodot = '${pkgs.graphviz}/bin/dot';
+
+  require_once('${cfg.package}/share/moodle/lib/setup.php');
+
+  // There is no php closing tag in this file,
+  // it is intentional because it prevents trailing whitespace problems!
+  '';
+
+  mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
+  pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
+in
+{
+  # interface
+  options.services.moodle = {
+    enable = mkEnableOption "Moodle web application";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.moodle;
+      defaultText = "pkgs.moodle";
+      description = "The Moodle package to use.";
+    };
+
+    initialPassword = mkOption {
+      type = types.str;
+      example = "correcthorsebatterystaple";
+      description = ''
+        Specifies the initial password for the admin, i.e. the password assigned if the user does not already exist.
+        The password specified here is world-readable in the Nix store, so it should be changed promptly.
+      '';
+    };
+
+    database = {
+      type = mkOption {
+        type = types.enum [ "mysql" "pgsql" ];
+        default = "mysql";
+        description = ''Database engine to use.'';
+      };
+
+      host = mkOption {
+        type = types.str;
+        default = "localhost";
+        description = "Database host address.";
+      };
+
+      port = mkOption {
+        type = types.int;
+        description = "Database host port.";
+        default = {
+          "mysql" = 3306;
+          "pgsql" = 5432;
+        }.${cfg.database.type};
+        defaultText = "3306";
+      };
+
+      name = mkOption {
+        type = types.str;
+        default = "moodle";
+        description = "Database name.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "moodle";
+        description = "Database user.";
+      };
+
+      passwordFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/run/keys/moodle-dbpassword";
+        description = ''
+          A file containing the password corresponding to
+          <option>database.user</option>.
+        '';
+      };
+
+      socket = mkOption {
+        type = types.nullOr types.path;
+        default =
+          if mysqlLocal then "/run/mysqld/mysqld.sock"
+          else if pgsqlLocal then "/run/postgresql"
+          else null;
+        defaultText = "/run/mysqld/mysqld.sock";
+        description = "Path to the unix socket file to use for authentication.";
+      };
+
+      createLocally = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Create the database and database user locally.";
+      };
+    };
+
+    virtualHost = mkOption {
+      type = types.submodule ({
+        options = import ../web-servers/apache-httpd/per-server-options.nix {
+          inherit lib;
+          forMainServer = false;
+        };
+      });
+      example = {
+        hostName = "moodle.example.org";
+        enableSSL = true;
+        adminAddr = "webmaster@example.org";
+        sslServerCert = "/var/lib/acme/moodle.example.org/full.pem";
+        sslServerKey = "/var/lib/acme/moodle.example.org/key.pem";
+      };
+      description = ''
+        Apache configuration can be done by adapting <option>services.httpd.virtualHosts</option>.
+        See <xref linkend="opt-services.httpd.virtualHosts"/> for further information.
+      '';
+    };
+
+    poolConfig = mkOption {
+      type = with types; attrsOf (oneOf [ str int bool ]);
+      default = {
+        "pm" = "dynamic";
+        "pm.max_children" = 32;
+        "pm.start_servers" = 2;
+        "pm.min_spare_servers" = 2;
+        "pm.max_spare_servers" = 4;
+        "pm.max_requests" = 500;
+      };
+      description = ''
+        Options for the Moodle PHP pool. See the documentation on <literal>php-fpm.conf</literal>
+        for details on configuration directives.
+      '';
+    };
+  };
+
+  # implementation
+  config = mkIf cfg.enable {
+
+    assertions = [
+      { assertion = cfg.database.createLocally -> cfg.database.user == user;
+        message = "services.moodle.database.user must be set to ${user} if services.moodle.database.createLocally is set true";
+      }
+      { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
+        message = "a password cannot be specified if services.moodle.database.createLocally is set to true";
+      }
+    ];
+
+    services.mysql = mkIf mysqlLocal {
+      enable = true;
+      package = mkDefault pkgs.mariadb;
+      ensureDatabases = [ cfg.database.name ];
+      ensureUsers = [
+        { name = cfg.database.user;
+          ensurePermissions = {
+            "${cfg.database.name}.*" = "SELECT, INSERT, UPDATE, DELETE, CREATE, CREATE TEMPORARY TABLES, DROP, INDEX, ALTER";
+          };
+        }
+      ];
+    };
+
+    services.postgresql = mkIf pgsqlLocal {
+      enable = true;
+      ensureDatabases = [ cfg.database.name ];
+      ensureUsers = [
+        { name = cfg.database.user;
+          ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; };
+        }
+      ];
+    };
+
+    services.phpfpm.pools.moodle = {
+      inherit user group;
+      phpEnv.MOODLE_CONFIG = "${moodleConfig}";
+      phpOptions = ''
+        zend_extension = opcache.so
+        opcache.enable = 1
+      '';
+      settings = {
+        "listen.owner" = config.services.httpd.user;
+        "listen.group" = config.services.httpd.group;
+      } // cfg.poolConfig;
+    };
+
+    services.httpd = {
+      enable = true;
+      adminAddr = mkDefault cfg.virtualHost.adminAddr;
+      extraModules = [ "proxy_fcgi" ];
+      virtualHosts = [ (mkMerge [
+        cfg.virtualHost {
+          documentRoot = mkForce "${cfg.package}/share/moodle";
+          extraConfig = ''
+            <Directory "${cfg.package}/share/moodle">
+              <FilesMatch "\.php$">
+                <If "-f %{REQUEST_FILENAME}">
+                  SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
+                </If>
+              </FilesMatch>
+              Options -Indexes
+              DirectoryIndex index.php
+            </Directory>
+          '';
+        }
+      ]) ];
+    };
+
+    systemd.tmpfiles.rules = [
+      "d '${stateDir}' 0750 ${user} ${group} - -"
+    ];
+
+    systemd.services.moodle-init = {
+      wantedBy = [ "multi-user.target" ];
+      before = [ "phpfpm-moodle.service" ];
+      after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
+      environment.MOODLE_CONFIG = moodleConfig;
+      script = ''
+        ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/check_database_schema.php && rc=$? || rc=$?
+
+        [ "$rc" == 1 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/upgrade.php \
+          --non-interactive \
+          --allow-unstable
+
+        [ "$rc" == 2 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/install_database.php \
+          --agree-license \
+          --adminpass=${cfg.initialPassword}
+
+        true
+      '';
+      serviceConfig = {
+        User = user;
+        Group = group;
+        Type = "oneshot";
+      };
+    };
+
+    systemd.services.moodle-cron = {
+      description = "Moodle cron service";
+      after = [ "moodle-init.service" ];
+      environment.MOODLE_CONFIG = moodleConfig;
+      serviceConfig = {
+        User = user;
+        Group = group;
+        ExecStart = "${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/cron.php";
+      };
+    };
+
+    systemd.timers.moodle-cron = {
+      description = "Moodle cron timer";
+      wantedBy = [ "timers.target" ];
+      timerConfig = {
+        OnCalendar = "minutely";
+      };
+    };
+
+    systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
+
+    users.users."${user}".group = group;
+
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 36a053e8e6b..e3e4ddab72c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -161,6 +161,7 @@ in
   minio = handleTest ./minio.nix {};
   misc = handleTest ./misc.nix {};
   mongodb = handleTest ./mongodb.nix {};
+  moodle = handleTest ./moodle.nix {};
   morty = handleTest ./morty.nix {};
   mosquitto = handleTest ./mosquitto.nix {};
   mpd = handleTest ./mpd.nix {};
diff --git a/nixos/tests/moodle.nix b/nixos/tests/moodle.nix
new file mode 100644
index 00000000000..565a6b63694
--- /dev/null
+++ b/nixos/tests/moodle.nix
@@ -0,0 +1,22 @@
+import ./make-test.nix ({ pkgs, lib, ... }: {
+  name = "moodle";
+  meta.maintainers = [ lib.maintainers.aanderse ];
+
+  machine =
+    { ... }:
+    { services.moodle.enable = true;
+      services.moodle.virtualHost.hostName = "localhost";
+      services.moodle.virtualHost.adminAddr = "root@example.com";
+      services.moodle.initialPassword = "correcthorsebatterystaple";
+
+      # Ensure the virtual machine has enough memory to avoid errors like:
+      # Fatal error: Out of memory (allocated 152047616) (tried to allocate 33554440 bytes)
+      virtualisation.memorySize = 2000;
+    };
+
+  testScript = ''
+    startAll;
+    $machine->waitForUnit('phpfpm-moodle.service');
+    $machine->succeed('curl http://localhost/') =~ /You are not logged in/ or die;
+  '';
+})

From e19b17cc147d58fc8e7c2ba16ffb161ec9c153fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 25 Aug 2019 14:23:01 +0200
Subject: [PATCH 149/794] rust-bindgen: fixup build with rustc 1.37

Thanks to Symphorien: #67426
---
 pkgs/development/tools/rust/bindgen/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index df782d93515..ca1c2fa45e9 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -5,6 +5,8 @@ rustPlatform.buildRustPackage rec {
   pname = "rust-bindgen";
   version = "0.51.0";
 
+  RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update
+
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = pname;

From abf17cb6acb85dab737517323c44f29b880e66ce Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Tue, 20 Aug 2019 23:52:24 +0000
Subject: [PATCH 150/794] out-of-tree: init at 1.0.1

---
 .../development/tools/out-of-tree/default.nix |  30 +++++
 pkgs/development/tools/out-of-tree/deps.nix   | 120 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 152 insertions(+)
 create mode 100644 pkgs/development/tools/out-of-tree/default.nix
 create mode 100644 pkgs/development/tools/out-of-tree/deps.nix

diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix
new file mode 100644
index 00000000000..7064cb8285e
--- /dev/null
+++ b/pkgs/development/tools/out-of-tree/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildGoPackage, fetchgit, qemu, docker, which, makeWrapper }:
+
+buildGoPackage rec {
+  pname = "out-of-tree";
+  version = "1.0.1";
+
+  buildInputs = [ makeWrapper ];
+
+  goPackagePath = "code.dumpstack.io/tools/${pname}";
+
+  src = fetchgit {
+    rev = "refs/tags/v${version}";
+    url = "https://code.dumpstack.io/tools/${pname}.git";
+    sha256 = "0p0ps73w6lmsdyf7irqgbhfxjg5smgbn081d06pnr1zmxvw8dryx";
+  };
+
+  goDeps = ./deps.nix;
+
+  postFixup = ''
+    wrapProgram $bin/bin/out-of-tree \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "kernel {module, exploit} development tool";
+    homepage = https://out-of-tree.io;
+    maintainers = [ maintainers.dump_stack ];
+    license = licenses.agpl3Plus;
+  };
+}
diff --git a/pkgs/development/tools/out-of-tree/deps.nix b/pkgs/development/tools/out-of-tree/deps.nix
new file mode 100644
index 00000000000..28c6af4586c
--- /dev/null
+++ b/pkgs/development/tools/out-of-tree/deps.nix
@@ -0,0 +1,120 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211";
+      sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "5dd71670cca4bc0ee90371eabd0f1bdba1ac6f35";
+      sha256 = "1zq7gq5bhf5w9g43680v2z6j0px366a3gmmk5dyxqv0gyrgcpm17";
+    };
+  }
+  {
+    goPackagePath = "github.com/naoina/go-stringutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/naoina/go-stringutil";
+      rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b";
+      sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6";
+    };
+  }
+  {
+    goPackagePath = "github.com/naoina/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/naoina/toml";
+      rev = "9fafd69674167c06933b1787ae235618431ce87f";
+      sha256 = "0mpvdnidgab48k7dfq1vaiz1wny8n29y7zxpipnp1zm8ibxpism0";
+    };
+  }
+  {
+    goPackagePath = "github.com/olekukonko/tablewriter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/olekukonko/tablewriter";
+      rev = "e6d60cf7ba1f42d86d54cdf5508611c4aafb3970";
+      sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj";
+    };
+  }
+  {
+    goPackagePath = "github.com/otiai10/copy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/otiai10/copy";
+      rev = "7e9a647135a142c2669943d4a4d29be015ce9392";
+      sha256 = "1fpjyk6zrcdwgw3w93v3sb4xf0gq8w5py6vvlljxgf4gi7k96klj";
+    };
+  }
+  {
+    goPackagePath = "github.com/remeh/sizedwaitgroup";
+    fetch = {
+      type = "git";
+      url = "https://github.com/remeh/sizedwaitgroup";
+      rev = "5e7302b12ccef91dce9fde2f5bda6d5c7ea5d2eb";
+      sha256 = "1xwdzby27xzcghsqhli3il165iz3vkx3g4abgvkl99wysyhcvn0a";
+    };
+  }
+  {
+    goPackagePath = "github.com/zcalusic/sysinfo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/zcalusic/sysinfo";
+      rev = "fbadb57345c2ba8d05d75e81206f665d322c0bb2";
+      sha256 = "0556jj50aw2an6a4s4v2n0kk42hbkpgcvd4gbahkdlh4qrqg2r0j";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285";
+      sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/logrusorgru/aurora.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/logrusorgru/aurora.v1";
+      rev = "a7b3b318ed4e1ae5b80602b08627267303c68572";
+      sha256 = "1dldc270z42zm2d377ks7sa5059janjcjhv3inza3rjvapknsrcb";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9608d9fc83..596679ba46d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5210,6 +5210,8 @@ in
     stdenv = clangStdenv;
   };
 
+  out-of-tree = callPackage ../development/tools/out-of-tree { };
+
   oppai-ng = callPackage ../tools/misc/oppai-ng { };
 
   update-dotdee = with python3Packages; toPythonApplication update-dotdee;

From bc238b8df55bad9d8a436e120615cc5cfbbb78dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 25 Aug 2019 14:53:27 +0200
Subject: [PATCH 151/794] firefoxPackages: fix builds based on ESR 60

Attributes: firefox-esr-60, tor-browser(-8-5), icecat
Thanks to Symphorien: #67426
---
 pkgs/applications/networking/browsers/firefox/common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index f464972a9df..e6f143c9762 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -314,6 +314,9 @@ stdenv.mkDerivation rec {
   ]
   ++ extraMakeFlags;
 
+  RUSTFLAGS = if (lib.versionAtLeast ffversion "67"/*somewhere betwween ESRs*/)
+    then null else "--cap-lints warn";
+
   enableParallelBuilding = true;
   doCheck = false; # "--disable-tests" above
 

From cabab90ad2640544476cb9e89c61e7343892ac65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Sun, 25 Aug 2019 16:34:06 +0200
Subject: [PATCH 152/794] nixos/memcached: Remove PrivateUsers

Seems to break systems using the hardened profile.
Ref #62936
cc @Izorkin
---
 nixos/modules/services/databases/memcached.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
index f9e403dfc0c..84d2c8674f4 100644
--- a/nixos/modules/services/databases/memcached.nix
+++ b/nixos/modules/services/databases/memcached.nix
@@ -103,7 +103,6 @@ in
         LockPersonality = true;
         RestrictRealtime = true;
         PrivateMounts = true;
-        PrivateUsers = true;
         MemoryDenyWriteExecute = true;
       };
     };

From 401c5d606986ac8edc09553ca5ade8d290e136b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= <mic.liamg@gmail.com>
Date: Sun, 25 Aug 2019 16:10:12 +0200
Subject: [PATCH 153/794] megasync: 4.1.1.0 -> 4.2.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
---
 pkgs/applications/misc/megasync/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index 7e66b7bf0bb..bcfd1adb4b4 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -17,9 +17,7 @@
 , lsb-release
 , mkDerivation
 , pkgconfig
-, qmake
 , qtbase
-, qtsvg
 , qttools
 , sqlite
 , swig
@@ -29,13 +27,13 @@
 
 mkDerivation rec {
   name = "megasync-${version}";
-  version = "4.1.1.0";
+  version = "4.2.3.0";
 
   src = fetchFromGitHub {
     owner = "meganz";
     repo = "MEGAsync";
     rev = "v${version}_Linux";
-    sha256 = "0lc228q3s9xp78dxjn22g6anqlsy1hi7a6yfs4q3l6gyfc3qcxl2";
+    sha256 = "0l4yfrxjb62vc9dnlzy8rjqi68ga1bys5x5rfzs40daw13yf1adv";
     fetchSubmodules = true;
   };
 
@@ -45,7 +43,6 @@ mkDerivation rec {
     doxygen
     lsb-release
     pkgconfig
-    qmake
     qttools
     swig
   ];
@@ -62,7 +59,6 @@ mkDerivation rec {
     libuv
     libzen
     qtbase
-    qtsvg
     sqlite
     unzip
     wget

From c0cd8e33c80b788f016b603756d43632f4e84eae Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Sun, 25 Aug 2019 17:07:34 +0200
Subject: [PATCH 154/794] jormungandr: installing the bootstrap scripts

---
 .../altcoins/jormungandr/default.nix             | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/applications/altcoins/jormungandr/default.nix b/pkgs/applications/altcoins/jormungandr/default.nix
index abfd3fa5171..8c276d6bb80 100644
--- a/pkgs/applications/altcoins/jormungandr/default.nix
+++ b/pkgs/applications/altcoins/jormungandr/default.nix
@@ -24,6 +24,22 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkgconfig protobuf ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
+  patchPhase = ''
+    sed -i "s~SCRIPTPATH=.*~SCRIPTPATH=$out/templates/~g" scripts/bootstrap
+  '';
+
+  installPhase = ''
+    install -d $out/bin $out/templates
+    install -m755 target/*/release/jormungandr $out/bin/
+    install -m755 target/*/release/jcli $out/bin/
+    install -m755 scripts/send-transaction $out/templates
+    install -m755 scripts/jcli-helpers $out/bin/
+    install -m755 scripts/bootstrap $out/bin/jormungandr-bootstrap
+    install -m644 scripts/faucet-send-money.shtempl $out/templates/
+    install -m644 scripts/create-account-and-delegate.shtempl $out/templates/
+    install -m644 scripts/faucet-send-certificate.shtempl $out/templates/
+  '';
+
   PROTOC = "${protobuf}/bin/protoc";
 
   # Disabling integration tests

From f6ced211e68cd1b00cb3df98504d778d191fdd58 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Sun, 25 Aug 2019 17:37:58 +0200
Subject: [PATCH 155/794] nixos/jormungandr: changing the port to match
 upstream

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

diff --git a/nixos/modules/services/networking/jormungandr.nix b/nixos/modules/services/networking/jormungandr.nix
index c1a16a316b7..0c66b85fe8a 100644
--- a/nixos/modules/services/networking/jormungandr.nix
+++ b/nixos/modules/services/networking/jormungandr.nix
@@ -13,7 +13,7 @@ let
   configSettings = {
     storage = dataDir;
     p2p = {
-      public_address = "/ip4/127.0.0.1/tcp/8606";
+      public_address = "/ip4/127.0.0.1/tcp/8299";
       messages = "high";
       blocks = "high";
     };

From 1a6d3f5bc25a1cd8879f25d1086aa63eb810d4ff Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Sun, 25 Aug 2019 18:07:59 +0200
Subject: [PATCH 156/794] nixos/jormungandr: adding genesis tests

---
 nixos/tests/jormungandr.nix | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/nixos/tests/jormungandr.nix b/nixos/tests/jormungandr.nix
index ab4edf0506a..2abafc53ce5 100644
--- a/nixos/tests/jormungandr.nix
+++ b/nixos/tests/jormungandr.nix
@@ -5,9 +5,17 @@ import ./make-test.nix ({ pkgs, ... }: {
   };
 
   nodes = {
+    # Testing the Byzantine Fault Tolerant protocol
     bft = { ... }: {
       environment.systemPackages = [ pkgs.jormungandr ];
+      services.jormungandr.enable = true;
+      services.jormungandr.genesisBlockFile = "/var/lib/jormungandr/block-0.bin";
+      services.jormungandr.secretFile = "/etc/secrets/jormungandr.yaml";
+    };
 
+    # Testing the Ouroboros Genesis Praos protocol
+    genesis = { ... }: {
+      environment.systemPackages = [ pkgs.jormungandr ];
       services.jormungandr.enable = true;
       services.jormungandr.genesisBlockFile = "/var/lib/jormungandr/block-0.bin";
       services.jormungandr.secretFile = "/etc/secrets/jormungandr.yaml";
@@ -17,6 +25,7 @@ import ./make-test.nix ({ pkgs, ... }: {
   testScript = ''
     startAll;
 
+    ## Testing BFT
     # Let's wait for the StateDirectory
     $bft->waitForFile("/var/lib/jormungandr/");
 
@@ -45,5 +54,24 @@ import ./make-test.nix ({ pkgs, ... }: {
 
     # Now we can test if we are able to reach the REST API
     $bft->waitUntilSucceeds("curl -L http://localhost:8607/api/v0/node/stats | grep uptime");
+
+    ## Testing Genesis
+    # Let's wait for the StateDirectory
+    $genesis->waitForFile("/var/lib/jormungandr/");
+
+    # Bootstraping the configuration
+    $genesis->succeed("jormungandr-bootstrap -g -p 8607 -s 1");
+
+    # Moving generated files in place
+    $genesis->succeed("mkdir -p /etc/secrets");
+    $genesis->succeed("mv pool-secret1.yaml /etc/secrets/jormungandr.yaml");
+    $genesis->succeed("mv block-0.bin /var/lib/jormungandr/");
+
+    # We should have everything to start the service now
+    $genesis->succeed("systemctl restart jormungandr");
+    $genesis->waitForUnit("jormungandr.service");
+
+    # Now we can create and delegate an account
+    $genesis->succeed("./create-account-and-delegate.sh | tee -a /tmp/delegate.log");
   '';
 })

From 04de5d7c3c13956252ebb6942f94abbd972883c0 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Sun, 25 Aug 2019 18:49:35 +0200
Subject: [PATCH 157/794] exiv2: 0.27.1 -> 0.27.2

Fixes #67194
---
 pkgs/development/libraries/exiv2/default.nix     | 11 +++--------
 pkgs/development/libraries/exiv2/fix-cmake.patch | 16 ----------------
 2 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/exiv2/fix-cmake.patch

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 9b05165e1b2..f0e685d3daf 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -14,20 +14,15 @@
 
 stdenv.mkDerivation rec {
   pname = "exiv2";
-  version = "0.27.1";
+  version = "0.27.2";
 
   src = fetchFromGitHub rec {
     owner = "exiv2";
     repo  = "exiv2";
-    rev = version;
-    sha256 = "0b5m921070fkyif0zlyb49gly3p6xd0hv1jyym4j25hx12gzbx0c";
+    rev = "v${version}";
+    sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf";
   };
 
-  patches = [
-    # https://github.com/Exiv2/exiv2/commit/aae88060ca85a483cd7fe791ba116c04d96c0bf9#comments
-    ./fix-cmake.patch
-  ];
-
   cmakeFlags = [
     "-DEXIV2_BUILD_PO=ON"
     "-DEXIV2_BUILD_DOC=ON"
diff --git a/pkgs/development/libraries/exiv2/fix-cmake.patch b/pkgs/development/libraries/exiv2/fix-cmake.patch
deleted file mode 100644
index 1e19aed8b90..00000000000
--- a/pkgs/development/libraries/exiv2/fix-cmake.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 34087004..41b3a068 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -239,9 +239,9 @@ install(FILES
-     ${CMAKE_BINARY_DIR}/exiv2lib_export.h
-     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
- 
--install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
-+install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
- 
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
- 
- # ******************************************************************************
- # exiv2 application

From 3ce3e759462acd6afec66fff55d216ac08730b63 Mon Sep 17 00:00:00 2001
From: scalavision <scalavison@gmail.com>
Date: Sun, 25 Aug 2019 18:31:17 +0000
Subject: [PATCH 158/794] singularity: prepatch path to cp in 3.2.1

---
 pkgs/applications/virtualization/singularity/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 8ec9ec6c8b4..e146086b554 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -31,6 +31,11 @@ buildGoPackage rec {
   nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper ];
   propagatedBuildInputs = [ coreutils squashfsTools ];
 
+  prePatch = ''
+    substituteInPlace internal/pkg/build/copy/copy.go \
+      --replace /bin/cp ${coreutils}/bin/cp
+  '';
+
   postConfigure = ''
     cd go/src/github.com/sylabs/singularity
 

From aec95ecf0df93665ba53af1b4e771ee5f00b6c16 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 25 Aug 2019 20:11:30 +0200
Subject: [PATCH 159/794] wev: init at 2019-08-11

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

diff --git a/pkgs/tools/misc/wev/default.nix b/pkgs/tools/misc/wev/default.nix
new file mode 100644
index 00000000000..fa69cc4445e
--- /dev/null
+++ b/pkgs/tools/misc/wev/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl
+, pkg-config, scdoc
+, wayland, wayland-protocols, libxkbcommon
+}:
+
+let
+  version = "2019-08-11";
+  commit = "47d17393473be152cf601272faf5704fff1c3f92";
+in stdenv.mkDerivation {
+  pname = "wev-unstable";
+  inherit version;
+
+  src = fetchurl {
+    url = "https://git.sr.ht/~sircmpwn/wev/archive/${commit}.tar.gz";
+    sha256 = "0a5kvrviz77bf7357gqs2iy7a1bvb3izgkmiv1rdxzzmihd563ga";
+  };
+
+  nativeBuildInputs = [ pkg-config scdoc ];
+  buildInputs = [ wayland wayland-protocols libxkbcommon ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Wayland event viewer";
+    longDescription = ''
+      This is a tool for debugging events on a Wayland window, analagous to the
+      X11 tool xev.
+    '';
+    homepage = https://git.sr.ht/~sircmpwn/wev;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e8da08f197..e5e13fc449a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2804,6 +2804,8 @@ in
 
   wallutils = callPackage ../tools/graphics/wallutils { };
 
+  wev = callPackage ../tools/misc/wev { };
+
   wl-clipboard = callPackage ../tools/misc/wl-clipboard { };
 
   z-lua = callPackage ../tools/misc/z-lua { };

From 842942baaa82e5a6c53e45c1dcaf1c85e7113b07 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Aug 2019 22:19:45 +0200
Subject: [PATCH 160/794] mailman: update from 2.1.29 to version 3.2.2

---
 .../python-modules/flufl/bounce.nix           | 14 +++++
 .../development/python-modules/flufl/i18n.nix | 13 +++++
 .../development/python-modules/flufl/lock.nix | 13 +++++
 .../python-modules/lazr/config.nix            | 13 +++++
 .../python-modules/lazr/delegates.nix         | 15 ++++++
 pkgs/servers/mail/mailman/default.nix         | 51 +++++++++++--------
 .../servers/mail/mailman/fix-var-prefix.patch | 33 ------------
 pkgs/top-level/all-packages.nix               |  2 -
 pkgs/top-level/python-packages.nix            | 12 +++++
 9 files changed, 109 insertions(+), 57 deletions(-)
 create mode 100644 pkgs/development/python-modules/flufl/bounce.nix
 create mode 100644 pkgs/development/python-modules/flufl/i18n.nix
 create mode 100644 pkgs/development/python-modules/flufl/lock.nix
 create mode 100644 pkgs/development/python-modules/lazr/config.nix
 create mode 100644 pkgs/development/python-modules/lazr/delegates.nix
 delete mode 100644 pkgs/servers/mail/mailman/fix-var-prefix.patch

diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix
new file mode 100644
index 00000000000..0a2e8dff1b7
--- /dev/null
+++ b/pkgs/development/python-modules/flufl/bounce.nix
@@ -0,0 +1,14 @@
+{ buildPythonPackage, fetchPypi, atpublic, zope_interface, nose2 }:
+
+buildPythonPackage rec {
+  pname = "flufl.bounce";
+  version = "3.0";
+
+  buildInputs = [ nose2 ];
+  propagatedBuildInputs = [ atpublic zope_interface ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0k5kjqa3x6gvwwxyzb2vwi1g1i6asm1zw5fivylxz3d583y4kid2";
+  };
+}
diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix
new file mode 100644
index 00000000000..6e8d77bf4f8
--- /dev/null
+++ b/pkgs/development/python-modules/flufl/i18n.nix
@@ -0,0 +1,13 @@
+{ buildPythonPackage, fetchPypi, atpublic }:
+
+buildPythonPackage rec {
+  pname = "flufl.i18n";
+  version = "2.0.2";
+
+  propagatedBuildInputs = [ atpublic ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1csgds59nx0ann9v2alqr69lakp1cnc1ikmbgn96l6n23js7c2ah";
+  };
+}
diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix
new file mode 100644
index 00000000000..1be5d9a7c4c
--- /dev/null
+++ b/pkgs/development/python-modules/flufl/lock.nix
@@ -0,0 +1,13 @@
+{ buildPythonPackage, fetchPypi, atpublic }:
+
+buildPythonPackage rec {
+  pname = "flufl.lock";
+  version = "3.2";
+
+  propagatedBuildInputs = [ atpublic ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0nzzd6l30ff6cwsrlrb94xzfja4wkyrqv3ydc6cz0hdbr766mmm8";
+  };
+}
diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix
new file mode 100644
index 00000000000..759c9689bc9
--- /dev/null
+++ b/pkgs/development/python-modules/lazr/config.nix
@@ -0,0 +1,13 @@
+{ buildPythonPackage, fetchPypi, lazr_delegates }:
+
+buildPythonPackage rec {
+  pname = "lazr.config";
+  version = "2.2.1";
+
+  propagatedBuildInputs = [ lazr_delegates ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1s7pyvlq06qjrkaw9r6nc290lb095n25ybzgavvy51ygpxkgqxwn";
+  };
+}
diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix
new file mode 100644
index 00000000000..40e2e47d517
--- /dev/null
+++ b/pkgs/development/python-modules/lazr/delegates.nix
@@ -0,0 +1,15 @@
+{ buildPythonPackage, fetchPypi, nose, zope_interface }:
+
+buildPythonPackage rec {
+  pname = "lazr.delegates";
+  version = "2.0.4";
+
+  propagatedBuildInputs = [ nose zope_interface ];
+
+  doCheck = false;  # cannot import name 'ClassType' from 'types'
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx";
+  };
+}
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index 91445afa97d..e3cd393c3c3 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -1,33 +1,40 @@
-{ stdenv, fetchurl, python2 }:
+{ stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython
+, flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib
+, requests, zope_configuration, click, falcon, importlib-resources
+, zope_component
+}:
 
-stdenv.mkDerivation rec {
-  name = "mailman-${version}";
-  version = "2.1.29";
+buildPythonPackage rec {
+  pname = "mailman";
+  version = "3.2.2";
 
-  src = fetchurl {
-    url = "mirror://gnu/mailman/${name}.tgz";
-    sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6";
   };
 
-  buildInputs = [ python2 python2.pkgs.dnspython ];
-
-  patches = [ ./fix-var-prefix.patch ];
-
-  configureFlags = [
-    "--without-permcheck"
-    "--with-cgi-ext=.cgi"
-    "--with-var-prefix=/var/lib/mailman"
+  propagatedBuildInputs = [
+    alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock
+    importlib-resources lazr_config passlib requests zope_configuration
+    zope_component
   ];
 
-  installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'.
-
-  makeFlags = [ "DIRSETGID=:" ];
+  # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping
+  # them in shell code breaks this assumption. The proper way to use mailman is
+  # to create a specialized python interpreter:
+  #
+  #   python37.withPackages (ps: [ps.mailman])
+  #
+  # This gives a properly wrapped 'mailman' command plus an interpreter that
+  # has all the necessary search paths to execute unwrapped 'master' and
+  # 'runner' scripts. The setup is a little tricky, but fortunately NixOS is
+  # about to get a OS module that takes care of those details.
+  dontWrapPythonPrograms = true;
 
   meta = {
     homepage = https://www.gnu.org/software/mailman/;
-    description = "Free software for managing electronic mail discussion and e-newsletter lists";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    description = "Free software for managing electronic mail discussion and newsletter lists";
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ peti ];
   };
 }
diff --git a/pkgs/servers/mail/mailman/fix-var-prefix.patch b/pkgs/servers/mail/mailman/fix-var-prefix.patch
deleted file mode 100644
index 9bb735ecbed..00000000000
--- a/pkgs/servers/mail/mailman/fix-var-prefix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ubr mailman-2.1.16-orig/contrib/redhat_fhs.patch mailman-2.1.16/contrib/redhat_fhs.patch
---- mailman-2.1.16-orig/contrib/redhat_fhs.patch	2013-10-21 14:55:48.797631434 +0200
-+++ mailman-2.1.16/contrib/redhat_fhs.patch	2013-10-21 14:56:42.534310378 +0200
-@@ -197,7 +197,7 @@
- +	    else true; \
- +	    fi; \
- +	done
-- 	chmod o-r $(DESTDIR)$(var_prefix)/archives/private
-+ 	chmod o-r $(prefix)$(var_prefix)/archives/private
-  	@for d in $(ARCH_INDEP_DIRS); \
-  	do \
- Only in mailman-2.1.5.FHS: Makefile.in~
-diff -ubr mailman-2.1.16-orig/Makefile.in mailman-2.1.16/Makefile.in
---- mailman-2.1.16-orig/Makefile.in	2013-10-21 14:55:48.798631519 +0200
-+++ mailman-2.1.16/Makefile.in	2013-10-21 14:56:42.562313220 +0200
-@@ -87,7 +87,7 @@
- 	@echo "Creating architecture independent directories..."
- 	@for d in $(VAR_DIRS); \
- 	do \
--	    dir=$(DESTDIR)$(var_prefix)/$$d; \
-+	    dir=$(prefix)$(var_prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
- 		$(srcdir)/mkinstalldirs $$dir; \
-@@ -96,7 +96,7 @@
- 	    else true; \
- 	    fi; \
- 	done
--	chmod o-r $(DESTDIR)$(var_prefix)/archives/private
-+	chmod o-r $(prefix)$(var_prefix)/archives/private
- 	@for d in $(ARCH_INDEP_DIRS); \
- 	do \
- 	    dir=$(DESTDIR)$(prefix)/$$d; \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b01b7a6bff..c819d1e893f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14669,8 +14669,6 @@ in
 
   labelImg = callPackage ../applications/science/machine-learning/labelimg { };
 
-  mailman = callPackage ../servers/mail/mailman { };
-
   mailman-rss = callPackage ../development/python-modules/mailman-rss { };
 
   mattermost = callPackage ../servers/mattermost { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c61bab85fa7..e77d3aecea2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -583,6 +583,12 @@ in {
 
   firetv = callPackage ../development/python-modules/firetv { };
 
+  flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { };
+
+  flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { };
+
+  flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { };
+
   foxdot = callPackage ../development/python-modules/foxdot { };
 
   fsspec = callPackage ../development/python-modules/fsspec { };
@@ -685,6 +691,10 @@ in {
 
   langdetect = callPackage ../development/python-modules/langdetect { };
 
+  lazr_config = callPackage ../development/python-modules/lazr/config.nix { };
+
+  lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { };
+
   libmr = callPackage ../development/python-modules/libmr { };
 
   limitlessled = callPackage ../development/python-modules/limitlessled { };
@@ -701,6 +711,8 @@ in {
 
   mail-parser = callPackage ../development/python-modules/mail-parser { };
 
+  mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman { });
+
   manhole = callPackage ../development/python-modules/manhole { };
 
   markerlib = callPackage ../development/python-modules/markerlib { };

From e6878f36d895214ee53fad03393512617c11c495 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 25 Aug 2019 22:53:20 +0300
Subject: [PATCH 161/794] lispPackages: update to Quicklisp release 2019-07-11

Fixes:

Survive empty ASDF description (UIOP)
Patch "split-sequence" that misses :serial
---
 .../lisp-modules/lisp-packages.nix            |  4 ++--
 .../quicklisp-to-nix-output/cffi-grovel.nix   | 14 +++++------
 .../cffi-toolchain.nix                        | 14 +++++------
 .../quicklisp-to-nix-output/cffi.nix          | 14 +++++------
 .../quicklisp-to-nix-output/chipz.nix         | 14 +++++------
 .../quicklisp-to-nix-output/cl-async-repl.nix | 14 +++++------
 .../quicklisp-to-nix-output/cl-async-ssl.nix  | 14 +++++------
 .../quicklisp-to-nix-output/cl-async.nix      | 14 +++++------
 .../quicklisp-to-nix-output/cl-dbi.nix        | 14 +++++------
 .../quicklisp-to-nix-output/cl-emb.nix        | 14 +++++------
 .../cl-fuse-meta-fs.nix                       | 14 +++++------
 .../quicklisp-to-nix-output/cl-fuse.nix       | 14 +++++------
 .../cl-html5-parser.nix                       | 14 +++++------
 .../quicklisp-to-nix-output/cl-interpol.nix   |  4 ++--
 .../quicklisp-to-nix-output/cl-markup.nix     |  4 ++--
 .../quicklisp-to-nix-output/cl-postgres.nix   | 14 +++++------
 .../cl-ppcre-unicode.nix                      | 14 +++++------
 .../quicklisp-to-nix-output/cl-ppcre.nix      | 14 +++++------
 .../quicklisp-to-nix-output/cl-project.nix    | 14 +++++------
 .../quicklisp-to-nix-output/cl-smtp.nix       | 14 +++++------
 .../quicklisp-to-nix-output/cl-unicode.nix    | 14 +++++------
 .../quicklisp-to-nix-output/cl-who.nix        | 14 +++++------
 .../quicklisp-to-nix-output/cl_plus_ssl.nix   | 17 ++++++--------
 .../clack-handler-hunchentoot.nix             | 14 +++++------
 .../quicklisp-to-nix-output/clack-socket.nix  | 14 +++++------
 .../quicklisp-to-nix-output/clack-test.nix    | 14 +++++------
 .../clack-v1-compat.nix                       | 14 +++++------
 .../quicklisp-to-nix-output/clack.nix         | 14 +++++------
 .../quicklisp-to-nix-output/closer-mop.nix    | 14 +++++------
 .../closure-common.nix                        |  4 ++--
 .../quicklisp-to-nix-output/clss.nix          | 14 +++++------
 .../quicklisp-to-nix-output/clx.nix           | 14 +++++------
 .../command-line-arguments.nix                | 14 +++++------
 .../quicklisp-to-nix-output/cxml-stp.nix      | 20 ++++++++--------
 .../quicklisp-to-nix-output/dbd-mysql.nix     | 14 +++++------
 .../quicklisp-to-nix-output/dbd-postgres.nix  | 14 +++++------
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   | 19 +++++++--------
 .../quicklisp-to-nix-output/dbi.nix           | 14 +++++------
 .../quicklisp-to-nix-output/dexador.nix       | 14 +++++------
 .../documentation-utils.nix                   | 14 +++++------
 .../quicklisp-to-nix-output/drakma.nix        | 14 +++++------
 .../quicklisp-to-nix-output/esrap.nix         | 14 +++++------
 .../external-program.nix                      | 14 +++++------
 .../quicklisp-to-nix-output/fiasco.nix        | 14 +++++------
 .../quicklisp-to-nix-output/form-fiddle.nix   | 14 +++++------
 .../hu_dot_dwim_dot_asdf.nix                  | 14 +++++------
 .../quicklisp-to-nix-output/ironclad.nix      | 22 ++++++++++--------
 .../quicklisp-to-nix-output/jonathan.nix      | 14 +++++------
 .../quicklisp-to-nix-output/kmrcl.nix         |  4 ++--
 .../lack-component.nix                        | 14 +++++------
 .../lack-middleware-backtrace.nix             | 14 +++++------
 .../quicklisp-to-nix-output/lack-util.nix     | 21 +++++++++--------
 .../quicklisp-to-nix-output/lack.nix          | 23 +++++++++++--------
 .../quicklisp-to-nix-output/lift.nix          | 14 +++++------
 .../quicklisp-to-nix-output/local-time.nix    | 14 +++++------
 .../quicklisp-to-nix-output/lquery.nix        | 14 +++++------
 .../quicklisp-to-nix-output/map-set.nix       | 14 +++++------
 .../quicklisp-to-nix-output/pcall-queue.nix   |  4 ++--
 .../quicklisp-to-nix-output/plump.nix         | 14 +++++------
 .../quicklisp-to-nix-output/query-fs.nix      | 14 +++++------
 .../quicklisp-to-nix-output/quri.nix          | 14 +++++------
 .../quicklisp-to-nix-output/simple-date.nix   | 14 +++++------
 .../split-sequence.nix                        | 14 +++++------
 .../quicklisp-to-nix-output/sqlite.nix        |  4 ++--
 .../quicklisp-to-nix-output/stumpwm.nix       | 14 +++++------
 .../quicklisp-to-nix-output/swank.nix         | 18 +++++++--------
 .../trivial-backtrace.nix                     | 14 +++++------
 .../trivial-features.nix                      | 14 +++++------
 .../trivial-garbage.nix                       | 16 ++++++-------
 .../trivial-indent.nix                        | 14 +++++------
 .../quicklisp-to-nix-output/trivial-mimes.nix | 14 +++++------
 .../quicklisp-to-nix-output/uiop.nix          | 18 +++++++--------
 .../quicklisp-to-nix-output/usocket.nix       | 14 +++++------
 .../quicklisp-to-nix-output/woo.nix           | 14 +++++------
 .../quicklisp-to-nix-output/xembed.nix        | 19 +++++++--------
 .../quicklisp-to-nix-output/xpath.nix         | 14 +++++------
 .../quicklisp-to-nix-overrides.nix            |  7 ++++++
 .../lisp-modules/quicklisp-to-nix.nix         |  7 ++++++
 .../quicklisp-to-nix/system-info.lisp         |  5 +++-
 79 files changed, 545 insertions(+), 521 deletions(-)

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index b0e97038b7b..08339802950 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -24,8 +24,8 @@ let lispPackages = rec {
       quicklispdist = pkgs.fetchurl {
         # Will usually be replaced with a fresh version anyway, but needs to be
         # a valid distinfo.txt
-        url = "https://beta.quicklisp.org/dist/quicklisp/2019-01-07/distinfo.txt";
-        sha256 = "1f0giy182p6qlmmqljir92566c8l1g2sv41cbzv86s3kv0j640fd";
+        url = "https://beta.quicklisp.org/dist/quicklisp/2019-07-11/distinfo.txt";
+        sha256 = "0r7ga5gkiy6va1v7a01fnj1yp97pifl9v8fnqpvbiv33dwdvbx2w";
       };
       buildPhase = '' true; '';
       postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index 1af0947627f..a7d22ac129b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cffi-grovel'';
-  version = ''cffi_0.20.0'';
+  version = ''cffi_0.20.1'';
 
   description = ''The CFFI Groveller'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz'';
-    sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z'';
+    url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz'';
+    sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka'';
   };
 
   packageName = "cffi-grovel";
@@ -18,13 +18,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256
-    1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL
-    http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5
-    94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-grovel FILENAME cffi-grovel DEPS
+    0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL
+    http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5
+    b8a8337465a7b4c1be05270b777ce14f NAME cffi-grovel FILENAME cffi-grovel DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME trivial-features FILENAME trivial-features))
     DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features)
-    VERSION cffi_0.20.0 SIBLINGS
+    VERSION cffi_0.20.1 SIBLINGS
     (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
index c440c72788f..3d246380607 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cffi-toolchain'';
-  version = ''cffi_0.20.0'';
+  version = ''cffi_0.20.1'';
 
   description = ''The CFFI toolchain'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz'';
-    sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z'';
+    url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz'';
+    sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka'';
   };
 
   packageName = "cffi-toolchain";
@@ -18,14 +18,14 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256
-    1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL
-    http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5
-    94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-toolchain FILENAME
+    0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL
+    http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5
+    b8a8337465a7b4c1be05270b777ce14f NAME cffi-toolchain FILENAME
     cffi-toolchain DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi)
      (NAME trivial-features FILENAME trivial-features))
-    DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.0
+    DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.1
     SIBLINGS
     (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index 001c7d9a545..b83b1461197 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cffi'';
-  version = ''cffi_0.20.0'';
+  version = ''cffi_0.20.1'';
 
   parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz'';
-    sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z'';
+    url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz'';
+    sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka'';
   };
 
   packageName = "cffi";
@@ -20,15 +20,15 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256
-    1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL
-    http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5
-    94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi FILENAME cffi DEPS
+    0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL
+    http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5
+    b8a8337465a7b4c1be05270b777ce14f NAME cffi FILENAME cffi DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME trivial-features FILENAME trivial-features)
      (NAME uiop FILENAME uiop))
     DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop)
-    VERSION cffi_0.20.0 SIBLINGS
+    VERSION cffi_0.20.1 SIBLINGS
     (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain
      cffi-uffi-compat)
     PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index a9808173b62..c30c68e53c8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''chipz'';
-  version = ''20180328-git'';
+  version = ''20190202-git'';
 
   description = ''A library for decompressing deflate, zlib, and gzip data'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz'';
-    sha256 = ''0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7'';
+    url = ''http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz'';
+    sha256 = ''1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a'';
   };
 
   packageName = "chipz";
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM chipz DESCRIPTION
     A library for decompressing deflate, zlib, and gzip data SHA256
-    0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7 URL
-    http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz
-    MD5 a548809d6ef705c69356a2057ecd8a52 NAME chipz FILENAME chipz DEPS NIL
-    DEPENDENCIES NIL VERSION 20180328-git SIBLINGS NIL PARASITES NIL) */
+    1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a URL
+    http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz
+    MD5 e3533408ca6899fe996eede390e820c7 NAME chipz FILENAME chipz DEPS NIL
+    DEPENDENCIES NIL VERSION 20190202-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index d678fd8e942..d84233c4342 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async-repl'';
-  version = ''cl-async-20190107-git'';
+  version = ''cl-async-20190307-git'';
 
   description = ''REPL integration for CL-ASYNC.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz'';
-    sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz'';
+    sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6'';
   };
 
   packageName = "cl-async-repl";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
-    11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL
-    http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz
-    MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-repl FILENAME
+    1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL
+    http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz
+    MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async-repl FILENAME
     cl-async-repl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -39,5 +39,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
      cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
      trivial-features trivial-gray-streams vom)
-    VERSION cl-async-20190107-git SIBLINGS
+    VERSION cl-async-20190307-git SIBLINGS
     (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index 722e05ed09c..c13b8b70647 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async-ssl'';
-  version = ''cl-async-20190107-git'';
+  version = ''cl-async-20190307-git'';
 
   description = ''SSL Wrapper around cl-async socket implementation.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz'';
-    sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz'';
+    sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6'';
   };
 
   packageName = "cl-async-ssl";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM cl-async-ssl DESCRIPTION
     SSL Wrapper around cl-async socket implementation. SHA256
-    11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL
-    http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz
-    MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-ssl FILENAME
+    1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL
+    http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz
+    MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async-ssl FILENAME
     cl-async-ssl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -40,5 +40,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
      cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
      trivial-features trivial-gray-streams vom)
-    VERSION cl-async-20190107-git SIBLINGS
+    VERSION cl-async-20190307-git SIBLINGS
     (cl-async-repl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index edb4b01b0d1..363227534a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async'';
-  version = ''20190107-git'';
+  version = ''20190307-git'';
 
   parasites = [ "cl-async-base" "cl-async-util" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz'';
-    sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz'';
+    sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6'';
   };
 
   packageName = "cl-async";
@@ -20,9 +20,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
-    11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL
-    http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz
-    MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async FILENAME cl-async DEPS
+    1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL
+    http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz
+    MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async FILENAME cl-async DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -37,5 +37,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv
      cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop
      vom)
-    VERSION 20190107-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
+    VERSION 20190307-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
     PARASITES (cl-async-base cl-async-util)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index a1da44a6b89..bdc5fe920cf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-dbi'';
-  version = ''20190107-git'';
+  version = ''20190521-git'';
 
   description = '''';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
-    sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
+    sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
   };
 
   packageName = "cl-dbi";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
-    02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
-    http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
-    MD5 349829f5d0bf363b828827ad6728c54e NAME cl-dbi FILENAME cl-dbi DEPS
+    1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
+    MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME cl-dbi FILENAME cl-dbi DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
      dbi named-readtables split-sequence trivial-types)
-    VERSION 20190107-git SIBLINGS
+    VERSION 20190521-git SIBLINGS
     (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 78f70be2f1f..1510495a4cb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-emb'';
-  version = ''20180228-git'';
+  version = ''20190521-git'';
 
   description = ''A templating system for Common Lisp'';
 
   deps = [ args."cl-ppcre" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz'';
-    sha256 = ''0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw'';
+    url = ''http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz'';
+    sha256 = ''1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d'';
   };
 
   packageName = "cl-emb";
@@ -18,8 +18,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256
-    0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw URL
-    http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz
-    MD5 94db80b2a91611e71ada33f500b49d22 NAME cl-emb FILENAME cl-emb DEPS
+    1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d URL
+    http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz
+    MD5 b27bbe8de2206ab7c461700b58d4d527 NAME cl-emb FILENAME cl-emb DEPS
     ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
-    20180228-git SIBLINGS NIL PARASITES NIL) */
+    20190521-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index c33efa2eb08..6a40d0fa8c9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-fuse-meta-fs'';
-  version = ''20150608-git'';
+  version = ''20190710-git'';
 
   description = ''CFFI bindings to FUSE (Filesystem in user space)'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz'';
-    sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2'';
+    url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz'';
+    sha256 = ''1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7'';
   };
 
   packageName = "cl-fuse-meta-fs";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM cl-fuse-meta-fs DESCRIPTION
     CFFI bindings to FUSE (Filesystem in user space) SHA256
-    1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL
-    http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz
-    MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs FILENAME
+    1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7 URL
+    http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz
+    MD5 461f7023274fb273e6c759e881bdd636 NAME cl-fuse-meta-fs FILENAME
     cl-fuse-meta-fs DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -37,4 +37,4 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse
      cl-utilities iterate pcall pcall-queue trivial-backtrace trivial-features
      trivial-utf-8)
-    VERSION 20150608-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index d41fe76ca23..de71e2e299a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-fuse'';
-  version = ''20160318-git'';
+  version = ''20190710-git'';
 
   description = ''CFFI bindings to FUSE (Filesystem in user space)'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz'';
-    sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6'';
+    url = ''http://beta.quicklisp.org/archive/cl-fuse/2019-07-10/cl-fuse-20190710-git.tgz'';
+    sha256 = ''1gxah8qwwb9xlvbdy5xxz07hh2hsw7xdrps1n4slhz4x6vyy80li'';
   };
 
   packageName = "cl-fuse";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space)
-    SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL
-    http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz
-    MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse FILENAME cl-fuse DEPS
+    SHA256 1gxah8qwwb9xlvbdy5xxz07hh2hsw7xdrps1n4slhz4x6vyy80li URL
+    http://beta.quicklisp.org/archive/cl-fuse/2019-07-10/cl-fuse-20190710-git.tgz
+    MD5 5f267e59eb2358b1b6e4e735fb408e6a NAME cl-fuse FILENAME cl-fuse DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -32,4 +32,4 @@ rec {
     DEPENDENCIES
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain
      cl-utilities iterate trivial-backtrace trivial-features trivial-utf-8)
-    VERSION 20160318-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
index d1ce782e7f8..dde2cc31dd0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-html5-parser'';
-  version = ''20171019-git'';
+  version = ''20190521-git'';
 
   description = ''A HTML5 parser for Common Lisp'';
 
   deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz'';
-    sha256 = ''0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98'';
+    url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz'';
+    sha256 = ''055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p'';
   };
 
   packageName = "cl-html5-parser";
@@ -18,14 +18,14 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-html5-parser DESCRIPTION A HTML5 parser for Common Lisp SHA256
-    0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98 URL
-    http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz
-    MD5 c4a18ac20668c9aef723954fb901c16b NAME cl-html5-parser FILENAME
+    055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p URL
+    http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz
+    MD5 149e5609d0a96c867fac6c22693c5e30 NAME cl-html5-parser FILENAME
     cl-html5-parser DEPS
     ((NAME cl-ppcre FILENAME cl-ppcre)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME string-case FILENAME string-case)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams))
     DEPENDENCIES (cl-ppcre flexi-streams string-case trivial-gray-streams)
-    VERSION 20171019-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests)
+    VERSION 20190521-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
index 1f58be6c09e..b0be8c775a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -5,7 +5,7 @@ rec {
 
   parasites = [ "cl-interpol-test" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ];
 
@@ -19,7 +19,7 @@ rec {
   asdFilesToKeep = ["cl-interpol.asd"];
   overrides = x: x;
 }
-/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256
+/* (SYSTEM cl-interpol DESCRIPTION System lacks description SHA256
     1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r URL
     http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz
     MD5 b2d6893ef703c5b6e5736fa33ba0794e NAME cl-interpol FILENAME cl-interpol
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 8967b0970c5..b1916c27bfd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -3,7 +3,7 @@ rec {
   baseName = ''cl-markup'';
   version = ''20131003-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ rec {
   asdFilesToKeep = ["cl-markup.asd"];
   overrides = x: x;
 }
-/* (SYSTEM cl-markup DESCRIPTION NIL SHA256
+/* (SYSTEM cl-markup DESCRIPTION System lacks description SHA256
     1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r URL
     http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz
     MD5 3ec36b8e15435933f614959032987848 NAME cl-markup FILENAME cl-markup DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 08b6a492e76..2fad295c7ee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-postgres'';
-  version = ''postmodern-20190107-git'';
+  version = ''postmodern-20190521-git'';
 
   parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz'';
-    sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz'';
+    sha256 = ''1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5'';
   };
 
   packageName = "cl-postgres";
@@ -20,14 +20,14 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
-    SHA256 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL
-    http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz
-    MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME cl-postgres FILENAME cl-postgres
+    SHA256 1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL
+    http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz
+    MD5 102567f386757cd52aca500c0c348d90 NAME cl-postgres FILENAME cl-postgres
     DEPS
     ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)
      (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
      (NAME split-sequence FILENAME split-sequence)
      (NAME usocket FILENAME usocket))
     DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket)
-    VERSION postmodern-20190107-git SIBLINGS (postmodern s-sql simple-date)
+    VERSION postmodern-20190521-git SIBLINGS (postmodern s-sql simple-date)
     PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index e65c0a03ddc..27887f12497 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-ppcre-unicode'';
-  version = ''cl-ppcre-20180831-git'';
+  version = ''cl-ppcre-20190521-git'';
 
   parasites = [ "cl-ppcre-unicode-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz'';
-    sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb'';
+    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz'';
+    sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx'';
   };
 
   packageName = "cl-ppcre-unicode";
@@ -21,13 +21,13 @@ rec {
 }
 /* (SYSTEM cl-ppcre-unicode DESCRIPTION
     Perl-compatible regular expression library (Unicode) SHA256
-    03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL
-    http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz
-    MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre-unicode FILENAME
+    0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx URL
+    http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz
+    MD5 a980b75c1b386b49bcb28107991eb4ec NAME cl-ppcre-unicode FILENAME
     cl-ppcre-unicode DEPS
     ((NAME cl-ppcre FILENAME cl-ppcre)
      (NAME cl-ppcre-test FILENAME cl-ppcre-test)
      (NAME cl-unicode FILENAME cl-unicode)
      (NAME flexi-streams FILENAME flexi-streams))
     DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION
-    cl-ppcre-20180831-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
+    cl-ppcre-20190521-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index 3f56cf3dfae..8bb8fb2478d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-ppcre'';
-  version = ''20180831-git'';
+  version = ''20190521-git'';
 
   parasites = [ "cl-ppcre-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz'';
-    sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb'';
+    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz'';
+    sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx'';
   };
 
   packageName = "cl-ppcre";
@@ -20,8 +20,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library
-    SHA256 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL
-    http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz
-    MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre FILENAME cl-ppcre DEPS
+    SHA256 0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx URL
+    http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz
+    MD5 a980b75c1b386b49bcb28107991eb4ec NAME cl-ppcre FILENAME cl-ppcre DEPS
     ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams)
-    VERSION 20180831-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
+    VERSION 20190521-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 15fd56107c8..496a0bd4e56 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-project'';
-  version = ''20180831-git'';
+  version = ''20190521-git'';
 
   description = ''Generate a skeleton for modern project'';
 
   deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz'';
-    sha256 = ''0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s'';
+    url = ''http://beta.quicklisp.org/archive/cl-project/2019-05-21/cl-project-20190521-git.tgz'';
+    sha256 = ''1wm1php6bdyy1gy76vfxlmh1lm7snqg1mhpzhkcmqrrmz0jx0gnf'';
   };
 
   packageName = "cl-project";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256
-    0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s URL
-    http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz
-    MD5 11fbcc0f4f5c6d7b921eb83ab5f3ee1b NAME cl-project FILENAME cl-project
+    1wm1php6bdyy1gy76vfxlmh1lm7snqg1mhpzhkcmqrrmz0jx0gnf URL
+    http://beta.quicklisp.org/archive/cl-project/2019-05-21/cl-project-20190521-git.tgz
+    MD5 1468189ff8880f43034c44adc317274f NAME cl-project FILENAME cl-project
     DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -32,4 +32,4 @@ rec {
     DEPENDENCIES
     (alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad
      cl-ppcre let-plus local-time prove uiop)
-    VERSION 20180831-git SIBLINGS (cl-project-test) PARASITES NIL) */
+    VERSION 20190521-git SIBLINGS (cl-project-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 3ca67723925..0d58e11b4d2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-smtp'';
-  version = ''20180131-git'';
+  version = ''20190710-git'';
 
   description = ''Common Lisp smtp client.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz'';
-    sha256 = ''0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61'';
+    url = ''http://beta.quicklisp.org/archive/cl-smtp/2019-07-10/cl-smtp-20190710-git.tgz'';
+    sha256 = ''1bx5jh5vl8slsgrl2w4yv7imiswl8nmknczzyj5bzm1bzk0hx52r'';
   };
 
   packageName = "cl-smtp";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256
-    0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61 URL
-    http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz
-    MD5 0ce08f067f145ab4c7528f806f0b51ff NAME cl-smtp FILENAME cl-smtp DEPS
+    1bx5jh5vl8slsgrl2w4yv7imiswl8nmknczzyj5bzm1bzk0hx52r URL
+    http://beta.quicklisp.org/archive/cl-smtp/2019-07-10/cl-smtp-20190710-git.tgz
+    MD5 f55956a4708d0b4fc2ba181063b73e92 NAME cl-smtp FILENAME cl-smtp DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl)
@@ -35,4 +35,4 @@ rec {
     (alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams
      split-sequence trivial-features trivial-garbage trivial-gray-streams
      usocket)
-    VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index cec8cc2865c..7849acb57c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-unicode'';
-  version = ''20180328-git'';
+  version = ''20190521-git'';
 
   parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."cl-ppcre" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz'';
-    sha256 = ''1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln'';
+    url = ''http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz'';
+    sha256 = ''0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc'';
   };
 
   packageName = "cl-unicode";
@@ -20,11 +20,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256
-    1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln URL
-    http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz
-    MD5 6030b7833f08f78946ddd44d6c6a9086 NAME cl-unicode FILENAME cl-unicode
+    0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc URL
+    http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz
+    MD5 04009a1266edbdda4d38902907caba25 NAME cl-unicode FILENAME cl-unicode
     DEPS
     ((NAME cl-ppcre FILENAME cl-ppcre)
      (NAME flexi-streams FILENAME flexi-streams))
-    DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180328-git SIBLINGS NIL
+    DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20190521-git SIBLINGS NIL
     PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index 575e05aa074..3be45384d41 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-who'';
-  version = ''20171130-git'';
+  version = ''20190710-git'';
 
   parasites = [ "cl-who-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz'';
-    sha256 = ''1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw'';
+    url = ''http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz'';
+    sha256 = ''0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir'';
   };
 
   packageName = "cl-who";
@@ -20,8 +20,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256
-    1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw URL
-    http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz
-    MD5 257a670166ff9d24d1570f44be0c7171 NAME cl-who FILENAME cl-who DEPS
+    0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir URL
+    http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz
+    MD5 e5bb2856ed62d76528e4cef7b5e701c0 NAME cl-who FILENAME cl-who DEPS
     ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams)
-    VERSION 20171130-git SIBLINGS NIL PARASITES (cl-who-test)) */
+    VERSION 20190710-git SIBLINGS NIL PARASITES (cl-who-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index f329437a75a..f344dbfa2fe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,17 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl_plus_ssl'';
-  version = ''cl+ssl-20181018-git'';
-
-  parasites = [ "openssl-1.1.0" ];
+  version = ''cl+ssl-20190710-git'';
 
   description = ''Common Lisp interface to OpenSSL.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz'';
-    sha256 = ''1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm'';
+    url = ''http://beta.quicklisp.org/archive/cl+ssl/2019-07-10/cl+ssl-20190710-git.tgz'';
+    sha256 = ''0lxyd8nryhk9f8gg0fksqf3y5lgbb7f61snsc3qzi5gplkdy0mzv'';
   };
 
   packageName = "cl+ssl";
@@ -20,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
-    1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm URL
-    http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz
-    MD5 45d92813cc134bf04725ee6a1f0c24a7 NAME cl+ssl FILENAME cl_plus_ssl DEPS
+    0lxyd8nryhk9f8gg0fksqf3y5lgbb7f61snsc3qzi5gplkdy0mzv URL
+    http://beta.quicklisp.org/archive/cl+ssl/2019-07-10/cl+ssl-20190710-git.tgz
+    MD5 fae6e01902964d010ad2565a61a6af2a NAME cl+ssl FILENAME cl_plus_ssl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
@@ -33,5 +31,4 @@ rec {
     DEPENDENCIES
     (alexandria babel bordeaux-threads cffi flexi-streams trivial-features
      trivial-garbage trivial-gray-streams uiop)
-    VERSION cl+ssl-20181018-git SIBLINGS (cl+ssl.test) PARASITES
-    (openssl-1.1.0)) */
+    VERSION cl+ssl-20190710-git SIBLINGS (cl+ssl.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
index 6de9d3f8fc9..6cfd7842409 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-handler-hunchentoot'';
-  version = ''clack-20181018-git'';
+  version = ''clack-20190710-git'';
 
   description = ''Clack handler for Hunchentoot.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
-    sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
+    url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
+    sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
   };
 
   packageName = "clack-handler-hunchentoot";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot.
-    SHA256 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
-    http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
-    MD5 16121d921667ee8d0d70324da7281849 NAME clack-handler-hunchentoot
+    SHA256 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
+    http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
+    MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-handler-hunchentoot
     FILENAME clack-handler-hunchentoot DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -42,7 +42,7 @@ rec {
      cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence
      trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
      usocket)
-    VERSION clack-20181018-git SIBLINGS
+    VERSION clack-20190710-git SIBLINGS
     (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket
      clack-test clack-v1-compat clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index 745b87a6576..1ac6ccc329c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-socket'';
-  version = ''clack-20181018-git'';
+  version = ''clack-20190710-git'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
-    sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
+    url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
+    sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
   };
 
   packageName = "clack-socket";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-socket DESCRIPTION NIL SHA256
-    1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
-    http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
-    MD5 16121d921667ee8d0d70324da7281849 NAME clack-socket FILENAME
-    clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20181018-git SIBLINGS
+    1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
+    http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
+    MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-socket FILENAME
+    clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20190710-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index c1c80e48cbd..1792d79f1d8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-test'';
-  version = ''clack-20181018-git'';
+  version = ''clack-20190710-git'';
 
   description = ''Testing Clack Applications.'';
 
   deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
-    sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
+    url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
+    sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
   };
 
   packageName = "clack-test";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256
-    1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
-    http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
-    MD5 16121d921667ee8d0d70324da7281849 NAME clack-test FILENAME clack-test
+    1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
+    http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
+    MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-test FILENAME clack-test
     DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME babel FILENAME babel)
@@ -71,7 +71,7 @@ rec {
      split-sequence static-vectors trivial-backtrace trivial-features
      trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket
      xsubseq)
-    VERSION clack-20181018-git SIBLINGS
+    VERSION clack-20190710-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-v1-compat clack
      t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 5477fc5cd02..749fce006e4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-v1-compat'';
-  version = ''clack-20181018-git'';
+  version = ''clack-20190710-git'';
 
   description = '''';
 
   deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
-    sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
+    url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
+    sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
   };
 
   packageName = "clack-v1-compat";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
-    1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
-    http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
-    MD5 16121d921667ee8d0d70324da7281849 NAME clack-v1-compat FILENAME
+    1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
+    http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
+    MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-v1-compat FILENAME
     clack-v1-compat DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME babel FILENAME babel)
@@ -73,7 +73,7 @@ rec {
      rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace
      trivial-features trivial-garbage trivial-gray-streams trivial-mimes
      trivial-types uiop usocket xsubseq)
-    VERSION clack-20181018-git SIBLINGS
+    VERSION clack-20190710-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 612e6b5c066..1813844e85f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack'';
-  version = ''20181018-git'';
+  version = ''20190710-git'';
 
   description = ''Web application environment for Common Lisp'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
-    sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
+    url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
+    sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
   };
 
   packageName = "clack";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256
-    1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
-    http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
-    MD5 16121d921667ee8d0d70324da7281849 NAME clack FILENAME clack DEPS
+    1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
+    http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
+    MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack FILENAME clack DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack)
@@ -31,7 +31,7 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads ironclad lack lack-component
      lack-middleware-backtrace lack-util nibbles uiop)
-    VERSION 20181018-git SIBLINGS
+    VERSION 20190710-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-test clack-v1-compat
      t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index ce078c3196a..ca03207fabd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
-  version = ''20190107-git'';
+  version = ''20190710-git'';
 
   description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz'';
-    sha256 = ''0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw'';
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2019-07-10/closer-mop-20190710-git.tgz'';
+    sha256 = ''0zh53f4jffzjl8ix9dks0shqcxnsj830a34iqgmz3prq8rwba0gx'';
   };
 
   packageName = "closer-mop";
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM closer-mop DESCRIPTION
     Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw URL
-    http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz
-    MD5 6aa5a1e9901b579eb50e2fb46035bc50 NAME closer-mop FILENAME closer-mop
-    DEPS NIL DEPENDENCIES NIL VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */
+    SHA256 0zh53f4jffzjl8ix9dks0shqcxnsj830a34iqgmz3prq8rwba0gx URL
+    http://beta.quicklisp.org/archive/closer-mop/2019-07-10/closer-mop-20190710-git.tgz
+    MD5 5ebb554f9f7ba7f0d9dc6584806c8a0e NAME closer-mop FILENAME closer-mop
+    DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index 3866dd6f459..c1b36b6b653 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -3,7 +3,7 @@ rec {
   baseName = ''closure-common'';
   version = ''20181018-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ];
 
@@ -17,7 +17,7 @@ rec {
   asdFilesToKeep = ["closure-common.asd"];
   overrides = x: x;
 }
-/* (SYSTEM closure-common DESCRIPTION NIL SHA256
+/* (SYSTEM closure-common DESCRIPTION System lacks description SHA256
     18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn URL
     http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz
     MD5 b09ee60c258a29f0c107960ec4c04ada NAME closure-common FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 3f6d6ae32ac..2f07706a912 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clss'';
-  version = ''20180831-git'';
+  version = ''20190710-git'';
 
   description = ''A DOM tree searching engine based on CSS selectors.'';
 
   deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz'';
-    sha256 = ''18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd'';
+    url = ''http://beta.quicklisp.org/archive/clss/2019-07-10/clss-20190710-git.tgz'';
+    sha256 = ''1gvnvwjrvinp8545gzav108pzrh00wx3vx2v7l6z18a80kn0h9vs'';
   };
 
   packageName = "clss";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors.
-    SHA256 18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd URL
-    http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz MD5
-    39b69790115d6c4fe4709f5a45b5d4a4 NAME clss FILENAME clss DEPS
+    SHA256 1gvnvwjrvinp8545gzav108pzrh00wx3vx2v7l6z18a80kn0h9vs URL
+    http://beta.quicklisp.org/archive/clss/2019-07-10/clss-20190710-git.tgz MD5
+    c5a918fe272b71af7c4b6e71a7faad46 NAME clss FILENAME clss DEPS
     ((NAME array-utils FILENAME array-utils)
      (NAME documentation-utils FILENAME documentation-utils)
      (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent))
     DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION
-    20180831-git SIBLINGS NIL PARASITES NIL) */
+    20190710-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 6f570ce5c8f..6b99f99b7ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clx'';
-  version = ''20181210-git'';
+  version = ''20190521-git'';
 
   parasites = [ "clx/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."fiasco" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz'';
-    sha256 = ''1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6'';
+    url = ''http://beta.quicklisp.org/archive/clx/2019-05-21/clx-20190521-git.tgz'';
+    sha256 = ''0rsais9nsz4naf50wp2iirxfj84rdmbdxivfh3496rsi2ji7j8qs'';
   };
 
   packageName = "clx";
@@ -21,8 +21,8 @@ rec {
 }
 /* (SYSTEM clx DESCRIPTION
     An implementation of the X Window System protocol in Lisp. SHA256
-    1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6 URL
-    http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz MD5
-    d6d0edd1594e6bc420b1e2ba0c453636 NAME clx FILENAME clx DEPS
-    ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20181210-git
+    0rsais9nsz4naf50wp2iirxfj84rdmbdxivfh3496rsi2ji7j8qs URL
+    http://beta.quicklisp.org/archive/clx/2019-05-21/clx-20190521-git.tgz MD5
+    afcd581193237d3202a4fbcc1f0622c3 NAME clx FILENAME clx DEPS
+    ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20190521-git
     SIBLINGS NIL PARASITES (clx/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index e1fb5965852..1d81acba2dc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''command-line-arguments'';
-  version = ''20151218-git'';
+  version = ''20190710-git'';
 
   description = ''small library to deal with command-line arguments'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz'';
-    sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh'';
+    url = ''http://beta.quicklisp.org/archive/command-line-arguments/2019-07-10/command-line-arguments-20190710-git.tgz'';
+    sha256 = ''1221nraxk55mwgf6pilhzg5lh98jd0nxrdn2mj1zczj88im01733'';
   };
 
   packageName = "command-line-arguments";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM command-line-arguments DESCRIPTION
     small library to deal with command-line arguments SHA256
-    07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh URL
-    http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz
-    MD5 8cdb99db40143e34cf6b0b25ca95f826 NAME command-line-arguments FILENAME
-    command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20151218-git
+    1221nraxk55mwgf6pilhzg5lh98jd0nxrdn2mj1zczj88im01733 URL
+    http://beta.quicklisp.org/archive/command-line-arguments/2019-07-10/command-line-arguments-20190710-git.tgz
+    MD5 77b361a7f4b3b73a88c3a95c7bbffa98 NAME command-line-arguments FILENAME
+    command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20190710-git
     SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
index 74648ba66a8..ebae32962f1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cxml-stp'';
-  version = ''20181018-git'';
+  version = ''20190521-git'';
 
-  parasites = [ "cxml-stp-test" ];
+  parasites = [ "cxml-stp/test" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz'';
-    sha256 = ''0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77'';
+    url = ''http://beta.quicklisp.org/archive/cxml-stp/2019-05-21/cxml-stp-20190521-git.tgz'';
+    sha256 = ''1lgqw1w65yra0lyy41finj19y1z6yqkvkyzgvagb7s54cnzafz21'';
   };
 
   packageName = "cxml-stp";
@@ -19,10 +19,10 @@ rec {
   asdFilesToKeep = ["cxml-stp.asd"];
   overrides = x: x;
 }
-/* (SYSTEM cxml-stp DESCRIPTION NIL SHA256
-    0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77 URL
-    http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz
-    MD5 38d39fce85b270145d5a5bd4668d953f NAME cxml-stp FILENAME cxml-stp DEPS
+/* (SYSTEM cxml-stp DESCRIPTION System lacks description SHA256
+    1lgqw1w65yra0lyy41finj19y1z6yqkvkyzgvagb7s54cnzafz21 URL
+    http://beta.quicklisp.org/archive/cxml-stp/2019-05-21/cxml-stp-20190521-git.tgz
+    MD5 9e0c99bd2b547e07b23305a5ff72aff6 NAME cxml-stp FILENAME cxml-stp DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
@@ -34,4 +34,4 @@ rec {
     DEPENDENCIES
     (alexandria babel cl-ppcre closure-common cxml parse-number puri rt
      trivial-features trivial-gray-streams xpath xpath/test yacc)
-    VERSION 20181018-git SIBLINGS NIL PARASITES (cxml-stp-test)) */
+    VERSION 20190521-git SIBLINGS NIL PARASITES (cxml-stp/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 2f863a627bb..173a31e9f31 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-mysql'';
-  version = ''cl-dbi-20190107-git'';
+  version = ''cl-dbi-20190521-git'';
 
   description = ''Database driver for MySQL.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
-    sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
+    sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
   };
 
   packageName = "dbd-mysql";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
-    02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
-    http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
-    MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-mysql FILENAME dbd-mysql DEPS
+    1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
+    MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-mysql FILENAME dbd-mysql DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot)
@@ -35,5 +35,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax
      cl-syntax-annot closer-mop dbi named-readtables split-sequence
      trivial-features trivial-types)
-    VERSION cl-dbi-20190107-git SIBLINGS
+    VERSION cl-dbi-20190521-git SIBLINGS
     (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index f76f5e7e561..6668cd4f762 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-postgres'';
-  version = ''cl-dbi-20190107-git'';
+  version = ''cl-dbi-20190521-git'';
 
   description = ''Database driver for PostgreSQL.'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
-    sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
+    sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
   };
 
   packageName = "dbd-postgres";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256
-    02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
-    http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
-    MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-postgres FILENAME
+    1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
+    MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-postgres FILENAME
     dbd-postgres DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -37,5 +37,5 @@ rec {
     (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot
      closer-mop dbi md5 named-readtables split-sequence trivial-garbage
      trivial-types usocket)
-    VERSION cl-dbi-20190107-git SIBLINGS
+    VERSION cl-dbi-20190521-git SIBLINGS
     (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 01acb76767e..9b6fde0ea94 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-sqlite3'';
-  version = ''cl-dbi-20190107-git'';
+  version = ''cl-dbi-20190521-git'';
 
   description = ''Database driver for SQLite3.'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" args."trivial-types" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
-    sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
+    sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
   };
 
   packageName = "dbd-sqlite3";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256
-    02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
-    http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
-    MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-sqlite3 FILENAME dbd-sqlite3
+    1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
+    MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-sqlite3 FILENAME dbd-sqlite3
     DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -33,10 +33,11 @@ rec {
      (NAME split-sequence FILENAME split-sequence)
      (NAME sqlite FILENAME sqlite)
      (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-garbage FILENAME trivial-garbage)
      (NAME trivial-types FILENAME trivial-types) (NAME uiop FILENAME uiop))
     DEPENDENCIES
     (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot
      closer-mop dbi iterate named-readtables split-sequence sqlite
-     trivial-features trivial-types uiop)
-    VERSION cl-dbi-20190107-git SIBLINGS
+     trivial-features trivial-garbage trivial-types uiop)
+    VERSION cl-dbi-20190521-git SIBLINGS
     (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index 382143eb8fb..26c5306c06a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbi'';
-  version = ''cl-20190107-git'';
+  version = ''cl-20190521-git'';
 
   description = ''Database independent interface for Common Lisp'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
-    sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
+    sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
   };
 
   packageName = "dbi";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp
-    SHA256 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
-    http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
-    MD5 349829f5d0bf363b828827ad6728c54e NAME dbi FILENAME dbi DEPS
+    SHA256 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
+    MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbi FILENAME dbi DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
      named-readtables split-sequence trivial-types)
-    VERSION cl-20190107-git SIBLINGS
+    VERSION cl-20190521-git SIBLINGS
     (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index c47d9f1a1aa..4d5bc0a2217 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dexador'';
-  version = ''20181018-git'';
+  version = ''20190521-git'';
 
   description = ''Yet another HTTP client for Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz'';
-    sha256 = ''1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc'';
+    url = ''http://beta.quicklisp.org/archive/dexador/2019-05-21/dexador-20190521-git.tgz'';
+    sha256 = ''15v475xvawp3vhbw3kkvxq8z98j6i7h9fi4mkicn5mylx2j3z1mk'';
   };
 
   packageName = "dexador";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256
-    1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc URL
-    http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz
-    MD5 268ea459fac563834490247de52a6ce1 NAME dexador FILENAME dexador DEPS
+    15v475xvawp3vhbw3kkvxq8z98j6i7h9fi4mkicn5mylx2j3z1mk URL
+    http://beta.quicklisp.org/archive/dexador/2019-05-21/dexador-20190521-git.tgz
+    MD5 4e405ba1b7721c2d62bc315ec31af0fe NAME dexador FILENAME dexador DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -48,4 +48,4 @@ rec {
      fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer
      split-sequence static-vectors trivial-features trivial-garbage
      trivial-gray-streams trivial-mimes usocket xsubseq)
-    VERSION 20181018-git SIBLINGS (dexador-test) PARASITES NIL) */
+    VERSION 20190521-git SIBLINGS (dexador-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 541f1c6a169..7c25ed9a037 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''documentation-utils'';
-  version = ''20180831-git'';
+  version = ''20190710-git'';
 
   description = ''A few simple tools to help you with documenting your library.'';
 
   deps = [ args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz'';
-    sha256 = ''0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5'';
+    url = ''http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz'';
+    sha256 = ''1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3'';
   };
 
   packageName = "documentation-utils";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM documentation-utils DESCRIPTION
     A few simple tools to help you with documenting your library. SHA256
-    0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5 URL
-    http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz
-    MD5 e0f58ffe20602cada3413b4eeec909ef NAME documentation-utils FILENAME
+    1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3 URL
+    http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz
+    MD5 4f45f511ac55008b8b8aa04f7feaa2d4 NAME documentation-utils FILENAME
     documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent))
-    DEPENDENCIES (trivial-indent) VERSION 20180831-git SIBLINGS
+    DEPENDENCIES (trivial-indent) VERSION 20190710-git SIBLINGS
     (multilang-documentation-utils) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index 95162ffc99a..aa97f8f7cbe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''drakma'';
-  version = ''v2.0.4'';
+  version = ''v2.0.5'';
 
   description = ''Full-featured http/https client based on usocket'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz'';
-    sha256 = ''0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga'';
+    url = ''http://beta.quicklisp.org/archive/drakma/2019-05-21/drakma-v2.0.5.tgz'';
+    sha256 = ''14bqvdr1f5ms6kxdgran57qk43g9c37ia7ni1z3afdkbv8wp2lyj'';
   };
 
   packageName = "drakma";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket
-    SHA256 0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga URL
-    http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz MD5
-    1c668721156beadeca4f6536677e143e NAME drakma FILENAME drakma DEPS
+    SHA256 14bqvdr1f5ms6kxdgran57qk43g9c37ia7ni1z3afdkbv8wp2lyj URL
+    http://beta.quicklisp.org/archive/drakma/2019-05-21/drakma-v2.0.5.tgz MD5
+    85316671dd8ada170b85af82ed97ce8e NAME drakma FILENAME drakma DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz)
@@ -36,4 +36,4 @@ rec {
     (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64
      cl-ppcre flexi-streams puri split-sequence trivial-features
      trivial-garbage trivial-gray-streams usocket)
-    VERSION v2.0.4 SIBLINGS (drakma-test) PARASITES NIL) */
+    VERSION v2.0.5 SIBLINGS (drakma-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 3b2d0225ff9..a024ad3907a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''esrap'';
-  version = ''20190107-git'';
+  version = ''20190521-git'';
 
   parasites = [ "esrap/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz'';
-    sha256 = ''0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs'';
+    url = ''http://beta.quicklisp.org/archive/esrap/2019-05-21/esrap-20190521-git.tgz'';
+    sha256 = ''0kbb05735yhkh2vply6hdk2jn43s8pym8j6jqip13qyaaiax6w5q'';
   };
 
   packageName = "esrap";
@@ -21,9 +21,9 @@ rec {
 }
 /* (SYSTEM esrap DESCRIPTION
     A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256
-    0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs URL
-    http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz
-    MD5 b8c98e84e3c63e4e3ce2f6c8b4d4bab7 NAME esrap FILENAME esrap DEPS
+    0kbb05735yhkh2vply6hdk2jn43s8pym8j6jqip13qyaaiax6w5q URL
+    http://beta.quicklisp.org/archive/esrap/2019-05-21/esrap-20190521-git.tgz
+    MD5 401362d64d644f02824de03697435883 NAME esrap FILENAME esrap DEPS
     ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
-    DEPENDENCIES (alexandria fiveam) VERSION 20190107-git SIBLINGS NIL
+    DEPENDENCIES (alexandria fiveam) VERSION 20190521-git SIBLINGS NIL
     PARASITES (esrap/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index cec236dc556..0e7f5b79160 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''external-program'';
-  version = ''20160825-git'';
+  version = ''20190307-git'';
 
   parasites = [ "external-program-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz'';
-    sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13'';
+    url = ''http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz'';
+    sha256 = ''1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz'';
   };
 
   packageName = "external-program";
@@ -20,11 +20,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM external-program DESCRIPTION NIL SHA256
-    0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL
-    http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz
-    MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program FILENAME
+    1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz URL
+    http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz
+    MD5 b30fe104c34059506fd4c493fa79fe1a NAME external-program FILENAME
     external-program DEPS
     ((NAME fiveam FILENAME fiveam)
      (NAME trivial-features FILENAME trivial-features))
-    DEPENDENCIES (fiveam trivial-features) VERSION 20160825-git SIBLINGS NIL
+    DEPENDENCIES (fiveam trivial-features) VERSION 20190307-git SIBLINGS NIL
     PARASITES (external-program-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
index 87d9fe983ec..39f2af5430f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fiasco'';
-  version = ''20181210-git'';
+  version = ''20190307-git'';
 
   parasites = [ "fiasco-self-tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz'';
-    sha256 = ''0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y'';
+    url = ''http://beta.quicklisp.org/archive/fiasco/2019-03-07/fiasco-20190307-git.tgz'';
+    sha256 = ''0ffnkfnj4ayvzsxb2h04xaypgxg3fbar07f6rvlbncdckm9q5jk3'';
   };
 
   packageName = "fiasco";
@@ -21,10 +21,10 @@ rec {
 }
 /* (SYSTEM fiasco DESCRIPTION
     A Common Lisp test framework that treasures your failures, logical continuation of Stefil.
-    SHA256 0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y URL
-    http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz
-    MD5 9d3c0ec30c7f73490188f27eaec00fd8 NAME fiasco FILENAME fiasco DEPS
+    SHA256 0ffnkfnj4ayvzsxb2h04xaypgxg3fbar07f6rvlbncdckm9q5jk3 URL
+    http://beta.quicklisp.org/archive/fiasco/2019-03-07/fiasco-20190307-git.tgz
+    MD5 7cc0c66f865d44974c8d682346b5f6d5 NAME fiasco FILENAME fiasco DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams))
-    DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20181210-git
+    DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20190307-git
     SIBLINGS NIL PARASITES (fiasco-self-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 4a23cbf51ee..90ce8b83dde 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''form-fiddle'';
-  version = ''20180831-git'';
+  version = ''20190710-git'';
 
   description = ''A collection of utilities to destructure lambda forms.'';
 
   deps = [ args."documentation-utils" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz'';
-    sha256 = ''013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj'';
+    url = ''http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz'';
+    sha256 = ''12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl'';
   };
 
   packageName = "form-fiddle";
@@ -19,11 +19,11 @@ rec {
 }
 /* (SYSTEM form-fiddle DESCRIPTION
     A collection of utilities to destructure lambda forms. SHA256
-    013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj URL
-    http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz
-    MD5 1e9ae81423ed3c5f2e07c26f93b45956 NAME form-fiddle FILENAME form-fiddle
+    12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl URL
+    http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz
+    MD5 2576065de1e3c95751285fb155f5bcf6 NAME form-fiddle FILENAME form-fiddle
     DEPS
     ((NAME documentation-utils FILENAME documentation-utils)
      (NAME trivial-indent FILENAME trivial-indent))
-    DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180831-git
+    DEPENDENCIES (documentation-utils trivial-indent) VERSION 20190710-git
     SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
index a74f24f8642..1f2700608e3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hu_dot_dwim_dot_asdf'';
-  version = ''20180228-darcs'';
+  version = ''20190521-darcs'';
 
   description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz'';
-    sha256 = ''19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld'';
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2019-05-21/hu.dwim.asdf-20190521-darcs.tgz'';
+    sha256 = ''0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn'';
   };
 
   packageName = "hu.dwim.asdf";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM hu.dwim.asdf DESCRIPTION
     Various ASDF extensions such as attached test and documentation system, explicit development support, etc.
-    SHA256 19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld URL
-    http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz
-    MD5 a1f3085cbd7ea77f9212112cc8914e86 NAME hu.dwim.asdf FILENAME
+    SHA256 0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn URL
+    http://beta.quicklisp.org/archive/hu.dwim.asdf/2019-05-21/hu.dwim.asdf-20190521-darcs.tgz
+    MD5 b359bf05f587196eba172803b5594318 NAME hu.dwim.asdf FILENAME
     hu_dot_dwim_dot_asdf DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop)
-    VERSION 20180228-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */
+    VERSION 20190521-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 4c3bcbb42b0..2c56b5964f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''ironclad'';
-  version = ''v0.44'';
+  version = ''v0.46'';
 
   parasites = [ "ironclad/tests" ];
 
   description = ''A cryptographic toolkit written in pure Common Lisp'';
 
-  deps = [ args."nibbles" args."rt" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."nibbles" args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz'';
-    sha256 = ''0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y'';
+    url = ''http://beta.quicklisp.org/archive/ironclad/2019-07-10/ironclad-v0.46.tgz'';
+    sha256 = ''1bcqz7z30dpr9rz5wg94bbq93swn6lxqj60rn9f5q0fryn9na3l2'';
   };
 
   packageName = "ironclad";
@@ -21,9 +21,11 @@ rec {
 }
 /* (SYSTEM ironclad DESCRIPTION
     A cryptographic toolkit written in pure Common Lisp SHA256
-    0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y URL
-    http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz
-    MD5 ebce1cbac421a5d7ad461cdaed4ac863 NAME ironclad FILENAME ironclad DEPS
-    ((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES
-    (nibbles rt) VERSION v0.44 SIBLINGS (ironclad-text) PARASITES
-    (ironclad/tests)) */
+    1bcqz7z30dpr9rz5wg94bbq93swn6lxqj60rn9f5q0fryn9na3l2 URL
+    http://beta.quicklisp.org/archive/ironclad/2019-07-10/ironclad-v0.46.tgz
+    MD5 23f67c2312723bdaf1ff78898d2354c7 NAME ironclad FILENAME ironclad DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt))
+    DEPENDENCIES (alexandria bordeaux-threads nibbles rt) VERSION v0.46
+    SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 81493865b86..702eb2d05b5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''jonathan'';
-  version = ''20181210-git'';
+  version = ''20190202-git'';
 
   description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz'';
-    sha256 = ''1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh'';
+    url = ''http://beta.quicklisp.org/archive/jonathan/2019-02-02/jonathan-20190202-git.tgz'';
+    sha256 = ''1p70ji0mwx11q5iy792lxpcbx7mzh4az88vgkq39yx1ffwvpxvwl'';
   };
 
   packageName = "jonathan";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM jonathan DESCRIPTION
     High performance JSON encoder and decoder. Currently support: SBCL, CCL.
-    SHA256 1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh URL
-    http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz
-    MD5 eb76f293df02d1b85faf92b92cb24d53 NAME jonathan FILENAME jonathan DEPS
+    SHA256 1p70ji0mwx11q5iy792lxpcbx7mzh4az88vgkq39yx1ffwvpxvwl URL
+    http://beta.quicklisp.org/archive/jonathan/2019-02-02/jonathan-20190202-git.tgz
+    MD5 bf340574fc901706ba2dcdc57e1e78ad NAME jonathan FILENAME jonathan DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
      (NAME cffi-toolchain FILENAME cffi-toolchain)
@@ -39,4 +39,4 @@ rec {
     (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre
      cl-syntax cl-syntax-annot fast-io named-readtables proc-parse
      static-vectors trivial-features trivial-gray-streams trivial-types)
-    VERSION 20181210-git SIBLINGS (jonathan-test) PARASITES NIL) */
+    VERSION 20190202-git SIBLINGS (jonathan-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
index e5cbad3e9e8..e44004a9cf7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -3,7 +3,7 @@ rec {
   baseName = ''kmrcl'';
   version = ''20150923-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ rec {
   asdFilesToKeep = ["kmrcl.asd"];
   overrides = x: x;
 }
-/* (SYSTEM kmrcl DESCRIPTION NIL SHA256
+/* (SYSTEM kmrcl DESCRIPTION System lacks description SHA256
     0sx7p16pp5i4qr569p2265ky6rd65gyjp21k348a6c3fs2yn0r2g URL
     http://beta.quicklisp.org/archive/kmrcl/2015-09-23/kmrcl-20150923-git.tgz
     MD5 0cd15d3ed3e7d56528dd3243d1a5c9b1 NAME kmrcl FILENAME kmrcl DEPS NIL
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index b99f7867a7a..96a831147bb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-component'';
-  version = ''lack-20181210-git'';
+  version = ''lack-20190521-git'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
-    sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
+    url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
+    sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
   };
 
   packageName = "lack-component";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-component DESCRIPTION NIL SHA256
-    00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
-    http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
-    b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-component FILENAME
-    lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20181210-git SIBLINGS
+    0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
+    http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
+    7d7321550f0795e998c7afe4498e7a40 NAME lack-component FILENAME
+    lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20190521-git SIBLINGS
     (lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 7cce4b21294..610633e9af2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-middleware-backtrace'';
-  version = ''lack-20181210-git'';
+  version = ''lack-20190521-git'';
 
   description = '''';
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
-    sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
+    url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
+    sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
   };
 
   packageName = "lack-middleware-backtrace";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
-    00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
-    http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
-    b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-middleware-backtrace FILENAME
+    0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
+    http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
+    7d7321550f0795e998c7afe4498e7a40 NAME lack-middleware-backtrace FILENAME
     lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
-    (uiop) VERSION lack-20181210-git SIBLINGS
+    (uiop) VERSION lack-20190521-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-csrf lack-middleware-mount lack-middleware-session
      lack-middleware-static lack-request lack-response lack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index 6da62f22f65..3607cbedf44 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-util'';
-  version = ''lack-20181210-git'';
+  version = ''lack-20190521-git'';
 
   description = '''';
 
-  deps = [ args."ironclad" args."nibbles" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."nibbles" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
-    sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
+    url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
+    sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
   };
 
   packageName = "lack-util";
@@ -18,11 +18,14 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-util DESCRIPTION NIL SHA256
-    00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
-    http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
-    b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-util FILENAME lack-util DEPS
-    ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles))
-    DEPENDENCIES (ironclad nibbles) VERSION lack-20181210-git SIBLINGS
+    0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
+    http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
+    7d7321550f0795e998c7afe4498e7a40 NAME lack-util FILENAME lack-util DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles))
+    DEPENDENCIES (alexandria bordeaux-threads ironclad nibbles) VERSION
+    lack-20190521-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index c8ef9a7f670..08095979989 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack'';
-  version = ''20181210-git'';
+  version = ''20190521-git'';
 
   description = ''A minimal Clack'';
 
-  deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" args."nibbles" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
-    sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
+    url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
+    sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
   };
 
   packageName = "lack";
@@ -18,14 +18,17 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256
-    00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
-    http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
-    b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack FILENAME lack DEPS
-    ((NAME ironclad FILENAME ironclad)
+    0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
+    http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
+    7d7321550f0795e998c7afe4498e7a40 NAME lack FILENAME lack DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME ironclad FILENAME ironclad)
      (NAME lack-component FILENAME lack-component)
      (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles))
-    DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION
-    20181210-git SIBLINGS
+    DEPENDENCIES
+    (alexandria bordeaux-threads ironclad lack-component lack-util nibbles)
+    VERSION 20190521-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index a3ddc2fd953..1edb65596a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lift'';
-  version = ''20151031-git'';
+  version = ''20190521-git'';
 
   description = ''LIsp Framework for Testing'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lift/2015-10-31/lift-20151031-git.tgz'';
-    sha256 = ''1h8fkpm377brbrc06zdynd2qilc85vr9i8r9f8pjqqmk3p1qyl46'';
+    url = ''http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz'';
+    sha256 = ''0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9'';
   };
 
   packageName = "lift";
@@ -18,8 +18,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lift DESCRIPTION LIsp Framework for Testing SHA256
-    1h8fkpm377brbrc06zdynd2qilc85vr9i8r9f8pjqqmk3p1qyl46 URL
-    http://beta.quicklisp.org/archive/lift/2015-10-31/lift-20151031-git.tgz MD5
-    b92e97b3d337607743f47bde0889f3ee NAME lift FILENAME lift DEPS NIL
-    DEPENDENCIES NIL VERSION 20151031-git SIBLINGS
+    0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9 URL
+    http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz MD5
+    c03d3fa715792440c7b51a852ad581e3 NAME lift FILENAME lift DEPS NIL
+    DEPENDENCIES NIL VERSION 20190521-git SIBLINGS
     (lift-documentation lift-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index 1a94c643d8a..5ffa27fcca5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''local-time'';
-  version = ''20181210-git'';
+  version = ''20190710-git'';
 
   parasites = [ "local-time/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz'';
-    sha256 = ''0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s'';
+    url = ''http://beta.quicklisp.org/archive/local-time/2019-07-10/local-time-20190710-git.tgz'';
+    sha256 = ''1f6l5g4frb2cyqdyyr64wdhp3fralshm43q7rigsrcz2vx5y75jk'';
   };
 
   packageName = "local-time";
@@ -21,12 +21,12 @@ rec {
 }
 /* (SYSTEM local-time DESCRIPTION
     A library for manipulating dates and times, based on a paper by Erik Naggum
-    SHA256 0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s URL
-    http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz
-    MD5 161762ecff2ffbe4dc68c8dc28472515 NAME local-time FILENAME local-time
+    SHA256 1f6l5g4frb2cyqdyyr64wdhp3fralshm43q7rigsrcz2vx5y75jk URL
+    http://beta.quicklisp.org/archive/local-time/2019-07-10/local-time-20190710-git.tgz
+    MD5 ff315f40d1f955210c78aa0804a117f2 NAME local-time FILENAME local-time
     DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil))
     DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION
-    20181210-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */
+    20190710-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 19382889315..f64e9ee6a33 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lquery'';
-  version = ''20190107-git'';
+  version = ''20190710-git'';
 
   description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
 
   deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz'';
-    sha256 = ''023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r'';
+    url = ''http://beta.quicklisp.org/archive/lquery/2019-07-10/lquery-20190710-git.tgz'';
+    sha256 = ''17kgp8xrygg2d7pfzqram3iv3rry91yfgjs1ym37ac8r5gqrmfsw'';
   };
 
   packageName = "lquery";
@@ -19,13 +19,13 @@ rec {
 }
 /* (SYSTEM lquery DESCRIPTION
     A library to allow jQuery-like HTML/DOM manipulation. SHA256
-    023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r URL
-    http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz
-    MD5 295245984aa471d2709dcf926abd82e2 NAME lquery FILENAME lquery DEPS
+    17kgp8xrygg2d7pfzqram3iv3rry91yfgjs1ym37ac8r5gqrmfsw URL
+    http://beta.quicklisp.org/archive/lquery/2019-07-10/lquery-20190710-git.tgz
+    MD5 987e9e505ff230c7bfc425bdf58fb717 NAME lquery FILENAME lquery DEPS
     ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss)
      (NAME documentation-utils FILENAME documentation-utils)
      (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump)
      (NAME trivial-indent FILENAME trivial-indent))
     DEPENDENCIES
     (array-utils clss documentation-utils form-fiddle plump trivial-indent)
-    VERSION 20190107-git SIBLINGS (lquery-test) PARASITES NIL) */
+    VERSION 20190710-git SIBLINGS (lquery-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index db25e6ae534..8187c99f94a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''map-set'';
-  version = ''20160628-hg'';
+  version = ''20190307-hg'';
 
   description = ''Set-like data structure.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz'';
-    sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v'';
+    url = ''http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz'';
+    sha256 = ''1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9'';
   };
 
   packageName = "map-set";
@@ -18,7 +18,7 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM map-set DESCRIPTION Set-like data structure. SHA256
-    15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v URL
-    http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz
-    MD5 49cf6b527841b717b8696efaa7bb6389 NAME map-set FILENAME map-set DEPS NIL
-    DEPENDENCIES NIL VERSION 20160628-hg SIBLINGS NIL PARASITES NIL) */
+    1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9 URL
+    http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz
+    MD5 866dba36cdf060c943267cb79ccc0532 NAME map-set FILENAME map-set DEPS NIL
+    DEPENDENCIES NIL VERSION 20190307-hg SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
index 93890afd300..fe9ccae2886 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
@@ -3,7 +3,7 @@ rec {
   baseName = ''pcall-queue'';
   version = ''pcall-0.3'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."bordeaux-threads" ];
 
@@ -17,7 +17,7 @@ rec {
   asdFilesToKeep = ["pcall-queue.asd"];
   overrides = x: x;
 }
-/* (SYSTEM pcall-queue DESCRIPTION NIL SHA256
+/* (SYSTEM pcall-queue DESCRIPTION System lacks description SHA256
     02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
     http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5
     019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall-queue FILENAME pcall-queue DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 9f36a671765..8757c704c8f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''plump'';
-  version = ''20190107-git'';
+  version = ''20190710-git'';
 
   description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
 
   deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz'';
-    sha256 = ''0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3'';
+    url = ''http://beta.quicklisp.org/archive/plump/2019-07-10/plump-20190710-git.tgz'';
+    sha256 = ''1in8c86a1ss8h02bsr3yb0clqgbvqh0bh5gy4y01yfckixbxh5fi'';
   };
 
   packageName = "plump";
@@ -19,11 +19,11 @@ rec {
 }
 /* (SYSTEM plump DESCRIPTION
     An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256
-    0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3 URL
-    http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz
-    MD5 5b1a46b83536d5bf1a082a1ef191d3aa NAME plump FILENAME plump DEPS
+    1in8c86a1ss8h02bsr3yb0clqgbvqh0bh5gy4y01yfckixbxh5fi URL
+    http://beta.quicklisp.org/archive/plump/2019-07-10/plump-20190710-git.tgz
+    MD5 e3276779e368758274156c9477f0b22a NAME plump FILENAME plump DEPS
     ((NAME array-utils FILENAME array-utils)
      (NAME documentation-utils FILENAME documentation-utils)
      (NAME trivial-indent FILENAME trivial-indent))
     DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION
-    20190107-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
+    20190710-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 589f6917899..3666dda9bf8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''query-fs'';
-  version = ''20190107-git'';
+  version = ''20190521-git'';
 
   description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz'';
-    sha256 = ''1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4'';
+    url = ''http://beta.quicklisp.org/archive/query-fs/2019-05-21/query-fs-20190521-git.tgz'';
+    sha256 = ''1zz917yjjnjx09cl27793056262nz1jhikdaj1mxhgzm3w6ywf39'';
   };
 
   packageName = "query-fs";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM query-fs DESCRIPTION
     High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries
-    SHA256 1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4 URL
-    http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz
-    MD5 3abd1f0a2f82d10d919bb5b4aa5485be NAME query-fs FILENAME query-fs DEPS
+    SHA256 1zz917yjjnjx09cl27793056262nz1jhikdaj1mxhgzm3w6ywf39 URL
+    http://beta.quicklisp.org/archive/query-fs/2019-05-21/query-fs-20190521-git.tgz
+    MD5 1108c91b69007c6ab35b42d70d4dd7a2 NAME query-fs FILENAME query-fs DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -40,4 +40,4 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse
      cl-fuse-meta-fs cl-ppcre cl-utilities command-line-arguments iterate pcall
      pcall-queue trivial-backtrace trivial-features trivial-utf-8)
-    VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20190521-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index 2f30db52448..f6022cb2a1f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''quri'';
-  version = ''20181210-git'';
+  version = ''20190521-git'';
 
   description = ''Yet another URI library for Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz'';
-    sha256 = ''0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4'';
+    url = ''http://beta.quicklisp.org/archive/quri/2019-05-21/quri-20190521-git.tgz'';
+    sha256 = ''1khhdhn1isszii52xaibn6m4hv4sm5j2v0vgc2rp1x05xds9rzs2'';
   };
 
   packageName = "quri";
@@ -18,13 +18,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256
-    0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4 URL
-    http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz MD5
-    94f607540ccc8a15a4439527e41bf7ac NAME quri FILENAME quri DEPS
+    1khhdhn1isszii52xaibn6m4hv4sm5j2v0vgc2rp1x05xds9rzs2 URL
+    http://beta.quicklisp.org/archive/quri/2019-05-21/quri-20190521-git.tgz MD5
+    c2e37013c3b8e109aeb009719e9492ac NAME quri FILENAME quri DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-utilities FILENAME cl-utilities)
      (NAME split-sequence FILENAME split-sequence)
      (NAME trivial-features FILENAME trivial-features))
     DEPENDENCIES
     (alexandria babel cl-utilities split-sequence trivial-features) VERSION
-    20181210-git SIBLINGS (quri-test) PARASITES NIL) */
+    20190521-git SIBLINGS (quri-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 86890d60dc5..33847198bdd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''simple-date'';
-  version = ''postmodern-20190107-git'';
+  version = ''postmodern-20190521-git'';
 
   parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz'';
-    sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz'';
+    sha256 = ''1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5'';
   };
 
   packageName = "simple-date";
@@ -20,12 +20,12 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM simple-date DESCRIPTION NIL SHA256
-    030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL
-    http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz
-    MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME simple-date FILENAME simple-date
+    1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL
+    http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz
+    MD5 102567f386757cd52aca500c0c348d90 NAME simple-date FILENAME simple-date
     DEPS
     ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam)
      (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket))
     DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION
-    postmodern-20190107-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
+    postmodern-20190521-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
     (simple-date/postgres-glue simple-date/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index f0a21983f16..a22076facd3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''split-sequence'';
-  version = ''v1.5.0'';
+  version = ''v2.0.0'';
 
   parasites = [ "split-sequence/tests" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz'';
-    sha256 = ''0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g'';
+    url = ''http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz'';
+    sha256 = ''09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba'';
   };
 
   packageName = "split-sequence";
@@ -23,8 +23,8 @@ rec {
 /* (SYSTEM split-sequence DESCRIPTION
     Splits a sequence into a list of subsequences
   delimited by objects satisfying a test.
-    SHA256 0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g URL
-    http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz
-    MD5 67844853787187d993e6d530306eb2b4 NAME split-sequence FILENAME
+    SHA256 09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba URL
+    http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz
+    MD5 88aadc6c9da23663ebbb39d546991df4 NAME split-sequence FILENAME
     split-sequence DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam)
-    VERSION v1.5.0 SIBLINGS NIL PARASITES (split-sequence/tests)) */
+    VERSION v2.0.0 SIBLINGS NIL PARASITES (split-sequence/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index 991791b57d0..57dec7c93ca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -3,7 +3,7 @@ rec {
   baseName = ''sqlite'';
   version = ''cl-20130615-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ];
 
@@ -17,7 +17,7 @@ rec {
   asdFilesToKeep = ["sqlite.asd"];
   overrides = x: x;
 }
-/* (SYSTEM sqlite DESCRIPTION NIL SHA256
+/* (SYSTEM sqlite DESCRIPTION System lacks description SHA256
     0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL
     http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz
     MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite FILENAME sqlite DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index e75cb087f38..e89eb1971d6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''stumpwm'';
-  version = ''20190107-git'';
+  version = ''20190710-git'';
 
   description = ''A tiling, keyboard driven window manager'';
 
   deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz'';
-    sha256 = ''1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar'';
+    url = ''http://beta.quicklisp.org/archive/stumpwm/2019-07-10/stumpwm-20190710-git.tgz'';
+    sha256 = ''10msx6a7s28aqkdz6x847n5jhg9sykvx96p3gh2pq1ab71wq1l3w'';
   };
 
   packageName = "stumpwm";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256
-    1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar URL
-    http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz
-    MD5 5634a308f5b40d9bab1f7c066aa6b9df NAME stumpwm FILENAME stumpwm DEPS
+    10msx6a7s28aqkdz6x847n5jhg9sykvx96p3gh2pq1ab71wq1l3w URL
+    http://beta.quicklisp.org/archive/stumpwm/2019-07-10/stumpwm-20190710-git.tgz
+    MD5 7956cf3486c586f137b75f8b8c0e677c NAME stumpwm FILENAME stumpwm DEPS
     ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME clx FILENAME clx))
-    DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190107-git SIBLINGS
+    DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190710-git SIBLINGS
     (stumpwm-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 301b12a8998..50b815425dc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''swank'';
-  version = ''slime-v2.23'';
+  version = ''slime-v2.24'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz'';
-    sha256 = ''1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky'';
+    url = ''http://beta.quicklisp.org/archive/slime/2019-07-10/slime-v2.24.tgz'';
+    sha256 = ''0gsq3i5818iwfbh710lf96kb66q3ap3qvvkcj06zyfh30n50x1g6'';
   };
 
   packageName = "swank";
@@ -17,8 +17,8 @@ rec {
   asdFilesToKeep = ["swank.asd"];
   overrides = x: x;
 }
-/* (SYSTEM swank DESCRIPTION NIL SHA256
-    1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky URL
-    http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz MD5
-    726724480d861d97e8b58bc8f9f27697 NAME swank FILENAME swank DEPS NIL
-    DEPENDENCIES NIL VERSION slime-v2.23 SIBLINGS NIL PARASITES NIL) */
+/* (SYSTEM swank DESCRIPTION System lacks description SHA256
+    0gsq3i5818iwfbh710lf96kb66q3ap3qvvkcj06zyfh30n50x1g6 URL
+    http://beta.quicklisp.org/archive/slime/2019-07-10/slime-v2.24.tgz MD5
+    05f421f7a9dffa4ba206c548524ef1c0 NAME swank FILENAME swank DEPS NIL
+    DEPENDENCIES NIL VERSION slime-v2.24 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index 9a4afce3280..683f87357f5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-backtrace'';
-  version = ''20160531-git'';
+  version = ''20190710-git'';
 
   description = ''trivial-backtrace'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz'';
-    sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx'';
+    url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2019-07-10/trivial-backtrace-20190710-git.tgz'';
+    sha256 = ''01pzn5ki3w5sgp270rqg6y982zw4p72x5zqcdjgn8hp7lk2a9g9x'';
   };
 
   packageName = "trivial-backtrace";
@@ -18,8 +18,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM trivial-backtrace DESCRIPTION trivial-backtrace SHA256
-    1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx URL
-    http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz
-    MD5 a3b41b4ae24e3fde303a2623201aac4d NAME trivial-backtrace FILENAME
-    trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS
+    01pzn5ki3w5sgp270rqg6y982zw4p72x5zqcdjgn8hp7lk2a9g9x URL
+    http://beta.quicklisp.org/archive/trivial-backtrace/2019-07-10/trivial-backtrace-20190710-git.tgz
+    MD5 e9035ed00321b24278cbf5449a1aebed NAME trivial-backtrace FILENAME
+    trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS
     (trivial-backtrace-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 1a562c2288b..82d0e4513ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-features'';
-  version = ''20161204-git'';
+  version = ''20190710-git'';
 
   description = ''Ensures consistent *FEATURES* across multiple CLs.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz'';
-    sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2'';
+    url = ''http://beta.quicklisp.org/archive/trivial-features/2019-07-10/trivial-features-20190710-git.tgz'';
+    sha256 = ''04i2vhhij8pwy46zih1dkm8ldy8qqgrncxxqd4y1sgiq3airg3dy'';
   };
 
   packageName = "trivial-features";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM trivial-features DESCRIPTION
     Ensures consistent *FEATURES* across multiple CLs. SHA256
-    0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2 URL
-    http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz
-    MD5 07497e3fd92e68027a96f877cfe62bd4 NAME trivial-features FILENAME
-    trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20161204-git SIBLINGS
+    04i2vhhij8pwy46zih1dkm8ldy8qqgrncxxqd4y1sgiq3airg3dy URL
+    http://beta.quicklisp.org/archive/trivial-features/2019-07-10/trivial-features-20190710-git.tgz
+    MD5 3907b044e00a812ebae989134fe57c55 NAME trivial-features FILENAME
+    trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS
     (trivial-features-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index 5c3c486fb0f..c629bb3548d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-garbage'';
-  version = ''20181018-git'';
+  version = ''20190521-git'';
 
-  parasites = [ "trivial-garbage-tests" ];
+  parasites = [ "trivial-garbage/tests" ];
 
   description = ''Portable finalizers, weak hash-tables and weak pointers.'';
 
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz'';
-    sha256 = ''0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl'';
+    url = ''http://beta.quicklisp.org/archive/trivial-garbage/2019-05-21/trivial-garbage-20190521-git.tgz'';
+    sha256 = ''0yhb7rkrbcfgghwvbw13nvmr86v19ka6qb53j8n89c7r270d8fdl'';
   };
 
   packageName = "trivial-garbage";
@@ -21,8 +21,8 @@ rec {
 }
 /* (SYSTEM trivial-garbage DESCRIPTION
     Portable finalizers, weak hash-tables and weak pointers. SHA256
-    0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl URL
-    http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz
-    MD5 4d1d1ab0518b375da21b9a6eeaa498e3 NAME trivial-garbage FILENAME
+    0yhb7rkrbcfgghwvbw13nvmr86v19ka6qb53j8n89c7r270d8fdl URL
+    http://beta.quicklisp.org/archive/trivial-garbage/2019-05-21/trivial-garbage-20190521-git.tgz
+    MD5 38fb70797069d4402c6b0fe91f4ca5a8 NAME trivial-garbage FILENAME
     trivial-garbage DEPS ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION
-    20181018-git SIBLINGS NIL PARASITES (trivial-garbage-tests)) */
+    20190521-git SIBLINGS NIL PARASITES (trivial-garbage/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index d34913b1656..33eedbaa818 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-indent'';
-  version = ''20181018-git'';
+  version = ''20190710-git'';
 
   description = ''A very simple library to allow indentation hints for SWANK.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz'';
-    sha256 = ''0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g'';
+    url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-07-10/trivial-indent-20190710-git.tgz'';
+    sha256 = ''00s35j8cf1ivwc1l55wprx1a78mvnxaz6innwwb3jan1sl3caycx'';
   };
 
   packageName = "trivial-indent";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM trivial-indent DESCRIPTION
     A very simple library to allow indentation hints for SWANK. SHA256
-    0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g URL
-    http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz
-    MD5 87679f984544027ac939c22e288b09c5 NAME trivial-indent FILENAME
-    trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS NIL
+    00s35j8cf1ivwc1l55wprx1a78mvnxaz6innwwb3jan1sl3caycx URL
+    http://beta.quicklisp.org/archive/trivial-indent/2019-07-10/trivial-indent-20190710-git.tgz
+    MD5 a5026ac3d68e02fce100761e546a0d77 NAME trivial-indent FILENAME
+    trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index f06c0d7ebf5..f02d9e0dc2c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-mimes'';
-  version = ''20180831-git'';
+  version = ''20190710-git'';
 
   description = ''Tiny library to detect mime types in files.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz'';
-    sha256 = ''0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr'';
+    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2019-07-10/trivial-mimes-20190710-git.tgz'';
+    sha256 = ''0z6m26gs0ilqs183xb4a5acpka9md10szbbdpm5xzjrhl15nb4jn'';
   };
 
   packageName = "trivial-mimes";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM trivial-mimes DESCRIPTION
     Tiny library to detect mime types in files. SHA256
-    0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr URL
-    http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz
-    MD5 503680e90278947d888bcbe3338c74e3 NAME trivial-mimes FILENAME
-    trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL
+    0z6m26gs0ilqs183xb4a5acpka9md10szbbdpm5xzjrhl15nb4jn URL
+    http://beta.quicklisp.org/archive/trivial-mimes/2019-07-10/trivial-mimes-20190710-git.tgz
+    MD5 b7fa1cb9382a2a562343c6ca87b1b4ac NAME trivial-mimes FILENAME
+    trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index fdaa07109b4..18f1b74edbd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''uiop'';
-  version = ''3.3.2'';
+  version = ''3.3.3'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz'';
-    sha256 = ''1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5'';
+    url = ''http://beta.quicklisp.org/archive/uiop/2019-05-21/uiop-3.3.3.tgz'';
+    sha256 = ''1r89bqjmz1919l3wlmd32p416jzpacy3glkhiwnf1crkja27iagm'';
   };
 
   packageName = "uiop";
@@ -17,8 +17,8 @@ rec {
   asdFilesToKeep = ["uiop.asd"];
   overrides = x: x;
 }
-/* (SYSTEM uiop DESCRIPTION NIL SHA256
-    1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5 URL
-    http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz MD5
-    8d7b7b4065873107147678c6ef72e5ee NAME uiop FILENAME uiop DEPS NIL
-    DEPENDENCIES NIL VERSION 3.3.2 SIBLINGS (asdf-driver) PARASITES NIL) */
+/* (SYSTEM uiop DESCRIPTION System lacks description SHA256
+    1r89bqjmz1919l3wlmd32p416jzpacy3glkhiwnf1crkja27iagm URL
+    http://beta.quicklisp.org/archive/uiop/2019-05-21/uiop-3.3.3.tgz MD5
+    64d561117f048ad8621eff7a6173d65e NAME uiop FILENAME uiop DEPS NIL
+    DEPENDENCIES NIL VERSION 3.3.3 SIBLINGS (asdf-driver) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 6d02b976470..c3928cf0e4c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''usocket'';
-  version = ''0.7.1'';
+  version = ''0.8.2'';
 
   description = ''Universal socket library for Common Lisp'';
 
   deps = [ args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz'';
-    sha256 = ''18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw'';
+    url = ''http://beta.quicklisp.org/archive/usocket/2019-07-10/usocket-0.8.2.tgz'';
+    sha256 = ''0g5niqwzh4y6f25lnjx1qyzl0yg906zq2sy7ck67f7bcmc79w8zm'';
   };
 
   packageName = "usocket";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256
-    18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw URL
-    http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz MD5
-    fb48ff59f0d71bfc9c2939aacdb123a0 NAME usocket FILENAME usocket DEPS
+    0g5niqwzh4y6f25lnjx1qyzl0yg906zq2sy7ck67f7bcmc79w8zm URL
+    http://beta.quicklisp.org/archive/usocket/2019-07-10/usocket-0.8.2.tgz MD5
+    0218443cd70b675d9b09c1bf09cd9da4 NAME usocket FILENAME usocket DEPS
     ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES
-    (split-sequence) VERSION 0.7.1 SIBLINGS (usocket-server usocket-test)
+    (split-sequence) VERSION 0.8.2 SIBLINGS (usocket-server usocket-test)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index 0d8822c2f4f..59a41a7cf9a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''woo'';
-  version = ''20181210-git'';
+  version = ''20190710-git'';
 
   description = ''An asynchronous HTTP server written in Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz'';
-    sha256 = ''1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms'';
+    url = ''http://beta.quicklisp.org/archive/woo/2019-07-10/woo-20190710-git.tgz'';
+    sha256 = ''16fxk75bfb6g3998wqra93a7w4n0yqqi1i8w8dx8yiyy9yb7jij5'';
   };
 
   packageName = "woo";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp
-    SHA256 1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms URL
-    http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz MD5
-    ecc4d7c194b3a941e381d9e6392d51c9 NAME woo FILENAME woo DEPS
+    SHA256 16fxk75bfb6g3998wqra93a7w4n0yqqi1i8w8dx8yiyy9yb7jij5 URL
+    http://beta.quicklisp.org/archive/woo/2019-07-10/woo-20190710-git.tgz MD5
+    f35b65dec09276f08c4ca532d077a7a9 NAME woo FILENAME woo DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -43,4 +43,4 @@ rec {
      cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse
      quri smart-buffer split-sequence static-vectors swap-bytes
      trivial-features trivial-gray-streams trivial-utf-8 vom xsubseq)
-    VERSION 20181210-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
+    VERSION 20190710-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
index 4c88e839bda..9854567fd5b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''xembed'';
-  version = ''clx-20120909-git'';
+  version = ''clx-20190307-git'';
 
-  description = '''';
+  description = ''An implementation of the XEMBED protocol that integrates with CLX.'';
 
   deps = [ args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz'';
-    sha256 = ''06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb'';
+    url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-03-07/clx-xembed-20190307-git.tgz'';
+    sha256 = ''1a0yy707qdb7sw20lavmhlass3n3ds2pn52jxdkrvpgg358waf3j'';
   };
 
   packageName = "xembed";
@@ -17,9 +17,10 @@ rec {
   asdFilesToKeep = ["xembed.asd"];
   overrides = x: x;
 }
-/* (SYSTEM xembed DESCRIPTION NIL SHA256
-    06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb URL
-    http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz
-    MD5 4270362697093017ac0243b71e3576f9 NAME xembed FILENAME xembed DEPS
-    ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20120909-git
+/* (SYSTEM xembed DESCRIPTION
+    An implementation of the XEMBED protocol that integrates with CLX. SHA256
+    1a0yy707qdb7sw20lavmhlass3n3ds2pn52jxdkrvpgg358waf3j URL
+    http://beta.quicklisp.org/archive/clx-xembed/2019-03-07/clx-xembed-20190307-git.tgz
+    MD5 04304f828ea8970b6f5301fe78ed8e10 NAME xembed FILENAME xembed DEPS
+    ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20190307-git
     SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
index ad90b855218..3e14a5ba9f0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''xpath'';
-  version = ''plexippus-20181210-git'';
+  version = ''plexippus-20190521-git'';
 
   parasites = [ "xpath/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz'';
-    sha256 = ''1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn'';
+    url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz'';
+    sha256 = ''15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa'';
   };
 
   packageName = "xpath";
@@ -21,9 +21,9 @@ rec {
 }
 /* (SYSTEM xpath DESCRIPTION
     An implementation of the XML Path Language (XPath) Version 1.0 SHA256
-    1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn URL
-    http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz
-    MD5 106060a6e90dd35c80385ad5a1e8554d NAME xpath FILENAME xpath DEPS
+    15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa URL
+    http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz
+    MD5 eb9a4c39a7c37aa0338c401713b3f944 NAME xpath FILENAME xpath DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
@@ -34,4 +34,4 @@ rec {
     DEPENDENCIES
     (alexandria babel cl-ppcre closure-common cxml parse-number puri
      trivial-features trivial-gray-streams yacc)
-    VERSION plexippus-20181210-git SIBLINGS NIL PARASITES (xpath/test)) */
+    VERSION plexippus-20190521-git SIBLINGS NIL PARASITES (xpath/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 3343f22b7b0..2e4ceda31c8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -165,4 +165,11 @@ $out/lib/common-lisp/query-fs"
       meta.broken = true; # 2018-04-10
     };
   };
+  split-sequence = x: {
+    overrides = y: (x.overrides y) // {
+      preConfigure = ''
+        sed -i -e '/:components/i:serial t' split-sequence.asd
+      '';
+    };
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 0de50a17ad6..2e71e0174f6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -590,6 +590,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."lack-util" or (x: {}))
        (import ./quicklisp-to-nix-output/lack-util.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "ironclad" = quicklisp-to-nix-packages."ironclad";
            "nibbles" = quicklisp-to-nix-packages."nibbles";
        }));
@@ -1352,6 +1354,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."lack" or (x: {}))
        (import ./quicklisp-to-nix-output/lack.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "ironclad" = quicklisp-to-nix-packages."ironclad";
            "lack-component" = quicklisp-to-nix-packages."lack-component";
            "lack-util" = quicklisp-to-nix-packages."lack-util";
@@ -1372,6 +1376,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."ironclad" or (x: {}))
        (import ./quicklisp-to-nix-output/ironclad.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "nibbles" = quicklisp-to-nix-packages."nibbles";
            "rt" = quicklisp-to-nix-packages."rt";
        }));
@@ -1683,6 +1689,7 @@ let quicklisp-to-nix-packages = rec {
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "sqlite" = quicklisp-to-nix-packages."sqlite";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
            "trivial-types" = quicklisp-to-nix-packages."trivial-types";
            "uiop" = quicklisp-to-nix-packages."uiop";
        }));
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
index 9dd82ce2b2d..6a4c2b4ad1a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
@@ -352,7 +352,10 @@ quicklisp-to-nix."
         (remove name (mapcar 'name ql-sibling-systems)
                 :test 'equal))
        (dependencies raw-dependencies)
-       (description (asdf:system-description (asdf:find-system system)))
+       (description
+         (or
+           (ignore-errors (asdf:system-description (asdf:find-system system)))
+           "System lacks description"))
        (release-name (short-description ql-release)))
     (list
      :system system

From f34f38ef1c0d2e9e5d985d266cfff84e17312fd1 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 19 Aug 2019 17:42:30 +0200
Subject: [PATCH 162/794] nixos/systemd: honor default enableCgroupAccounting
 settings

systemd defaults DefaultMemoryAccounting and DefaultTasksAccounting to
yes, so no need to enable explicitly
---
 nixos/modules/system/boot/systemd.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 23a2dd45d49..877c608188b 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -806,8 +806,6 @@ in
           DefaultCPUAccounting=yes
           DefaultIOAccounting=yes
           DefaultBlockIOAccounting=yes
-          DefaultMemoryAccounting=yes
-          DefaultTasksAccounting=yes
         ''}
         DefaultLimitCORE=infinity
         ${config.systemd.extraConfig}

From f3a18d4562f30737235997e666ed41d6c2e6235a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 19 Aug 2019 17:43:57 +0200
Subject: [PATCH 163/794] nixos/systemd: add new Default{BlockIO,IP}Accounting
 settings

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

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 877c608188b..5d0783b663d 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -804,8 +804,10 @@ in
         [Manager]
         ${optionalString config.systemd.enableCgroupAccounting ''
           DefaultCPUAccounting=yes
+          DefaultBlockIOAccounting=yes
           DefaultIOAccounting=yes
           DefaultBlockIOAccounting=yes
+          DefaultIPAccounting=yes
         ''}
         DefaultLimitCORE=infinity
         ${config.systemd.extraConfig}

From 0fb17141fb2c8a9d64ada11b7e3082b2b8041d7a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 19 Aug 2019 17:50:29 +0200
Subject: [PATCH 164/794] nixos/systemd: enable cgroup accounting by default

If this is the default for OpenShift already, we probably can enable it
as well.

see https://github.com/openshift/machine-config-operator/pull/581
---
 nixos/doc/manual/release-notes/rl-1909.xml | 20 ++++++++++++++------
 nixos/modules/system/boot/systemd.nix      |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index b02d99438de..85ad34f6a66 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -506,12 +506,20 @@
     been removed.
    </para>
   </listitem>
-   <listitem>
-    <para>
-      The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer.
-      Use <literal>rspamd</literal> in proxy mode instead.
-    </para>
-   </listitem>
+  <listitem>
+   <para>
+    The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer.
+    Use <literal>rspamd</literal> in proxy mode instead.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+     systemd cgroup accounting via the
+     <link linkend="opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link>
+     option is now enabled by default. It now also enables the more recent Block IO and IP accounting
+     features.
+   </para>
+  </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 5d0783b663d..2a0360b12cb 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -537,7 +537,7 @@ in
     };
 
     systemd.enableCgroupAccounting = mkOption {
-      default = false;
+      default = true;
       type = types.bool;
       description = ''
         Whether to enable cgroup accounting.

From 6b075ddc8fc02358e5bd4b41cb3c36a691a1f424 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 19 Aug 2019 17:59:30 +0200
Subject: [PATCH 165/794] nixos/systemd: add cgroup accounting test

---
 nixos/tests/systemd.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index 3168c026d51..1c201e3b5dc 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -89,5 +89,12 @@ import ./make-test.nix ({ pkgs, ... }: {
      $machine->waitForUnit('multi-user.target');
      $machine->succeed('sysctl net.core.default_qdisc | grep -q "fq_codel"');
    };
+
+   # Test cgroup accounting is enabled
+   subtest "systemd cgroup accounting is enabled", sub {
+     $machine->waitForUnit('multi-user.target');
+     $machine->succeed('systemctl show testservice1.service -p IOAccounting | grep -q "yes"');
+     $machine->succeed('systemctl status testservice1.service | grep -q "CPU:"');
+   };
   '';
 })

From f44bb0d0c387a3251d21e842521045c36f930f70 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Sun, 25 Aug 2019 14:41:50 -0700
Subject: [PATCH 166/794] ffsend: v0.2.49 -> v0.2.50

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

diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 22697cfb24d..73734ee5ea0 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -16,16 +16,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   pname = "ffsend";
-  version = "0.2.49";
+  version = "0.2.50";
 
   src = fetchFromGitLab {
     owner = "timvisee";
     repo = "ffsend";
     rev = "v${version}";
-    sha256 = "08x0kakhn75yzajxpvpdp1ml9z77i2x2k02kqcx3ssr6mbc7xnpf";
+    sha256 = "06virzmg3prvwk5gilr19qrpi93wvv7jq096kgsbn3rmnv3ys1zh";
   };
 
-  cargoSha256 = "1dmkij25gj0ya1i6h5l7pkjnqvj02zvsx15hddbjn1q06pihcsjm";
+  cargoSha256 = "1g72nz3nha41cvsb514z4k78yw7xcsh3nm0bl2wqy9dvdzgp1lm1";
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ openssl ]

From 64f6a951eb9e557e12196e58feee82e0cd09cc41 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 26 Aug 2019 01:31:10 +0200
Subject: [PATCH 167/794] darwin.network_cmds: pin to openssl 1.0.2

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

diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index feee054c2ac..9ca0f3b4e56 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -1,9 +1,9 @@
 { stdenv, appleDerivation, xcbuildHook
-, openssl, Librpcsvc, xnu, libpcap, developer_cmds }:
+, openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }:
 
 appleDerivation rec {
   nativeBuildInputs = [ xcbuildHook ];
-  buildInputs = [ openssl xnu Librpcsvc libpcap developer_cmds ];
+  buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ];
 
   NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/";
 

From a5d13ad2259a1af61a22297ec373779ebca7e324 Mon Sep 17 00:00:00 2001
From: Nathan Yong <nathyong@users.noreply.github.com>
Date: Mon, 26 Aug 2019 09:48:00 +1000
Subject: [PATCH 168/794] vcv-rack: 1.1.3 -> 1.1.4

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

diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 2e55306029f..9a27ed302e6 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -28,13 +28,13 @@ let
 in
 with stdenv.lib; stdenv.mkDerivation rec {
   name = "VCV-Rack-${version}";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "VCVRack";
     repo = "Rack";
     rev = "v${version}";
-    sha256 = "16q3x0jpwkdwwvh7rn472w7nfjf81s10z9c7bx011kk7rgk88hh2";
+    sha256 = "04kg0nm7w19s2zfrsxjfl3bs4sy3bzf28kzl4hayzwv480667ybx";
     fetchSubmodules = true;
   };
 
@@ -78,7 +78,7 @@ with stdenv.lib; stdenv.mkDerivation rec {
     # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a
     # no-derivatives clause
     license = with licenses; [ bsd3 cc-by-nc-40 unfreeRedistributable ];
-    maintainers = with maintainers; [ moredread ];
+    maintainers = with maintainers; [ moredread nathyong ];
     platforms = platforms.linux;
   };
 }

From 907529ff0641d1202a3cd0c278c41871540b65d5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 26 Aug 2019 02:01:49 +0200
Subject: [PATCH 169/794] lib/options: fix path in comment

---
 lib/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/options.nix b/lib/options.nix
index d2eae3ae3a9..e5c0631a543 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -36,7 +36,7 @@ rec {
     example ? null,
     # String describing the option.
     description ? null,
-    # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix).
+    # Related packages used in the manual (see `genRelatedPackages` in ../nixos/lib/make-options-doc/default.nix).
     relatedPackages ? null,
     # Option type, providing type-checking and value merging.
     type ? null,

From e3a6b8f31fd781f58084d104863d62247afcdf8a Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <xworld21@gmail.com>
Date: Mon, 26 Aug 2019 01:15:18 +0100
Subject: [PATCH 170/794] hugo: 0.55.4 -> 0.57.2 (#67462)

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 0bb3f15fdc1..2b49a5ae9a9 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   name = "hugo-${version}";
-  version = "0.55.4";
+  version = "0.57.2";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner  = "gohugoio";
     repo   = "hugo";
     rev    = "v${version}";
-    sha256 = "0hbkl8dhhdic0admrkvlp1h1bmfrrwfnvipx27clyk0f88jcvb7y";
+    sha256 = "1cqvm2fj6hh2n9iv67vamhn23fbxmmwciks0r4h4y0hapzlzpyd8";
   };
 
-  modSha256 = "0yrwkaaasj9ihjjfbywnzkppix1y2znagg3dkyikk21sl5n0nz23";
+  modSha256 = "09r7r1s5b2fvnzpzjarpv2lnvp6bxdfschiq6352hw631n7kkyz1";
 
   buildFlags = "-tags extended";
 

From 81fe072a8fb335a668d68e9dde9fe4bf60e611a6 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 26 Aug 2019 02:22:03 +0200
Subject: [PATCH 171/794] nixos/unifi: restarting on failure (#67456)

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

diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 6239c88b7e4..c922ba15960 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -176,6 +176,7 @@ in
         Type = "simple";
         ExecStart = "${(removeSuffix "\n" cmd)} start";
         ExecStop = "${(removeSuffix "\n" cmd)} stop";
+        Restart = "on-failure";
         User = "unifi";
         UMask = "0077";
         WorkingDirectory = "${stateDir}";

From 3f4144c30a6351dd79b177328ec4dea03e2ce45f Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@users.noreply.github.com>
Date: Mon, 26 Aug 2019 03:29:21 +0300
Subject: [PATCH 172/794] gofumpt: Init at 2019-07-29 (#66892)

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

diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix
new file mode 100644
index 00000000000..221058a461e
--- /dev/null
+++ b/pkgs/development/tools/gofumpt/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "gofumpt";
+  version = "2019-07-29";
+
+  src = fetchFromGitHub {
+    owner = "mvdan";
+    repo = pname;
+    rev = "96300e3d49fbb3b7bc9c6dc74f8a5cc0ef46f84b";
+    sha256 = "169hwggbhlr6ga045d6sa7xsan3mnj19qbh63i3h4rynqlppzvpf";
+  };
+
+  modSha256 = "1g7dkl60zwlk4q2gwx2780xys8rf2c4kqyy8gr99s5y342wsbx2g";
+
+  meta = with lib; {
+    description = "A stricter gofmt";
+    homepage = https://github.com/mvdan/gofumpt;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ rvolosatovs ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0429fd68c3..25a2e16cf46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16149,6 +16149,8 @@ in
 
   goconvey = callPackage ../development/tools/goconvey { };
 
+  gofumpt = callPackage ../development/tools/gofumpt { };
+
   gotags = callPackage ../development/tools/gotags { };
 
   golint = callPackage ../development/tools/golint { };

From 48d0e9401ee55df3c6a4291df8c6297943de2327 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 25 Aug 2019 20:35:19 -0400
Subject: [PATCH 173/794] cpython: skip macOS system frameworks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don’t want cpython picking up /Library/Frameworks and
/System/Library/Frameworks which contains Tcl.framework. Instead it
should use the one provided by Nix. this would not be an issue if
sandboxing was enabled, but unfortunately that has its own issues.

Fixes #66647
---
 pkgs/development/interpreters/python/cpython/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 7561fdad785..60d067c1bf2 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -83,6 +83,8 @@ in with passthru; stdenv.mkDerivation {
   prePatch = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
+  '' + optionalString (stdenv.isDarwin && x11Support) ''
+    substituteInPlace setup.py --replace /Library/Frameworks /no-such-path
   '';
 
   patches = [

From b2fd2b739e59686ee0636ed921cc90eb38a1a266 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 25 Aug 2019 21:54:45 -0400
Subject: [PATCH 174/794] emacs-irony: fix build

Fixes #66556
---
 .../editors/emacs-modes/melpa-packages.nix    | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index f57c1b71b13..d80d680aaa1 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -131,20 +131,20 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         initsplit = markBroken super.initsplit;
 
-        irony = super.irony.overrideAttrs(old: {
+        irony = super.irony.overrideAttrs (old: {
+          cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
           preConfigure = ''
             cd server
           '';
           preBuild = ''
             make
+            install -D bin/irony-server $out/bin/irony-server
+            cd ..
           '';
-          postInstall = ''
-            mkdir -p $out
-            mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
-            rm -rf $out/share/emacs/site-lisp/elpa/*/server
-          '';
-          preCheck = ''
+          checkPhase = ''
             cd source/server
+            make check
+            cd ../..
           '';
           dontUseCmakeBuildDir = true;
           doCheck = true;
@@ -396,13 +396,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # Expects bash to be at /bin/bash
         helm-rtags = markBroken super.helm-rtags;
 
-        # Fails with "package does not untar cleanly into ..."
-        irony = shared.irony.overrideAttrs(old: {
-          meta = old.meta // {
-            broken = true;
-          };
-        });
-
         orgit =
           (super.orgit.overrideAttrs (attrs: {
             # searches for Git at build time

From b993fb03aca3967c6efc7f40971ec900d161dee5 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 25 Aug 2019 21:57:21 -0400
Subject: [PATCH 175/794] melpa-packages.nix: remove generic

This file does not exist
---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index d80d680aaa1..9574ec43a61 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -33,8 +33,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
     inherit (import ./libgenerated.nix lib self) melpaDerivation;
     super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson));
 
-    generic = import ./melpa-generic.nix;
-
     overrides = rec {
       shared = {
         # Expects bash to be at /bin/bash

From ae3fc3a6882360ff8a221969c70bc470c5094523 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 14 Jul 2019 07:20:01 -0400
Subject: [PATCH 176/794] nixos/pantheon: fix launching nm-applet components

For some reason nm-applet has to be running for an authentication
dialog to be spawned by wingpanel-indicator-network.

This also fixes storing NetworkManager secrets in the keyring, but this
is still broken because we lack the proper PAM configuration.
---
 nixos/modules/services/x11/desktop-managers/pantheon.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index ae23015d200..34ad969987a 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -145,6 +145,9 @@ in
     programs.dconf.enable = true;
     programs.evince.enable = mkDefault true;
     programs.file-roller.enable = mkDefault true;
+    # Otherwise you can't store NetworkManager Secrets with
+    # "Store the password only for this user"
+    programs.nm-applet.enable = true;
 
     # Shell integration for VTE terminals
     programs.bash.vteIntegration = mkDefault true;

From fc565c1b9d59a4a1b96d8ead859d3ea6f03a7d0e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 25 Aug 2019 23:42:31 -0400
Subject: [PATCH 177/794] nixos/update-users-groups.pl: chomp hashedPassword
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don’t want any trailing whitespace, otherwise we mess up the
formating of the shadow file. Some things like readFile may have the
trailing new line.

Fixes #66745
---
 nixos/modules/config/update-users-groups.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index ef5e6346f02..59cea51c611 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -267,6 +267,7 @@ foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) {
     next if !defined $u;
     $hashedPassword = "!" if !$spec->{mutableUsers};
     $hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME
+    chomp $hashedPassword;
     push @shadowNew, join(":", $name, $hashedPassword, @rest) . "\n";
     $shadowSeen{$name} = 1;
 }

From 70c1c856d4c96fb37b6e507db4acb125656f992d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Aug 2019 00:19:48 -0400
Subject: [PATCH 178/794] qtbase: remove sdk.mk check for macOS

---
 .../libraries/qt-5/5.12/qtbase.patch          | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
index 118ffaa511e..87ed0ddc4d4 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
@@ -1114,3 +1114,33 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmak
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
+diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
+index c40f58c987..e69de29bb2 100644
+--- a/mkspecs/features/mac/sdk.mk
++++ b/mkspecs/features/mac/sdk.mk
+@@ -1,25 +0,0 @@
+-
+-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
+-    CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1
+-    CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
+-    ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
+-        # We don't want to complain about out of date SDK unless the target needs to be remade.
+-        # This covers use-cases such as running 'make check' after moving the build to a
+-        # computer without Xcode or with a different Xcode version.
+-        TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0)
+-        ifeq ($(TARGET_UP_TO_DATE),0)
+-            ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),)
+-                $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.)
+-            else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),)
+-                $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.)
+-            else ifneq ($(CURRENT_MAC_SDK_VERSION),)
+-                $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)
+-            else
+-                $(info Unknown error resolving current platform SDK version.)
+-            endif
+-            $(info This requires a fresh build. Please wipe the build directory completely,)
+-            $(info including any .qmake.stash and .qmake.cache files generated by qmake.)
+-            $(error ^)
+-        endif
+-    endif
+-endif

From aa2bf1bc25a622bc6c86c5047e3cf149d811da20 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 25 Aug 2019 23:15:26 -0700
Subject: [PATCH 179/794] ansible: 2.8.2 -> 2.8.4

---
 pkgs/development/python-modules/ansible/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index e21445ab3ec..fab3c0df58c 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchurl
+, fetchFromGitHub
 , buildPythonPackage
 , pycrypto
 , paramiko
@@ -18,11 +18,13 @@
 
 buildPythonPackage rec {
   pname = "ansible";
-  version = "2.8.2";
+  version = "2.8.4";
 
-  src = fetchurl {
-    url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
-    sha256 = "1e5ba829ca0602c55b33da399b06f99b135a34014b661d1c36d8892a1e2d3730";
+  src = fetchFromGitHub {
+    owner = "ansible";
+    repo = "ansible";
+    rev = "v${version}";
+    sha256 = "1fp7zz8awfv70nn8i6x0ggx4472377hm7787x16qv2kz4nb069ki";
   };
 
   prePatch = ''

From 6256c215b26754c4d8312f71fdfdee8ee6d3a22b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 11 Jun 2019 14:30:04 +0800
Subject: [PATCH 180/794] perlPackages.DeviceSerialPort: init at 1.04

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cd9d4936491..1d0b4b2e190 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15004,6 +15004,18 @@ let
     };
   };
 
+  DeviceSerialPort = buildPerlPackage rec {
+    name = "Device-SerialPort-1.04";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CO/COOK/${name}.tar.gz";
+      sha256 = "1mz9a2qzkz6fbz76wcwmp48h6ckjxpcazb70q03acklvndy5d4nk";
+    };
+    meta = with stdenv.lib; {
+      description = "Linux/POSIX emulation of Win32::SerialPort functions.";
+      license = with licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   ServerStarter = buildPerlModule {
     pname = "Server-Starter";
     version = "0.34";

From 7c119ba48bb14ee4b736b391eca81753d0320c61 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 11 Jun 2019 14:30:22 +0800
Subject: [PATCH 181/794] zoneminder: use DeviceSerialPort for zmtrigger.pl

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

diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index 5a052df9e0a..996bd6a8fb6 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -146,7 +146,7 @@ in stdenv.mkDerivation rec {
     # build-time dependencies
     DateManip DBI DBDmysql LWP SysMmap
     # run-time dependencies not checked at build-time
-    ClassStdFast DataDump JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
+    ClassStdFast DataDump DeviceSerialPort JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
   ]);
 
   nativeBuildInputs = [ cmake makeWrapper pkgconfig ];

From 574ec28ef17b91c883c1c6c6a389c8653a2428dd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 11 Jun 2019 14:30:45 +0800
Subject: [PATCH 182/794] nixos/zoneminder: open telnet port for remote admin

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

diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index 6e83d47df1c..bf38b9ad7a2 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -200,7 +200,10 @@ in {
       "zoneminder/80-nixos.conf".source    = configFile;
     };
 
-    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ];
+    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [
+      cfg.port
+      6802 # zmtrigger
+    ];
 
     services = {
       fcgiwrap = lib.mkIf useNginx {

From ca0c667a0873590fb2975983c42da8f39de7565b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 26 Aug 2019 14:57:39 +0800
Subject: [PATCH 183/794] remove duplicate definition

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1d0b4b2e190..ce83fbd6e8d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4532,17 +4532,6 @@ let
     };
   };
 
-  DeviceSerialPort = buildPerlPackage {
-    pname = "Device-SerialPort";
-    version = "1.04";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CO/COOK/Device-SerialPort-1.04.tar.gz;
-      sha256 = "1mz9a2qzkz6fbz76wcwmp48h6ckjxpcazb70q03acklvndy5d4nk";
-    };
-    meta = {
-    };
-  };
-
   DBDMock = buildPerlModule {
     pname = "DBD-Mock";
     version = "1.45";

From 3d67ac24c3fb81709f56015bffc7ca1ab45aeb60 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 26 Aug 2019 15:45:56 +0800
Subject: [PATCH 184/794] perlPackages.DeviceSerialPort: name -> pname

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ce83fbd6e8d..6180f6372e2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14994,9 +14994,10 @@ let
   };
 
   DeviceSerialPort = buildPerlPackage rec {
-    name = "Device-SerialPort-1.04";
+    pname = "Device-SerialPort";
+    version = "1.04";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/C/CO/COOK/${name}.tar.gz";
+      url = "mirror://cpan/authors/id/C/CO/COOK/${pname}-${version}.tar.gz";
       sha256 = "1mz9a2qzkz6fbz76wcwmp48h6ckjxpcazb70q03acklvndy5d4nk";
     };
     meta = with stdenv.lib; {

From 792c8e8756ca4df76aa1ee0ddd360c8636b6487c Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 26 Aug 2019 00:53:26 -0700
Subject: [PATCH 185/794] allegro: 5.2.4.0 -> 5.2.5.0

---
 pkgs/development/libraries/allegro/5.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 9f8ca69a70f..b267c62d6c7 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -8,14 +8,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "allegro-${version}";
-  version = "5.2.4.0";
+  pname = "allegro";
+  version = "5.2.5.0";
 
   src = fetchFromGitHub {
     owner = "liballeg";
     repo = "allegro5";
     rev = version;
-    sha256 = "01y3hirn5b08f188nnhb2cbqj4vzysr7l2qpz2208srv8arzmj2d";
+    sha256 = "1jrnizpwznyxz2c7zb75lfy7l51ww5jlqfaahcrycfj1xay9mpqp";
   };
 
   buildInputs = [
@@ -28,14 +28,6 @@ stdenv.mkDerivation rec {
     libpulseaudio libpthreadstubs
   ];
 
-  patches = [
-   # fix compilation with mesa 18.2.5
-   (fetchpatch {
-     url = "https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47.patch";
-     sha256 = "1f1xlj5y2vr6wzmcz04s8kxn8cfdwrg9kjlnvpz9dix1z3qjnd4m";
-   })
-  ];
-
   postPatch = ''
     sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
   '';

From 336eb202f633dfb9cb46a8b8a6d95a4ea343b3d3 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 26 Aug 2019 10:01:51 +0200
Subject: [PATCH 186/794] exiv2: enable tests

---
 pkgs/development/libraries/exiv2/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index f0e685d3daf..85889cf8af1 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -53,8 +53,6 @@ stdenv.mkDerivation rec {
     "doc"
   ];
 
-  doCheck = stdenv.isLinux;
-
   # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake.
   checkTarget = "tests";
 

From 076f9d88dde8313fe4ecc1a390f3705590259dd1 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 26 Aug 2019 16:40:04 +0800
Subject: [PATCH 187/794] astyle: use cmake to avoid having to manually fix up
 LDFLAGS

---
 .../development/tools/misc/astyle/default.nix | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix
index e66d92e34d6..66e972826cb 100644
--- a/pkgs/development/tools/misc/astyle/default.nix
+++ b/pkgs/development/tools/misc/astyle/default.nix
@@ -1,32 +1,26 @@
-{ stdenv, fetchurl }:
+{ stdenv, lib, fetchurl, cmake }:
 
-let
-  name = "astyle";
+stdenv.mkDerivation rec {
+  pname = "astyle";
   version = "3.1";
-in
-stdenv.mkDerivation {
-  name = "${name}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}_${version}_linux.tar.gz";
     sha256 = "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b";
   };
 
-  sourceRoot = if stdenv.cc.isClang
-    then "astyle/build/clang"
-    else "astyle/build/gcc";
+  # lots of hardcoded references to /usr
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace ' /usr/' " $out/"
+  '';
 
-  # -s option is obsolete on Darwin and breaks build
-  postPatch = if stdenv.isDarwin then ''
-    substituteInPlace Makefile --replace "LDFLAGSr   = -s" "LDFLAGSr ="
-  '' else null;
+  nativeBuildInputs = [ cmake ];
 
-  installFlags = "INSTALL=install prefix=$$out";
-
-  meta = {
-    homepage = http://astyle.sourceforge.net/;
+  meta = with lib; {
     description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.unix;
+    homepage = "https://astyle.sourceforge.net/";
+    license = licenses.lgpl3;
+    platforms = platforms.unix;
   };
 }

From 05de8873686d97bd9b8eec135fc189adc2c719e3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 25 Aug 2019 23:15:52 -0700
Subject: [PATCH 188/794] pythonPackage.pytest-ansible: 2.0.2- > 2.1.1

---
 .../python-modules/pytest-ansible/default.nix    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index 3085ee06e87..0ef79cd0989 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , ansible
 , pytest
 , mock
@@ -8,11 +8,13 @@
 
 buildPythonPackage rec {
   pname = "pytest-ansible";
-  version = "2.0.2";
+  version = "2.1.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d69d89cbcf29e587cbe6ec4b229346edbf027d3c04944dd7bcbf3d7bba46348f";
+  src = fetchFromGitHub {
+    owner = "ansible";
+    repo = "pytest-ansible";
+    rev = "v${version}";
+    sha256 = "0v97sqk3q2vkmwnjlnncz8ss8086x9jg3cz0g2nzlngs4ql1gdb0";
   };
 
   patchPhase = ''
@@ -24,11 +26,11 @@ buildPythonPackage rec {
   checkInputs =  [ mock ];
   propagatedBuildInputs = [ ansible pytest ];
 
-  # tests not included with release
+  # tests not included with release, even on github
   doCheck = false;
 
   checkPhase = ''
-    pytest
+    HOME=$TMPDIR pytest tests/
   '';
 
   meta = with stdenv.lib; {

From c8e863e25ecc7e20836f8f9275329d5afd5e4f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 26 Aug 2019 11:04:10 +0200
Subject: [PATCH 189/794] nixos/systemd: Add suspend-then-hibernate units

Pretty useful for laptops. I use them with:

```
services.logind.lidSwitch = "suspend-then-hibernate";
environment.etc."systemd/sleep.conf".text = "HibernateDelaySec=8h";
```
---
 nixos/modules/system/boot/systemd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 23a2dd45d49..fedb2ebe86f 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -112,11 +112,13 @@ let
       # Hibernate / suspend.
       "hibernate.target"
       "suspend.target"
+      "suspend-then-hibernate.target"
       "sleep.target"
       "hybrid-sleep.target"
       "systemd-hibernate.service"
       "systemd-hybrid-sleep.service"
       "systemd-suspend.service"
+      "systemd-suspend-then-hibernate.service"
 
       # Reboot stuff.
       "reboot.target"

From fca8d355317eee3d112f40fa8b02740e4057b5b2 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 25 Aug 2019 18:52:38 -0400
Subject: [PATCH 190/794] nixos/gnome3: split up

This introduces the following options under the services.gnome3 namespace:

* core-os-services.enable
* core-shell.enable
* core-utilities.enable
* games.enable

The first three are all default enabled by gnome3.enable
and their purpose is to make gnome3 more flexable for users
usecases. In the case of core-utilities and games, it allows
users to easily switch on the default gnome3 applications
and games packages. Previously we had lists in gnome-3/default.nix
but they weren't visible to the user. By having options we have
generated documentation and an interface.
---
 .../services/x11/desktop-managers/gnome3.nix  | 283 +++++++++++-------
 pkgs/desktops/gnome-3/default.nix             |  30 --
 2 files changed, 172 insertions(+), 141 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index b18d06a095d..16622bd1beb 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -3,7 +3,9 @@
 with lib;
 
 let
+
   cfg = config.services.xserver.desktopManager.gnome3;
+  serviceCfg = config.services.gnome3;
 
   # Prioritize nautilus by default when opening directories
   mimeAppsList = pkgs.writeTextFile {
@@ -45,10 +47,19 @@ let
 
   flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0;
 
-in {
+in
+
+{
 
   options = {
 
+    services.gnome3 = {
+      core-os-services.enable = mkEnableOption "essential services for GNOME3";
+      core-shell.enable = mkEnableOption "GNOME Shell services";
+      core-utilities.enable = mkEnableOption "GNOME core utilities";
+      games.enable = mkEnableOption "GNOME games";
+    };
+
     services.xserver.desktopManager.gnome3 = {
       enable = mkOption {
         default = false;
@@ -121,62 +132,13 @@ in {
 
   };
 
-  config = mkIf cfg.enable {
+  config = mkMerge [
+    (mkIf cfg.enable {
+      services.gnome3.core-os-services.enable = true;
+      services.gnome3.core-shell.enable = true;
+      services.gnome3.core-utilities.enable = mkDefault true;
 
-    # Enable helpful DBus services.
-    security.polkit.enable = true;
-    services.udisks2.enable = true;
-    services.accounts-daemon.enable = true;
-    services.dleyna-renderer.enable = mkDefault true;
-    services.dleyna-server.enable = mkDefault true;
-    services.gnome3.at-spi2-core.enable = true;
-    services.gnome3.evolution-data-server.enable = true;
-    services.gnome3.glib-networking.enable = true;
-    services.gnome3.gnome-keyring.enable = true;
-    services.gnome3.gnome-online-accounts.enable = mkDefault true;
-    services.gnome3.gnome-remote-desktop.enable = mkDefault true;
-    services.gnome3.gnome-settings-daemon.enable = true;
-    services.gnome3.gnome-user-share.enable = mkDefault true;
-    services.gvfs.enable = true;
-    services.gnome3.rygel.enable = mkDefault true;
-    services.gnome3.seahorse.enable = mkDefault true;
-    services.gnome3.sushi.enable = mkDefault true;
-    services.gnome3.tracker.enable = mkDefault true;
-    services.gnome3.tracker-miners.enable = mkDefault true;
-    hardware.pulseaudio.enable = mkDefault true;
-    services.telepathy.enable = mkDefault true;
-    networking.networkmanager.enable = mkDefault true;
-    services.upower.enable = config.powerManagement.enable;
-    services.dbus.packages =
-      optional config.services.printing.enable pkgs.system-config-printer ++
-      optional flashbackEnabled pkgs.gnome3.gnome-screensaver;
-    services.colord.enable = mkDefault true;
-    services.packagekit.enable = mkDefault true;
-    hardware.bluetooth.enable = mkDefault true;
-    services.hardware.bolt.enable = mkDefault true;
-    services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
-    systemd.packages = [ pkgs.gnome3.vino ];
-    xdg.portal.enable = true;
-    xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-
-    # Enable default programs
-    programs.dconf.enable = true;
-    programs.evince.enable = mkDefault true;
-    programs.file-roller.enable = mkDefault true;
-    programs.gnome-disks.enable = mkDefault true;
-    programs.gnome-documents.enable = mkDefault true;
-    programs.gnome-terminal.enable = mkDefault true;
-
-    # If gnome3 is installed, build vim for gtk3 too.
-    nixpkgs.config.vim.gui = "gtk3";
-
-    fonts.fonts = [
-      pkgs.dejavu_fonts pkgs.cantarell-fonts
-      pkgs.source-sans-pro
-      pkgs.source-code-pro # Default monospace font in 3.32
-    ];
-
-    services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]
+      services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]
       ++ map
         (wm: pkgs.gnome3.gnome-flashback.mkSessionForWm {
           inherit (wm) wmName wmLabel wmCommand;
@@ -186,73 +148,172 @@ in {
               wmCommand = "${pkgs.gnome3.metacity}/bin/metacity";
             } ++ cfg.flashback.customSessions);
 
-    environment.extraInit = ''
-      ${concatMapStrings (p: ''
-        if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
-          export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
-        fi
+      environment.extraInit = ''
+        ${concatMapStrings (p: ''
+          if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
+            export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
+          fi
 
-        if [ -d "${p}/lib/girepository-1.0" ]; then
-          export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
-          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
-        fi
-      '') cfg.sessionPath}
-    '';
+          if [ -d "${p}/lib/girepository-1.0" ]; then
+            export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
+            export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
+          fi
+        '') cfg.sessionPath}
+      '';
 
+      environment.systemPackages = cfg.sessionPath;
 
-    services.geoclue2.enable = mkDefault true;
-    # GNOME should have its own geoclue agent
-    services.geoclue2.enableDemoAgent = false;
+      environment.variables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
 
-    services.geoclue2.appConfig."gnome-datetime-panel" = {
-      isAllowed = true;
-      isSystem = true;
-    };
-    services.geoclue2.appConfig."gnome-color-panel" = {
-      isAllowed = true;
-      isSystem = true;
-    };
-    services.geoclue2.appConfig."org.gnome.Shell" = {
-      isAllowed = true;
-      isSystem = true;
-    };
+      # Override GSettings schemas
+      environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
 
-    environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";
+       # If gnome3 is installed, build vim for gtk3 too.
+      nixpkgs.config.vim.gui = "gtk3";
+    })
 
-    # Override default mimeapps
-    environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
+    (mkIf serviceCfg.core-os-services.enable {
+      hardware.bluetooth.enable = mkDefault true;
+      hardware.pulseaudio.enable = mkDefault true;
+      programs.dconf.enable = true;
+      security.polkit.enable = true;
+      services.accounts-daemon.enable = true;
+      services.dleyna-renderer.enable = mkDefault true;
+      services.dleyna-server.enable = mkDefault true;
+      services.gnome3.at-spi2-core.enable = true;
+      services.gnome3.evolution-data-server.enable = true;
+      services.gnome3.gnome-keyring.enable = true;
+      services.gnome3.gnome-online-accounts.enable = mkDefault true;
+      services.gnome3.gnome-online-miners.enable = true;
+      services.gnome3.tracker-miners.enable = mkDefault true;
+      services.gnome3.tracker.enable = mkDefault true;
+      services.hardware.bolt.enable = mkDefault true;
+      services.packagekit.enable = mkDefault true;
+      services.udisks2.enable = true;
+      services.upower.enable = config.powerManagement.enable;
+      services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
 
-    # Override GSettings schemas
-    environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+      xdg.portal.enable = true;
+      xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
 
-    # Let nautilus find extensions
-    # TODO: Create nautilus-with-extensions package
-    environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
+      networking.networkmanager.enable = mkDefault true;
 
-    services.xserver.updateDbusEnvironment = true;
-
-    environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath
-      ++ (pkgs.gnome3.removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [
-      pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
-    ];
-
-    # Use the correct gnome3 packageSet
-    networking.networkmanager.basePackages =
-      { inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
+      # Use the correct gnome3 packageSet
+      networking.networkmanager.basePackages = {
+        inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
         inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
-                              networkmanager-openconnect networkmanager-fortisslvpn
-                              networkmanager-iodine networkmanager-l2tp; };
+        networkmanager-openconnect networkmanager-fortisslvpn
+        networkmanager-iodine networkmanager-l2tp;
+      };
 
-    # Needed for themes and backgrounds
-    environment.pathsToLink = [
-      "/share"
-      "/share/nautilus-python/extensions"
-    ];
+      services.xserver.updateDbusEnvironment = true;
 
-    security.pam.services.gnome-screensaver = mkIf flashbackEnabled {
-      enableGnomeKeyring = true;
-    };
-  };
+      # Needed for themes and backgrounds
+      environment.pathsToLink = [
+        "/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173
+      ];
+    })
 
+    (mkIf serviceCfg.core-shell.enable {
+      services.colord.enable = mkDefault true;
+      services.gnome3.glib-networking.enable = true;
+      services.gnome3.gnome-remote-desktop.enable = mkDefault true;
+      services.gnome3.gnome-settings-daemon.enable = true;
+      services.gnome3.gnome-user-share.enable = mkDefault true;
+      services.gnome3.rygel.enable = mkDefault true;
+      services.gvfs.enable = true;
+      services.telepathy.enable = mkDefault true;
+      systemd.packages = [ pkgs.gnome3.vino ];
+      services.dbus.packages =
+        optional config.services.printing.enable pkgs.system-config-printer ++
+        optional flashbackEnabled pkgs.gnome3.gnome-screensaver;
+
+      services.geoclue2.enable = mkDefault true;
+      services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent
+
+      services.geoclue2.appConfig."gnome-datetime-panel" = {
+        isAllowed = true;
+        isSystem = true;
+      };
+      services.geoclue2.appConfig."gnome-color-panel" = {
+        isAllowed = true;
+        isSystem = true;
+      };
+      services.geoclue2.appConfig."org.gnome.Shell" = {
+        isAllowed = true;
+        isSystem = true;
+      };
+
+      fonts.fonts = with pkgs; [
+        cantarell-fonts
+        dejavu_fonts
+        source-code-pro # Default monospace font in 3.32
+        source-sans-pro
+      ];
+
+      environment.systemPackages = with pkgs.gnome3; [
+        adwaita-icon-theme
+        gnome-backgrounds
+        gnome-bluetooth
+        gnome-control-center
+        gnome-getting-started-docs
+        gnome-shell
+        gnome-shell-extensions
+        gnome-themes-extra
+        gnome-user-docs
+        pkgs.glib # for gsettings
+        pkgs.gnome-menus
+        pkgs.gtk3.out # for gtk-launch
+        pkgs.hicolor-icon-theme
+        pkgs.shared-mime-info # for update-mime-database
+        pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
+        vino
+      ];
+
+      security.pam.services.gnome-screensaver = mkIf flashbackEnabled {
+        enableGnomeKeyring = true;
+      };
+    })
+
+    (mkIf serviceCfg.core-utilities.enable {
+      environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
+        baobab eog epiphany evince gucharmap nautilus totem yelp gnome-calculator
+        gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-monitor simple-scan
+        gnome-terminal evolution file-roller gedit gnome-clocks gnome-music gnome-tweaks
+        pkgs.gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
+        gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-packagekit
+        gnome-software gnome-power-manager gnome-todo pkgs.gnome-usage
+      ] config.environment.gnome3.excludePackages);
+
+      # Enable default programs
+      programs.evince.enable = mkDefault true;
+      programs.file-roller.enable = mkDefault true;
+      programs.gnome-disks.enable = mkDefault true;
+      programs.gnome-documents.enable = mkDefault true;
+      programs.gnome-terminal.enable = mkDefault true;
+      services.gnome3.seahorse.enable = mkDefault true;
+      services.gnome3.sushi.enable = mkDefault true;
+
+      # Let nautilus find extensions
+      # TODO: Create nautilus-with-extensions package
+      environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
+
+      # Override default mimeapps for nautilus
+      environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
+
+      environment.pathsToLink = [
+        "/share/nautilus-python/extensions"
+      ];
+    })
+
+    (mkIf serviceCfg.games.enable {
+      environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
+        aisleriot atomix five-or-more four-in-a-row gnome-chess gnome-klotski
+        gnome-mahjongg gnome-mines gnome-nibbles gnome-robots gnome-sudoku
+        gnome-taquin gnome-tetravex hitori iagno lightsoff quadrapassel
+        swell-foop tali
+      ] config.environment.gnome3.excludePackages);
+    })
+  ];
 
 }
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7820c32e2a6..95df8b33392 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -21,36 +21,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning worldofpeace ];
 
-  corePackages = with gnome3; [
-    pkgs.desktop-file-utils
-    pkgs.shared-mime-info # for update-mime-database
-    pkgs.glib # for gsettings
-    pkgs.gtk3.out # for gtk-update-icon-cache
-    glib-networking gvfs dconf gnome-backgrounds gnome-control-center
-    pkgs.gnome-menus gnome-settings-daemon gnome-shell
-    gnome-themes-extra adwaita-icon-theme gnome-shell-extensions
-    pkgs.hicolor-icon-theme
-  ];
-
-  optionalPackages = with gnome3; [ baobab eog epiphany evince
-    gucharmap nautilus totem vino yelp gnome-bluetooth
-    gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
-    gnome-system-monitor simple-scan
-    gnome-terminal gnome-user-docs evolution file-roller gedit
-    gnome-clocks gnome-music gnome-tweaks pkgs.gnome-photos
-    nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
-    gnome-getting-started-docs gnome-packagekit gnome-software
-    gnome-power-manager gnome-todo pkgs.gnome-usage
-  ];
-
-  gamesPackages = with gnome3; [ swell-foop lightsoff iagno
-    tali quadrapassel gnome-sudoku atomix aisleriot five-or-more
-    four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
-    gnome-mines gnome-nibbles gnome-robots gnome-tetravex
-    hitori gnome-taquin
-  ];
-
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
   gnome3 = self // { recurseForDerivations = false; };

From 01efdec3566b6923bafb1c70fc4b325b9e5a5ce5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 26 Aug 2019 04:20:00 -0500
Subject: [PATCH 191/794] tflint: 0.10.1 -> 0.10.3

Changelog: https://github.com/wata727/tflint/releases/tag/v0.10.3
---
 pkgs/development/tools/analysis/tflint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 24ad463439a..5099505cc5b 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.10.1";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "wata727";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0x9kh0bvbil6z09v41gzk5sdiprqg288jfcjw1n2x809sj7c6vhf";
+    sha256 = "1p4w1ddgb4nqibbrvix0p0gdlj6ann5lkyvlcsbkn25z8ha3qa39";
   };
 
-  modSha256 = "0wig41m81kmy7l6sj6kk4ryc3m1b18n2vlf80x0bbhn46kyfnbgr";
+  modSha256 = "1snanz4cpqkfgxp8k52w3x4i49k6d5jffcffrcx8xya8yvx2wxy3";
 
   subPackages = [ "." ];
 

From fc4ca1aead492d11dc8e5c7a08d450776881b989 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 13 Jul 2019 18:09:25 +0200
Subject: [PATCH 192/794] magnetico: init at 0.8.1

---
 .../networking/p2p/magnetico/default.nix      | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/networking/p2p/magnetico/default.nix

diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix
new file mode 100644
index 00000000000..1c266d247b7
--- /dev/null
+++ b/pkgs/applications/networking/p2p/magnetico/default.nix
@@ -0,0 +1,33 @@
+{ lib, fetchFromGitHub, buildGoModule, go-bindata }:
+
+buildGoModule rec {
+  pname = "magnetico";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner  = "boramalper";
+    repo   = "magnetico";
+    rev    = "v${version}";
+    sha256 = "1f7y3z9ql079ix6ycihkmd3z3da3sfiqw2fap31pbvvjs65sg644";
+  };
+
+  modSha256 = "1h9fij8mxlxfw7kxix00n10fkhkvmf8529fxbk1n30cxc1bs2szf";
+
+  buildInputs = [ go-bindata ];
+  buildPhase = ''
+    make magneticow magneticod
+  '';
+
+  doCheck = true;
+  checkPhase = ''
+    make test
+  '';
+
+  meta = with lib; {
+    description  = "Autonomous (self-hosted) BitTorrent DHT search engine suite.";
+    homepage     = https://github.com/boramalper/magnetico;
+    license      = licenses.agpl3;
+    badPlatforms = platforms.darwin;
+    maintainers  = with maintainers; [ rnhmjoj ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b56dbe6c15..081d6a912d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19062,6 +19062,8 @@ in
 
   marp = callPackage ../applications/office/marp { };
 
+  magnetico = callPackage ../applications/networking/p2p/magnetico { };
+
   matchbox = callPackage ../applications/window-managers/matchbox { };
 
   mblaze = callPackage ../applications/networking/mailreaders/mblaze { };

From 70e506cf7ca2f4b8bc712b1d69b4bdb0ba6f1af8 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 26 Aug 2019 05:36:11 -0400
Subject: [PATCH 193/794] nixos/gnome3: split out gnome-flashback

---
 .../services/x11/desktop-managers/gnome3.nix  | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 16622bd1beb..0caa93ad217 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -133,20 +133,12 @@ in
   };
 
   config = mkMerge [
-    (mkIf cfg.enable {
+    (mkIf (cfg.enable || flashbackEnabled) {
       services.gnome3.core-os-services.enable = true;
       services.gnome3.core-shell.enable = true;
       services.gnome3.core-utilities.enable = mkDefault true;
 
-      services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]
-      ++ map
-        (wm: pkgs.gnome3.gnome-flashback.mkSessionForWm {
-          inherit (wm) wmName wmLabel wmCommand;
-        }) (optional cfg.flashback.enableMetacity {
-              wmName = "metacity";
-              wmLabel = "Metacity";
-              wmCommand = "${pkgs.gnome3.metacity}/bin/metacity";
-            } ++ cfg.flashback.customSessions);
+      services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ];
 
       environment.extraInit = ''
         ${concatMapStrings (p: ''
@@ -172,6 +164,25 @@ in
       nixpkgs.config.vim.gui = "gtk3";
     })
 
+    (mkIf flashbackEnabled {
+      services.xserver.displayManager.extraSessionFilePackages =  map
+        (wm: pkgs.gnome3.gnome-flashback.mkSessionForWm {
+          inherit (wm) wmName wmLabel wmCommand;
+        }) (optional cfg.flashback.enableMetacity {
+              wmName = "metacity";
+              wmLabel = "Metacity";
+              wmCommand = "${pkgs.gnome3.metacity}/bin/metacity";
+            } ++ cfg.flashback.customSessions);
+
+      security.pam.services.gnome-screensaver = {
+        enableGnomeKeyring = true;
+      };
+
+      services.dbus.packages = [
+        pkgs.gnome3.gnome-screensaver
+      ];
+    })
+
     (mkIf serviceCfg.core-os-services.enable {
       hardware.bluetooth.enable = mkDefault true;
       hardware.pulseaudio.enable = mkDefault true;
@@ -225,8 +236,7 @@ in
       services.telepathy.enable = mkDefault true;
       systemd.packages = [ pkgs.gnome3.vino ];
       services.dbus.packages =
-        optional config.services.printing.enable pkgs.system-config-printer ++
-        optional flashbackEnabled pkgs.gnome3.gnome-screensaver;
+        optional config.services.printing.enable pkgs.system-config-printer;
 
       services.geoclue2.enable = mkDefault true;
       services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent
@@ -269,10 +279,6 @@ in
         pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
         vino
       ];
-
-      security.pam.services.gnome-screensaver = mkIf flashbackEnabled {
-        enableGnomeKeyring = true;
-      };
     })
 
     (mkIf serviceCfg.core-utilities.enable {

From bf7bdcd1c64682d7fe8bc01a766f75759264970a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 25 Aug 2019 20:41:31 -0400
Subject: [PATCH 194/794] gnome3: add throw's for old lists

---
 pkgs/desktops/gnome-3/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 95df8b33392..1f16ff9d0b5 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -355,4 +355,9 @@ lib.makeScope pkgs.newScope (self: with self; {
   rest = librest;
 
   pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01
+
+  # added 2019-08-25
+  corePackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-shell.enable`";
+  optionalPackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-utilities.enable`";
+  gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`";
 })

From 9b4e5a9325c1887cbd1fff5f50e59a5b3b2abc68 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 26 Aug 2019 12:02:45 +0200
Subject: [PATCH 195/794] exiv2: enabling tests for real

Fixes #67453
---
 pkgs/development/libraries/exiv2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 85889cf8af1..2dc435fe257 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
     "doc"
   ];
 
+  doCheck = true;
+
   # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake.
   checkTarget = "tests";
 

From 388d6de5bdb8ff5b525ca73ac0b2238402a0fe1e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Mon, 26 Aug 2019 12:58:06 +0200
Subject: [PATCH 196/794] gitAndTools.qgit: 2.8 -> 2.9

* switch name -> pname
* qtApps compatibility: use Qt's mkDerivation
* cmake: remove enableParallelBuilding
---
 .../git-and-tools/qgit/default.nix                | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 06c8bb8cb2d..74fad30b8a9 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase }:
 
-stdenv.mkDerivation rec {
-  name = "qgit-2.8";
+mkDerivation rec {
+  pname = "qgit";
+  version = "2.9";
 
   src = fetchFromGitHub {
     owner = "tibirna";
     repo = "qgit";
-    rev = name;
-    sha256 = "01l6mz2f333x3zbfr68mizwpsh6sdsnadcavpasidiych1m5ry8f";
+    rev = "${pname}-${version}";
+    sha256 = "0n4dq9gffm9yd7n5p5qcdfgrmg2kwnfd51hfx10adgj9ibxlnc3z";
   };
 
   buildInputs = [ qtbase ];
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl2;
     homepage = https://github.com/tibirna/qgit;
     description = "Graphical front-end to Git";

From 48046cf2b7b7696f2fdf7f939fe18ea3614c4aea Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 26 Aug 2019 07:54:16 -0400
Subject: [PATCH 197/794] linux: 5.2.9 -> 5.2.10

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

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

From c876affce0256f9ea725ad2760bfcba1b8b5bde5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 2 Apr 2018 11:33:07 +0800
Subject: [PATCH 198/794] nixos darkhttpd: module to enable darkhttpd

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/web-servers/darkhttpd.nix        | 77 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/darkhttpd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 437a118bf67..40f4d4ad4d0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -802,6 +802,7 @@
   ./services/web-apps/zabbix.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/caddy.nix
+  ./services/web-servers/darkhttpd.nix
   ./services/web-servers/fcgiwrap.nix
   ./services/web-servers/hitch/default.nix
   ./services/web-servers/hydron.nix
diff --git a/nixos/modules/services/web-servers/darkhttpd.nix b/nixos/modules/services/web-servers/darkhttpd.nix
new file mode 100644
index 00000000000..80870118c33
--- /dev/null
+++ b/nixos/modules/services/web-servers/darkhttpd.nix
@@ -0,0 +1,77 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.darkhttpd;
+
+  args = concatStringsSep " " ([
+    cfg.rootDir
+    "--port ${toString cfg.port}"
+    "--addr ${cfg.address}"
+  ] ++ cfg.extraArgs
+    ++ optional cfg.hideServerId             "--no-server-id"
+    ++ optional config.networking.enableIPv6 "--ipv6");
+
+in {
+  options.services.darkhttpd = with types; {
+    enable = mkEnableOption "DarkHTTPd web server";
+
+    port = mkOption {
+      default = 80;
+      type = ints.u16;
+      description = ''
+        Port to listen on.
+        Pass 0 to let the system choose any free port for you.
+      '';
+    };
+
+    address = mkOption {
+      default = "127.0.0.1";
+      type = str;
+      description = ''
+        Address to listen on.
+        Pass `all` to listen on all interfaces.
+      '';
+    };
+
+    rootDir = mkOption {
+      type = path;
+      description = ''
+        Path from which to serve files.
+      '';
+    };
+
+    hideServerId = mkOption {
+      type = bool;
+      default = true;
+      description = ''
+        Don't identify the server type in headers or directory listings.
+      '';
+    };
+
+    extraArgs = mkOption {
+      type = listOf str;
+      default = [];
+      description = ''
+        Additional configuration passed to the executable.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.darkhttpd = {
+      description = "Dark HTTPd";
+      wants = [ "network.target" ];
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        DynamicUser = true;
+        ExecStart = "${cfg.package}/bin/darkhttpd ${args}";
+        AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
+        Restart = "on-failure";
+        RestartSec = "2s";
+      };
+    };
+  };
+}

From 071804bf6062bbe54c76e3d8d020dc995fe22526 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 25 Aug 2019 01:05:48 +0200
Subject: [PATCH 199/794] =?UTF-8?q?babl:=200.1.66=20=E2=86=92=200.1.72?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/babl/blob/BABL_0_1_72/NEWS#L6-24
---
 pkgs/development/libraries/babl/default.nix   | 36 ++++++++++++++++---
 .../libraries/babl/fix-darwin.patch           | 16 +++++++++
 2 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/babl/fix-darwin.patch

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index eff6ff62632..d95797d5a5f 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,15 +1,41 @@
-{ stdenv, fetchurl }:
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, gobject-introspection
+, lcms2
+}:
 
 stdenv.mkDerivation rec {
   pname = "babl";
-  version = "0.1.66";
+  version = "0.1.72";
+
+  outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n";
+    url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4";
   };
 
-  doCheck = true;
+  patches = [
+    # Apple linker does not know --version-script flag
+    # https://gitlab.gnome.org/GNOME/babl/merge_requests/26
+    ./fix-darwin.patch
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkgconfig
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    lcms2
+  ];
+
+  doCheck = !stdenv.isDarwin;
 
   meta = with stdenv.lib; {
     description = "Image pixel format conversion library";
diff --git a/pkgs/development/libraries/babl/fix-darwin.patch b/pkgs/development/libraries/babl/fix-darwin.patch
new file mode 100644
index 00000000000..eaeff63689f
--- /dev/null
+++ b/pkgs/development/libraries/babl/fix-darwin.patch
@@ -0,0 +1,16 @@
+diff --git a/babl/meson.build b/babl/meson.build
+index b551c9a..f452435 100644
+--- a/babl/meson.build
++++ b/babl/meson.build
+@@ -24,9 +24,9 @@
+ ]
+ 
+ # Linker arguments
+-babl_link_args = [
++babl_link_args = cc.get_supported_link_arguments([
+   '-Wl,--version-script,' + version_script,
+-]
++])
+ if platform_win32
+   babl_link_args += '-Wl,--no-undefined'
+ endif

From ba2a16ffa2769abd46e6c29c47ef458afa904f3b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 25 Aug 2019 01:16:45 +0200
Subject: [PATCH 200/794] gegl_0_3: drop

---
 pkgs/development/libraries/gegl/3.0.nix | 38 -------------------------
 pkgs/top-level/all-packages.nix         |  4 ---
 2 files changed, 42 deletions(-)
 delete mode 100644 pkgs/development/libraries/gegl/3.0.nix

diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
deleted file mode 100644
index 54ee7662d06..00000000000
--- a/pkgs/development/libraries/gegl/3.0.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
-, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw
-, libwebp, gnome3, libintl }:
-
-stdenv.mkDerivation rec {
-  name = "gegl-0.3.34";
-
-  src = fetchurl {
-    url = "https://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
-    sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw";
-  };
-
-  hardeningDisable = [ "format" ];
-
-  # needs fonts otherwise  don't know how to pass them
-  configureFlags = [ "--disable-docs" ];
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  buildInputs = [
-    libpng cairo libjpeg librsvg pango gtk bzip2
-    libraw libwebp gnome3.gexiv2
-  ];
-
-  propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc
-
-  nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ];
-
-  meta = with stdenv.lib; {
-    description = "Graph-based image processing framework";
-    homepage = http://www.gegl.org;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84e88b918da..925a749c2b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10796,10 +10796,6 @@ in
     inherit (darwin.apple_sdk.frameworks) OpenGL;
   };
 
-  gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix {
-    gtk = res.gtk2;
-  };
-
   gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
     gtk = res.gtk2;
   };

From 7bf8d783f8148939e7e21ff85d6976bf6ac53727 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2019 13:34:07 +0200
Subject: [PATCH 201/794] The proper release of ghc-8.8.1 is out.

---
 pkgs/development/compilers/ghc/8.8.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
index 423eaf02d8c..95bbab3cb3e 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -86,12 +86,12 @@ let
 
 in
 stdenv.mkDerivation (rec {
-  version = "8.8.0.20190721";
+  version = "8.8.1";
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/ghc/8.8.1-rc1/ghc-${version}-src.tar.xz";
-    sha256 = "1ih76zpxk8ay84xjyaflqc754002y8pdaainqfvb4cnhy6lpb1br";
+    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
+    sha256 = "06kj4fhvijinjafiy4s873n60qly323rdlz9bmc79nhlp3cq72lh";
   };
 
   enableParallelBuilding = true;

From 43ab91e6c405fc70b04b3ba3f88711aa6a382c82 Mon Sep 17 00:00:00 2001
From: Alkeryn <plbraundev@gmail.com>
Date: Mon, 26 Aug 2019 15:02:10 +0200
Subject: [PATCH 202/794] ckb-next: fix #67371

---
 pkgs/tools/misc/ckb-next/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix
index b02446cd3e1..e913d517683 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/pkgs/tools/misc/ckb-next/default.nix
@@ -23,6 +23,10 @@ mkDerivation rec {
     cmake
   ];
 
+  cmakeFlags = [
+    "-DINSTALL_DIR_ANIMATIONS=libexec"
+  ];
+
   patches = [
     ./install-dirs.patch
     ./systemd-service.patch

From bc266953348d114ac05b861cd6d3a6dd6f406216 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 26 Aug 2019 14:06:28 +0100
Subject: [PATCH 203/794] poco: enable for darwin

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

diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index 68ddf5c91d1..e766657c19a 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -28,6 +28,5 @@ stdenv.mkDerivation rec {
     description = "Cross-platform C++ libraries with a network/internet focus";
     license = licenses.boost;
     maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
   };
 }

From f8c2a8461e83b84c0c5a6948fdcb73d04652e162 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 2 Jun 2019 12:01:30 +0100
Subject: [PATCH 204/794] cctz: enable for darwin

only minor tweaks needed
---
 pkgs/development/libraries/cctz/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix
index 2930ffa61e3..832b070c883 100644
--- a/pkgs/development/libraries/cctz/default.nix
+++ b/pkgs/development/libraries/cctz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, darwin }:
 
 stdenv.mkDerivation rec {
   name = "cctz-${version}";
@@ -13,8 +13,14 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation;
+
   installTargets = [ "install_hdrs" "install_shared_lib" ];
 
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so
+  '';
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From 38882f150388ce567d002515830c0c43c9807925 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 26 Aug 2019 15:02:38 +0200
Subject: [PATCH 205/794] =?UTF-8?q?mutest:=202019-08-12=20=E2=86=92=202019?=
 =?UTF-8?q?-08-26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes OOB write breaking graphene installed tests:

https://github.com/ebassi/mutest/pull/11
---
 pkgs/development/libraries/mutest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix
index b247706067e..423a93b69a8 100644
--- a/pkgs/development/libraries/mutest/default.nix
+++ b/pkgs/development/libraries/mutest/default.nix
@@ -6,15 +6,15 @@
 
 stdenv.mkDerivation rec {
   pname = "mutest";
-  version = "unstable-2019-10-12";
+  version = "unstable-2019-08-26";
 
   outputs = [ "out" "dev" ];
 
   src = fetchFromGitHub {
     owner = "ebassi";
     repo = "mutest";
-    rev = "822b5ddf07f957135ba39889d81e513d525b9b8e";
-    sha256 = "0a5fjdq9p0q5bibqngbbpd9lga0gzrv8yj5wgdfb8ylxzg0jph2p";
+    rev = "e6246c9ae4f36ffe8c021f0a80438f6c7a6efa3a";
+    sha256 = "0gdqwq6fvk06wld4rhnw5752hahrvhd69zrci045x25rwx90x26q";
   };
 
   nativeBuildInputs = [

From b5bb10d7edac9e273a025022adcf34fc66573aab Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 26 Aug 2019 15:04:55 +0200
Subject: [PATCH 206/794] graphene: add installed tests as a passthru

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

diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix
index 7c61b222486..c439e763e73 100644
--- a/pkgs/development/libraries/graphene/default.nix
+++ b/pkgs/development/libraries/graphene/default.nix
@@ -5,6 +5,7 @@
 , ninja
 , python3
 , mutest
+, nixosTests
 , glib
 , gtk-doc
 , docbook_xsl
@@ -57,6 +58,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  passthru = {
+    tests = {
+      installedTests = nixosTests.graphene;
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "A thin layer of graphic data types";
     homepage = "https://ebassi.github.com/graphene";

From e89dc6af4ec4da3dd2f590389b3b788f4f17453d Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Mon, 26 Aug 2019 16:17:56 +0300
Subject: [PATCH 207/794] hunspellDicts.uk-ua: 4.2.5 -> 4.6.3

---
 pkgs/development/libraries/hunspell/dictionaries.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index b9a283d80d2..4fa369e299d 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -640,12 +640,12 @@ in rec {
   uk_UA = uk-ua;
   uk-ua = mkDict rec {
     name = "hunspell-dict-uk-ua-${version}";
-    version = "4.2.5";
-    _version = "4-2.5";
+    version = "4.6.3";
+    _version = "4-6.3";
 
     src = fetchurl {
       url = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/${_version}/@@download/file/dict-uk_UA-${version}.oxt";
-      sha256 = "1s2i9cd569g97kafrswczvwmvg7m9aks8qsbxd1mi73zy2y1r7n4";
+      sha256 = "14rd07yx4fx2qxjr5xqc8qy151idd8k2hr5yi18d9r8gccnm9w50";
     };
 
     dictFileName = "uk_UA";

From 95c021393f330c5024588b099b2d7324cc4527c6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2019 16:16:38 +0200
Subject: [PATCH 208/794] mailman: reserve uid & gid in NixOS

---
 nixos/modules/misc/ids.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ac741caa953..efd8544d6a2 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -340,6 +340,7 @@
       cockroachdb = 313;
       zoneminder = 314;
       paperless = 315;
+      mailman = 316;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -640,6 +641,7 @@
       cockroachdb = 313;
       zoneminder = 314;
       paperless = 315;
+      mailman = 316;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal

From da1ff985aef12591772074f8e80698f36225c616 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2019 16:13:42 +0200
Subject: [PATCH 209/794] mailman: drop hard-coded references to /usr/bin

---
 ...ols-via-PATH-rather-than-hard-coding.patch | 51 +++++++++++++++++++
 pkgs/servers/mail/mailman/default.nix         |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch

diff --git a/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch b/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch
new file mode 100644
index 00000000000..b8a5476c055
--- /dev/null
+++ b/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch
@@ -0,0 +1,51 @@
+From 47469af384a6d4a0877c76d3c52013b40ab61f04 Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons@cryp.to>
+Date: Mon, 26 Aug 2019 16:10:04 +0200
+Subject: [PATCH] Find external tools via $PATH rather than hard-coding
+ /usr/bin.
+
+---
+ src/mailman/config/mhonarc.cfg | 2 +-
+ src/mailman/config/postfix.cfg | 2 +-
+ src/mailman/config/schema.cfg  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/mailman/config/mhonarc.cfg b/src/mailman/config/mhonarc.cfg
+index b00f93aea..096e9521b 100644
+--- a/src/mailman/config/mhonarc.cfg
++++ b/src/mailman/config/mhonarc.cfg
+@@ -24,4 +24,4 @@ base_url: http://$hostname/archives/$fqdn_listname
+ 
+ # If the archiver works by calling a command on the local machine, this is the
+ # command to call.
+-command: /usr/bin/mhonarc -outdir /path/to/archive/$listname -add
++command: mhonarc -outdir /path/to/archive/$listname -add
+diff --git a/src/mailman/config/postfix.cfg b/src/mailman/config/postfix.cfg
+index cddda220a..934c9a977 100644
+--- a/src/mailman/config/postfix.cfg
++++ b/src/mailman/config/postfix.cfg
+@@ -5,7 +5,7 @@
+ # db file, from the associated plain text files.  The file being updated will
+ # be appended to this string (with a separating space), so it must be
+ # appropriate for os.system().
+-postmap_command: /usr/sbin/postmap
++postmap_command: postmap
+ 
+ # This variable describes the type of transport maps that will be generated by
+ # mailman to be used with postfix for LMTP transport. By default, it is set to
+diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg
+index fa06ccced..406999e13 100644
+--- a/src/mailman/config/schema.cfg
++++ b/src/mailman/config/schema.cfg
+@@ -65,7 +65,7 @@ filtered_messages_are_preservable: no
+ # where the substitution variable $filename is filled in by Mailman, and
+ # contains the path to the temporary file that the command should read from.
+ # The command should print the converted text to stdout.
+-html_to_plain_text_command: /usr/bin/lynx -dump $filename
++html_to_plain_text_command: lynx -dump $filename
+ 
+ # Specify what characters are allowed in list names.  Characters outside of
+ # the class [-_.+=!$*{}~0-9a-z] matched case insensitively are never allowed,
+-- 
+2.22.0
+
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index e3cd393c3c3..fcd594270db 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -8,6 +8,8 @@ buildPythonPackage rec {
   pname = "mailman";
   version = "3.2.2";
 
+  patches = [ ./0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch ];
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6";

From cce6e9e7a185022d64c9cf7a7999aee3a25f00d4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 26 Aug 2019 16:25:48 +0200
Subject: [PATCH 210/794] wireshark-cli: remove Qt from build closure

Not sure how it gets into extra-cmake-modules but I saw the following tree on my system:

+---/nix/store/s8abxisr8d5m6mgyqmas52msjzvdc0dn-wireshark-cli-3.0.3.drv
|   + [...]
|   +---/nix/store/izi9ma2lqz7kppswhqkrdh1b98a8a853-extra-cmake-modules-5.58.0.drv
|   |   +---[...]
|   |   +---/nix/store/scgsmlabpvm6r31kps8p7yflwh17q7ns-hook.drv
|   |       +---/nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25b-default-builder.sh [...]
|   |       +---/nix/store/0iwik51jw5r1a2ffk4q5fmlpbqziwkvi-bash-4.4-p23.drv [...]
|   |       +---/nix/store/8af1a7lnk062h46lfs762pkzbyam5sb3-wrap-qt-apps-hook.sh
|   |       +---/nix/store/lsd5v3xzsskl14fpi4n4a851d7h1g7i3-qtbase-5.12.0.drv
[...]
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 643e421625f..aa965a0c868 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
 , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
-, libssh, nghttp2, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
+, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper
 , withQt ? true, qt5 ? null
 , ApplicationServices, SystemConfiguration, gmp
 }:
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    bison cmake extra-cmake-modules flex pkgconfig
+    bison cmake flex pkgconfig
   ] ++ optional withQt qt5.wrapQtAppsHook;
 
   buildInputs = [

From 8c60f67f2dbc0b1eeddf67db317964ae3619d646 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 26 Aug 2019 16:31:48 +0200
Subject: [PATCH 211/794] mint: Fix build

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

diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index 1c8e9fb7eb2..95b30da5b75 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -3,7 +3,7 @@
 #   wget https://raw.githubusercontent.com/mint-lang/mint/0.3.1/shard.lock
 #   nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr'
 #
-{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }:
+{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }:
 let
   crystalPackages = lib.mapAttrs (name: src:
     stdenv.mkDerivation {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl";
   };
 
-  nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ];
+  nativeBuildInputs = [ which crystal zlib openssl_1_0_2 duktape libyaml ];
 
   buildPhase = ''
     mkdir -p $out/bin tmp

From 86e1452556e811619b0762fdaa9e3006453fe07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 26 Aug 2019 12:11:52 -0300
Subject: [PATCH 212/794]  theme-obsidian2: 2.8 -> 2.9  (#67501)

* theme-obsidian2: 2.8 -> 2.9

* theme-obsidian2: move to pkgs/data

* theme-obsidian2: use pname

* theme-obsidian2: run hooks preInstall and postInstall in install phase
---
 pkgs/{misc => data}/themes/obsidian2/default.nix | 12 +++++-------
 pkgs/top-level/all-packages.nix                  |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/{misc => data}/themes/obsidian2/default.nix (73%)

diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix
similarity index 73%
rename from pkgs/misc/themes/obsidian2/default.nix
rename to pkgs/data/themes/obsidian2/default.nix
index 8a8e88ff6f9..3a2dcea4b3a 100644
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ b/pkgs/data/themes/obsidian2/default.nix
@@ -1,25 +1,23 @@
 { stdenv, fetchFromGitHub, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "theme-obsidian2-${version}";
-  version = "2.8";
+  pname = "theme-obsidian2";
+  version = "2.9";
 
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = "theme-obsidian-2";
     rev = "v${version}";
-    sha256 = "0qryqpyxbhr0kyar2cshwhzv4da6rfz9gi4wjb6xvcb6szxhlcaq";
+    sha256 = "1m89ws2a4nms4m8187d5cxi281b66i59xa5shlp3g1r2jc4312cy";
   };
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
-  postPatch = ''
-    sed -i -e 's|Obsidian-2-Local|Obsidian-2|' Obsidian-2/index.theme
-  '';
-
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/share/themes
     cp -a Obsidian-2 $out/share/themes
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbe997367c8..267cbcc5bca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17104,6 +17104,8 @@ in
     gtk = res.gtk2;
   };
 
+  theme-obsidian2 = callPackage ../data/themes/obsidian2 { };
+
   themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {};
 
   theano = callPackage ../data/fonts/theano { };
@@ -22741,8 +22743,6 @@ in
 
   theme-jade1 = callPackage ../misc/themes/jade1 { };
 
-  theme-obsidian2 = callPackage ../misc/themes/obsidian2 { };
-
   theme-vertex = callPackage ../misc/themes/vertex { };
 
   rox-filer = callPackage ../desktops/rox/rox-filer {

From 4ee4bb98729412b4741e1f5309ec76ff6878a3cc Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 26 Aug 2019 15:31:31 +0200
Subject: [PATCH 213/794] exiv2: adding DYLD_LIBRARY_PATH= for darwin tests

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

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 2dc435fe257..ec6f07f0953 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -67,6 +67,14 @@ stdenv.mkDerivation rec {
     ${stdenv.lib.optionalString stdenv.isAarch64 ''
       rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py
     ''}
+
+    ${stdenv.lib.optionalString stdenv.isDarwin ''
+      export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib
+      # Removing tests depending on charset conversion
+      substituteInPlace ../test/Makefile --replace "conversions.sh" ""
+      rm -f ../tests/bugfixes/redmine/test_issue_460.py
+      rm -f ../tests/bugfixes/redmine/test_issue_662.py
+     ''}
   '';
 
   postCheck = ''

From 506d0581595cf6737e17f734bc51c0223aeb498a Mon Sep 17 00:00:00 2001
From: Boris Babic <boris.ivan.babic@gmail.com>
Date: Mon, 26 Aug 2019 17:36:53 +0200
Subject: [PATCH 214/794] python3Packages.browser-cookie3: 0.6.4 -> 0.7.6

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

diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix
index 64510ee5b64..807dafab436 100644
--- a/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/pkgs/development/python-modules/browser-cookie3/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}:
 buildPythonPackage rec {
   pname = "browser-cookie3";
-  version = "0.6.4";
+  version = "0.7.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16nghwsrv08gz4iiyxsy5lgg5ljgrwkp471m7xnsvhhpb3axmnsc";
+    sha256 = "1f24hsclg1wz2i8aiam91l06qqy0plxhwl615l4qkg35mbw4ry7h";
   };
 
   disabled = !isPy3k;

From e4506992255676b4911570f473f432cc79742515 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 26 Aug 2019 17:38:38 +0200
Subject: [PATCH 215/794] altcoins.bitcoin-classic: fix build

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

diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index ad48ea2a625..ddce5c3f715 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -16,15 +16,15 @@ stdenv.mkDerivation rec {
     sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh";
   };
 
-  patches = [ ./fix-bitcoin-qt-build.patch ];
-
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ openssl db48 boost zlib
                   miniupnpc utillinux protobuf libevent ]
                   ++ optionals withGui [ qtbase qttools qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
-                     ++ optionals withGui [ "--with-gui=qt5" ];
+                     ++ optionals withGui [ "--with-gui=qt5"
+                                            "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+                                          ];
 
   enableParallelBuilding = true;
 

From 92d956267ae5babd8c446942316a099024d3c0fa Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 22 Aug 2019 14:02:02 +0200
Subject: [PATCH 216/794] nixos/pdns-recursor: implement a `settings` option

---
 .../services/networking/pdns-recursor.nix     | 78 ++++++++++++++-----
 1 file changed, 57 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index d07deb9dcc6..ae22ea17f01 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -6,25 +6,27 @@ let
   dataDir  = "/var/lib/pdns-recursor";
   username = "pdns-recursor";
 
-  cfg   = config.services.pdns-recursor;
-  zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones;
+  cfg = config.services.pdns-recursor;
 
-  configFile = pkgs.writeText "recursor.conf" ''
-    local-address=${cfg.dns.address}
-    local-port=${toString cfg.dns.port}
-    allow-from=${concatStringsSep "," cfg.dns.allowFrom}
+  oneOrMore  = type: with types; either type (listOf type);
+  valueType  = with types; oneOf [ int str bool path ];
+  configType = with types; attrsOf (nullOr (oneOrMore valueType));
 
-    webserver-address=${cfg.api.address}
-    webserver-port=${toString cfg.api.port}
-    webserver-allow-from=${concatStringsSep "," cfg.api.allowFrom}
+  toBool    = val: if val then "yes" else "no";
+  serialize = val: with types;
+         if str.check       val then val
+    else if int.check       val then toString val
+    else if path.check      val then toString val
+    else if bool.check      val then toBool val
+    else if builtins.isList val then (concatMapStringsSep "," serialize val)
+    else "";
 
-    forward-zones=${concatStringsSep "," zones}
-    export-etc-hosts=${if cfg.exportHosts then "yes" else "no"}
-    dnssec=${cfg.dnssecValidation}
-    serve-rfc1918=${if cfg.serveRFC1918 then "yes" else "no"}
+  configFile = pkgs.writeText "recursor.conf"
+    (concatStringsSep "\n"
+      (flip mapAttrsToList cfg.settings
+        (name: val: "${name}=${serialize val}")));
 
-    ${cfg.extraConfig}
-  '';
+  mkDefaultAttrs = mapAttrs (n: v: mkDefault v);
 
 in {
   options.services.pdns-recursor = {
@@ -117,17 +119,46 @@ in {
       '';
     };
 
-    extraConfig = mkOption {
-      type = types.lines;
-      default = "";
+    settings = mkOption {
+      type = configType;
+      default = { };
+      example = literalExample ''
+        {
+          loglevel = 8;
+          log-common-errors = true;
+        }
+      '';
       description = ''
-        Extra options to be appended to the configuration file.
+        PowerDNS Recursor settings. Use this option to configure Recursor
+        settings not exposed in a NixOS option or to bypass one.
+        See the full documentation at
+        <link xlink:href="https://doc.powerdns.com/recursor/settings.html"/>
+        for the available options.
       '';
     };
+
   };
 
   config = mkIf cfg.enable {
 
+    services.pdns-recursor.settings = mkDefaultAttrs {
+      local-address = cfg.dns.address;
+      local-port    = cfg.dns.port;
+      allow-from    = cfg.dns.allowFrom;
+
+      webserver-address    = cfg.api.address;
+      webserver-port       = cfg.api.port;
+      webserver-allow-from = cfg.api.allowFrom;
+
+      forward-zones    = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones;
+      export-etc-hosts = cfg.exportHosts;
+      dnssec           = cfg.dnssecValidation;
+      serve-rfc1918    = cfg.serveRFC1918;
+
+      log-timestamp  = false;
+      disable-syslog = true;
+    };
+
     users.users."${username}" = {
       home = dataDir;
       createHome = true;
@@ -150,8 +181,7 @@ in {
         AmbientCapabilities = "cap_net_bind_service";
         ExecStart = ''${pkgs.pdns-recursor}/bin/pdns_recursor \
           --config-dir=${dataDir} \
-          --socket-dir=${dataDir} \
-          --disable-syslog
+          --socket-dir=${dataDir}
         '';
       };
 
@@ -165,4 +195,10 @@ in {
       '';
     };
   };
+
+  imports = [
+   (mkRemovedOptionModule [ "services" "pdns-recursor" "extraConfig" ]
+     "To change extra Recursor settings use services.pdns-recursor.settings instead.")
+  ];
+
 }

From 0e0a533d9a185727d088de793b52950263bdef85 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 22 Aug 2019 15:03:14 +0200
Subject: [PATCH 217/794] nixos/pdns-recursor: add luaConfig option

---
 nixos/modules/services/networking/pdns-recursor.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index ae22ea17f01..ec69cc838da 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -137,6 +137,14 @@ in {
       '';
     };
 
+    luaConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        The content Lua configuration file for PowerDNS Recursor. See
+        <link xlink:href="https://doc.powerdns.com/recursor/lua-config/index.html"/>.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -154,6 +162,7 @@ in {
       export-etc-hosts = cfg.exportHosts;
       dnssec           = cfg.dnssecValidation;
       serve-rfc1918    = cfg.serveRFC1918;
+      lua-config-file  = pkgs.writeText "recursor.lua" cfg.luaConfig;
 
       log-timestamp  = false;
       disable-syslog = true;

From d5f098a96c29486e901e12de3c5f59cf1754c29a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 26 Aug 2019 17:37:40 +0200
Subject: [PATCH 218/794] nixos/doc: mention extraConfig -> settings change in
 pdns-recursor

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

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index b02d99438de..4d636fb2b58 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -284,6 +284,13 @@
        Squid 3 has been removed and the <option>squid</option> derivation now refers to Squid 4.
      </para>
    </listitem>
+   <listitem>
+     <para>
+       The <option>services.pdns-recursor.extraConfig</option> option has been replaced by
+       <option>services.pdns-recursor.settings</option>. The new option allows setting extra
+       configuration while being better type-checked and mergeable.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From a3aec20f266c57d989524f02b1243b4ad24020a2 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 26 Aug 2019 18:22:55 +0200
Subject: [PATCH 219/794] Implement crystal.buildCrystalPackage

---
 .../compilers/crystal/build-package.nix       | 53 +++++++++++++++++++
 .../development/compilers/crystal/default.nix | 11 ++--
 2 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/crystal/build-package.nix

diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix
new file mode 100644
index 00000000000..8ffa89a11b4
--- /dev/null
+++ b/pkgs/development/compilers/crystal/build-package.nix
@@ -0,0 +1,53 @@
+{ stdenv, lib, crystal, linkFarm, fetchFromGitHub }:
+{ # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root
+  shardsFile ? null
+  # Specify binaries to build in the form { foo.src = "src/foo.cr"; }
+  # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; }
+, crystalBinaries ? {}
+, ...
+}@args:
+let
+  mkDerivationArgs = builtins.removeAttrs args [ "shardsFile" "crystalBinaries" ];
+
+  crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: {
+    inherit name;
+    path = fetchFromGitHub value;
+  }) (import shardsFile));
+
+  defaultOptions = [ "--release" "--progress" "--no-debug" "--verbose" ];
+
+in stdenv.mkDerivation (mkDerivationArgs // {
+
+  configurePhase = args.configurePhase or ''
+    runHook preConfigure
+    ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"}
+    runHook postConfigure
+  '';
+
+  buildInputs = args.buildInputs or [] ++ [ crystal ];
+
+  buildPhase = args.buildPhase or ''
+    runHook preBuild
+    ${lib.concatStringsSep "\n" (lib.mapAttrsToList (bin: attrs: ''
+      crystal ${lib.escapeShellArgs ([
+        "build"
+        "-o" bin
+        (attrs.src or (throw "No source file for crystal binary ${bin} provided"))
+      ] ++ attrs.options or defaultOptions)}
+    '') crystalBinaries)}
+    runHook postBuild
+  '';
+
+  installPhase = args.installPhase or ''
+    runHook preInstall
+    mkdir -p "$out/bin"
+    ${lib.concatMapStringsSep "\n" (bin: ''
+      mv ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]}
+    '') (lib.attrNames crystalBinaries)}
+    runHook postInstall
+  '';
+
+  meta = args.meta or {} // {
+    platforms = args.meta.platforms or crystal.meta.platforms;
+  };
+})
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index db57bc3e9df..0cb0a3733ed 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
 , coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml
-, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }:
+, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib
+, callPackage }:
 
 # We need multiple binaries as a given binary isn't always able to build
 # (even slightly) older or newer versions.
@@ -37,7 +38,7 @@ let
   };
 
   generic = { version, sha256, binary, doCheck ? true }:
-  stdenv.mkDerivation rec {
+  let compiler = stdenv.mkDerivation rec {
     pname = "crystal";
     inherit doCheck version;
 
@@ -134,6 +135,10 @@ let
       export PATH=${lib.makeBinPath checkInputs}:$PATH
     '';
 
+    passthru.buildCrystalPackage = callPackage ./build-package.nix {
+      crystal = compiler;
+    };
+
     meta = with lib; {
       description = "A compiled language with Ruby like syntax and type inference";
       homepage = https://crystal-lang.org/;
@@ -141,7 +146,7 @@ let
       maintainers = with maintainers; [ manveru david50407 peterhoeg ];
       platforms = builtins.attrNames archs;
     };
-  };
+  }; in compiler;
 
 in rec {
   binaryCrystal_0_26 = genericBinary {

From 1ffdf01777360f548cc7c10ef5b168cbe78fd183 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 26 Aug 2019 18:23:55 +0200
Subject: [PATCH 220/794] crystal2nix: Put it into pkgs

---
 .../compilers/{mint => crystal}/crystal2nix.cr   |  2 +-
 .../compilers/crystal/crystal2nix.nix            | 16 ++++++++++++++++
 pkgs/development/compilers/crystal/default.nix   |  2 ++
 pkgs/top-level/all-packages.nix                  |  3 ++-
 4 files changed, 21 insertions(+), 2 deletions(-)
 rename pkgs/development/compilers/{mint => crystal}/crystal2nix.cr (94%)
 create mode 100644 pkgs/development/compilers/crystal/crystal2nix.nix

diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/pkgs/development/compilers/crystal/crystal2nix.cr
similarity index 94%
rename from pkgs/development/compilers/mint/crystal2nix.cr
rename to pkgs/development/compilers/crystal/crystal2nix.cr
index f608102a37b..0610de5cfa4 100644
--- a/pkgs/development/compilers/mint/crystal2nix.cr
+++ b/pkgs/development/compilers/crystal/crystal2nix.cr
@@ -26,7 +26,7 @@ File.open "shards.nix", "w+" do |file|
 
     sha256 = ""
     args = ["--url", url, "--rev", rev]
-    Process.run("nix-prefetch-git", args: args) do |x|
+    Process.run("@nixPrefetchGit@", args: args) do |x|
       x.error.each_line { |e| puts e }
       sha256 = PrefetchJSON.from_json(x.output).sha256
     end
diff --git a/pkgs/development/compilers/crystal/crystal2nix.nix b/pkgs/development/compilers/crystal/crystal2nix.nix
new file mode 100644
index 00000000000..ac69b9b3d96
--- /dev/null
+++ b/pkgs/development/compilers/crystal/crystal2nix.nix
@@ -0,0 +1,16 @@
+{ lib, crystal, nix-prefetch-git }:
+crystal.buildCrystalPackage {
+  pname = "crystal2nix";
+  version = "unstable-2018-07-31";
+
+  nixPrefetchGit = "${lib.getBin nix-prefetch-git}/bin/nix-prefetch-git";
+  unpackPhase = "substituteAll ${./crystal2nix.cr} crystal2nix.cr";
+
+  crystalBinaries.crystal2nix.src = "crystal2nix.cr";
+
+  meta = with lib; {
+    description = "Utility to convert Crystal's shard.lock files to a Nix file";
+    license = licenses.mit;
+    maintainers = [ maintainers.manveru ];
+  };
+}
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 0cb0a3733ed..c7a74880e44 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -212,4 +212,6 @@ in rec {
   };
 
   crystal = crystal_0_30;
+
+  crystal2nix = callPackage ./crystal2nix.nix {};
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbe997367c8..d788224cf39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7453,7 +7453,8 @@ in
     crystal_0_27
     crystal_0_29
     crystal_0_30
-    crystal;
+    crystal
+    crystal2nix;
 
   icr = callPackage ../development/tools/icr {};
 

From 1fe6e41cccbe2b83835b0e9eeb91d7df5fa84043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Mon, 26 Aug 2019 18:52:37 +0200
Subject: [PATCH 221/794] skaffold: 0.35.0 -> 0.36.0

---
 pkgs/development/tools/skaffold/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index 61d47cf907b..58dde838692 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -1,10 +1,10 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "skaffold-${version}";
-  version = "0.35.0";
-  # rev is the 0.35.0 commit, mainly for skaffold version command output
-  rev = "1da7608f9eb21ebe722bc054584e591e4223a3dc";
+  pname = "skaffold";
+  version = "0.36.0";
+  # rev is the 0.36.0 commit, mainly for skaffold version command output
+  rev = "1c054d4ffc7e14b4d81efcbea8b2022403ee4b89";
 
   goPackagePath = "github.com/GoogleContainerTools/skaffold";
   subPackages = ["cmd/skaffold"];
@@ -20,7 +20,7 @@ buildGoPackage rec {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    sha256 = "1vh7vlz14gfjpxf2wy1pybw5x55mw34j6isyy5zl0rsbs9mf6ci1";
+    sha256 = "1d7z36r33lmxm5cv1kby6g9zbsr88prgsp32x4jcs9l1ifwblhng";
   };
 
   meta = {

From 910a4f2637ba570b6117583cbb65ed9b1bbe2fed Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 13:31:20 -0400
Subject: [PATCH 222/794] jetbrains.clion: 2019.1.4 -> 2019.2.1

---
 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 844999b0366..a337edc8d48 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -250,12 +250,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2019.1.4"; /* updated by script */
+    version = "2019.2.1"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "1ccb7g5nzipfmvx6ycg9cn3s7bykpwws62239hg0frlb6xx9y969"; /* updated by script */
+      sha256 = "13y2c3vzlklwz9cd7anpfdc3dqwh714xivm1g59s6p4x9sy172lp"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml

From f16366856fa532f49548c36eef274ab91794028e Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 13:31:40 -0400
Subject: [PATCH 223/794] jetbrains.datagrip: 2019.2.1 -> 2019.2.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a337edc8d48..94e095557cc 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -263,12 +263,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2019.2.1"; /* updated by script */
+    version = "2019.2.2"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "0va5dcvjxq7mlkz0di5zl1ra5gv6cls3wy40fvkpm2vlirg0m31s"; /* updated by script */
+      sha256 = "1babydzmgaas1rxjv11yhgbp0l5scsdwy17l9927qwlbgccf24mb"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "DataGrip RELEASE";

From 26e598825eaaaa9b9c361a5a93f0286468a290cb Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 13:32:07 -0400
Subject: [PATCH 224/794] jetbrains.goland: 2019.1.3 -> 2019.2.1

---
 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 94e095557cc..76a460b8343 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -276,12 +276,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2019.1.3"; /* updated by script */
+    version = "2019.2.1"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "0nw9s4vc7dbj2daxi88m1hqyl3rbzvahbw4mhp409ngac3l2pqmh"; /* updated by script */
+      sha256 = "16wmsf6c8x95d050grqgv6aaxlkc6pqhbqzlz6fzsngjnbkn64yj"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "GoLand RELEASE";

From f7d8e1f5e8cef477863e4bcbcaca106712eb1d10 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 13:32:24 -0400
Subject: [PATCH 225/794] jetbrains.idea-community: 2019.1.3 -> 2019.2.1

---
 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 76a460b8343..61598a1be43 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -289,12 +289,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2019.1.3"; /* updated by script */
+    version = "2019.2.1"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "02ddxqwflqrr5xf27s1gmaz7ai400cxzlbiz2wrs9vqsdcpj9jbr"; /* updated by script */
+      sha256 = "1pbqnyqly09m7lw6356dydbvppq4i94rsk7c3y40mrc285qzj413"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IntelliJ IDEA RELEASE";

From 19d68692fde8206a43bf84a039f0e06829d45a31 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 13:32:39 -0400
Subject: [PATCH 226/794] jetbrains.idea-ultimate: 2019.1.3 -> 2019.2.1

---
 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 61598a1be43..c5cf5ffbf5e 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -302,12 +302,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2019.1.3"; /* updated by script */
+    version = "2019.2.1"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
-      sha256 = "0qhj3wai0jb3bg8ddck27ivx2q60xsbk8pj6ryqp5dh75ja4zx1s"; /* updated by script */
+      sha256 = "0mslmhakjjgwj76hbfw9dcidic6zprjfjryggic7dqywl7vjwc95"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IntelliJ IDEA RELEASE";

From b380c7c6193e9488ff5a7cda8671a7e981b5d936 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 13:33:02 -0400
Subject: [PATCH 227/794] jetbrains.phpstorm: 2019.1.3 -> 2019.2.1

---
 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 c5cf5ffbf5e..1e749764344 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -315,12 +315,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2019.1.3"; /* updated by script */
+    version = "2019.2.1"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "04nrdgnyxywy0yfari26ghc371yni1rx3h0pmc4fw02ibbqx1f1y"; /* updated by script */
+      sha256 = "1m198p6586dych6mrgwqxs486qndypsmnikl0rxx45ddrwfjl42g"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
     update-channel = "PhpStorm RELEASE";

From 75fdf58e112d084a8aeff09a523311fe60b10a3d Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 13:33:23 -0400
Subject: [PATCH 228/794] jetbrains.pycharm-community: 2019.1.3 -> 2019.2.1

---
 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 1e749764344..7188dec4bf5 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -328,12 +328,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2019.1.3"; /* updated by script */
+    version = "2019.2.1"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0acwfxp0ky3014zcvmlsig1732h87jvmf2wwjankamrk6ynmlvgh"; /* updated by script */
+      sha256 = "0a3fi2wjj0166199pyhvvpaih9nx0xr6q7zf7jfj8i7khpkdk8i5"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm RELEASE";

From 64e74365b70f6869e494401e1b24c024fdb3047f Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 13:33:59 -0400
Subject: [PATCH 229/794] jetbrains.pycharm-professional: 2019.1.3 -> 2019.2.1

---
 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 7188dec4bf5..db43c2ac259 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -341,12 +341,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2019.1.3"; /* updated by script */
+    version = "2019.2.1"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0948jlpfz5d4k12mn2xrl8z5kc44a3986kl5znvzr5b8h65xw8l3"; /* updated by script */
+      sha256 = "03i7qi0kcnx0irih468xaz7hzicaa5yh399r676drs22ak23qwrq"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm RELEASE";

From 64a7035504df5eebb627df18a76ecde919e0448d Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 13:34:16 -0400
Subject: [PATCH 230/794] jetbrains.rider: 2019.1.2 -> 2019.2.1

---
 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 db43c2ac259..34c030f39f2 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -354,12 +354,12 @@ in
 
   rider = buildRider rec {
     name = "rider-${version}";
-    version = "2019.1.2"; /* updated by script */
+    version = "2019.2.1"; /* updated by script */
     description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
-      sha256 = "0b0p18pcq4ml8nds4460a1ml8qjsq38kxwdrsh2ca5s194cbaapq"; /* updated by script */
+      sha256 = "1p0mlch7qvkvgxjscx6rl65v6h8g6fwk8rcb8s27qkcjm0d78ic8"; /* updated by script */
     };
     wmClass = "jetbrains-rider";
     update-channel = "Rider RELEASE";

From 34d44f33de2fa7f6ed98c03dcfecc31ea97d4aa8 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 13:34:40 -0400
Subject: [PATCH 231/794] jetbrains.ruby-mine: 2019.2 -> 2019.2.1

---
 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 34c030f39f2..92355552fce 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -367,12 +367,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2019.2"; /* updated by script */
+    version = "2019.2.1"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "1f4mdarmh7m9jq432d0s9jds9288g0zgpxnlpmx12i26vvq8kykd"; /* updated by script */
+      sha256 = "0l0kwc1mih55px8j6bvp1g3pxrv0scd9vpydwvkaqmq5x0r1n3jf"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "RubyMine RELEASE";

From 2f92cd6960f26f1f45e862cf4fea277305a07a4e Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 26 Aug 2019 18:24:45 +0200
Subject: [PATCH 232/794] mint: Use buildCrystalPackage

---
 pkgs/development/compilers/mint/default.nix | 59 ++++-----------------
 1 file changed, 11 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index 95b30da5b75..5f72bd3649b 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -1,40 +1,7 @@
-# Updating the dependencies for this package:
-#
-#   wget https://raw.githubusercontent.com/mint-lang/mint/0.3.1/shard.lock
-#   nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr'
-#
-{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }:
-let
-  crystalPackages = lib.mapAttrs (name: src:
-    stdenv.mkDerivation {
-      name = lib.replaceStrings ["/"] ["-"] name;
-      src = fetchFromGitHub src;
-      phases = "installPhase";
-      installPhase = ''cp -r $src $out'';
-      passthru = { libName = name; };
-    }
-  ) (import ./shards.nix);
-
-  crystalLib = stdenv.mkDerivation {
-    name = "crystal-lib";
-    src = lib.attrValues crystalPackages;
-    libNames = lib.mapAttrsToList (k: v: [k v]) crystalPackages;
-    phases = "buildPhase";
-    buildPhase = ''
-      mkdir -p $out
-      linkup () {
-        while [ "$#" -gt 0 ]; do
-          ln -s $2 $out/$1
-          shift; shift
-        done
-      }
-      linkup $libNames
-    '';
-  };
-in
-stdenv.mkDerivation rec {
+{ lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }:
+crystal.buildCrystalPackage rec {
   version = "0.5.0";
-  name = "mint-${version}";
+  pname = "mint";
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
@@ -42,23 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl";
   };
 
-  nativeBuildInputs = [ which crystal zlib openssl_1_0_2 duktape libyaml ];
+  buildInputs = [ openssl_1_0_2 ];
 
-  buildPhase = ''
-    mkdir -p $out/bin tmp
-    cd tmp
-    ln -s ${crystalLib} lib
-    cp -r $src/* .
-    crystal build src/mint.cr -o $out/bin/mint --verbose --progress --release --no-debug
-  '';
-
-  installPhase = ''true'';
+  # Update with
+  #   nix-shell -p crystal2nix --run crystal2nix
+  # with mint's shard.lock file in the current directory
+  shardsFile = ./shards.nix;
+  crystalBinaries.mint.src = "src/mint.cr";
 
   meta = {
     description = "A refreshing language for the front-end web";
     homepage = https://mint-lang.com/;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ manveru ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ manveru ];
     platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
   };
 }

From ba9305c404068e31f99a922da893e2af5271de80 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 26 Aug 2019 19:34:12 +0200
Subject: [PATCH 233/794] tcpflow: 1.4.6 -> 1.5.2

Changelog: https://github.com/simsong/tcpflow/blob/tcpflow-1.5.2/ChangeLog
Does now cross-compile and build with OpenSSL 1.1.1.
I've also restructured/simplified the expression and added additional
meta information.
---
 pkgs/tools/networking/tcpflow/default.nix     | 71 +++++++------------
 .../tools/networking/tcpflow/default.upstream |  1 -
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 28 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/tools/networking/tcpflow/default.upstream

diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix
index 1df0f2c37fc..8f502c5ef3f 100644
--- a/pkgs/tools/networking/tcpflow/default.nix
+++ b/pkgs/tools/networking/tcpflow/default.nix
@@ -1,61 +1,44 @@
-{ stdenv, lib, fetchFromGitHub, openssl, zlib, libpcap, boost, cairo, automake, autoconf, useCairo ? false }:
+{ stdenv, lib, fetchFromGitHub, automake, autoconf
+, openssl, zlib, libpcap, boost
+, useCairo ? false, cairo
+}:
 
 stdenv.mkDerivation rec {
-  baseName = "tcpflow";
-  version  = "1.4.6";
-  name     = "${baseName}-${version}";
+  pname   = "tcpflow";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner  = "simsong";
-    repo   = "tcpflow";
-    rev    = "017687365b8233d16260f4afd7572c8ad8873cf6";
-    sha256 = "002cqmn786sjysf59xnbb7lgr23nqqslb2gvy29q2xpnq6my9w38";
+    repo   = pname;
+    rev    = "${pname}-${version}";
+    sha256 = "063n3pfqa0lgzcwk4c0h01g2y5c3sli615j6a17dxpg95aw1zryy";
+    fetchSubmodules = true;
   };
 
-  be13_api = fetchFromGitHub {
-    owner  = "simsong";
-    repo   = "be13_api";
-    rev    = "8f4f4b3fe0b4815babb3a6fb595eb9a6d07e8a2e";
-    sha256 = "1dlys702x3m8cr9kf4b9j8n28yh6knhwgqkm6a5yhh1grd8r3ksm";
-  };
-
-  dfxml = fetchFromGitHub {
-    owner  = "simsong";
-    repo   = "dfxml";
-    rev    = "13a8cc22189a8336d16777f2897ada6ae2ee59de";
-    sha256 = "0wzhbkp4c8sp6wrk4ilz3skxp14scdnm3mw2xmxxrsifymzs2f5n";
-  };
-
-  httpparser = fetchFromGitHub {
-    owner  = "nodejs";
-    repo   = "http-parser";
-    rev    = "8d9e5db981b623fffc93657abacdc80270cbee58";
-    sha256 = "0x17wwhrc7b2ngiqy0clnzn1zz2gbcz5n9m29pcyrcplly782k52";
-  };
-
-  buildInputs = [ openssl zlib libpcap boost automake autoconf ] ++ lib.optional useCairo cairo;
-
-  postUnpack = ''
-    pushd "$sourceRoot/src"
-    cp -rv ${be13_api}/* be13_api/
-    cp -rv ${dfxml}/* dfxml/
-    cp -rv ${httpparser}/* http-parser/
-    chmod -R u+w dfxml
-    popd
-  '';
+  nativeBuildInputs = [ automake autoconf ];
+  buildInputs = [ openssl zlib libpcap boost ]
+    ++ lib.optional useCairo cairo;
 
   prePatch = ''
-    substituteInPlace ./bootstrap.sh \
-      --replace \ git 'echo git' \
-      --replace /bin/rm rm
+    substituteInPlace bootstrap.sh \
+      --replace ".git" "" \
+      --replace "/bin/rm" "rm"
+    substituteInPlace configure.ac \
+      --replace "1.5.1" "1.5.2"
   '';
 
   preConfigure = "bash ./bootstrap.sh";
 
   meta = with stdenv.lib; {
-    description = ''TCP stream extractor'';
-    license     = licenses.gpl3 ;
-    maintainers = with maintainers; [ raskin obadz ];
+    description = "TCP stream extractor";
+    longDescription = ''
+      tcpflow is a program that captures data transmitted as part of TCP
+      connections (flows), and stores the data in a way that is convenient for
+      protocol analysis and debugging.
+    '';
+    inherit (src.meta) homepage;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ primeos raskin obadz ];
     platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/tcpflow/default.upstream b/pkgs/tools/networking/tcpflow/default.upstream
deleted file mode 100644
index 72802e4d046..00000000000
--- a/pkgs/tools/networking/tcpflow/default.upstream
+++ /dev/null
@@ -1 +0,0 @@
-url http://www.digitalcorpora.org/downloads/tcpflow/
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 267cbcc5bca..dd2ee119013 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6397,9 +6397,7 @@ in
 
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
-  tcpflow = callPackage ../tools/networking/tcpflow {
-    openssl = openssl_1_0_2;
-  };
+  tcpflow = callPackage ../tools/networking/tcpflow { };
 
   tcpkali = callPackage ../applications/networking/tcpkali { };
 

From 1d0749139d2edc1ce20ae71e5258cf1f802fba48 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 26 Aug 2019 20:12:15 +0200
Subject: [PATCH 234/794] docs: Add Crystal language framework section

---
 doc/languages-frameworks/crystal.section.md | 71 +++++++++++++++++++++
 doc/languages-frameworks/index.xml          |  1 +
 2 files changed, 72 insertions(+)
 create mode 100644 doc/languages-frameworks/crystal.section.md

diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md
new file mode 100644
index 00000000000..07bfc65a553
--- /dev/null
+++ b/doc/languages-frameworks/crystal.section.md
@@ -0,0 +1,71 @@
+# Crystal
+
+## Building a Crystal package
+
+This section uses [Mint](https://github.com/mint-lang/mint) as an example for how to build a Crystal package.
+
+If the Crystal project has any dependencies, the first step is to get a `shards.nix` file encoding those. Get a copy of the project and go to its root directory such that its `shard.lock` file is in the current directory, then run `crystal2nix` in it
+```bash
+$ git clone https://github.com/mint-lang/mint
+$ cd mint
+$ git checkout 0.5.0
+$ nix-shell -p crystal2nix --run crystal2nix
+```
+
+This should have generated a `shards.nix` file.
+
+Next create a Nix file for your derivation and use `pkgs.crystal.buildCrystalPackage` as follows:
+```nix
+with import <nixpkgs> {};
+crystal.buildCrystalPackage rec {
+  pname = "mint";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "mint-lang";
+    repo = "mint";
+    rev = version;
+    sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl";
+  };
+
+  # Insert the path to your shards.nix file here
+  shardsFile = ./shards.nix;
+
+  ...
+}
+```
+
+This won't build anything yet, because we haven't told it what files build. We can specify a mapping from binary names to source files with the `crystalBinaries` attribute. The project's compilation instructions should show this. For Mint, the binary is called "mint", which is compiled from the source file `src/mint.cr`, so we'll specify this as follows:
+
+```nix
+  crystalBinaries.mint.src = "src/mint.cr";
+
+  # ...
+```
+
+Additionally you can override the default `crystal build` options (which are currently `--release --progress --no-debug --verbose`) with
+
+```nix
+  crystalBinaries.mint.options = [ "--release" "--verbose" ];
+```
+
+Depending on the project, you might need additional steps to get it to compile successfully. In Mint's case, we need to link against openssl, so in the end the Nix file looks as follows:
+
+```nix
+with import <nixpkgs> {};
+crystal.buildCrystalPackage rec {
+  version = "0.5.0";
+  pname = "mint";
+  src = fetchFromGitHub {
+    owner = "mint-lang";
+    repo = "mint";
+    rev = version;
+    sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl";
+  };
+
+  shardsFile = ./shards.nix;
+  crystalBinaries.mint.src = "src/mint.cr";
+
+  buildInputs = [ openssl_1_0_2 ];
+}
+```
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 4564df98fe9..cd4e95cfae6 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -32,4 +32,5 @@
  <xi:include href="titanium.section.xml" />
  <xi:include href="vim.section.xml" />
  <xi:include href="emscripten.section.xml" />
+ <xi:include href="crystal.section.xml" />
 </chapter>

From 47c398f632949487026a2cc1d1e2309f0b71a711 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 26 Aug 2019 11:29:05 -0700
Subject: [PATCH 235/794] gnurl: 7.64.0 -> 7.65.0

---
 .../libraries/libgnurl/default.nix            | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index e87f535a1f7..0bb3af37eee 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -2,23 +2,38 @@
   libidn2, libunistring, nghttp2 }:
 
 stdenv.mkDerivation rec {
-  version = "7.64.0";
-
-  name = "libgnurl-${version}";
+  pname = "libgnurl";
+  version = "7.65.3";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
-    sha256 = "0pvmbi32lixcpk10prplmwrmi4wzp3bc1aiyhr552kx0wqdqmdk8";
+    sha256 = "19l7jw3x83qk7yay5968pc39vzvxl55mhn1nmjh51miyda405qa9";
   };
 
   nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
-    
+
   buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
 
   configureFlags = [
     "--disable-ntlm-wb"
     "--without-ca-bundle"
     "--with-ca-fallback"
+    # below options will cause errors if enabled
+    "--disable-ftp"
+    "--disable-tftp"
+    "--disable-file"
+    "--disable-ldap"
+    "--disable-dict"
+    "--disable-rtsp"
+    "--disable-telnet"
+    "--disable-pop3"
+    "--disable-imap"
+    "--disable-smb"
+    "--disable-smtp"
+    "--disable-gopher"
+    "--without-ssl" # disables only openssl, not ssl in general
+    "--without-libpsl"
+    "--without-librtmp"
   ];
 
   meta = with stdenv.lib; {

From 0cc9e33cc4e8eb49a6acd7add823e2007a75b8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Mon, 26 Aug 2019 20:48:24 +0200
Subject: [PATCH 236/794] wasm: alias to ocamlPackages.wasm

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c94c2999c17..4f3d09199fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8750,6 +8750,8 @@ in
   tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
   tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
 
+  wasm = ocamlPackages.wasm;
+
   proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { };
 
   wasm-gc = callPackage ../development/interpreters/wasm-gc { };

From 22af3829a4bf9722c96ca07cb2840e4d61ee8b7e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2019 17:41:02 +0200
Subject: [PATCH 237/794] mailman: add the Postorious web UI

---
 .../django-mailman3/default.nix               | 19 ++++++++++++++
 .../python-modules/mailmanclient/default.nix  | 13 ++++++++++
 .../mail/mailman/{default.nix => core.nix}    |  0
 pkgs/servers/mail/mailman/postorius.nix       | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  8 +++++-
 5 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/django-mailman3/default.nix
 create mode 100644 pkgs/development/python-modules/mailmanclient/default.nix
 rename pkgs/servers/mail/mailman/{default.nix => core.nix} (100%)
 create mode 100644 pkgs/servers/mail/mailman/postorius.nix

diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
new file mode 100644
index 00000000000..bd0f626d54e
--- /dev/null
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor
+, django-allauth, mailmanclient
+}:
+
+buildPythonPackage rec {
+  pname = "django-mailman3";
+  version = "1.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0v6c1jhcc212wc2xa314irfcchl05r7nysrcy63dcaan958kmnnx";
+  };
+
+  propagatedBuildInputs = [
+    django-gravatar2 django_compressor django-allauth mailmanclient
+  ];
+
+  doCheck = false;
+}
diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix
new file mode 100644
index 00000000000..a3a807901f3
--- /dev/null
+++ b/pkgs/development/python-modules/mailmanclient/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, buildPythonPackage, fetchPypi, six, httplib2 }:
+
+buildPythonPackage rec {
+  pname = "mailmanclient";
+  version = "3.2.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xsrzdrsmfhnxv68zwm1g6awk7in08k6yhkyd27ipn0mq1wjm5jd";
+  };
+
+  propagatedBuildInputs = [ six httplib2 ];
+}
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/core.nix
similarity index 100%
rename from pkgs/servers/mail/mailman/default.nix
rename to pkgs/servers/mail/mailman/core.nix
diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix
new file mode 100644
index 00000000000..7ae07a99528
--- /dev/null
+++ b/pkgs/servers/mail/mailman/postorius.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock
+, django-mailman3, mailmanclient
+}:
+
+buildPythonPackage rec {
+  pname = "postorius";
+  version = "1.2.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1722lnscxfl8wdigf5d80d1qmd5gblr439wa989jxlww0wkjg9fl";
+  };
+
+  buildInputs = [ beautifulsoup4 vcrpy mock ];
+  propagatedBuildInputs = [ django-mailman3 ];
+
+  doCheck = false;
+
+  meta = {
+    homepage = https://www.gnu.org/software/mailman/;
+    description = "Web-based user interface for managing GNU Mailman";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ peti ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e77d3aecea2..91a828f3c1d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -711,7 +711,9 @@ in {
 
   mail-parser = callPackage ../development/python-modules/mail-parser { };
 
-  mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman { });
+  mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/core.nix { });
+
+  mailmanclient = callPackage ../development/python-modules/mailmanclient { };
 
   manhole = callPackage ../development/python-modules/manhole { };
 
@@ -821,6 +823,8 @@ in {
 
   poetry = callPackage ../development/python-modules/poetry { };
 
+  postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { });
+
   pplpy = callPackage ../development/python-modules/pplpy { };
 
   pprintpp = callPackage ../development/python-modules/pprintpp { };
@@ -2868,6 +2872,8 @@ in {
 
   django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { };
 
+  django-mailman3 = callPackage ../development/python-modules/django-mailman3 { };
+
   django-pglocks = callPackage ../development/python-modules/django-pglocks { };
 
   django-picklefield = callPackage ../development/python-modules/django-picklefield { };

From 46b630efa9f742a3923066aa1c9e19ca64039041 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 19 Aug 2019 15:43:08 +0000
Subject: [PATCH 238/794] ocamlPackages.mtime: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix
index 73f84886cc5..f4e3586b43c 100644
--- a/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/pkgs/development/ocaml-modules/mtime/default.nix
@@ -7,8 +7,8 @@ with lib;
 let param =
   if versionAtLeast ocaml.version "4.03"
   then {
-    version = "1.1.0";
-    sha256 = "1qb4ljwirrc3g8brh97s76rjky2cpmy7zm87y7iqd6pxix52ydk3";
+    version = "1.2.0";
+    sha256 = "0zm1jvqkz3ghznfsm3bbv9q2zinp9grggdf7k9phjazjvny68xb8";
   } else {
     version = "0.8.4";
     sha256 = "1adm8sc3lkjly99hyi5gqnxas748k7h62ljgn8x423nkn8gyp8dh";

From 49000e433b49de6e8ef2b9cb255c659086487ffa Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 26 Aug 2019 21:51:58 +0200
Subject: [PATCH 239/794] yate: 6.0.0-1 -> 6.1.0-1

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

diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 53d427e61c2..294229d08a9 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, lib, qt4, openssl, autoconf, automake, pkgconfig }:
+{ stdenv, fetchurl, lib, qt4, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "yate-${version}";
-  version = "6.0.0-1";
+  version = "6.1.0-1";
 
   src = fetchurl {
     url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${name}.tar.gz";
-    sha256 = "05qqdhi3rp5660gq1484jkmxkm9vq81j0yr765h0gf0xclan1dqa";
+    sha256 = "0xx3i997nsf2wzbv6m5n6adsym0qhgc6xg4rsv0fwqrgisf5327d";
   };
 
   # TODO zaptel ? postgres ?
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ qt4 openssl autoconf automake ];
+  buildInputs = [ qt4 openssl ];
 
   # /dev/null is used when linking which is a impure path for the wrapper
   preConfigure =

From f92e0a962e599ea1b46280a4631c2eb9f52afcef Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 26 Aug 2019 13:00:22 -0700
Subject: [PATCH 240/794] gnunet: 0.11.0 -> 0.11.6

---
 .../networking/p2p/gnunet/default.nix         | 40 ++++++++-----------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 715d8e13ec3..eaa6b07c8fa 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -1,20 +1,24 @@
 { stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor
 , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring
 , makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib
-, libpulseaudio, libopus, libogg }:
+, libpulseaudio, libopus, libogg, jansson }:
 
 stdenv.mkDerivation rec {
-  name = "gnunet-0.11.0";
+  pname = "gnunet";
+  version = "0.11.6";
 
   src = fetchurl {
-    url = "mirror://gnu/gnunet/${name}.tar.gz";
-    sha256 = "16kydkrjlf2vxflgls46bwaf9kjczf621p456q0qlphd7cy7lixp";
+    url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
+    sha256 = "1gspr1lh885sb9r2anh7bi4zan3zjqx33lpyhq9hm2g0n5ip187q";
   };
 
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ pkgconfig libtool makeWrapper ];
   buildInputs = [
-    adns curl gettext gmp gnutls libextractor libgcrypt libgnurl libidn
-    libmicrohttpd libtool libunistring libxml2 makeWrapper ncurses
-    pkgconfig sqlite zlib libpulseaudio libopus libogg
+    adns curl gmp gnutls libextractor libgcrypt libgnurl libidn
+    libmicrohttpd libunistring libxml2 ncurses gettext
+    sqlite zlib libpulseaudio libopus libogg jansson
   ];
 
   preConfigure = ''
@@ -29,26 +33,18 @@ stdenv.mkDerivation rec {
     find . \( -iname \*test\*.c -or -name \*.conf \) | \
       xargs sed -ie "s|/tmp|$TMPDIR|g"
 
-    # Ensure NSS installation works fine
-    configureFlags="$configureFlags --with-nssdir=$out/lib"
-    patchShebangs src/gns/nss/install-nss-plugin.sh
-
     sed -ie 's|@LDFLAGS@|@LDFLAGS@ $(Z_LIBS)|g' \
       src/regex/Makefile.in \
       src/fs/Makefile.in
   '';
 
+  # unfortunately, there's still a few failures with impure tests
   doCheck = false;
-
-  /* FIXME: Tests must be run this way, but there are still a couple of
-     failures.
-
-  postInstall =
-    '' export GNUNET_PREFIX="$out"
-       export PATH="$out/bin:$PATH"
-       make -k check
-    '';
-  */
+  checkPhase = ''
+    export GNUNET_PREFIX="$out"
+    export PATH="$out/bin:$PATH"
+    make -k check
+  '';
 
   meta = with stdenv.lib; {
     description = "GNU's decentralized anonymous and censorship-resistant P2P framework";
@@ -69,9 +65,7 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = https://gnunet.org/;
-
     license = licenses.gpl2Plus;
-
     maintainers = with maintainers; [ vrthra ];
     platforms = platforms.gnu ++ platforms.linux;
   };

From 279bd6fcd9ee59e22f0c87740107789a28f59220 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 26 Aug 2019 22:12:05 +0200
Subject: [PATCH 241/794] xorg.xf86videosis: 0.10.9 -> 0.11.0

fixes build
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3be672c29f1..66d4643de39 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2159,11 +2159,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
-    name = "xf86-video-sis-0.10.9";
+    name = "xf86-video-sis-0.11.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2;
-      sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj";
+      url = mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2;
+      sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 426b848a138..beeffc21e56 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -117,7 +117,7 @@ mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2
-mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2
+mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2

From 38f810ea330753d2052f27e0ddb829b4bf137ebb Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 26 Aug 2019 13:16:43 -0700
Subject: [PATCH 242/794] texi2html: 1.82 -> 5.0

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

diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix
index b094f05e951..247733b81ba 100644
--- a/pkgs/development/tools/misc/texi2html/default.nix
+++ b/pkgs/development/tools/misc/texi2html/default.nix
@@ -1,20 +1,27 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "texi2html-1.82";
+  pname = "texi2html";
+  version = "5.0";
 
   src = fetchurl {
-    url = "mirror://savannah/texi2html/${name}.tar.bz2";
-    sha256 = "1wdli2szkgm3l0vx8rf6lylw0b0m47dlz9iy004n928nqkzix76n";
+    url = "mirror://savannah/texi2html/${pname}-${version}.tar.bz2";
+    sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8";
   };
 
-  buildInputs = [perl];
+  nativeBuildInputs = [ gettext ];
+  buildInputs = [ perl ];
 
-  meta = { 
+  preBuild = ''
+    substituteInPlace separated_to_hash.pl \
+      --replace "/usr/bin/perl" "${perl}/bin/perl"
+  '';
+
+  meta = with stdenv.lib; {
     description = "Perl script which converts Texinfo source files to HTML output";
     homepage = https://www.nongnu.org/texi2html/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.marcweber ];
+    platforms = platforms.unix;
   };
 }

From ec4798f9a8d814e00bfc760d872c453e5f0d6641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Mon, 26 Aug 2019 22:31:00 +0200
Subject: [PATCH 243/794] tilt: 0.9.7 -> 0.10.4

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

diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index c4075075299..b4707327bc7 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,20 +5,20 @@ buildGoPackage rec {
   /* Do not use "dev" as a version. If you do, Tilt will consider itself
      running in development environment and try to serve assets from the
      source tree, which is not there once build completes.  */
-  version = "0.9.7";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner  = "windmilleng";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0b7jk7iwjzdsb2wp9qx4gs9g3gi2vcqw5ilkax3gfz7wsplm0n65";
+    sha256 = "0nxgmldbcaj91jq47qxpf6jqwvi9bhg243qchdkiliphybvilcrg";
   };
 
   goPackagePath = "github.com/windmilleng/tilt";
 
   subPackages = [ "cmd/tilt" ];
 
-  buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-07-30");
+  buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-08-14");
 
   meta = with stdenv.lib; {
     description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";

From 4b1cc7eebfe21906f1823193e75eab70f8d1de4f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 26 Aug 2019 22:51:33 +0200
Subject: [PATCH 244/794] mailman: add meta to python deps

---
 .../python-modules/django-mailman3/default.nix            | 7 +++++++
 pkgs/development/python-modules/mailmanclient/default.nix | 8 ++++++++
 pkgs/servers/mail/mailman/postorius.nix                   | 2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
index bd0f626d54e..2dd3801dad5 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -16,4 +16,11 @@ buildPythonPackage rec {
   ];
 
   doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Django library for Mailman UIs";
+    homepage = https://gitlab.com/mailman/django-mailman3;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ globin peti ];
+  };
 }
diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix
index a3a807901f3..95e9e4fdd3e 100644
--- a/pkgs/development/python-modules/mailmanclient/default.nix
+++ b/pkgs/development/python-modules/mailmanclient/default.nix
@@ -10,4 +10,12 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ six httplib2 ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.gnu.org/software/mailman/";
+    description = "REST client for driving Mailman 3";
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ peti globin ];
+  };
 }
diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix
index 7ae07a99528..e48a7da581e 100644
--- a/pkgs/servers/mail/mailman/postorius.nix
+++ b/pkgs/servers/mail/mailman/postorius.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
     homepage = https://www.gnu.org/software/mailman/;
     description = "Web-based user interface for managing GNU Mailman";
     license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ peti ];
+    maintainers = with stdenv.lib.maintainers; [ globin peti ];
   };
 }

From 6bff4c107e2344f24e9247a5a815617916416185 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 26 Aug 2019 22:51:53 +0200
Subject: [PATCH 245/794] mailman: add postorius testing

---
 pkgs/servers/mail/mailman/postorius.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix
index e48a7da581e..871f2ea244d 100644
--- a/pkgs/servers/mail/mailman/postorius.nix
+++ b/pkgs/servers/mail/mailman/postorius.nix
@@ -14,7 +14,10 @@ buildPythonPackage rec {
   buildInputs = [ beautifulsoup4 vcrpy mock ];
   propagatedBuildInputs = [ django-mailman3 ];
 
-  doCheck = false;
+  checkPhase = ''
+    cd $NIX_BUILD_TOP/$sourceRoot
+    PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test --settings=test_settings postorius
+  '';
 
   meta = {
     homepage = https://www.gnu.org/software/mailman/;

From 582bb946242dd61a2500dcc9f8114a616fe9933f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 26 Aug 2019 22:54:10 +0200
Subject: [PATCH 246/794] mailman: add django_mailman3 testing

---
 .../python-modules/django-mailman3/default.nix            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
index 2dd3801dad5..91cea9b0059 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor
-, django-allauth, mailmanclient
+, django-allauth, mailmanclient, django, mock
 }:
 
 buildPythonPackage rec {
@@ -14,8 +14,12 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     django-gravatar2 django_compressor django-allauth mailmanclient
   ];
+  checkInputs = [ django mock ];
 
-  doCheck = false;
+  checkPhase = ''
+    cd $NIX_BUILD_TOP/$sourceRoot
+    PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test
+  '';
 
   meta = with stdenv.lib; {
     description = "Django library for Mailman UIs";

From 6f279584fde080646f689c653c571fb8a8919d3b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 26 Aug 2019 14:00:48 -0700
Subject: [PATCH 247/794] stp: 2.2.0 -> 2.3.3

---
 pkgs/applications/science/logic/stp/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix
index 081dc788163..0ea659d1927 100644
--- a/pkgs/applications/science/logic/stp/default.nix
+++ b/pkgs/applications/science/logic/stp/default.nix
@@ -1,14 +1,14 @@
 { stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl, python3, python3Packages, zlib, minisatUnstable, cryptominisat }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.0";
-  name = "stp-${version}";
+  pname = "stp";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "stp";
     repo = "stp";
-    rev    = "stp-${version}";
-    sha256 = "1jh23wjm62nnqfx447g2y53bbangq04hjrvqc35v9xxpcjgj3i49";
+    rev    = version;
+    sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87";
   };
 
   buildInputs = [ boost zlib minisatUnstable cryptominisat python3 ];
@@ -23,9 +23,8 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  # `make -f lib/Interface/CMakeFiles/cppinterface.dir/build.make lib/Interface/CMakeFiles/cppinterface.dir/cpp_interface.cpp.o`:
-  # include/stp/AST/UsefulDefs.h:41:29: fatal error: stp/AST/ASTKind.h: No such file or directory
-  enableParallelBuilding = false;
+  # seems to build fine now, may revert if concurrency does become an issue
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Simple Theorem Prover";

From ff1839bb26257fbb69e509640d62e17dba6e7b79 Mon Sep 17 00:00:00 2001
From: blargg <tomjankauski@gmail.com>
Date: Mon, 26 Aug 2019 07:55:56 -0500
Subject: [PATCH 248/794] tiled: use qt5's mkDerivation

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

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 4fa93d78235..b0b80a4ec00 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake
 , python, qtbase, qttools }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "tiled";
   version = "1.2.4";
 

From a9ae2c055c5827ea14170fa8073330bbc03e63cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Mon, 26 Aug 2019 19:07:24 +0200
Subject: [PATCH 249/794] riot-desktop: use yarn2nix-moretea

Now that we have yarn2nix-moretea in the tree, we can use that instead of the vendored version that was introduced when yarn2nix was removed previously. Also add an update script.
---
 .../riot/riot-desktop-yarndeps.nix            | 129 +------
 .../instant-messengers/riot/riot-desktop.nix  |  20 +-
 .../riot/update-riot-desktop.sh               |  17 +
 .../instant-messengers/riot/yarn2nix.nix      | 320 ------------------
 4 files changed, 26 insertions(+), 460 deletions(-)
 create mode 100755 pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
 delete mode 100644 pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
index b84807c69a0..b76848c2b81 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
@@ -1,7 +1,6 @@
-{fetchurl, linkFarm}: rec {
+{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
   offline_cache = linkFarm "offline" packages;
   packages = [
-
     {
       name = "_types_node___node_9.6.45.tgz";
       path = fetchurl {
@@ -10,7 +9,6 @@
         sha1 = "a9e5cfd026a3abaaf17e3c0318a470da9f2f178e";
       };
     }
-
     {
       name = "ajv___ajv_6.10.0.tgz";
       path = fetchurl {
@@ -19,7 +17,6 @@
         sha1 = "90d0d54439da587cd7e843bfb7045f50bd22bdf1";
       };
     }
-
     {
       name = "applescript___applescript_1.0.0.tgz";
       path = fetchurl {
@@ -28,7 +25,6 @@
         sha1 = "bb87af568cad034a4e48c4bdaf6067a3a2701317";
       };
     }
-
     {
       name = "asn1___asn1_0.2.4.tgz";
       path = fetchurl {
@@ -37,7 +33,6 @@
         sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136";
       };
     }
-
     {
       name = "assert_plus___assert_plus_1.0.0.tgz";
       path = fetchurl {
@@ -46,7 +41,6 @@
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     }
-
     {
       name = "asynckit___asynckit_0.4.0.tgz";
       path = fetchurl {
@@ -55,7 +49,6 @@
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     }
-
     {
       name = "auto_launch___auto_launch_5.0.5.tgz";
       path = fetchurl {
@@ -64,7 +57,6 @@
         sha1 = "d14bd002b1ef642f85e991a6195ff5300c8ad3c0";
       };
     }
-
     {
       name = "aws_sign2___aws_sign2_0.7.0.tgz";
       path = fetchurl {
@@ -73,7 +65,6 @@
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     }
-
     {
       name = "aws4___aws4_1.8.0.tgz";
       path = fetchurl {
@@ -82,7 +73,6 @@
         sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f";
       };
     }
-
     {
       name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz";
       path = fetchurl {
@@ -91,7 +81,6 @@
         sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
       };
     }
-
     {
       name = "bignumber.js___bignumber.js_2.4.0.tgz";
       path = fetchurl {
@@ -100,7 +89,6 @@
         sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8";
       };
     }
-
     {
       name = "bmp_js___bmp_js_0.0.3.tgz";
       path = fetchurl {
@@ -109,7 +97,6 @@
         sha1 = "64113e9c7cf1202b376ed607bf30626ebe57b18a";
       };
     }
-
     {
       name = "buffer_equal___buffer_equal_0.0.1.tgz";
       path = fetchurl {
@@ -118,7 +105,6 @@
         sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
       };
     }
-
     {
       name = "caseless___caseless_0.12.0.tgz";
       path = fetchurl {
@@ -127,7 +113,6 @@
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     }
-
     {
       name = "combined_stream___combined_stream_1.0.7.tgz";
       path = fetchurl {
@@ -136,7 +121,6 @@
         sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828";
       };
     }
-
     {
       name = "conf___conf_2.2.0.tgz";
       path = fetchurl {
@@ -145,7 +129,6 @@
         sha1 = "ee282efafc1450b61e205372041ad7d866802d9a";
       };
     }
-
     {
       name = "core_util_is___core_util_is_1.0.2.tgz";
       path = fetchurl {
@@ -154,7 +137,6 @@
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     }
-
     {
       name = "dashdash___dashdash_1.14.1.tgz";
       path = fetchurl {
@@ -163,7 +145,6 @@
         sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     }
-
     {
       name = "deep_equal___deep_equal_1.0.1.tgz";
       path = fetchurl {
@@ -172,7 +153,6 @@
         sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
       };
     }
-
     {
       name = "define_properties___define_properties_1.1.3.tgz";
       path = fetchurl {
@@ -181,7 +161,6 @@
         sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1";
       };
     }
-
     {
       name = "delayed_stream___delayed_stream_1.0.0.tgz";
       path = fetchurl {
@@ -190,7 +169,6 @@
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     }
-
     {
       name = "dom_walk___dom_walk_0.1.1.tgz";
       path = fetchurl {
@@ -199,7 +177,6 @@
         sha1 = "672226dc74c8f799ad35307df936aba11acd6018";
       };
     }
-
     {
       name = "dot_prop___dot_prop_4.2.0.tgz";
       path = fetchurl {
@@ -208,7 +185,6 @@
         sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
       };
     }
-
     {
       name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz";
       path = fetchurl {
@@ -217,7 +193,6 @@
         sha1 = "3a83a904e54353287874c564b7549386849a98c9";
       };
     }
-
     {
       name = "electron_store___electron_store_2.0.0.tgz";
       path = fetchurl {
@@ -226,7 +201,6 @@
         sha1 = "1035cca2a95409d1f54c7466606345852450d64a";
       };
     }
-
     {
       name = "electron_window_state___electron_window_state_4.1.1.tgz";
       path = fetchurl {
@@ -235,7 +209,6 @@
         sha1 = "6b34fdc31b38514dfec8b7c8f7b5d4addb67632d";
       };
     }
-
     {
       name = "env_paths___env_paths_1.0.0.tgz";
       path = fetchurl {
@@ -244,7 +217,6 @@
         sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0";
       };
     }
-
     {
       name = "es_abstract___es_abstract_1.13.0.tgz";
       path = fetchurl {
@@ -253,7 +225,6 @@
         sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9";
       };
     }
-
     {
       name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
       path = fetchurl {
@@ -262,7 +233,6 @@
         sha1 = "edf72478033456e8dda8ef09e00ad9650707f377";
       };
     }
-
     {
       name = "es6_promise___es6_promise_3.3.1.tgz";
       path = fetchurl {
@@ -271,7 +241,6 @@
         sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613";
       };
     }
-
     {
       name = "exif_parser___exif_parser_0.1.12.tgz";
       path = fetchurl {
@@ -280,7 +249,6 @@
         sha1 = "58a9d2d72c02c1f6f02a0ef4a9166272b7760922";
       };
     }
-
     {
       name = "extend___extend_3.0.2.tgz";
       path = fetchurl {
@@ -289,7 +257,6 @@
         sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa";
       };
     }
-
     {
       name = "extsprintf___extsprintf_1.3.0.tgz";
       path = fetchurl {
@@ -298,7 +265,6 @@
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     }
-
     {
       name = "extsprintf___extsprintf_1.4.0.tgz";
       path = fetchurl {
@@ -307,7 +273,6 @@
         sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f";
       };
     }
-
     {
       name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz";
       path = fetchurl {
@@ -316,7 +281,6 @@
         sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
       };
     }
-
     {
       name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz";
       path = fetchurl {
@@ -325,7 +289,6 @@
         sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
       };
     }
-
     {
       name = "file_type___file_type_3.9.0.tgz";
       path = fetchurl {
@@ -334,7 +297,6 @@
         sha1 = "257a078384d1db8087bc449d107d52a52672b9e9";
       };
     }
-
     {
       name = "find_up___find_up_2.1.0.tgz";
       path = fetchurl {
@@ -343,7 +305,6 @@
         sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
       };
     }
-
     {
       name = "for_each___for_each_0.3.3.tgz";
       path = fetchurl {
@@ -352,7 +313,6 @@
         sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e";
       };
     }
-
     {
       name = "forever_agent___forever_agent_0.6.1.tgz";
       path = fetchurl {
@@ -361,7 +321,6 @@
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     }
-
     {
       name = "form_data___form_data_2.3.3.tgz";
       path = fetchurl {
@@ -370,7 +329,6 @@
         sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6";
       };
     }
-
     {
       name = "function_bind___function_bind_1.1.1.tgz";
       path = fetchurl {
@@ -379,7 +337,6 @@
         sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d";
       };
     }
-
     {
       name = "getpass___getpass_0.1.7.tgz";
       path = fetchurl {
@@ -388,7 +345,6 @@
         sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
       };
     }
-
     {
       name = "global___global_4.3.2.tgz";
       path = fetchurl {
@@ -397,7 +353,6 @@
         sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
       };
     }
-
     {
       name = "graceful_fs___graceful_fs_4.1.15.tgz";
       path = fetchurl {
@@ -406,7 +361,6 @@
         sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00";
       };
     }
-
     {
       name = "har_schema___har_schema_2.0.0.tgz";
       path = fetchurl {
@@ -415,7 +369,6 @@
         sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     }
-
     {
       name = "har_validator___har_validator_5.1.3.tgz";
       path = fetchurl {
@@ -424,7 +377,6 @@
         sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080";
       };
     }
-
     {
       name = "has_symbols___has_symbols_1.0.0.tgz";
       path = fetchurl {
@@ -433,7 +385,6 @@
         sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
       };
     }
-
     {
       name = "has___has_1.0.3.tgz";
       path = fetchurl {
@@ -442,7 +393,6 @@
         sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796";
       };
     }
-
     {
       name = "http_signature___http_signature_1.2.0.tgz";
       path = fetchurl {
@@ -451,7 +401,6 @@
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     }
-
     {
       name = "imurmurhash___imurmurhash_0.1.4.tgz";
       path = fetchurl {
@@ -460,7 +409,6 @@
         sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
       };
     }
-
     {
       name = "ip_regex___ip_regex_1.0.3.tgz";
       path = fetchurl {
@@ -469,7 +417,6 @@
         sha1 = "dc589076f659f419c222039a33316f1c7387effd";
       };
     }
-
     {
       name = "is_callable___is_callable_1.1.4.tgz";
       path = fetchurl {
@@ -478,7 +425,6 @@
         sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75";
       };
     }
-
     {
       name = "is_date_object___is_date_object_1.0.1.tgz";
       path = fetchurl {
@@ -487,7 +433,6 @@
         sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
       };
     }
-
     {
       name = "is_function___is_function_1.0.1.tgz";
       path = fetchurl {
@@ -496,7 +441,6 @@
         sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5";
       };
     }
-
     {
       name = "is_obj___is_obj_1.0.1.tgz";
       path = fetchurl {
@@ -505,7 +449,6 @@
         sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
       };
     }
-
     {
       name = "is_regex___is_regex_1.0.4.tgz";
       path = fetchurl {
@@ -514,7 +457,6 @@
         sha1 = "5517489b547091b0930e095654ced25ee97e9491";
       };
     }
-
     {
       name = "is_symbol___is_symbol_1.0.2.tgz";
       path = fetchurl {
@@ -523,7 +465,6 @@
         sha1 = "a055f6ae57192caee329e7a860118b497a950f38";
       };
     }
-
     {
       name = "is_typedarray___is_typedarray_1.0.0.tgz";
       path = fetchurl {
@@ -532,7 +473,6 @@
         sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
       };
     }
-
     {
       name = "isstream___isstream_0.1.2.tgz";
       path = fetchurl {
@@ -541,7 +481,6 @@
         sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
       };
     }
-
     {
       name = "jimp___jimp_0.2.28.tgz";
       path = fetchurl {
@@ -550,7 +489,6 @@
         sha1 = "dd529a937190f42957a7937d1acc3a7762996ea2";
       };
     }
-
     {
       name = "jpeg_js___jpeg_js_0.2.0.tgz";
       path = fetchurl {
@@ -559,7 +497,6 @@
         sha1 = "53e448ec9d263e683266467e9442d2c5a2ef5482";
       };
     }
-
     {
       name = "jsbn___jsbn_0.1.1.tgz";
       path = fetchurl {
@@ -568,7 +505,6 @@
         sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     }
-
     {
       name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz";
       path = fetchurl {
@@ -577,7 +513,6 @@
         sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660";
       };
     }
-
     {
       name = "json_schema___json_schema_0.2.3.tgz";
       path = fetchurl {
@@ -586,7 +521,6 @@
         sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
       };
     }
-
     {
       name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz";
       path = fetchurl {
@@ -595,7 +529,6 @@
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     }
-
     {
       name = "jsonfile___jsonfile_2.4.0.tgz";
       path = fetchurl {
@@ -604,7 +537,6 @@
         sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
       };
     }
-
     {
       name = "jsprim___jsprim_1.4.1.tgz";
       path = fetchurl {
@@ -613,7 +545,6 @@
         sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     }
-
     {
       name = "load_bmfont___load_bmfont_1.4.0.tgz";
       path = fetchurl {
@@ -622,7 +553,6 @@
         sha1 = "75f17070b14a8c785fe7f5bee2e6fd4f98093b6b";
       };
     }
-
     {
       name = "locate_path___locate_path_2.0.0.tgz";
       path = fetchurl {
@@ -631,7 +561,6 @@
         sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
       };
     }
-
     {
       name = "make_dir___make_dir_1.3.0.tgz";
       path = fetchurl {
@@ -640,7 +569,6 @@
         sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c";
       };
     }
-
     {
       name = "mime_db___mime_db_1.38.0.tgz";
       path = fetchurl {
@@ -649,7 +577,6 @@
         sha1 = "1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad";
       };
     }
-
     {
       name = "mime_types___mime_types_2.1.22.tgz";
       path = fetchurl {
@@ -658,7 +585,6 @@
         sha1 = "fe6b355a190926ab7698c9a0556a11199b2199bd";
       };
     }
-
     {
       name = "mime___mime_1.6.0.tgz";
       path = fetchurl {
@@ -667,7 +593,6 @@
         sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1";
       };
     }
-
     {
       name = "min_document___min_document_2.19.0.tgz";
       path = fetchurl {
@@ -676,7 +601,6 @@
         sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685";
       };
     }
-
     {
       name = "minimist___minimist_0.0.8.tgz";
       path = fetchurl {
@@ -685,7 +609,6 @@
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     }
-
     {
       name = "minimist___minimist_1.2.0.tgz";
       path = fetchurl {
@@ -694,7 +617,6 @@
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     }
-
     {
       name = "mkdirp___mkdirp_0.5.1.tgz";
       path = fetchurl {
@@ -703,7 +625,6 @@
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     }
-
     {
       name = "oauth_sign___oauth_sign_0.9.0.tgz";
       path = fetchurl {
@@ -712,7 +633,6 @@
         sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455";
       };
     }
-
     {
       name = "object_keys___object_keys_1.1.0.tgz";
       path = fetchurl {
@@ -721,7 +641,6 @@
         sha1 = "11bd22348dd2e096a045ab06f6c85bcc340fa032";
       };
     }
-
     {
       name = "p_limit___p_limit_1.3.0.tgz";
       path = fetchurl {
@@ -730,7 +649,6 @@
         sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8";
       };
     }
-
     {
       name = "p_locate___p_locate_2.0.0.tgz";
       path = fetchurl {
@@ -739,7 +657,6 @@
         sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
       };
     }
-
     {
       name = "p_try___p_try_1.0.0.tgz";
       path = fetchurl {
@@ -748,7 +665,6 @@
         sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
       };
     }
-
     {
       name = "parse_bmfont_ascii___parse_bmfont_ascii_1.0.6.tgz";
       path = fetchurl {
@@ -757,7 +673,6 @@
         sha1 = "11ac3c3ff58f7c2020ab22769079108d4dfa0285";
       };
     }
-
     {
       name = "parse_bmfont_binary___parse_bmfont_binary_1.0.6.tgz";
       path = fetchurl {
@@ -766,7 +681,6 @@
         sha1 = "d038b476d3e9dd9db1e11a0b0e53a22792b69006";
       };
     }
-
     {
       name = "parse_bmfont_xml___parse_bmfont_xml_1.1.4.tgz";
       path = fetchurl {
@@ -775,7 +689,6 @@
         sha1 = "015319797e3e12f9e739c4d513872cd2fa35f389";
       };
     }
-
     {
       name = "parse_headers___parse_headers_2.0.2.tgz";
       path = fetchurl {
@@ -784,7 +697,6 @@
         sha1 = "9545e8a4c1ae5eaea7d24992bca890281ed26e34";
       };
     }
-
     {
       name = "path_exists___path_exists_3.0.0.tgz";
       path = fetchurl {
@@ -793,7 +705,6 @@
         sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
       };
     }
-
     {
       name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
       path = fetchurl {
@@ -802,7 +713,6 @@
         sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
       };
     }
-
     {
       name = "performance_now___performance_now_2.1.0.tgz";
       path = fetchurl {
@@ -811,7 +721,6 @@
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     }
-
     {
       name = "phin___phin_2.9.3.tgz";
       path = fetchurl {
@@ -820,7 +729,6 @@
         sha1 = "f9b6ac10a035636fb65dfc576aaaa17b8743125c";
       };
     }
-
     {
       name = "pify___pify_3.0.0.tgz";
       path = fetchurl {
@@ -829,7 +737,6 @@
         sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
       };
     }
-
     {
       name = "pixelmatch___pixelmatch_4.0.2.tgz";
       path = fetchurl {
@@ -838,7 +745,6 @@
         sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854";
       };
     }
-
     {
       name = "pkg_up___pkg_up_2.0.0.tgz";
       path = fetchurl {
@@ -847,7 +753,6 @@
         sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f";
       };
     }
-
     {
       name = "png_to_ico___png_to_ico_1.0.7.tgz";
       path = fetchurl {
@@ -856,7 +761,6 @@
         sha1 = "9346b5f4d6fd7e94cb08fd49eeb585f501c3e5f2";
       };
     }
-
     {
       name = "pngjs___pngjs_3.4.0.tgz";
       path = fetchurl {
@@ -865,7 +769,6 @@
         sha1 = "99ca7d725965fb655814eaf65f38f12bbdbf555f";
       };
     }
-
     {
       name = "process___process_0.5.2.tgz";
       path = fetchurl {
@@ -874,7 +777,6 @@
         sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf";
       };
     }
-
     {
       name = "psl___psl_1.1.31.tgz";
       path = fetchurl {
@@ -883,7 +785,6 @@
         sha1 = "e9aa86d0101b5b105cbe93ac6b784cd547276184";
       };
     }
-
     {
       name = "punycode___punycode_1.4.1.tgz";
       path = fetchurl {
@@ -892,7 +793,6 @@
         sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
       };
     }
-
     {
       name = "punycode___punycode_2.1.1.tgz";
       path = fetchurl {
@@ -901,7 +801,6 @@
         sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec";
       };
     }
-
     {
       name = "qs___qs_6.5.2.tgz";
       path = fetchurl {
@@ -910,7 +809,6 @@
         sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36";
       };
     }
-
     {
       name = "read_chunk___read_chunk_1.0.1.tgz";
       path = fetchurl {
@@ -919,7 +817,6 @@
         sha1 = "5f68cab307e663f19993527d9b589cace4661194";
       };
     }
-
     {
       name = "request___request_2.88.0.tgz";
       path = fetchurl {
@@ -928,7 +825,6 @@
         sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef";
       };
     }
-
     {
       name = "safe_buffer___safe_buffer_5.1.2.tgz";
       path = fetchurl {
@@ -937,7 +833,6 @@
         sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
       };
     }
-
     {
       name = "safer_buffer___safer_buffer_2.1.2.tgz";
       path = fetchurl {
@@ -946,7 +841,6 @@
         sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a";
       };
     }
-
     {
       name = "sax___sax_1.2.4.tgz";
       path = fetchurl {
@@ -955,7 +849,6 @@
         sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
       };
     }
-
     {
       name = "signal_exit___signal_exit_3.0.2.tgz";
       path = fetchurl {
@@ -964,7 +857,6 @@
         sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     }
-
     {
       name = "sshpk___sshpk_1.16.1.tgz";
       path = fetchurl {
@@ -973,7 +865,6 @@
         sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877";
       };
     }
-
     {
       name = "stream_to_buffer___stream_to_buffer_0.1.0.tgz";
       path = fetchurl {
@@ -982,7 +873,6 @@
         sha1 = "26799d903ab2025c9bd550ac47171b00f8dd80a9";
       };
     }
-
     {
       name = "stream_to___stream_to_0.2.2.tgz";
       path = fetchurl {
@@ -991,7 +881,6 @@
         sha1 = "84306098d85fdb990b9fa300b1b3ccf55e8ef01d";
       };
     }
-
     {
       name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz";
       path = fetchurl {
@@ -1000,7 +889,6 @@
         sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea";
       };
     }
-
     {
       name = "tinycolor2___tinycolor2_1.4.1.tgz";
       path = fetchurl {
@@ -1009,7 +897,6 @@
         sha1 = "f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8";
       };
     }
-
     {
       name = "tough_cookie___tough_cookie_2.4.3.tgz";
       path = fetchurl {
@@ -1018,7 +905,6 @@
         sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781";
       };
     }
-
     {
       name = "tunnel_agent___tunnel_agent_0.6.0.tgz";
       path = fetchurl {
@@ -1027,7 +913,6 @@
         sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
       };
     }
-
     {
       name = "tweetnacl___tweetnacl_0.14.5.tgz";
       path = fetchurl {
@@ -1036,7 +921,6 @@
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     }
-
     {
       name = "untildify___untildify_3.0.3.tgz";
       path = fetchurl {
@@ -1045,7 +929,6 @@
         sha1 = "1e7b42b140bcfd922b22e70ca1265bfe3634c7c9";
       };
     }
-
     {
       name = "uri_js___uri_js_4.2.2.tgz";
       path = fetchurl {
@@ -1054,7 +937,6 @@
         sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0";
       };
     }
-
     {
       name = "url_regex___url_regex_3.2.0.tgz";
       path = fetchurl {
@@ -1063,7 +945,6 @@
         sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724";
       };
     }
-
     {
       name = "uuid___uuid_3.3.2.tgz";
       path = fetchurl {
@@ -1072,7 +953,6 @@
         sha1 = "1b4af4955eb3077c501c23872fc6513811587131";
       };
     }
-
     {
       name = "verror___verror_1.10.0.tgz";
       path = fetchurl {
@@ -1081,7 +961,6 @@
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     }
-
     {
       name = "winreg___winreg_1.2.4.tgz";
       path = fetchurl {
@@ -1090,7 +969,6 @@
         sha1 = "ba065629b7a925130e15779108cf540990e98d1b";
       };
     }
-
     {
       name = "write_file_atomic___write_file_atomic_2.4.2.tgz";
       path = fetchurl {
@@ -1099,7 +977,6 @@
         sha1 = "a7181706dfba17855d221140a9c06e15fcdd87b9";
       };
     }
-
     {
       name = "xhr___xhr_2.5.0.tgz";
       path = fetchurl {
@@ -1108,7 +985,6 @@
         sha1 = "bed8d1676d5ca36108667692b74b316c496e49dd";
       };
     }
-
     {
       name = "xml_parse_from_string___xml_parse_from_string_1.0.1.tgz";
       path = fetchurl {
@@ -1117,7 +993,6 @@
         sha1 = "a9029e929d3dbcded169f3c6e28238d95a5d5a28";
       };
     }
-
     {
       name = "xml2js___xml2js_0.4.19.tgz";
       path = fetchurl {
@@ -1126,7 +1001,6 @@
         sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7";
       };
     }
-
     {
       name = "xmlbuilder___xmlbuilder_9.0.7.tgz";
       path = fetchurl {
@@ -1135,7 +1009,6 @@
         sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d";
       };
     }
-
     {
       name = "xtend___xtend_4.0.1.tgz";
       path = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index d245fad7bca..2c4557f2cc0 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -1,9 +1,8 @@
-{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web }:
+{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, yarn2nix-moretea }:
 
-# Note for maintainers:
-# Versions of `riot-web` and `riot-desktop` should be kept in sync.
-
-with (import ./yarn2nix.nix { inherit pkgs; });
+# Notes for maintainers:
+# * versions of `riot-web` and `riot-desktop` should be kept in sync.
+# * the Yarn dependency expression must be updated with `./update-riot-desktop.sh <git release tag>`
 
 let
   executableName = "riot-desktop";
@@ -15,18 +14,13 @@ let
     sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc";
   };
 
-in mkYarnPackage rec {
+in yarn2nix-moretea.mkYarnPackage rec {
   name = "riot-desktop-${version}";
   inherit version;
 
   src = "${riot-web-src}/electron_app";
 
-  # The package manifest should be copied on each update of this package.
-  # > cp ${riot-web-src}/electron_app/package.json riot-desktop-package.json
   packageJSON = ./riot-desktop-package.json;
-
-  # The dependency expression can be regenerated using nixos.yarn2nix with the following command:
-  # > yarn2nix --lockfile=${riot-web-src}/electron_app/yarn.lock > riot-desktop-yarndeps.nix
   yarnNix = ./riot-desktop-yarndeps.nix;
 
   nativeBuildInputs = [ makeWrapper ];
@@ -36,7 +30,9 @@ in mkYarnPackage rec {
     mkdir -p "$out/share/riot"
     ln -s '${riot-web}' "$out/share/riot/webapp"
     cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator"
-    cp -r '.' "$out/share/riot/electron"
+    cp -r './deps/riot-web' "$out/share/riot/electron"
+    rm "$out/share/riot/electron/node_modules"
+    cp -r './node_modules' "$out/share/riot/electron"
 
     # icons
     for icon in $out/share/riot/electron/build/icons/*.png; do
diff --git a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
new file mode 100755
index 00000000000..b646a9e03ad
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix-moretea.yarn2nix
+
+set -euo pipefail
+
+if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
+	echo "Regenerates the Yarn dependency lock files for the riot-desktop package."
+	echo "Usage: $0 <git release tag>"
+	exit 1
+fi
+
+RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-web/$1"
+
+wget "$RIOT_WEB_SRC/electron_app/package.json" -O riot-desktop-package.json
+wget "$RIOT_WEB_SRC/electron_app/yarn.lock" -O riot-desktop-yarndeps.lock
+yarn2nix --lockfile=riot-desktop-yarndeps.lock > riot-desktop-yarndeps.nix
+rm riot-desktop-yarndeps.lock
diff --git a/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix b/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix
deleted file mode 100644
index 5dd79fdf1d8..00000000000
--- a/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix
+++ /dev/null
@@ -1,320 +0,0 @@
-{ pkgs ? import <nixpkgs> {}
-, nodejs ? pkgs.nodejs
-, yarn ? pkgs.yarn
-}:
-
-let
-  inherit (pkgs) stdenv lib fetchurl linkFarm;
-in rec {
-  # Export yarn again to make it easier to find out which yarn was used.
-  inherit yarn;
-
-  # Re-export pkgs
-  inherit pkgs;
-
-  unlessNull = item: alt:
-    if item == null then alt else item;
-
-  reformatPackageName = pname:
-    let
-      # regex adapted from `validate-npm-package-name`
-      # will produce 3 parts e.g.
-      # "@someorg/somepackage" -> [ "@someorg/" "someorg" "somepackage" ]
-      # "somepackage" -> [ null null "somepackage" ]
-      parts = builtins.tail (builtins.match "^(@([^/]+)/)?([^/]+)$" pname);
-      # if there is no organisation we need to filter out null values.
-      non-null = builtins.filter (x: x != null) parts;
-    in builtins.concatStringsSep "-" non-null;
-
-  # https://docs.npmjs.com/files/package.json#license
-  # TODO: support expression syntax (OR, AND, etc)
-  spdxLicense = licstr:
-    if licstr == "UNLICENSED" then
-      lib.licenses.unfree
-    else
-      lib.findFirst
-        (l: l ? spdxId && l.spdxId == licstr)
-        { shortName = licstr; }
-        (builtins.attrValues lib.licenses);
-
-  # Generates the yarn.nix from the yarn.lock file
-  mkYarnNix = yarnLock:
-    pkgs.runCommand "yarn.nix" {}
-      "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch > $out";
-
-  # Loads the generated offline cache. This will be used by yarn as
-  # the package source.
-  importOfflineCache = yarnNix:
-    let
-      pkg = import yarnNix { inherit fetchurl linkFarm; };
-    in
-      pkg.offline_cache;
-
-  defaultYarnFlags = [
-    "--offline"
-    "--frozen-lockfile"
-    "--ignore-engines"
-    "--ignore-scripts"
-  ];
-
-  mkYarnModules = {
-    name,
-    pname,
-    packageJSON,
-    yarnLock,
-    yarnNix ? mkYarnNix yarnLock,
-    yarnFlags ? defaultYarnFlags,
-    pkgConfig ? {},
-    preBuild ? "",
-    workspaceDependencies ? [],
-  }:
-    let
-      offlineCache = importOfflineCache yarnNix;
-      extraBuildInputs = (lib.flatten (builtins.map (key:
-        pkgConfig.${key} . buildInputs or []
-      ) (builtins.attrNames pkgConfig)));
-      postInstall = (builtins.map (key:
-        if (pkgConfig.${key} ? postInstall) then
-          ''
-            for f in $(find -L -path '*/node_modules/${key}' -type d); do
-              (cd "$f" && (${pkgConfig.${key}.postInstall}))
-            done
-          ''
-        else
-          ""
-      ) (builtins.attrNames pkgConfig));
-      workspaceJSON = pkgs.writeText
-        "${name}-workspace-package.json"
-        (builtins.toJSON { private = true; workspaces = ["deps/**"]; }); # scoped packages need second splat
-      workspaceDependencyLinks = lib.concatMapStringsSep "\n"
-        (dep: ''
-          mkdir -p "deps/${dep.pname}"
-          ln -sf ${dep.packageJSON} "deps/${dep.pname}/package.json"
-        '')
-        workspaceDependencies;
-    in stdenv.mkDerivation {
-      inherit preBuild name;
-      phases = ["configurePhase" "buildPhase"];
-      buildInputs = [ yarn nodejs ] ++ extraBuildInputs;
-
-      configurePhase = ''
-        # Yarn writes cache directories etc to $HOME.
-        export HOME=$PWD/yarn_home
-      '';
-
-      buildPhase = ''
-        runHook preBuild
-
-        mkdir -p "deps/${pname}"
-        cp ${packageJSON} "deps/${pname}/package.json"
-        cp ${workspaceJSON} ./package.json
-        cp ${yarnLock} ./yarn.lock
-        chmod +w ./yarn.lock
-
-        yarn config --offline set yarn-offline-mirror ${offlineCache}
-
-        # Do not look up in the registry, but in the offline cache.
-        # TODO: Ask upstream to fix this mess.
-        sed -i -E '/resolved /{s|https://registry.yarnpkg.com/||;s|[@/:-]|_|g}' yarn.lock
-
-        ${workspaceDependencyLinks}
-        yarn install ${lib.escapeShellArgs yarnFlags}
-
-        ${lib.concatStringsSep "\n" postInstall}
-
-        mkdir $out
-        mv node_modules $out/
-        mv deps $out/
-        patchShebangs $out
-      '';
-    };
-
-  # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into
-  # the shell-hook environment.
-  linkNodeModulesHook = ''
-    if [[ -d node_modules || -L node_modules ]]; then
-      echo "./node_modules is present. Replacing."
-      rm -rf node_modules
-    fi
-
-    ln -s "$node_modules" node_modules
-  '';
-
-  mkYarnWorkspace = {
-    src,
-    packageJSON ? src+"/package.json",
-    yarnLock ? src+"/yarn.lock",
-    packageOverrides ? {},
-    ...
-  }@attrs:
-  let
-    package = lib.importJSON packageJSON;
-    packageGlobs = package.workspaces;
-    globElemToRegex = lib.replaceStrings ["*"] [".*"];
-    # PathGlob -> [PathGlobElem]
-    splitGlob = lib.splitString "/";
-    # Path -> [PathGlobElem] -> [Path]
-    # Note: Only directories are included, everything else is filtered out
-    expandGlobList = base: globElems:
-    let
-      elemRegex = globElemToRegex (lib.head globElems);
-      rest = lib.tail globElems;
-      children = lib.attrNames (lib.filterAttrs (name: type: type == "directory") (builtins.readDir base));
-      matchingChildren = lib.filter (child: builtins.match elemRegex child != null) children;
-    in if globElems == []
-      then [ base ]
-      else lib.concatMap (child: expandGlobList (base+("/"+child)) rest) matchingChildren;
-    # Path -> PathGlob -> [Path]
-    expandGlob = base: glob: expandGlobList base (splitGlob glob);
-    packagePaths = lib.concatMap (expandGlob src) packageGlobs;
-    packages = lib.listToAttrs (map (src:
-    let
-      packageJSON = src+"/package.json";
-      package = lib.importJSON packageJSON;
-      allDependencies = lib.foldl (a: b: a // b) {} (map (field: lib.attrByPath [field] {} package) ["dependencies" "devDependencies"]);
-    in rec {
-      name = reformatPackageName package.name;
-      value = mkYarnPackage (builtins.removeAttrs attrs ["packageOverrides"] // {
-        inherit src packageJSON yarnLock;
-        workspaceDependencies = lib.mapAttrsToList (name: version: packages.${name})
-          (lib.filterAttrs (name: version: packages ? ${name}) allDependencies);
-      } // lib.attrByPath [name] {} packageOverrides);
-    }) packagePaths);
-  in packages;
-
-  mkYarnPackage = {
-    name ? null,
-    src,
-    packageJSON ? src + "/package.json",
-    yarnLock ? src + "/yarn.lock",
-    yarnNix ? mkYarnNix yarnLock,
-    yarnFlags ? defaultYarnFlags,
-    yarnPreBuild ? "",
-    pkgConfig ? {},
-    extraBuildInputs ? [],
-    publishBinsFor ? null,
-    workspaceDependencies ? [],
-    ...
-  }@attrs:
-    let
-      package = lib.importJSON packageJSON;
-      pname = package.name;
-      safeName = reformatPackageName pname;
-      version = package.version;
-      baseName = unlessNull name "${safeName}-${version}";
-      deps = mkYarnModules {
-        name = "${safeName}-modules-${version}";
-        preBuild = yarnPreBuild;
-        workspaceDependencies = workspaceDependenciesTransitive;
-        inherit packageJSON pname yarnLock yarnNix yarnFlags pkgConfig;
-      };
-      publishBinsFor_ = unlessNull publishBinsFor [pname];
-      linkDirFunction = ''
-        linkDirToDirLinks() {
-          target=$1
-          if [ ! -f "$target" ]; then
-            mkdir -p "$target"
-          elif [ -L "$target" ]; then
-            local new=$(mktemp -d)
-            trueSource=$(realpath "$target")
-            if [ "$(ls $trueSource | wc -l)" -gt 0 ]; then
-              ln -s $trueSource/* $new/
-            fi
-            rm -r "$target"
-            mv "$new" "$target"
-          fi
-        }
-      '';
-      workspaceDependenciesTransitive = lib.unique ((lib.flatten (builtins.map (dep: dep.workspaceDependencies) workspaceDependencies)) ++ workspaceDependencies);
-      workspaceDependencyCopy = lib.concatMapStringsSep "\n"
-        (dep: ''
-          # ensure any existing scope directory is not a symlink
-          linkDirToDirLinks "$(dirname node_modules/${dep.pname})"
-          mkdir -p "deps/${dep.pname}"
-          tar -xf "${dep}/tarballs/${dep.name}.tgz" --directory "deps/${dep.pname}" --strip-components=1
-          if [ ! -e "deps/${dep.pname}/node_modules" ]; then
-            ln -s "${deps}/deps/${dep.pname}/node_modules" "deps/${dep.pname}/node_modules"
-          fi
-        '')
-        workspaceDependenciesTransitive;
-    in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig" "workspaceDependencies"] // {
-      inherit src;
-
-      name = baseName;
-
-      buildInputs = [ yarn nodejs ] ++ extraBuildInputs;
-
-      node_modules = deps + "/node_modules";
-
-      configurePhase = attrs.configurePhase or ''
-        runHook preConfigure
-
-        for localDir in npm-packages-offline-cache node_modules; do
-          if [[ -d $localDir || -L $localDir ]]; then
-            echo "$localDir dir present. Removing."
-            rm -rf $localDir
-          fi
-        done
-
-        mkdir -p "deps/${pname}"
-        shopt -s extglob
-        cp -r !(deps) "deps/${pname}"
-        shopt -u extglob
-        ln -s ${deps}/deps/${pname}/node_modules "deps/${pname}/node_modules"
-
-        cp -r $node_modules node_modules
-        chmod -R +w node_modules
-
-        ${linkDirFunction}
-        linkDirToDirLinks "$(dirname node_modules/${pname})"
-        ln -s "deps/${pname}" "node_modules/${pname}"
-        ${workspaceDependencyCopy}
-
-        # Help yarn commands run in other phases find the package
-        echo "--cwd deps/${pname}" > .yarnrc
-        runHook postConfigure
-      '';
-
-      # Replace this phase on frontend packages where only the generated
-      # files are an interesting output.
-      installPhase = attrs.installPhase or ''
-        runHook preInstall
-
-        mkdir -p $out/{bin,libexec/${pname}}
-        mv node_modules $out/libexec/${pname}/node_modules
-        mv deps $out/libexec/${pname}/deps
-        node ${./nix/fixup_bin.js} $out/bin $out/libexec/${pname}/node_modules ${lib.concatStringsSep " " publishBinsFor_}
-
-        runHook postInstall
-      '';
-
-      doDist = true;
-      distPhase = attrs.distPhase or ''
-        # pack command ignores cwd option
-        rm -f .yarnrc
-        cd $out/libexec/${pname}/deps/${pname}
-        mkdir -p $out/tarballs/
-        yarn pack --ignore-scripts --filename $out/tarballs/${baseName}.tgz
-      '';
-
-      passthru = {
-        inherit pname package packageJSON deps;
-        workspaceDependencies = workspaceDependenciesTransitive;
-      } // (attrs.passthru or {});
-
-      meta = {
-        inherit (nodejs.meta) platforms;
-        description = packageJSON.description or "";
-        homepage = packageJSON.homepage or "";
-        version = packageJSON.version or "";
-        license = if packageJSON ? license then spdxLicense packageJSON.license else "";
-      } // (attrs.meta or {});
-    });
-
-  yarn2nix = mkYarnPackage {
-    src = ./.;
-    # yarn2nix is the only package that requires the yarnNix option.
-    # All the other projects can auto-generate that file.
-    yarnNix = ./yarn.nix;
-  };
-}

From bc22c2e07f954098bf6c0bf60543a9330a427e58 Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Fri, 12 Jul 2019 15:35:03 +0200
Subject: [PATCH 250/794] sortmerna: init at 3.0.3

This is a useful package in bioinformatics, namely in processing
short-read sequencing data from metagenomes
---
 .../science/biology/sortmerna/default.nix     | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/science/biology/sortmerna/default.nix

diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix
new file mode 100644
index 00000000000..4adce4461ed
--- /dev/null
+++ b/pkgs/applications/science/biology/sortmerna/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, cmake, rocksdb, rapidjson, pkgconfig, fetchFromGitHub, fetchpatch, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "sortmerna";
+  version = "3.0.3";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "biocore";
+    rev = "v${version}";
+    sha256 = "0zx5fbzyr8wdr0zwphp8hhcn1xz43s5lg2ag4py5sv0pv5l1jh76";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "CMakeInstallPrefix.patch";
+      url = "https://github.com/biocore/sortmerna/commit/4d36d620a3207e26cf3f588d4ec39889ea21eb79.patch";
+      sha256 = "0hc3jwdr6ylbyigg52q8islqc0mb1k8rrjadvjfqaxnili099apd";
+    })
+  ];
+
+  nativeBuildInputs = [ cmake rapidjson pkgconfig ];
+  buildInputs = [ zlib rocksdb rapidjson ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DROCKSDB_HOME=${rocksdb}"
+    "-DRAPIDJSON_HOME=${rapidjson}"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Tools for filtering, mapping, and OTU-picking from shotgun genomics data";
+    license = licenses.lgpl3;
+    platforms = platforms.x86_64;
+    homepage = https://bioinfo.lifl.fr/RNA/sortmerna/;
+    maintainers = with maintainers; [ luispedro ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3a40002f7c..6fe152f629d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22853,6 +22853,8 @@ in
 
   somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { };
 
+  sortmerna = callPackage ../applications/science/biology/sortmerna { };
+
   stacks = callPackage ../applications/science/biology/stacks { };
 
   star = callPackage ../applications/science/biology/star { };

From 4b60e0d6bcae4d98b4dbedf9dbfa5a68c4854473 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 18:47:28 -0400
Subject: [PATCH 251/794] vscode-extensions.ms-vscode.cpptools: 0.24.1 ->
 0.25.0

---
 pkgs/misc/vscode-extensions/cpptools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index a5dad88b924..73b533f368e 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "0.24.1";
-    sha256 = "0gqplcppfg2lr6k198q9pw08n0cpc0wvc9w350m9ivv35hw0x5ra";
+    version = "0.25.0";
+    sha256 = "0vqqc0j9ahhb9a8wrhjjb34rfdj7msqsza3443bi4206gkiwpp3n";
   };
 
   buildInputs = [

From 71095460b94b6c382afe188d1caa0b7048030b8a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 27 Aug 2019 02:43:32 +0300
Subject: [PATCH 252/794] tensorflow: fix build

You know, Tensorflow.
---
 .../python-modules/tensorflow/default.nix       | 17 ++++++++---------
 pkgs/top-level/python-packages.nix              |  1 +
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 70488a0d9dc..899e8936843 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -118,7 +118,7 @@ let
       keras-applications
 
       # libs taken from system through the TF_SYS_LIBS mechanism
-      grpc
+      # grpc
       sqlite
       openssl
       jsoncpp
@@ -169,7 +169,8 @@ let
       "flatbuffers"
       "gast_archive"
       "gif_archive"
-      "grpc"
+      # Lots of errors, requires an older version
+      # "grpc"
       "hwloc"
       "icu"
       "jpeg"
@@ -245,8 +246,7 @@ let
     '';
 
     # FIXME: Tensorflow uses dlopen() for CUDA libraries.
-    # No idea why gpr isn't linked properly; perhaps Tensorflow expects a static library?
-    NIX_LDFLAGS = [ "-lgpr" ] ++ lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ];
+    NIX_LDFLAGS = lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ];
 
     hardeningDisable = [ "format" ];
 
@@ -261,15 +261,14 @@ let
     bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow";
 
     fetchAttrs = {
-      preInstall = ''
-        rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*}
-      '';
+      # So that checksums don't depend on these.
+      TF_SYSTEM_LIBS = null;
 
       # cudaSupport causes fetch of ncclArchive, resulting in different hashes
       sha256 = if cudaSupport then
-        "19ll3f1i5qzd7ngz3m2jbxzgcrdjx5sv6kv2j5mcb8g3xsws8j5x"
+        "196pm3ynfafqlcxah07hkvphf536hpix1ydgsynr1yg08aynlvvx"
       else
-        "0y9kw3k4yvrxwdy7zry7nip9mdiwyv35r6mx65g4w7qajiypfc7i";
+        "138r85n27ijzwxfwb5pcfyb79v14368jpckw0vmciz6pwf11bd9g";
     };
 
     buildAttrs = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e77d3aecea2..008c624c94a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5837,6 +5837,7 @@ in {
     cudatoolkit = pkgs.cudatoolkit_10;
     cudnn = pkgs.cudnn_cudatoolkit_10;
     nccl = pkgs.nccl_cudatoolkit_10;
+    openssl = pkgs.openssl_1_0_2;
   };
 
   tensorflow = if stdenv.isDarwin then self.tensorflow-bin else self.tensorflow-build;

From 67b5f5a98f4d2dd864d6346e11802f2a67f97f06 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 27 Aug 2019 00:00:55 -0400
Subject: [PATCH 253/794] orca: add hicolor-icon-theme

---
 pkgs/applications/misc/orca/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 98ebde981c0..332c696d8da 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgconfig, fetchurl, buildPythonApplication
 , autoreconfHook, wrapGAppsHook, gobject-introspection
 , intltool, yelp-tools, itstool, libxmlxx3
-, python, pygobject3, gtk3, gnome3, substituteAll
+, python, pygobject3, gtk3, gnome3, substituteAll, hicolor-icon-theme
 , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
 , xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas
 , speechd, brltty, liblouis, setproctitle, gst_all_1, gst-python
@@ -31,6 +31,7 @@ buildPythonApplication rec {
   nativeBuildInputs = [
     autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
     intltool yelp-tools itstool gobject-introspection
+    hicolor-icon-theme # setup-hook
   ];
 
   propagatedBuildInputs = [

From e25b283f711f35dd9cdfb678ab7a6b7e4391c8e2 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 27 Aug 2019 00:01:11 -0400
Subject: [PATCH 254/794] gnome3.gnome-color-manager: add hicolor-icon-theme

---
 .../gnome-3/core/gnome-color-manager/default.nix         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
index b79651ea4bc..bcc8871bcf1 100644
--- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, desktop-file-utils, gnome3, glib, gtk3, libexif, libtiff, colord, colord-gtk, libcanberra-gtk3, lcms2, vte, exiv2 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, desktop-file-utils, gnome3, glib, gtk3, libexif, libtiff, colord, colord-gtk, libcanberra-gtk3, lcms2, vte, exiv2, hicolor-icon-theme }:
 
 let
   pname = "gnome-color-manager";
@@ -11,7 +11,12 @@ in stdenv.mkDerivation rec {
     sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext itstool desktop-file-utils
+    # setup-hook
+    hicolor-icon-theme
+  ];
+
   buildInputs = [ glib gtk3 libexif libtiff colord colord-gtk libcanberra-gtk3 lcms2 vte exiv2 ];
 
   passthru = {

From 15a87bbe06e358c7b92708918e2b1027263770bd Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 27 Aug 2019 00:33:42 -0400
Subject: [PATCH 255/794] gnome3.vino: 3.22.0 -> 2019-07-08

---
 pkgs/desktops/gnome-3/core/vino/default.nix | 92 +++++++++++++++++----
 1 file changed, 74 insertions(+), 18 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index b3f06c2dcc1..444c144cfab 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -1,29 +1,85 @@
-{ stdenv, fetchurl, lib, wrapGAppsHook
-, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
-, telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null
-, libsecret, gnutls, libgcrypt, avahi, zlib, libjpeg, libXdamage, libXfixes, libXext
-, networkmanager }:
-
-with lib;
+{ stdenv
+, fetchFromGitLab
+, wrapGAppsHook
+, pkgconfig
+, gnome3
+, gtk3
+, glib
+, intltool
+, libXtst
+, libnotify
+, libsoup
+, libsecret
+, gnutls
+, libgcrypt
+, avahi
+, zlib
+, libjpeg
+, libXdamage
+, libXfixes
+, libXext
+, networkmanager
+, gnome-common
+, libtool
+, automake
+, autoconf
+, telepathySupport ? false
+, dbus-glib ? null
+, telepathy-glib ? null
+}:
 
 stdenv.mkDerivation rec {
-  name = "vino-${version}";
-  version = "3.22.0";
+  pname = "vino";
+  version = "unstable-2019-07-08";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/vino/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "vino";
+    rev = "aed81a798558c8127b765cd4fb4dc726d10f1e21";
+    sha256 = "16r4cj5nsygmd9v97nq6d1yhynzak9hdnaprcdbmwfhh0c9w8jv3";
   };
 
   doCheck = true;
 
-  nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    gnome-common
+    intltool
+    libtool
+    pkgconfig
+    wrapGAppsHook
+  ];
 
   buildInputs = [
-    gnome3.adwaita-icon-theme gtk3 glib libXtst libnotify libsoup
-    libsecret gnutls libgcrypt avahi zlib libjpeg
-    libXdamage libXfixes libXext networkmanager
-  ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ];
+    avahi
+    glib
+    gnome3.adwaita-icon-theme
+    gnutls
+    gtk3
+    libXdamage
+    libXext
+    libXfixes
+    libXtst
+    libgcrypt
+    libjpeg
+    libnotify
+    libsecret
+    libsoup
+    networkmanager
+    zlib
+  ]
+  ++ stdenv.lib.optionals telepathySupport [ dbus-glib telepathy-glib ]
+  ;
+
+  preConfigure = ''
+    NOCONFIGURE=1 ./autogen.sh
+  '';
+
+  postInstall = stdenv.lib.optionalString (!telepathySupport) ''
+    rm -f $out/share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service
+  '';
 
   passthru = {
     updateScript = gnome3.updateScript {
@@ -35,7 +91,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/Vino;
     description = "GNOME desktop sharing server";
-    maintainers = with maintainers; [ lethalman domenkozar ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };

From f1ce41d78e002b47fa3f57dbcde61e77b0cf61f0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 27 Aug 2019 01:06:35 -0400
Subject: [PATCH 256/794] gnome3.gnome-control-center: add optional sharing
 deps

It appears that if gnome-control-center isn't wrapped with their
schemas they won't be added to the panel.
---
 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 6f137cc65d5..04730f2370f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -60,6 +60,8 @@
 , udisks2
 , upower
 , vino
+, gnome-user-share
+, gnome-remote-desktop
 , wrapGAppsHook
 }:
 
@@ -99,7 +101,9 @@ stdenv.mkDerivation rec {
     gnome-bluetooth
     gnome-desktop
     gnome-online-accounts
+    gnome-remote-desktop # optional, sharing panel
     gnome-settings-daemon
+    gnome-user-share # optional, sharing panel
     grilo
     grilo-plugins # for setting wallpaper from Flickr
     gsettings-desktop-schemas

From 27977f030f4f0fc14e3c1f5cf3da212023a40d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Wed, 10 Jul 2019 01:39:30 +0200
Subject: [PATCH 257/794] claws: init at 0.3.2

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

diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix
new file mode 100644
index 00000000000..10347e6e794
--- /dev/null
+++ b/pkgs/tools/misc/claws/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "claws";
+  version = "0.3.2";
+
+  goPackagePath = "github.com/thehowl/${pname}";
+
+  src = fetchFromGitHub {
+    rev = version;
+    owner = "thehowl";
+    repo = pname;
+    sha256 = "0nl7xvdivnabqr98mh3m1pwqznprsaqpagny6zcwwmz480x4pmfz";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/thehowl/claws";
+    description = "Interactive command line client for testing websocket servers";
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ petabyteboy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 267cbcc5bca..3dbd8d5a284 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -770,6 +770,8 @@ in
 
   chkcrontab = callPackage ../tools/admin/chkcrontab { };
 
+  claws = callPackage ../tools/misc/claws { };
+
   codespell = with python3Packages; toPythonApplication codespell;
 
   cozy = callPackage ../applications/audio/cozy-audiobooks { };

From 8a24bc2e08b2433bbb94626725e377965e244e9a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 27 Aug 2019 03:07:57 -0400
Subject: [PATCH 258/794] nixos/gnome-user-share: cleanup

* No sessionPath!

* add to systemd.packages
  This is for the gnome-user-share-webdav.service.

* Update option description
---
 .../desktops/gnome3/gnome-user-share.nix      | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
index 1f6ce2ae968..f8396287770 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
@@ -12,14 +12,7 @@ with lib;
 
     services.gnome3.gnome-user-share = {
 
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable GNOME User Share, a service that exports the
-          contents of the Public folder in your home directory on the local network.
-        '';
-      };
+      enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME";
 
     };
 
@@ -30,12 +23,13 @@ with lib;
 
   config = mkIf config.services.gnome3.gnome-user-share.enable {
 
-    environment.systemPackages = [ pkgs.gnome3.gnome-user-share ];
+    environment.systemPackages = [
+      pkgs.gnome3.gnome-user-share
+    ];
 
-    services.xserver.displayManager.sessionCommands = with pkgs.gnome3; ''
-      # Don't let gnome-control-center depend upon gnome-user-share
-      export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name}
-    '';
+    systemd.packages = [
+      pkgs.gnome3.gnome-user-share
+    ];
 
   };
 

From ee62ec62ec3200727f5c0723a13991378f03528a Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Sun, 25 Aug 2019 19:16:38 +0200
Subject: [PATCH 259/794] python2: CVE-2018-20852

Fixes #67200

(cherry picked from commit 302cac35f586d0cc4813ae0cf5d124f1375deecf)
---
 .../development/interpreters/python/cpython/2.7/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index de980f1ca68..4e323898afb 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -79,6 +79,12 @@ let
         sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
       })
 
+      (fetchpatch {
+        url = "https://github.com/python/cpython/commit/979daae300916adb399ab5b51410b6ebd0888f13.patch";
+        name = "CVE-2018-20852.patch";
+        sha256 = "0p838ycssd6abxzby69rhngjqqm59cmlp07910mpjx7lmsz049pb";
+      })
+
       # Fix race-condition during pyc creation. Has a slight backwards
       # incompatible effect: pyc symlinks will now be overridden
       # (https://bugs.python.org/issue17222). Included in python >= 3.4,

From c1d74a12724dc040471bec25fd1a90997a18667f Mon Sep 17 00:00:00 2001
From: Valerio Besozzi <valebes@gmail.com>
Date: Tue, 27 Aug 2019 11:10:41 +0200
Subject: [PATCH 260/794] maintainers: add valebes

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e20bc18ef27..f5c00ff6268 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6568,6 +6568,12 @@
     githubId = 1525767;
     name = "Vaibhav Sagar";
   };
+  valebes = {  
+    email = "valebes@gmail.com";
+    github = "valebes";
+    githubid = 10956211;
+    name = "Valerio Besozzi";
+  };
   valeriangalliat = {
     email = "val@codejam.info";
     github = "valeriangalliat";

From 595b7d808d70bc39458a8a7d112bb46434f4609d Mon Sep 17 00:00:00 2001
From: Valerio Besozzi <valebes@gmail.com>
Date: Tue, 27 Aug 2019 11:12:35 +0200
Subject: [PATCH 261/794] rsClock: init at 0.1.0

---
 pkgs/applications/misc/rsclock/default.nix | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/misc/rsclock/default.nix

diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
new file mode 100644
index 00000000000..81c001509f3
--- /dev/null
+++ b/pkgs/applications/misc/rsclock/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rsClock";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "valebes";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1fpidswkgpf9yr4vxqn38livz6r3z5i0lhg7ngj9f1ki4yqxn9zh";
+  };
+   
+  cargoSha256 = "1m0lm8xh1qp0cbx870xy2m0bv047mb00vcwzq7r5gxqx8n61qm4n";
+
+  meta = with stdenv.lib; {
+    description = "A simple terminal clock written in Rust";
+    homepage = "https://github.com/valebes/rsClock";
+    license = licenses.mit;
+    maintainers = with maintainers; [valebes];
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbe2e49bc8f..a3134e9a56d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20450,6 +20450,8 @@ in
 
   rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { };
 
+  rsclock = callPackage ../applications/misc/rsclock { };
+
   rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
     boost = boost166;
     llvmPackages = llvmPackages_7;

From ad339e91c1770d8dfdbc62d7148dea9753c34fcd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Aug 2019 11:09:43 +0200
Subject: [PATCH 262/794] wlroots: 0.6.0 -> 0.7.0

Changelog: https://github.com/swaywm/wlroots/releases/tag/0.7.0
Rootston was removed for this release.
---
 .../development/libraries/wlroots/default.nix | 36 ++++---------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index b85616842ea..4d820bd9519 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -6,18 +6,17 @@
 
 stdenv.mkDerivation rec {
   pname = "wlroots";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
     rev = version;
-    sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4";
+    sha256 = "0jzxa6psbc7ddxli7rbfqxmv1svxnis51l1vch4hb9fdixqm284a";
   };
 
-  # $out for the library, $bin for rootston, and $examples for the example
-  # programs (in examples) AND rootston
-  outputs = [ "out" "bin" "examples" ];
+  # $out for the library and $examples for the example programs (in examples):
+  outputs = [ "out" "examples" ];
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
 
@@ -32,31 +31,13 @@ stdenv.mkDerivation rec {
     "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
   ];
 
-  postPatch = ''
-    # It happens from time to time that the version wasn't updated:
-    sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build
-  '';
-
   postInstall = ''
-    # Copy the library to $bin and $examples
-    for output in "$bin" "$examples"; do
-      mkdir -p $output/lib
-      cp -P libwlroots* $output/lib/
-    done
+    # Copy the library to $examples
+    mkdir -p $examples/lib
+    cp -P libwlroots* $examples/lib/
   '';
 
   postFixup = ''
-    # Install rootston (the reference compositor) to $bin and $examples (this
-    # has to be done after the fixup phase to prevent broken binaries):
-    for output in "$bin" "$examples"; do
-      mkdir -p $output/bin
-      cp rootston/rootston $output/bin/
-      patchelf \
-        --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \
-        $output/bin/rootston
-      mkdir $output/etc
-      cp ../rootston/rootston.ini.example $output/etc/rootston.ini
-    done
     # Install ALL example programs to $examples:
     # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
     # screenshot output-layout multi-pointer rotation tablet touch pointer
@@ -65,9 +46,6 @@ stdenv.mkDerivation rec {
     cd ./examples
     for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
       cp "$binary" "$examples/bin/wlroots-$binary"
-      patchelf \
-        --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \
-        "$examples/bin/wlroots-$binary"
     done
   '';
 

From d861196c618f56d9bc4b6688d9df0a83e945fc23 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Aug 2019 11:07:16 +0200
Subject: [PATCH 263/794] sway: 1.1.1 -> 1.2

---
 pkgs/applications/window-managers/sway/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 12427b91265..215a576a578 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sway";
-  version = "1.1.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "sway";
     rev = version;
-    sha256 = "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776";
+    sha256 = "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd";
   };
 
   patches = [
@@ -41,10 +41,6 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin"
   '';
 
-  postPatch = ''
-    sed -i "s/version: '1.0'/version: '${version}'/" meson.build
-  '';
-
   meta = with stdenv.lib; {
     description = "i3-compatible tiling Wayland compositor";
     homepage    = https://swaywm.org;

From 3a9d17ef0469c9bf357ae46be6621812cdccfae9 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 27 Aug 2019 11:44:34 +0200
Subject: [PATCH 264/794] nixos/matomo: fixing the configuration path

---
 nixos/modules/services/web-apps/matomo.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index bf8b9dbcc21..d9f840408cc 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -176,7 +176,7 @@ in {
             # Use User-Private Group scheme to protect Matomo data, but allow administration / backup via 'matomo' group
             # Copy config folder
             chmod g+s "${dataDir}"
-            cp -r "${cfg.package}/config" "${dataDir}/"
+            cp -r "${cfg.package}/share/config" "${dataDir}/"
             chmod -R u+rwX,g+rwX,o-rwx "${dataDir}"
 
             # check whether user setup has already been done

From 821daf6598d877ea345d4ab0e1f317371116720e Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Tue, 27 Aug 2019 13:04:18 +0200
Subject: [PATCH 265/794] wire-desktop: 3.9.2895 -> 3.10.2904, mac 3.9.2943 ->
 3.10.3133

---
 .../instant-messengers/wire-desktop/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 10b7eb7d439..36bd10781dc 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -18,13 +18,13 @@ let
   pname = "wire-desktop";
 
   version = {
-    "x86_64-linux" = "3.9.2895";
-    "x86_64-darwin" = "3.9.2943";
+    "x86_64-linux" = "3.10.2904";
+    "x86_64-darwin" = "3.10.3133";
   }.${system} or throwSystem;
 
   sha256 = {
-    "x86_64-linux" = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5";
-    "x86_64-darwin" = "1y1bzsjmjrj518q29xfx6gg1nhdbaz7y5hzaqrp241az6plp090k";
+    "x86_64-linux" = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn";
+    "x86_64-darwin" = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9";
   }.${system} or throwSystem;
 
   meta = with stdenv.lib; {

From 2c23a35ff6a9e57a6e828919d82ddbdea59eca07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <suhr@i2pmail.org>
Date: Tue, 27 Aug 2019 14:14:02 +0300
Subject: [PATCH 266/794] oil: 0.6.0 -> 0.7.pre3

---
 pkgs/shells/oil/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index 48c8fd0815e..9f1bf3ce6af 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -1,13 +1,12 @@
 { stdenv, lib, fetchurl }:
-let
-  version = "0.6.0";
-in
-stdenv.mkDerivation {
-  name = "oil-${version}";
+
+stdenv.mkDerivation rec {
+  pname = "oil";
+  version = "0.7.pre3";
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    sha256 = "1dw4mgnlmaxlfygasfihgvbj32d3m9w6k5j7azb9d9lp35f3l7hl";
+    sha256 = "01zc36zaasaagr54rnh90k0j7pbnj0cc6a9pvz6gs6pk91i80lqg";
   };
 
   postPatch = ''
@@ -22,10 +21,9 @@ stdenv.mkDerivation {
   dontStrip = true;
 
   meta = {
+    description = "A new unix shell";
     homepage = https://www.oilshell.org/;
 
-    description = "A new unix shell, still in its early stages";
-
     license = with lib.licenses; [
       psfl # Includes a portion of the python interpreter and standard library
       asl20 # Licence for Oil itself

From b3899e38695fcbccb3585b8f947c1adc012a506c Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Tue, 27 Aug 2019 14:35:54 +0300
Subject: [PATCH 267/794] rclone: 1.48.0 -> 1.49.0

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

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 13d55bcf476..ce676566577 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "rclone";
-  version = "1.48.0";
+  version = "1.49.0";
 
   src = fetchFromGitHub {
-    owner = "ncw";
+    owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0wxsn3ynkwh2np12sxdmy435nclg2ry7cw26brz11xc0ri4x9azg";
+    sha256 = "13xzz6nl4863dyn9w1qczap77bbiwzp4znbifa9hg91qys0nj5ga";
   };
 
-  modSha256 = "0bbpny7xcwsvhmdypgbbr0gqc5pa40m71qhbps6k0v09rsgqhpn3";
+  modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03";
 
   subPackages = [ "." ];
 

From 1d6005e113431b63455c8323222c972e4ca3b3a5 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 27 Aug 2019 12:00:26 +0200
Subject: [PATCH 268/794] jameica: 2.8.2 -> 2.8.4

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

diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix
index 61cc3ea78f0..7b4feed1733 100644
--- a/pkgs/applications/office/jameica/default.nix
+++ b/pkgs/applications/office/jameica/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }:
 
 let
-  _version = "2.8.2";
-  _build = "450";
+  _version = "2.8.4";
+  _build = "453";
   version = "${_version}-${_build}";
   name = "jameica-${version}";
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "willuhn";
     repo = "jameica";
     rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}";
-    sha256 = "197n35lvx51k6cbp3fhndvfb38sikl4mjqcd42fgvn2khy2sij68";
+    sha256 = "1imm3wpdrgh2sr2wh9vgaf2mp1ixs845vgzk5ib82mak7lg9m1zl";
   };
 
   # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries

From 79c6d22c1fc55b69961f5b72c3b293fc739d0ef6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Aug 2019 14:26:17 +0200
Subject: [PATCH 269/794] mod_wsgi: allow building this module with python 2.x
 and 3.x

---
 pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                       | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index ff71e460b2a..a0fa4b4bca9 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, apacheHttpd, python2 }:
+{ stdenv, fetchurl, apacheHttpd, python, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "mod_wsgi-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2";
   };
 
-  buildInputs = [ apacheHttpd python2 ];
+  buildInputs = [ apacheHttpd python ncurses ];
 
   patchPhase = ''
     sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbe2e49bc8f..782994be6c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14466,7 +14466,9 @@ in
 
     mod_python = callPackage ../servers/http/apache-modules/mod_python { };
 
-    mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
+    mod_wsgi  = self.mod_wsgi2;
+    mod_wsgi2 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python2; ncurses = null; };
+    mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python3; };
 
     php = pkgs.php.override { inherit apacheHttpd; };
 

From 05ddde928defd3df444bf6149b5fe98e4a6a4fde Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 24 Mar 2019 11:41:45 +0100
Subject: [PATCH 270/794] nixos/dnschain: disable DNSSEC for namecoin TLDs

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

diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
index 0c2add424ba..5b58ea9b0c9 100644
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -136,10 +136,16 @@ in
         "/.dns/127.0.0.1#${toString cfg.dns.port}"
       ];
 
-    services.pdns-recursor.forwardZones = mkIf cfgs.pdns-recursor.resolveDNSChainQueries
-      { bit = "127.0.0.1:${toString cfg.dns.port}";
-        dns = "127.0.0.1:${toString cfg.dns.port}";
-      };
+    services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveDNSChainQueries {
+      forwardZones =
+        { bit = "127.0.0.1:${toString cfg.dns.port}";
+          dns = "127.0.0.1:${toString cfg.dns.port}";
+        };
+      luaConfig =''
+        addNTA("bit", "namecoin doesn't support DNSSEC")
+        addNTA("dns", "namecoin doesn't support DNSSEC")
+      '';
+    };
 
     users.users = singleton {
       name = username;

From 41505960a7fdb7259ed74b89542549f1e93693fc Mon Sep 17 00:00:00 2001
From: dawidsowa <dawid_sowa@posteo.net>
Date: Tue, 27 Aug 2019 16:33:00 +0200
Subject: [PATCH 271/794] gallery-dl: 1.10.1 -> 1.10.2

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

diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index 1ce9bfb1f67..6b57c74c123 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gallery_dl";
-  version = "1.10.1";
+  version = "1.10.2";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "174d2q7w0kwa6xx9k3bl5gdwmk0gklvch963g7vl979wqsf7nskw";
+    sha256 = "09q9l747vv6nrkscj08dv970qs6nm2azjcm015xf3bd5ab91l44r";
   };
 
   doCheck = false;

From eee23c116f19c3398b571b217445b4be0b0c0257 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 27 Aug 2019 16:35:38 +0200
Subject: [PATCH 272/794] prometheus-gitlab-ci-pipelines-exporter: init at
 0.2.5

---
 .../gitlab-ci-pipelines-exporter.nix          |  27 ++
 .../gitlab-ci-pipelines-exporter_deps.nix     | 390 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 3 files changed, 418 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix

diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
new file mode 100644
index 00000000000..06eba474c99
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "gitlab-ci-pipelines-exporter";
+  version = "0.2.5";
+
+  goPackagePath = "github.com/mvisonneau/gitlab-ci-pipelines-exporter";
+
+  goDeps = ./gitlab-ci-pipelines-exporter_deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "mvisonneau";
+    repo = pname;
+    rev = version;
+    sha256 = "0qmy6pqfhx9bphgh1zqi68kp0nscwy1x7z13lfiaaz8pgsjh95yy";
+  };
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Prometheus / OpenMetrics exporter for GitLab CI pipelines insights";
+    homepage = "https://github.com/mvisonneau/gitlab-ci-pipelines-exporter";
+    license = licenses.asl20;
+    maintainers = [ maintainers.mmahut ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix
new file mode 100644
index 00000000000..d439c9aab10
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix
@@ -0,0 +1,390 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+  {
+    goPackagePath = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev = "v0.34.0";
+      sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "v1.0.0";
+      sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.1";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-kit/kit";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-kit/kit";
+      rev = "v0.8.0";
+      sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-logfmt/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-logfmt/logfmt";
+      rev = "v0.4.0";
+      sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "v1.3.2";
+      sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-cmp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-cmp";
+      rev = "v0.3.0";
+      sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-querystring";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-querystring";
+      rev = "v1.0.0";
+      sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
+    };
+  }
+  {
+    goPackagePath = "github.com/heptiolabs/healthcheck";
+    fetch = {
+      type = "git";
+      url = "https://github.com/heptiolabs/healthcheck";
+      rev = "6ff867650f40";
+      sha256 = "17aqrqhx2ibv6mcxsmli6m3hmvwi06cnpaly05daimay3cys5q0l";
+    };
+  }
+  {
+    goPackagePath = "github.com/jpillora/backoff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jpillora/backoff";
+      rev = "3050d21c67d7";
+      sha256 = "1nxapdx9xg5gwiscfhq7m0w14hj4gaxb4avmgf1mx9zd3jnw9jxv";
+    };
+  }
+  {
+    goPackagePath = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev = "v1.1.6";
+      sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
+    };
+  }
+  {
+    goPackagePath = "github.com/julienschmidt/httprouter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/julienschmidt/httprouter";
+      rev = "v1.2.0";
+      sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+    };
+  }
+  {
+    goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+    fetch = {
+      type = "git";
+      url = "https://github.com/konsorten/go-windows-terminal-sequences";
+      rev = "v1.0.2";
+      sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/logfmt";
+      rev = "b84e30acd515";
+      sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev = "v0.1.0";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pty";
+      rev = "v1.1.1";
+      sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev = "v0.1.0";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "v1.0.1";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath = "github.com/modern-go/concurrent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/concurrent";
+      rev = "bacd9c7ef1dd";
+      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+    };
+  }
+  {
+    goPackagePath = "github.com/modern-go/reflect2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/reflect2";
+      rev = "v1.0.1";
+      sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+    };
+  }
+  {
+    goPackagePath = "github.com/mwitkow/go-conntrack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mwitkow/go-conntrack";
+      rev = "cc309e4a2223";
+      sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "v0.8.0";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "v1.0.0";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "v1.0.0";
+      sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "fd36f4220a90";
+      sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "v0.6.0";
+      sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "v0.0.3";
+      sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y";
+    };
+  }
+  {
+    goPackagePath = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev = "v1.4.2";
+      sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev = "v0.1.1";
+      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "v1.3.0";
+      sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "v1.20.0";
+      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+    };
+  }
+  {
+    goPackagePath = "github.com/xanzy/go-gitlab";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xanzy/go-gitlab";
+      rev = "v0.19.0";
+      sha256 = "0xbn94rb9ihpw1g698xbz9vdl7393z9zbb0lck52nxs838gkr4mb";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "f99c8df09eb5";
+      sha256 = "0jwi6c6366999mnpzwx3a2kr7hzvdx97qfwiphx0r7cy0mpf28hf";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "ca1201d0de80";
+      sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "0f29369cfe45";
+      sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "112230192c58";
+      sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "fc99dfbffb4e";
+      sha256 = "186x8bg926qb9sprs5zpd97xzvvhc2si7q1nhvyg12r5cd6v7zjd";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "v0.3.2";
+      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "d0a3d012864b";
+      sha256 = "1s2jbb94hbcb01hgkd9kzb9js13grj80a72il7467pm57b3rnggg";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev = "v1.6.1";
+      sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev = "v2.2.6";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/check.v1";
+      rev = "788fd7840127";
+      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "v2.2.2";
+      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e15740dc371..da56a4c2989 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15013,6 +15013,7 @@ in
   prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
   prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };
   prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };
+  prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { };
   prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
   prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
   prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { };

From 4081bec5ac3b60f757807356e1b41ddbee7824d8 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Aug 2019 11:00:58 -0400
Subject: [PATCH 273/794] zsh: remove unfunction on TERM=dumb

Unfortunately this gives an error when precmd or preexec exists. Removing to avoid that.
---
 nixos/modules/programs/zsh/zsh.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 27f4166e100..6e9eefd74d1 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -214,7 +214,6 @@ in
         # Need to disable features to support TRAMP
         if [ "$TERM" = dumb ]; then
             unsetopt zle prompt_cr prompt_subst
-            unfunction precmd preexec
             unset RPS1 RPROMPT
             PS1='$ '
             PROMPT='$ '

From 98a283af558a33013265a69a4471481070bc1a4b Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 27 Aug 2019 14:30:06 +0300
Subject: [PATCH 274/794] mkgmap: init at 4289

---
 pkgs/applications/misc/mkgmap/build.xml.patch | 11 ++++
 pkgs/applications/misc/mkgmap/default.nix     | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 70 insertions(+)
 create mode 100644 pkgs/applications/misc/mkgmap/build.xml.patch
 create mode 100644 pkgs/applications/misc/mkgmap/default.nix

diff --git a/pkgs/applications/misc/mkgmap/build.xml.patch b/pkgs/applications/misc/mkgmap/build.xml.patch
new file mode 100644
index 00000000000..6ec40786b24
--- /dev/null
+++ b/pkgs/applications/misc/mkgmap/build.xml.patch
@@ -0,0 +1,11 @@
+--- a/build.xml	2019-08-26 23:22:55.104829846 +0300
++++ b/build.xml	2019-08-27 00:11:07.366257594 +0300
+@@ -227,7 +227,7 @@
+ 	</target>
+ 
+ 	<!-- Compile the product itself (no tests). -->
+-	<target name="compile" depends="prepare, resolve-compile"
++	<target name="compile" depends="prepare"
+ 					description="main compilation">
+ 
+ 		<javac srcdir="${src}" destdir="${build.classes}" encoding="utf-8" debug="true" includeantruntime="false">
diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix
new file mode 100644
index 00000000000..debcea78f55
--- /dev/null
+++ b/pkgs/applications/misc/mkgmap/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchurl, fetchsvn, jdk, jre, ant, makeWrapper }:
+
+let
+  fastutil = fetchurl {
+    url = "http://ivy.mkgmap.org.uk/repo/it.unimi.dsi/fastutil/6.5.15-mkg.1b/jars/fastutil.jar";
+    sha256 = "0d88m0rpi69wgxhnj5zh924q4zsvxq8m4ybk7m9mr3gz1hx0yx8c";
+  };
+  osmpbf = fetchurl {
+    url = "http://ivy.mkgmap.org.uk/repo/crosby/osmpbf/1.3.3/jars/osmpbf.jar";
+    sha256 = "0zb4pqkwly5z30ww66qhhasdhdrzwmrw00347yrbgyk2ii4wjad3";
+  };
+  protobuf = fetchurl {
+    url = "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar";
+    sha256 = "0x6c4pbsizvk3lm6nxcgi1g2iqgrxcna1ip74lbn01f0fm2wdhg0";
+  };
+in
+
+stdenv.mkDerivation rec {
+  pname = "mkgmap";
+  version = "4289";
+
+  src = fetchsvn {
+    url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
+    rev = version;
+    sha256 = "1sm1pw71q7z0jrxm8bcgm6xjl2mcidyibcf0a3m8fv2andidxrb4";
+  };
+
+  # This patch removes from the build process
+  # the automatic download of dependencies (see configurePhase)
+  patches = [ ./build.xml.patch ];
+
+  nativeBuildInputs = [ jdk ant makeWrapper ];
+
+  configurePhase = ''
+    mkdir -p lib/compile
+    cp ${fastutil} ${osmpbf} ${protobuf} lib/compile/
+  '';
+
+  buildPhase = "ant";
+
+  installPhase = ''
+    cd dist
+    install -Dm644 mkgmap.jar $out/share/java/mkgmap/mkgmap.jar
+    install -Dm644 doc/mkgmap.1 $out/share/man/man1/mkgmap.1
+    cp -r lib/ $out/share/java/mkgmap/
+    makeWrapper ${jre}/bin/java $out/bin/mkgmap \
+      --add-flags "-jar $out/share/java/mkgmap/mkgmap.jar"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data";
+    homepage = "http://www.mkgmap.org.uk";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ sikmir ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbe2e49bc8f..dc5c6ee5438 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5027,6 +5027,8 @@ in
 
   milu = callPackage ../applications/misc/milu { };
 
+  mkgmap = callPackage ../applications/misc/mkgmap { };
+
   mpack = callPackage ../tools/networking/mpack { };
 
   mtm = callPackage ../tools/misc/mtm { };

From 1296b10c31b2205990ed7751dd01f103a2b06f70 Mon Sep 17 00:00:00 2001
From: Boris Babic <boris.ivan.babic@gmail.com>
Date: Mon, 26 Aug 2019 17:54:02 +0200
Subject: [PATCH 275/794] python3Packages.pre-commit: 1.18.1 -> 1.18.2

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

diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix
index 6b65af073f4..7b5377cc15a 100644
--- a/pkgs/development/python-modules/pre-commit/default.nix
+++ b/pkgs/development/python-modules/pre-commit/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonApplication rec {
   pname = "pre-commit";
-  version = "1.18.1";
+  version = "1.18.2";
 
   src = fetchPypi {
     inherit version;
     pname = "pre_commit";
-    sha256 = "0d9ja186g41kw3gmhbi6xjvaslz6z4xis4qn1q6jabkka6jz4qhp";
+    sha256 = "1y6gd6nq8mfyjxknrgdryvn1bj5arvwaz2r00h41g054lfg3iki1";
   };
 
   propagatedBuildInputs = [

From b4a4d98c5297e8d9bfe7b1794e9a875bcb4e339f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 25 Aug 2019 18:06:33 +0200
Subject: [PATCH 276/794] vde2: build with `--disable-python` by default

This package explicitly depends on `python2` which will be EOLed at the
end of the year[1]. This package provides python bindings for `python2`,
however the latest release (also used by other distros) is from 2011[2]
and doesn't support v3. For instance, debian ships `vde2` without
`python2` support since Debian Jessie[3].

KVM and QEMU appear to build fine, also NixOS tests and ISO builds are
still functional.

By running `nix-review` against this change, only `xen` packages failed,
but those were already broken on master[4].

Finally it's also worth mentioning that the closure size of `vde2` drops
from 99.5M to 33.5M without `python2` according to `nix path-info -S -h`.

[1] https://pythonclock.org/
[2] https://github.com/virtualsquare/vde-2/releases/tag/vde-2
    (vde.sourceforge.net redirects to this github page)
[3] https://packages.debian.org/en/jessie/vde2
[4] https://hydra.nixos.org/build/99185451, https://hydra.nixos.org/build/99187262
---
 pkgs/tools/networking/vde2/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix
index ac87a5c10e9..4ea09cd7f00 100644
--- a/pkgs/tools/networking/vde2/default.nix
+++ b/pkgs/tools/networking/vde2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, openssl, libpcap, python2 }:
+{ stdenv, fetchurl, fetchpatch, openssl, libpcap, python2, withPython ? false }:
 
 stdenv.mkDerivation rec {
   name = "vde2-2.3.2";
@@ -15,8 +15,10 @@ stdenv.mkDerivation rec {
     }
   );
 
+  configureFlags = stdenv.lib.optional (!withPython) [ "--disable-python" ];
 
-  buildInputs = [ openssl libpcap python2 ];
+  buildInputs = [ openssl libpcap ]
+    ++ stdenv.lib.optional withPython python2;
 
   hardeningDisable = [ "format" ];
 

From bb3f8ea9e23f53ee2172c81df5d0aaab260bb3ac Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 25 Aug 2019 18:33:10 +0300
Subject: [PATCH 277/794] pykde4: pin to openssl 1.0.2

---
 pkgs/development/python-modules/pykde4/default.nix | 8 +++++---
 pkgs/development/python-modules/pykde4/kdelibs.nix | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix
index 0770520ceee..850e6400073 100644
--- a/pkgs/development/python-modules/pykde4/default.nix
+++ b/pkgs/development/python-modules/pykde4/default.nix
@@ -1,8 +1,10 @@
-{ pyqt4,
-  stdenv, callPackage, fetchurl, cmake, automoc4, sip }:
+{ pyqt4, openssl_1_0_2
+, stdenv, callPackage, fetchurl, cmake, automoc4, sip }:
 
 let
-  kdelibs = callPackage ./kdelibs.nix {};
+  kdelibs = callPackage ./kdelibs.nix {
+    openssl = openssl_1_0_2;
+  };
   sip4_19_3 = sip.overrideAttrs (oldAttrs: rec {
     src = fetchurl {
       url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz";
diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix
index c5e148d1500..073a2e624a5 100644
--- a/pkgs/development/python-modules/pykde4/kdelibs.nix
+++ b/pkgs/development/python-modules/pykde4/kdelibs.nix
@@ -2,7 +2,7 @@
   stdenv, fetchurl,
   automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info,
   attica, docbook_xml_dtd_42, docbook_xsl, giflib,
-  libdbusmenu_qt, libjpeg, phonon, qt4
+  libdbusmenu_qt, libjpeg, phonon, qt4, openssl
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info
   ];
   buildInputs = [
-    attica giflib libdbusmenu_qt libjpeg
+    attica giflib libdbusmenu_qt libjpeg openssl
   ];
   propagatedBuildInputs = [ qt4 phonon ];
 

From c09bc3e7e2f29b860bc554e04176953989a5b940 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 27 Aug 2019 17:45:00 +0200
Subject: [PATCH 278/794] svtplay-dl: 2.1 -> 2.2

Also remove no longer supported dependency on rtmpdump.
---
 pkgs/tools/misc/svtplay-dl/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 5502f2542f1..15b8f1bf3b4 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -1,27 +1,24 @@
 { stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip
-, rtmpdump, gitMinimal }:
+, gitMinimal }:
 
 let
   inherit (python3Packages) python nose pycrypto pyyaml requests mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "1cnc32gbhs955391hs1x1jpjsl3b6pqy7ysdydmp9q1i2rw105ln";
+    sha256 = "02yjz17x8dl5spn7mcbj1ji7vsyx0qwwa60zqyrdxpr03g1rnhdz";
   };
 
   pythonPaths = [ pycrypto pyyaml requests ];
-  buildInputs = [ python perl nose mock rtmpdump makeWrapper ] ++ pythonPaths;
+  buildInputs = [ python perl nose mock makeWrapper ] ++ pythonPaths;
   nativeBuildInputs = [ gitMinimal zip ];
 
   postPatch = ''
-    substituteInPlace lib/svtplay_dl/fetcher/rtmp.py \
-      --replace '"rtmpdump"' '"${rtmpdump}/bin/rtmpdump"'
-
     substituteInPlace scripts/run-tests.sh \
       --replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH'
   '';

From 19fbc4a1dad091f7e1e3dea245c900b6e4f9ef52 Mon Sep 17 00:00:00 2001
From: Vika <kisik21@fireburn.ru>
Date: Tue, 27 Aug 2019 19:31:06 +0300
Subject: [PATCH 279/794] brave: 0.67.123 -> 0.68.131

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

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index ca5d3d0b665..45fb820a076 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "0.67.123";
+  version = "0.68.131";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "00kpysk84xwmlwziq7pjizmi2ljgiq45l1x743qkfflxlh0pj21m";
+    sha256 = "0syhwy1gxy82jbxbryi1n4zp1ya7wvm20g1vqvd2s7kqspprsi0l";
   };
 
   dontConfigure = true;

From 56a7bc05e1265a2ef964f25a5df2de2f1f776df2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 24 Aug 2019 16:52:17 +0200
Subject: [PATCH 280/794] nixos/treewide: drop dependencies to `keys.target`

The `keys.target` is used to indicate whether all NixOps keys were
successfully uploaded on an unattended reboot. However this can cause
startup issues e.g. with NixOS containers (see #67265) and can block
boots even though this might not be needed (e.g. with a dovecot2
instance running that doesn't need any of the NixOps keys).

As described in the NixOps manual[1], dependencies to keys should be
defined like this now:

``` nix
{
  systemd.services.myservice = {
    after = [ "secret-key.service" ];
    wants = [ "secret-key.service" ];
  };
}
```

However I'd leave the issue open until it's discussed whether or not to
keep `keys.target` in `nixpkgs`.

[1] https://nixos.org/nixops/manual/#idm140737322342384
---
 nixos/doc/manual/release-notes/rl-1909.xml    | 20 +++++++++++++++++++
 nixos/modules/services/mail/dovecot.nix       |  3 +--
 nixos/modules/services/networking/nsd.nix     |  3 +--
 .../modules/services/networking/softether.nix |  2 --
 .../networking/strongswan-swanctl/module.nix  |  5 ++---
 .../services/networking/strongswan.nix        |  3 +--
 .../web-servers/apache-httpd/default.nix      |  3 +--
 7 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 6493bb99596..93cc1f2a138 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -291,6 +291,26 @@
        configuration while being better type-checked and mergeable.
      </para>
    </listitem>
+   <listitem>
+    <para>
+     No service depends on <literal>keys.target</literal> anymore which is a systemd
+     target that indicates if all <link xlink:href="https://nixos.org/nixops/manual/#idm140737322342384">NixOps keys</link> were successfully uploaded.
+     Instead, <literal>&lt;key-name&gt;-key.service</literal> should be used to define
+     a dependency of a key in a service. The full issue behind the <literal>keys.target</literal>
+     dependency is described at <link xlink:href="https://github.com/NixOS/nixpkgs/issues/67265">NixOS/nixpkgs#67265</link>.
+    </para>
+    <para>
+     The following services are affected by this:
+     <itemizedlist>
+      <listitem><para><link linkend="opt-services.dovecot2.enable"><literal>services.dovecot2</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.nsd.enable"><literal>services.nsd</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.softether.enable"><literal>services.softether</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.strongswan.enable"><literal>services.strongswan</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.strongswan-swanctl.enable"><literal>services.strongswan-swanctl</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.httpd.enable"><literal>services.httpd</literal></link></para></listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 139011dca23..cdbb776454b 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -344,8 +344,7 @@ in
     systemd.services.dovecot2 = {
       description = "Dovecot IMAP/POP3 server";
 
-      after = [ "keys.target" "network.target" ];
-      wants = [ "keys.target" ];
+      after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [ cfg.configFile ];
 
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 8b918dab86d..c69b77f9dee 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -916,9 +916,8 @@ in
     systemd.services.nsd = {
       description = "NSD authoritative only domain name service";
 
-      after = [ "keys.target" "network.target" ];
+      after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      wants = [ "keys.target" ];
 
       serviceConfig = {
         ExecStart = "${nsdPkg}/sbin/nsd -d -c ${nsdEnv}/nsd.conf";
diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
index 0046dcd366f..65df93a00da 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixos/modules/services/networking/softether.nix
@@ -70,8 +70,6 @@ in
 
       systemd.services."softether-init" = {
         description = "SoftEther VPN services initial task";
-        after = [ "keys.target" ];
-        wants = [ "keys.target" ];
         wantedBy = [ "network.target" ];
         serviceConfig = {
           Type = "oneshot";
diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix
index 817b5ec55f7..0fec3ef00ad 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/module.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix
@@ -62,9 +62,8 @@ in  {
     systemd.services.strongswan-swanctl = {
       description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl";
       wantedBy = [ "multi-user.target" ];
-      after    = [ "network-online.target" "keys.target" ];
-      wants    = [ "keys.target" ];
-      path = with pkgs; [ kmod iproute iptables utillinux ];
+      after    = [ "network-online.target" ];
+      path     = with pkgs; [ kmod iproute iptables utillinux ];
       environment = {
         STRONGSWAN_CONF = pkgs.writeTextFile {
           name = "strongswan.conf";
diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix
index 41b69039ba7..4ff9c486059 100644
--- a/nixos/modules/services/networking/strongswan.nix
+++ b/nixos/modules/services/networking/strongswan.nix
@@ -151,8 +151,7 @@ in
       description = "strongSwan IPSec Service";
       wantedBy = [ "multi-user.target" ];
       path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux
-      wants = [ "keys.target" ];
-      after = [ "network-online.target" "keys.target" ];
+      after = [ "network-online.target" ];
       environment = {
         STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; };
       };
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 12200c879be..098160ee369 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -670,8 +670,7 @@ in
       { description = "Apache HTTPD";
 
         wantedBy = [ "multi-user.target" ];
-        wants = [ "keys.target" ];
-        after = [ "network.target" "fs.target" "keys.target" ];
+        after = [ "network.target" "fs.target" ];
 
         path =
           [ httpd pkgs.coreutils pkgs.gnugrep ]

From 6270d567b2dd4b48500ec6d167a74598d3974598 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 27 Aug 2019 20:03:38 +0200
Subject: [PATCH 281/794] gcc-arm-embedded: 8-2018-q4-major -> 8-2019-q3-update

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

diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
index ee57dcc8c14..562a21716b7 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
@@ -4,19 +4,19 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "gcc-arm-embedded-${version}";
-  version = "8-2018-q4-major";
-  subdir = "8-2018q4";
+  version = "8-2019-q3-update";
+  subdir = "8-2019q3/RC1.1";
 
   src =
   if stdenv.isLinux then
     fetchurl {
       url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2";
-      sha256="fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52";
+      sha256="b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92";
     }
   else if stdenv.isDarwin then
     fetchurl {
       url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2";
-      sha256="0q44r57fizpk1z3ngcjwal3rxgsnzjyfknpgwlwzmw5r9p98wlhb";
+      sha256="fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085";
     }
   else throw "unsupported platform";
 

From 70462081318239197781d2585013b34fd18ff579 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Tue, 27 Aug 2019 11:27:03 -0700
Subject: [PATCH 282/794] cocoapods-beta: 1.8.0.beta.1 -> 1.8.0.beta.2

---
 .../mobile/cocoapods/Gemfile-beta.lock         | 13 +++++++------
 .../mobile/cocoapods/gemset-beta.nix           | 18 +++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
index 2ddffbf16b7..c75dc334ebc 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
+    CFPropertyList (3.0.1)
     activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -12,16 +12,16 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.8.0.beta.1)
+    cocoapods (1.8.0.beta.2)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.8.0.beta.1)
+      cocoapods-core (= 1.8.0.beta.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -31,9 +31,10 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.11.1, < 2.0)
-    cocoapods-core (1.8.0.beta.1)
+    cocoapods-core (1.8.0.beta.2)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.0)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.4)
@@ -42,7 +43,7 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-trunk (1.4.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix
index baa4748fb94..e2d4127ae44 100644
--- a/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -36,10 +36,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z";
+      sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.0.1";
   };
   claide = {
     groups = ["default"];
@@ -57,21 +57,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gs9ybf1zbajhsn591dwh2papj0bs1dzbnw8shbsm4mfqz976y54";
+      sha256 = "1qsj34czqsy93w2bnwhdhr0cyzjwl7vy3sknmak4syyni6m0rlli";
       type = "gem";
     };
-    version = "1.8.0.beta.1";
+    version = "1.8.0.beta.2";
   };
   cocoapods-core = {
-    dependencies = ["activesupport" "algoliasearch" "fuzzy_match" "nap"];
+    dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02c0415b7iridf0gypajm4i3vqpq8zs6vx8bw49rm70l554jp14j";
+      sha256 = "166pr9m3da9hsra9rviaxz3i4spm7kl003mkn7sn25r9smcvfdj4";
       type = "gem";
     };
-    version = "1.8.0.beta.1";
+    version = "1.8.0.beta.2";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -130,10 +130,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl";
+      sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.4.0";
   };
   cocoapods-try = {
     groups = ["default"];

From c34746d52cb07a991edc32b89a75329b041c25a6 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 27 Aug 2019 09:46:57 +0200
Subject: [PATCH 283/794] sdrangel: add airpsy, hackrf, rtlsdr support

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

diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix
index 63e36fc9143..346c6aeed8e 100644
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@@ -1,4 +1,5 @@
 {
+airspy,
 boost,
 cm256cc,
 cmake,
@@ -6,6 +7,7 @@ codec2,
 fetchFromGitHub,
 fftwFloat,
 glew,
+hackrf,
 lib,
 libav,
 libiio,
@@ -20,6 +22,7 @@ pkgconfig,
 qtbase,
 qtmultimedia,
 qtwebsockets,
+rtl-sdr,
 serialdv
 }:
 
@@ -49,9 +52,8 @@ in mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [
     glew opencv3 libusb boost libopus limesuite libav libiio libpulseaudio
-    qtbase qtwebsockets qtmultimedia
-    fftwFloat
-    codec2' cm256cc serialdv
+    qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf
+    fftwFloat codec2' cm256cc serialdv
   ];
   cmakeFlags = [
     "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"

From 540b04493e3edcc91ee98d926cafe8826217d3b0 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 13 Aug 2019 15:39:43 +0000
Subject: [PATCH 284/794] xfce4-14.xfdashboard: init at 0.7.5

---
 pkgs/desktops/xfce4-14/default.nix            |  2 +
 .../desktops/xfce4-14/xfdashboard/default.nix | 44 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/desktops/xfce4-14/xfdashboard/default.nix

diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix
index d3e46cf2365..82fe5b65356 100644
--- a/pkgs/desktops/xfce4-14/default.nix
+++ b/pkgs/desktops/xfce4-14/default.nix
@@ -83,6 +83,8 @@ makeScope newScope (self: with self; {
 
   xfce4-terminal = callPackage ./xfce4-terminal { };
 
+  xfdashboard = callPackage ./xfdashboard { };
+
   xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { };
 
   xfce4-whiskermenu-plugin = callPackage ./xfce4-whiskermenu-plugin { };
diff --git a/pkgs/desktops/xfce4-14/xfdashboard/default.nix b/pkgs/desktops/xfce4-14/xfdashboard/default.nix
new file mode 100644
index 00000000000..a17c29f6723
--- /dev/null
+++ b/pkgs/desktops/xfce4-14/xfdashboard/default.nix
@@ -0,0 +1,44 @@
+{ mkXfceDerivation
+, clutter
+, libXcomposite
+, libXinerama
+, libXdamage
+, libX11
+, libwnck3
+, libxfce4ui
+, libxfce4util
+, garcon
+, xfconf
+, gtk3
+, glib
+, dbus-glib
+}:
+
+mkXfceDerivation {
+  category = "apps";
+  pname = "xfdashboard";
+  version = "0.7.5";
+  rev = "0.7.5";
+
+  sha256 = "0d0kg90h3li41bs75z3xldljsglkz220pba39c54qznnzb8v8a2i";
+
+  buildInputs = [
+    clutter
+    dbus-glib
+    garcon
+    glib
+    gtk3
+    libX11
+    libXcomposite
+    libXdamage
+    libXinerama
+    libwnck3
+    libxfce4ui
+    libxfce4util
+    xfconf
+  ];
+
+  meta = {
+    description = "Gnome shell like dashboard";
+  };
+}

From 35c1c170d7dc49bf3f878a2170be487c5d27c8b1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 27 Aug 2019 21:17:20 +0200
Subject: [PATCH 285/794] nix.conf: Set sandbox-fallback = false

For security, we don't want the sandbox to be disabled silently.
---
 nixos/modules/services/misc/nix-daemon.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 6bc88c66dc1..088dfd71860 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -8,7 +8,9 @@ let
 
   nix = cfg.package.out;
 
-  isNix20 = versionAtLeast (getVersion nix) "2.0pre";
+  nixVersion = getVersion nix;
+
+  isNix20 = versionAtLeast nixVersion "2.0pre";
 
   makeNixBuildUser = nr:
     { name = "nixbld${toString nr}";
@@ -61,6 +63,9 @@ let
           builders =
         ''}
         system-features = ${toString cfg.systemFeatures}
+        ${optionalString (versionAtLeast nixVersion "2.3pre") ''
+          sandbox-fallback = false
+        ''}
         $extraOptions
         END
       '' + optionalString cfg.checkConfig (

From 1d30da1e2b463ae0f3c5d2438c27e580206322f6 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 26 Aug 2019 14:13:45 -0400
Subject: [PATCH 286/794] pythonPackages.elpy: 1.28.0 -> 1.29.1 add tests

---
 .../python-modules/elpy/default.nix           | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix
index 3816a8c42e7..f30dc218379 100644
--- a/pkgs/development/python-modules/elpy/default.nix
+++ b/pkgs/development/python-modules/elpy/default.nix
@@ -1,32 +1,43 @@
 { stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , rope
 , flake8
 , autopep8
 , jedi
 , importmagic
-, isPy27
+, black
+, mock
+, nose
+, yapf
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "elpy";
-  version = "1.28.0";
+  version = "1.29.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0lx6bf6ajx6wmnns03gva5sh1mmmxahjaqrn735cgwn6j4ikyqfs";
+  src = fetchFromGitHub {
+    owner = "jorgenschaefer";
+    repo = pname;
+    rev = version;
+    sha256 = "19sd5p03rkp5yibq1ilwisq8jlma02ks2kdc3swy6r27n4hy90xf";
   };
 
-  propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ]
-    ++ stdenv.lib.optionals isPy27 [ rope ];
+  propagatedBuildInputs = [ flake8 autopep8 jedi importmagic rope yapf ]
+    ++ stdenv.lib.optionals isPy3k [ black ];
 
-  doCheck = false; # there are no tests
+  checkInputs = [ mock nose ];
+
+  checkPhase = ''
+    HOME=$(mktemp -d) nosetests -e "test_should_complete_top_level_modules_for_import"
+  '';
 
   meta = with stdenv.lib; {
     description = "Backend for the elpy Emacs mode";
     homepage = "https://github.com/jorgenschaefer/elpy";
     license = licenses.gpl3;
+    maintainers = [ maintainers.costrouc ];
   };
 
 }

From 2c0bb593c6af2edcd8bff478298ba436123c1f3f Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Tue, 27 Aug 2019 19:30:56 +0000
Subject: [PATCH 287/794] dino: 2019-02-06 -> 2019-08-27

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

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 2158409471f..c333ae7ddcb 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -15,13 +15,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2019-03-07";
+  name = "dino-unstable-2019-08-27";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "cc7b0aa7bd5b6599159f654fdd8a2fd111e16a3e";
-    sha256 = "1cq62vif92fz38si2bl49qwy4ys9gxdrvzkv25av6c6nwmyih4gv";
+    rev = "ff6caf241c4d57d3ef124a8b7c3144a09f320ea0";
+    sha256 = "1gjxfnywlypi3slvxb91b2mycrsqjinmafnkkngahyikr7gmqgnf";
     fetchSubmodules = true;
   };
 

From eb5ba591d9d5defc3a4e90322c9dda3a767723d9 Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Sun, 25 Aug 2019 14:26:03 +0200
Subject: [PATCH 288/794] elmPackages: share node-env.nix, add elm-live &
 elm-xref

---
 pkgs/development/compilers/elm/default.nix    |    5 +-
 .../elm/packages/generate-node-packages.sh    |    6 +-
 .../elm/packages/node-composition.nix         |    2 +-
 .../compilers/elm/packages/node-env.nix       |  540 ------
 .../compilers/elm/packages/node-packages.json |    6 +-
 .../compilers/elm/packages/node-packages.nix  | 1722 ++++++++++++-----
 6 files changed, 1296 insertions(+), 985 deletions(-)
 delete mode 100644 pkgs/development/compilers/elm/packages/node-env.nix

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index fbb991d7b5a..c8bef546b6d 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -56,8 +56,9 @@ let
             */
             elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test;
             elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples;
-            elm-analyse = elmNodePackages.elm-analyse;
-            inherit (elmNodePackages) elm-doc-preview elm-upgrade;
+            # elm-analyse@0.16.4 build is not working
+            elm-analyse = elmNodePackages."elm-analyse-0.16.3";
+            inherit (elmNodePackages) elm-doc-preview elm-live elm-upgrade elm-xref;
           };
       in elmPkgs // {
         inherit elmPkgs;
diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh
index 0e1835c6ffa..1d24df549ea 100755
--- a/pkgs/development/compilers/elm/packages/generate-node-packages.sh
+++ b/pkgs/development/compilers/elm/packages/generate-node-packages.sh
@@ -4,4 +4,8 @@
 set -eu -o pipefail
 
 rm -f node-env.nix
-node2nix --nodejs-10 -i node-packages.json -o node-packages.nix -c node-composition.nix
+node2nix --nodejs-10 \
+    -i node-packages.json \
+    -o node-packages.nix \
+    -c node-composition.nix \
+    --no-copy-node-env -e ../../../node-packages/node-env.nix
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index fa0a1482f97..1ffd758ac82 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -5,7 +5,7 @@
   }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
 
 let
-  nodeEnv = import ./node-env.nix {
+  nodeEnv = import ../../../node-packages/node-env.nix {
     inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
diff --git a/pkgs/development/compilers/elm/packages/node-env.nix b/pkgs/development/compilers/elm/packages/node-env.nix
deleted file mode 100644
index 670556bf271..00000000000
--- a/pkgs/development/compilers/elm/packages/node-env.nix
+++ /dev/null
@@ -1,540 +0,0 @@
-# This file originates from node2nix
-
-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
-
-let
-  python = if nodejs ? python then nodejs.python else python2;
-
-  # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
-  tarWrapper = runCommand "tarWrapper" {} ''
-    mkdir -p $out/bin
-
-    cat > $out/bin/tar <<EOF
-    #! ${stdenv.shell} -e
-    $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore
-    EOF
-
-    chmod +x $out/bin/tar
-  '';
-
-  # Function that generates a TGZ file from a NPM project
-  buildNodeSourceDist =
-    { name, version, src, ... }:
-
-    stdenv.mkDerivation {
-      name = "node-tarball-${name}-${version}";
-      inherit src;
-      buildInputs = [ nodejs ];
-      buildPhase = ''
-        export HOME=$TMPDIR
-        tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
-      '';
-      installPhase = ''
-        mkdir -p $out/tarballs
-        mv $tgzFile $out/tarballs
-        mkdir -p $out/nix-support
-        echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
-      '';
-    };
-
-  includeDependencies = {dependencies}:
-    stdenv.lib.optionalString (dependencies != [])
-      (stdenv.lib.concatMapStrings (dependency:
-        ''
-          # Bundle the dependencies of the package
-          mkdir -p node_modules
-          cd node_modules
-
-          # Only include dependencies if they don't exist. They may also be bundled in the package.
-          if [ ! -e "${dependency.name}" ]
-          then
-              ${composePackage dependency}
-          fi
-
-          cd ..
-        ''
-      ) dependencies);
-
-  # Recursively composes the dependencies of a package
-  composePackage = { name, packageName, src, dependencies ? [], ... }@args:
-    ''
-      DIR=$(pwd)
-      cd $TMPDIR
-
-      unpackFile ${src}
-
-      # Make the base dir in which the target dependency resides first
-      mkdir -p "$(dirname "$DIR/${packageName}")"
-
-      if [ -f "${src}" ]
-      then
-          # Figure out what directory has been unpacked
-          packageDir="$(find . -maxdepth 1 -type d | tail -1)"
-
-          # Restore write permissions to make building work
-          find "$packageDir" -type d -exec chmod u+x {} \;
-          chmod -R u+w "$packageDir"
-
-          # Move the extracted tarball into the output folder
-          mv "$packageDir" "$DIR/${packageName}"
-      elif [ -d "${src}" ]
-      then
-          # Get a stripped name (without hash) of the source directory.
-          # On old nixpkgs it's already set internally.
-          if [ -z "$strippedName" ]
-          then
-              strippedName="$(stripHash ${src})"
-          fi
-
-          # Restore write permissions to make building work
-          chmod -R u+w "$strippedName"
-
-          # Move the extracted directory into the output folder
-          mv "$strippedName" "$DIR/${packageName}"
-      fi
-
-      # Unset the stripped name to not confuse the next unpack step
-      unset strippedName
-
-      # Include the dependencies of the package
-      cd "$DIR/${packageName}"
-      ${includeDependencies { inherit dependencies; }}
-      cd ..
-      ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-    '';
-
-  pinpointDependencies = {dependencies, production}:
-    let
-      pinpointDependenciesFromPackageJSON = writeTextFile {
-        name = "pinpointDependencies.js";
-        text = ''
-          var fs = require('fs');
-          var path = require('path');
-
-          function resolveDependencyVersion(location, name) {
-              if(location == process.env['NIX_STORE']) {
-                  return null;
-              } else {
-                  var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
-
-                  if(fs.existsSync(dependencyPackageJSON)) {
-                      var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
-
-                      if(dependencyPackageObj.name == name) {
-                          return dependencyPackageObj.version;
-                      }
-                  } else {
-                      return resolveDependencyVersion(path.resolve(location, ".."), name);
-                  }
-              }
-          }
-
-          function replaceDependencies(dependencies) {
-              if(typeof dependencies == "object" && dependencies !== null) {
-                  for(var dependency in dependencies) {
-                      var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
-
-                      if(resolvedVersion === null) {
-                          process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
-                      } else {
-                          dependencies[dependency] = resolvedVersion;
-                      }
-                  }
-              }
-          }
-
-          /* Read the package.json configuration */
-          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-
-          /* Pinpoint all dependencies */
-          replaceDependencies(packageObj.dependencies);
-          if(process.argv[2] == "development") {
-              replaceDependencies(packageObj.devDependencies);
-          }
-          replaceDependencies(packageObj.optionalDependencies);
-
-          /* Write the fixed package.json file */
-          fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
-        '';
-      };
-    in
-    ''
-      node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
-
-      ${stdenv.lib.optionalString (dependencies != [])
-        ''
-          if [ -d node_modules ]
-          then
-              cd node_modules
-              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
-              cd ..
-          fi
-        ''}
-    '';
-
-  # Recursively traverses all dependencies of a package and pinpoints all
-  # dependencies in the package.json file to the versions that are actually
-  # being used.
-
-  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
-    ''
-      if [ -d "${packageName}" ]
-      then
-          cd "${packageName}"
-          ${pinpointDependencies { inherit dependencies production; }}
-          cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-      fi
-    '';
-
-  # Extract the Node.js source code which is used to compile packages with
-  # native bindings
-  nodeSources = runCommand "node-sources" {} ''
-    tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
-    mv node-* $out
-  '';
-
-  # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
-  addIntegrityFieldsScript = writeTextFile {
-    name = "addintegrityfields.js";
-    text = ''
-      var fs = require('fs');
-      var path = require('path');
-
-      function augmentDependencies(baseDir, dependencies) {
-          for(var dependencyName in dependencies) {
-              var dependency = dependencies[dependencyName];
-
-              // Open package.json and augment metadata fields
-              var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
-              var packageJSONPath = path.join(packageJSONDir, "package.json");
-
-              if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
-                  console.log("Adding metadata fields to: "+packageJSONPath);
-                  var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
-
-                  if(dependency.integrity) {
-                      packageObj["_integrity"] = dependency.integrity;
-                  } else {
-                      packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
-                  }
-
-                  if(dependency.resolved) {
-                      packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
-                  } else {
-                      packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
-                  }
-
-                  if(dependency.from !== undefined) { // Adopt from property if one has been provided
-                      packageObj["_from"] = dependency.from;
-                  }
-
-                  fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
-              }
-
-              // Augment transitive dependencies
-              if(dependency.dependencies !== undefined) {
-                  augmentDependencies(packageJSONDir, dependency.dependencies);
-              }
-          }
-      }
-
-      if(fs.existsSync("./package-lock.json")) {
-          var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
-
-          if(packageLock.lockfileVersion !== 1) {
-             process.stderr.write("Sorry, I only understand lock file version 1!\n");
-             process.exit(1);
-          }
-
-          if(packageLock.dependencies !== undefined) {
-              augmentDependencies(".", packageLock.dependencies);
-          }
-      }
-    '';
-  };
-
-  # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
-  reconstructPackageLock = writeTextFile {
-    name = "addintegrityfields.js";
-    text = ''
-      var fs = require('fs');
-      var path = require('path');
-
-      var packageObj = JSON.parse(fs.readFileSync("package.json"));
-
-      var lockObj = {
-          name: packageObj.name,
-          version: packageObj.version,
-          lockfileVersion: 1,
-          requires: true,
-          dependencies: {}
-      };
-
-      function augmentPackageJSON(filePath, dependencies) {
-          var packageJSON = path.join(filePath, "package.json");
-          if(fs.existsSync(packageJSON)) {
-              var packageObj = JSON.parse(fs.readFileSync(packageJSON));
-              dependencies[packageObj.name] = {
-                  version: packageObj.version,
-                  integrity: "sha1-000000000000000000000000000=",
-                  dependencies: {}
-              };
-              processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
-          }
-      }
-
-      function processDependencies(dir, dependencies) {
-          if(fs.existsSync(dir)) {
-              var files = fs.readdirSync(dir);
-
-              files.forEach(function(entry) {
-                  var filePath = path.join(dir, entry);
-                  var stats = fs.statSync(filePath);
-
-                  if(stats.isDirectory()) {
-                      if(entry.substr(0, 1) == "@") {
-                          // When we encounter a namespace folder, augment all packages belonging to the scope
-                          var pkgFiles = fs.readdirSync(filePath);
-
-                          pkgFiles.forEach(function(entry) {
-                              if(stats.isDirectory()) {
-                                  var pkgFilePath = path.join(filePath, entry);
-                                  augmentPackageJSON(pkgFilePath, dependencies);
-                              }
-                          });
-                      } else {
-                          augmentPackageJSON(filePath, dependencies);
-                      }
-                  }
-              });
-          }
-      }
-
-      processDependencies("node_modules", lockObj.dependencies);
-
-      fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
-    '';
-  };
-
-  prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
-    let
-      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
-    in
-    ''
-        # Pinpoint the versions of all dependencies to the ones that are actually being used
-        echo "pinpointing versions of dependencies..."
-        source $pinpointDependenciesScriptPath
-
-        # Patch the shebangs of the bundled modules to prevent them from
-        # calling executables outside the Nix store as much as possible
-        patchShebangs .
-
-        # Deploy the Node.js package by running npm install. Since the
-        # dependencies have been provided already by ourselves, it should not
-        # attempt to install them again, which is good, because we want to make
-        # it Nix's responsibility. If it needs to install any dependencies
-        # anyway (e.g. because the dependency parameters are
-        # incomplete/incorrect), it fails.
-        #
-        # The other responsibilities of NPM are kept -- version checks, build
-        # steps, postprocessing etc.
-
-        export HOME=$TMPDIR
-        cd "${packageName}"
-        runHook preRebuild
-
-        ${stdenv.lib.optionalString bypassCache ''
-          ${stdenv.lib.optionalString reconstructLock ''
-            if [ -f package-lock.json ]
-            then
-                echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
-                echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
-                rm package-lock.json
-            else
-                echo "No package-lock.json file found, reconstructing..."
-            fi
-
-            node ${reconstructPackageLock}
-          ''}
-
-          node ${addIntegrityFieldsScript}
-        ''}
-
-        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-
-        if [ "$dontNpmInstall" != "1" ]
-        then
-            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
-            rm -f npm-shrinkwrap.json
-
-            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
-        fi
-    '';
-
-  # Builds and composes an NPM package including all its dependencies
-  buildNodePackage =
-    { name
-    , packageName
-    , version
-    , dependencies ? []
-    , buildInputs ? []
-    , production ? true
-    , npmFlags ? ""
-    , dontNpmInstall ? false
-    , bypassCache ? false
-    , reconstructLock ? false
-    , preRebuild ? ""
-    , dontStrip ? true
-    , unpackPhase ? "true"
-    , buildPhase ? "true"
-    , ... }@args:
-
-    let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
-    in
-    stdenv.mkDerivation ({
-      name = "node_${name}-${version}";
-      buildInputs = [ tarWrapper python nodejs ]
-        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
-        ++ stdenv.lib.optional (stdenv.isDarwin) libtool
-        ++ buildInputs;
-
-      inherit dontStrip; # Stripping may fail a build for some package deployments
-      inherit dontNpmInstall preRebuild unpackPhase buildPhase;
-
-      compositionScript = composePackage args;
-      pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
-      passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
-
-      installPhase = ''
-        # Create and enter a root node_modules/ folder
-        mkdir -p $out/lib/node_modules
-        cd $out/lib/node_modules
-
-        # Compose the package and all its dependencies
-        source $compositionScriptPath
-
-        ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
-        # Create symlink to the deployed executable folder, if applicable
-        if [ -d "$out/lib/node_modules/.bin" ]
-        then
-            ln -s $out/lib/node_modules/.bin $out/bin
-        fi
-
-        # Create symlinks to the deployed manual page folders, if applicable
-        if [ -d "$out/lib/node_modules/${packageName}/man" ]
-        then
-            mkdir -p $out/share
-            for dir in "$out/lib/node_modules/${packageName}/man/"*
-            do
-                mkdir -p $out/share/man/$(basename "$dir")
-                for page in "$dir"/*
-                do
-                    ln -s $page $out/share/man/$(basename "$dir")
-                done
-            done
-        fi
-
-        # Run post install hook, if provided
-        runHook postInstall
-      '';
-    } // extraArgs);
-
-  # Builds a development shell
-  buildNodeShell =
-    { name
-    , packageName
-    , version
-    , src
-    , dependencies ? []
-    , buildInputs ? []
-    , production ? true
-    , npmFlags ? ""
-    , dontNpmInstall ? false
-    , bypassCache ? false
-    , reconstructLock ? false
-    , dontStrip ? true
-    , unpackPhase ? "true"
-    , buildPhase ? "true"
-    , ... }@args:
-
-    let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-
-      nodeDependencies = stdenv.mkDerivation ({
-        name = "node-dependencies-${name}-${version}";
-
-        buildInputs = [ tarWrapper python nodejs ]
-          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
-          ++ stdenv.lib.optional (stdenv.isDarwin) libtool
-          ++ buildInputs;
-
-        inherit dontStrip; # Stripping may fail a build for some package deployments
-        inherit dontNpmInstall unpackPhase buildPhase;
-
-        includeScript = includeDependencies { inherit dependencies; };
-        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
-        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
-
-        installPhase = ''
-          mkdir -p $out/${packageName}
-          cd $out/${packageName}
-
-          source $includeScriptPath
-
-          # Create fake package.json to make the npm commands work properly
-          cp ${src}/package.json .
-          chmod 644 package.json
-          ${stdenv.lib.optionalString bypassCache ''
-            if [ -f ${src}/package-lock.json ]
-            then
-                cp ${src}/package-lock.json .
-            fi
-          ''}
-
-          # Go to the parent folder to make sure that all packages are pinpointed
-          cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
-          # Expose the executables that were installed
-          cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          mv ${packageName} lib
-          ln -s $out/lib/node_modules/.bin $out/bin
-        '';
-      } // extraArgs);
-    in
-    stdenv.mkDerivation {
-      name = "node-shell-${name}-${version}";
-
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
-      buildCommand = ''
-        mkdir -p $out/bin
-        cat > $out/bin/shell <<EOF
-        #! ${stdenv.shell} -e
-        $shellHook
-        exec ${stdenv.shell}
-        EOF
-        chmod +x $out/bin/shell
-      '';
-
-      # Provide the dependencies in a development shell through the NODE_PATH environment variable
-      inherit nodeDependencies;
-      shellHook = stdenv.lib.optionalString (dependencies != []) ''
-        export NODE_PATH=$nodeDependencies/lib/node_modules
-        export PATH="$nodeDependencies/bin:$PATH"
-      '';
-    };
-in
-{
-  buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
-  buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
-  buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
-}
diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json
index 49edf689694..5ba7e49bfa6 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.json
+++ b/pkgs/development/compilers/elm/packages/node-packages.json
@@ -2,6 +2,8 @@
     "elm-test",
     "elm-verify-examples",
     "elm-doc-preview",
-    "elm-analyse",
-    "elm-upgrade"
+    "elm-upgrade",
+    { "elm-analyse": "0.16.3" },
+    "elm-live",
+    "elm-xref"
 ]
diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix
index c6cc1cbf247..7605c377057 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -13,22 +13,13 @@ let
         sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==";
       };
     };
-    "@sindresorhus/is-0.14.0" = {
+    "@sindresorhus/is-0.7.0" = {
       name = "_at_sindresorhus_slash_is";
       packageName = "@sindresorhus/is";
-      version = "0.14.0";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz";
-        sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==";
-      };
-    };
-    "@szmarczak/http-timer-1.1.2" = {
-      name = "_at_szmarczak_slash_http-timer";
-      packageName = "@szmarczak/http-timer";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz";
-        sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==";
+        url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz";
+        sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==";
       };
     };
     "accepts-1.3.7" = {
@@ -40,13 +31,13 @@ let
         sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
       };
     };
-    "ajv-6.10.1" = {
+    "ajv-6.10.2" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.10.1";
+      version = "6.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz";
-        sha512 = "w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz";
+        sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -58,13 +49,22 @@ let
         sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
       };
     };
-    "ansi-regex-3.0.0" = {
+    "ansi-regex-4.1.0" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
-      version = "3.0.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
-        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
+        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
+      };
+    };
+    "ansi-styles-2.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
       };
     };
     "ansi-styles-3.2.1" = {
@@ -85,6 +85,15 @@ let
         sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==";
       };
     };
+    "anymatch-3.0.3" = {
+      name = "anymatch";
+      packageName = "anymatch";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz";
+        sha512 = "c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==";
+      };
+    };
     "arr-diff-4.0.0" = {
       name = "arr-diff";
       packageName = "arr-diff";
@@ -166,13 +175,13 @@ let
         sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==";
       };
     };
-    "async-limiter-1.0.0" = {
+    "async-limiter-1.0.1" = {
       name = "async-limiter";
       packageName = "async-limiter";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
-        sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==";
+        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz";
+        sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==";
       };
     };
     "asynckit-0.4.0" = {
@@ -238,6 +247,15 @@ let
         sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==";
       };
     };
+    "batch-0.6.1" = {
+      name = "batch";
+      packageName = "batch";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz";
+        sha1 = "dc34314f4e679318093fc760272525f94bf25c16";
+      };
+    };
     "bcrypt-pbkdf-1.0.2" = {
       name = "bcrypt-pbkdf";
       packageName = "bcrypt-pbkdf";
@@ -265,6 +283,15 @@ let
         sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
       };
     };
+    "binary-extensions-2.0.0" = {
+      name = "binary-extensions";
+      packageName = "binary-extensions";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz";
+        sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==";
+      };
+    };
     "bindings-1.5.0" = {
       name = "bindings";
       packageName = "bindings";
@@ -274,13 +301,13 @@ let
         sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==";
       };
     };
-    "binwrap-0.2.1" = {
+    "binwrap-0.2.2" = {
       name = "binwrap";
       packageName = "binwrap";
-      version = "0.2.1";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binwrap/-/binwrap-0.2.1.tgz";
-        sha512 = "kILc2+zMfFEv66/NLfO2GIpmWRPE8hL68fv+o5A94OlN9AIIG4zernpgn9bpPAImb5t4QwFxnqAGSyP1+tGKrA==";
+        url = "https://registry.npmjs.org/binwrap/-/binwrap-0.2.2.tgz";
+        sha512 = "Y+Wvypk3JhH5GPZAvlwJAWOVH/OsOhQMSj37vySuWHwQivoALplPxfBA8b973rFJI7OS+O+1YmmYXIiEXVMAcw==";
       };
     };
     "bluebird-3.5.5" = {
@@ -328,6 +355,15 @@ let
         sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==";
       };
     };
+    "braces-3.0.2" = {
+      name = "braces";
+      packageName = "braces";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz";
+        sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
+      };
+    };
     "bser-2.1.0" = {
       name = "bser";
       packageName = "bser";
@@ -373,22 +409,22 @@ let
         sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
       };
     };
-    "cacheable-request-6.1.0" = {
+    "cacheable-request-2.1.4" = {
       name = "cacheable-request";
       packageName = "cacheable-request";
-      version = "6.1.0";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz";
-        sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==";
+        url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz";
+        sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d";
       };
     };
-    "camelcase-4.1.0" = {
+    "camelcase-5.3.1" = {
       name = "camelcase";
       packageName = "camelcase";
-      version = "4.1.0";
+      version = "5.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
+        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
       };
     };
     "capture-exit-2.0.0" = {
@@ -436,6 +472,15 @@ let
         sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98";
       };
     };
+    "chalk-1.1.3" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+      };
+    };
     "chalk-2.1.0" = {
       name = "chalk";
       packageName = "chalk";
@@ -454,6 +499,15 @@ let
         sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
       };
     };
+    "charenc-0.0.2" = {
+      name = "charenc";
+      packageName = "charenc";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz";
+        sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
+      };
+    };
     "chokidar-2.1.2" = {
       name = "chokidar";
       packageName = "chokidar";
@@ -463,6 +517,15 @@ let
         sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==";
       };
     };
+    "chokidar-3.0.0" = {
+      name = "chokidar";
+      packageName = "chokidar";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.0.tgz";
+        sha512 = "ebzWopcacB2J19Jsb5RPtMrzmjUZ5VAQnsL0Ztrix3lswozHbiDp+1Lg3AWSKHdwsps/W2vtshA/x3I827F78g==";
+      };
+    };
     "chownr-1.1.2" = {
       name = "chownr";
       packageName = "chownr";
@@ -481,13 +544,22 @@ let
         sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
-    "cliui-4.1.0" = {
+    "cli-color-1.2.0" = {
+      name = "cli-color";
+      packageName = "cli-color";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-color/-/cli-color-1.2.0.tgz";
+        sha1 = "3a5ae74fd76b6267af666e69e2afbbd01def34d1";
+      };
+    };
+    "cliui-5.0.0" = {
       name = "cliui";
       packageName = "cliui";
-      version = "4.1.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
-        sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==";
+        url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
+        sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
       };
     };
     "clone-response-1.0.2" = {
@@ -499,15 +571,6 @@ let
         sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b";
       };
     };
-    "code-point-at-1.1.0" = {
-      name = "code-point-at";
-      packageName = "code-point-at";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
-        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
-      };
-    };
     "collection-visit-1.0.0" = {
       name = "collection-visit";
       packageName = "collection-visit";
@@ -544,13 +607,31 @@ let
         sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
       };
     };
-    "commander-2.20.0" = {
+    "commander-2.17.1" = {
       name = "commander";
       packageName = "commander";
-      version = "2.20.0";
+      version = "2.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz";
-        sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==";
+        url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz";
+        sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==";
+      };
+    };
+    "commander-2.9.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+      };
+    };
+    "commander-3.0.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-3.0.0.tgz";
+        sha512 = "pl3QrGOBa9RZaslQiqnnKX2J068wcQw7j9AIaBQ9/JEp5RY6je4jKTImg0Bd+rpoONSe7GUFSgkxLeo17m3Pow==";
       };
     };
     "component-emitter-1.3.0" = {
@@ -589,6 +670,15 @@ let
         sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==";
       };
     };
+    "connect-pushstate-1.1.0" = {
+      name = "connect-pushstate";
+      packageName = "connect-pushstate";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connect-pushstate/-/connect-pushstate-1.1.0.tgz";
+        sha1 = "bcab224271c439604a0fb0f614c0a5f563e88e24";
+      };
+    };
     "content-disposition-0.5.2" = {
       name = "content-disposition";
       packageName = "content-disposition";
@@ -661,6 +751,15 @@ let
         sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==";
       };
     };
+    "core-js-3.2.1" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz";
+        sha512 = "Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==";
+      };
+    };
     "core-util-is-1.0.2" = {
       name = "core-util-is";
       packageName = "core-util-is";
@@ -688,13 +787,13 @@ let
         sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252";
       };
     };
-    "cross-spawn-5.1.0" = {
+    "cross-spawn-5.0.1" = {
       name = "cross-spawn";
       packageName = "cross-spawn";
-      version = "5.1.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
-        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.0.1.tgz";
+        sha1 = "a3bbb302db2297cbea3c04edf36941f4613aa399";
       };
     };
     "cross-spawn-6.0.5" = {
@@ -706,6 +805,24 @@ let
         sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
       };
     };
+    "crypt-0.0.2" = {
+      name = "crypt";
+      packageName = "crypt";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz";
+        sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b";
+      };
+    };
+    "d-1.0.1" = {
+      name = "d";
+      packageName = "d";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz";
+        sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==";
+      };
+    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -724,6 +841,15 @@ let
         sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
       };
     };
+    "debug-3.2.6" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
+        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
+      };
+    };
     "decamelize-1.2.0" = {
       name = "decamelize";
       packageName = "decamelize";
@@ -760,13 +886,22 @@ let
         sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
       };
     };
-    "defer-to-connect-1.0.2" = {
-      name = "defer-to-connect";
-      packageName = "defer-to-connect";
-      version = "1.0.2";
+    "default-gateway-2.7.2" = {
+      name = "default-gateway";
+      packageName = "default-gateway";
+      version = "2.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz";
-        sha512 = "k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==";
+        url = "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz";
+        sha512 = "lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==";
+      };
+    };
+    "define-properties-1.1.3" = {
+      name = "define-properties";
+      packageName = "define-properties";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz";
+        sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
       };
     };
     "define-property-0.2.5" = {
@@ -859,6 +994,15 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
+    "elm-serve-0.4.0" = {
+      name = "elm-serve";
+      packageName = "elm-serve";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elm-serve/-/elm-serve-0.4.0.tgz";
+        sha512 = "NYXzzaJT/zw8v7jzDWGXuvX3/soj+5NTLHxX0n/T6DICbmyDj8kO7rlI2wSKs9UTNjXhZ7quFQEKcgcf/SZksw==";
+      };
+    };
     "elm-test-0.19.0-rev6" = {
       name = "elm-test";
       packageName = "elm-test";
@@ -877,6 +1021,15 @@ let
         sha512 = "O0Z3YsYU9OTb1hTDGORWxi69QjQFEIPfZVq/oc1D5lhL3swduHKY8vdKGuo+WlKVdTas99oNIsgL7yojWdYcsQ==";
       };
     };
+    "emoji-regex-7.0.3" = {
+      name = "emoji-regex";
+      packageName = "emoji-regex";
+      version = "7.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
+        sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
+      };
+    };
     "encodeurl-1.0.2" = {
       name = "encodeurl";
       packageName = "encodeurl";
@@ -895,6 +1048,69 @@ let
         sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
       };
     };
+    "es-abstract-1.13.0" = {
+      name = "es-abstract";
+      packageName = "es-abstract";
+      version = "1.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz";
+        sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==";
+      };
+    };
+    "es-to-primitive-1.2.0" = {
+      name = "es-to-primitive";
+      packageName = "es-to-primitive";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
+        sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
+      };
+    };
+    "es5-ext-0.10.50" = {
+      name = "es5-ext";
+      packageName = "es5-ext";
+      version = "0.10.50";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz";
+        sha512 = "KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==";
+      };
+    };
+    "es6-iterator-2.0.3" = {
+      name = "es6-iterator";
+      packageName = "es6-iterator";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
+        sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
+      };
+    };
+    "es6-promisify-6.0.2" = {
+      name = "es6-promisify";
+      packageName = "es6-promisify";
+      version = "6.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.2.tgz";
+        sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg==";
+      };
+    };
+    "es6-symbol-3.1.1" = {
+      name = "es6-symbol";
+      packageName = "es6-symbol";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
+        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
+      };
+    };
+    "es6-weak-map-2.0.3" = {
+      name = "es6-weak-map";
+      packageName = "es6-weak-map";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz";
+        sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==";
+      };
+    };
     "escape-html-1.0.3" = {
       name = "escape-html";
       packageName = "escape-html";
@@ -922,6 +1138,24 @@ let
         sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
       };
     };
+    "event-emitter-0.3.5" = {
+      name = "event-emitter";
+      packageName = "event-emitter";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
+        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
+      };
+    };
+    "eventemitter3-3.1.2" = {
+      name = "eventemitter3";
+      packageName = "eventemitter3";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz";
+        sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==";
+      };
+    };
     "exec-sh-0.3.2" = {
       name = "exec-sh";
       packageName = "exec-sh";
@@ -931,13 +1165,13 @@ let
         sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==";
       };
     };
-    "execa-0.7.0" = {
+    "execa-0.10.0" = {
       name = "execa";
       packageName = "execa";
-      version = "0.7.0";
+      version = "0.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
-        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
+        url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz";
+        sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==";
       };
     };
     "execa-1.0.0" = {
@@ -1084,6 +1318,15 @@ let
         sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
       };
     };
+    "fill-range-7.0.1" = {
+      name = "fill-range";
+      packageName = "fill-range";
+      version = "7.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz";
+        sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";
+      };
+    };
     "finalhandler-1.1.1" = {
       name = "finalhandler";
       packageName = "finalhandler";
@@ -1129,13 +1372,13 @@ let
         sha1 = "33c44b429ab2b2f0646299c5f9f718f376ff8d54";
       };
     };
-    "find-up-2.1.0" = {
+    "find-up-3.0.0" = {
       name = "find-up";
       packageName = "find-up";
-      version = "2.1.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
-        sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
+        url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
+        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
       };
     };
     "firstline-1.2.0" = {
@@ -1156,6 +1399,15 @@ let
         sha1 = "b88673c42009f8821fac2926e99720acee924fae";
       };
     };
+    "follow-redirects-1.8.1" = {
+      name = "follow-redirects";
+      packageName = "follow-redirects";
+      version = "1.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.8.1.tgz";
+        sha512 = "micCIbldHioIegeKs41DoH0KS3AXfFzgS30qVkM6z/XOE/GJgvmsoc839NUqa1B9udYe9dQxgv7KFwng6+p/dw==";
+      };
+    };
     "for-in-1.0.2" = {
       name = "for-in";
       packageName = "for-in";
@@ -1210,6 +1462,15 @@ let
         sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
       };
     };
+    "from2-2.3.0" = {
+      name = "from2";
+      packageName = "from2";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
+        sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
+      };
+    };
     "fs-extra-0.30.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -1237,6 +1498,15 @@ let
         sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==";
       };
     };
+    "fs-extra-6.0.1" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "6.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz";
+        sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==";
+      };
+    };
     "fs-minipass-1.2.6" = {
       name = "fs-minipass";
       packageName = "fs-minipass";
@@ -1273,13 +1543,31 @@ let
         sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==";
       };
     };
-    "get-caller-file-1.0.3" = {
+    "fsevents-2.0.7" = {
+      name = "fsevents";
+      packageName = "fsevents";
+      version = "2.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz";
+        sha512 = "a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==";
+      };
+    };
+    "function-bind-1.1.1" = {
+      name = "function-bind";
+      packageName = "function-bind";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
+        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
+      };
+    };
+    "get-caller-file-2.0.5" = {
       name = "get-caller-file";
       packageName = "get-caller-file";
-      version = "1.0.3";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
-        sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz";
+        sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
       };
     };
     "get-proxy-2.1.0" = {
@@ -1309,15 +1597,6 @@ let
         sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
       };
     };
-    "get-stream-5.1.0" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz";
-        sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==";
-      };
-    };
     "get-value-2.0.6" = {
       name = "get-value";
       packageName = "get-value";
@@ -1363,6 +1642,15 @@ let
         sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
+    "glob-parent-5.0.0" = {
+      name = "glob-parent";
+      packageName = "glob-parent";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz";
+        sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==";
+      };
+    };
     "got-6.7.1" = {
       name = "got";
       packageName = "got";
@@ -1372,22 +1660,31 @@ let
         sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
       };
     };
-    "got-9.6.0" = {
+    "got-8.3.2" = {
       name = "got";
       packageName = "got";
-      version = "9.6.0";
+      version = "8.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz";
-        sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==";
+        url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz";
+        sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==";
       };
     };
-    "graceful-fs-4.2.0" = {
+    "graceful-fs-4.2.2" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.0";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz";
-        sha512 = "jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
+        sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
+      };
+    };
+    "graceful-readlink-1.0.1" = {
+      name = "graceful-readlink";
+      packageName = "graceful-readlink";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
       };
     };
     "har-schema-2.0.0" = {
@@ -1408,6 +1705,24 @@ let
         sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
       };
     };
+    "has-1.0.3" = {
+      name = "has";
+      packageName = "has";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
+        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
+      };
+    };
+    "has-ansi-2.0.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+      };
+    };
     "has-flag-2.0.0" = {
       name = "has-flag";
       packageName = "has-flag";
@@ -1435,6 +1750,15 @@ let
         sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==";
       };
     };
+    "has-symbols-1.0.0" = {
+      name = "has-symbols";
+      packageName = "has-symbols";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz";
+        sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
+      };
+    };
     "has-to-string-tag-x-1.4.1" = {
       name = "has-to-string-tag-x";
       packageName = "has-to-string-tag-x";
@@ -1480,13 +1804,13 @@ let
         sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
       };
     };
-    "http-cache-semantics-4.0.3" = {
+    "http-cache-semantics-3.8.1" = {
       name = "http-cache-semantics";
       packageName = "http-cache-semantics";
-      version = "4.0.3";
+      version = "3.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz";
-        sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==";
+        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz";
+        sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==";
       };
     };
     "http-errors-1.6.2" = {
@@ -1516,6 +1840,15 @@ let
         sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==";
       };
     };
+    "http-proxy-1.17.0" = {
+      name = "http-proxy";
+      packageName = "http-proxy";
+      version = "1.17.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz";
+        sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==";
+      };
+    };
     "http-signature-1.2.0" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -1579,13 +1912,31 @@ let
         sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
       };
     };
-    "invert-kv-1.0.0" = {
-      name = "invert-kv";
-      packageName = "invert-kv";
-      version = "1.0.0";
+    "internal-ip-3.0.1" = {
+      name = "internal-ip";
+      packageName = "internal-ip";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz";
-        sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
+        url = "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz";
+        sha512 = "NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==";
+      };
+    };
+    "into-stream-3.1.0" = {
+      name = "into-stream";
+      packageName = "into-stream";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz";
+        sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6";
+      };
+    };
+    "ip-regex-2.1.0" = {
+      name = "ip-regex";
+      packageName = "ip-regex";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz";
+        sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
       };
     };
     "ipaddr.js-1.9.0" = {
@@ -1597,6 +1948,15 @@ let
         sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==";
       };
     };
+    "ipaddr.js-1.9.1" = {
+      name = "ipaddr.js";
+      packageName = "ipaddr.js";
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
+        sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==";
+      };
+    };
     "is-accessor-descriptor-0.1.6" = {
       name = "is-accessor-descriptor";
       packageName = "is-accessor-descriptor";
@@ -1624,6 +1984,15 @@ let
         sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
       };
     };
+    "is-binary-path-2.1.0" = {
+      name = "is-binary-path";
+      packageName = "is-binary-path";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz";
+        sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
+      };
+    };
     "is-buffer-1.1.6" = {
       name = "is-buffer";
       packageName = "is-buffer";
@@ -1633,6 +2002,15 @@ let
         sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
+    "is-callable-1.1.4" = {
+      name = "is-callable";
+      packageName = "is-callable";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz";
+        sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==";
+      };
+    };
     "is-data-descriptor-0.1.4" = {
       name = "is-data-descriptor";
       packageName = "is-data-descriptor";
@@ -1651,6 +2029,15 @@ let
         sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
       };
     };
+    "is-date-object-1.0.1" = {
+      name = "is-date-object";
+      packageName = "is-date-object";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
+        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+      };
+    };
     "is-descriptor-0.1.6" = {
       name = "is-descriptor";
       packageName = "is-descriptor";
@@ -1696,15 +2083,6 @@ let
         sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
-    "is-fullwidth-code-point-1.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
-        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
-      };
-    };
     "is-fullwidth-code-point-2.0.0" = {
       name = "is-fullwidth-code-point";
       packageName = "is-fullwidth-code-point";
@@ -1741,6 +2119,15 @@ let
         sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
       };
     };
+    "is-number-7.0.0" = {
+      name = "is-number";
+      packageName = "is-number";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz";
+        sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
+      };
+    };
     "is-object-1.0.1" = {
       name = "is-object";
       packageName = "is-object";
@@ -1750,6 +2137,15 @@ let
         sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
       };
     };
+    "is-plain-obj-1.1.0" = {
+      name = "is-plain-obj";
+      packageName = "is-plain-obj";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz";
+        sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e";
+      };
+    };
     "is-plain-object-2.0.4" = {
       name = "is-plain-object";
       packageName = "is-plain-object";
@@ -1759,6 +2155,15 @@ let
         sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
       };
     };
+    "is-promise-2.1.0" = {
+      name = "is-promise";
+      packageName = "is-promise";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
+        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+      };
+    };
     "is-redirect-1.0.0" = {
       name = "is-redirect";
       packageName = "is-redirect";
@@ -1768,6 +2173,15 @@ let
         sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
       };
     };
+    "is-regex-1.0.4" = {
+      name = "is-regex";
+      packageName = "is-regex";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
+        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+      };
+    };
     "is-retry-allowed-1.1.0" = {
       name = "is-retry-allowed";
       packageName = "is-retry-allowed";
@@ -1786,6 +2200,15 @@ let
         sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     };
+    "is-symbol-1.0.2" = {
+      name = "is-symbol";
+      packageName = "is-symbol";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz";
+        sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==";
+      };
+    };
     "is-typedarray-1.0.0" = {
       name = "is-typedarray";
       packageName = "is-typedarray";
@@ -1939,13 +2362,13 @@ let
         sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
-    "keyv-3.1.0" = {
+    "keyv-3.0.0" = {
       name = "keyv";
       packageName = "keyv";
-      version = "3.1.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz";
-        sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==";
+        url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz";
+        sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==";
       };
     };
     "kind-of-3.2.2" = {
@@ -1993,31 +2416,31 @@ let
         sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
       };
     };
-    "latest-version-5.1.0" = {
+    "klaw-2.1.1" = {
+      name = "klaw";
+      packageName = "klaw";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/klaw/-/klaw-2.1.1.tgz";
+        sha1 = "42b76894701169cc910fd0d19ce677b5fb378af1";
+      };
+    };
+    "latest-version-4.0.0" = {
       name = "latest-version";
       packageName = "latest-version";
-      version = "5.1.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz";
-        sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==";
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-4.0.0.tgz";
+        sha512 = "b4Myk7aQiQJvgssw2O8yITjELdqKRX4JQJUF1IUplgLaA8unv7s+UsAOwH6Q0/a09czSvlxEm306it2LBXrCzg==";
       };
     };
-    "lcid-1.0.0" = {
-      name = "lcid";
-      packageName = "lcid";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz";
-        sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
-      };
-    };
-    "locate-path-2.0.0" = {
+    "locate-path-3.0.0" = {
       name = "locate-path";
       packageName = "locate-path";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
-        sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
+        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
       };
     };
     "lodash-4.17.11" = {
@@ -2029,6 +2452,15 @@ let
         sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==";
       };
     };
+    "lowercase-keys-1.0.0" = {
+      name = "lowercase-keys";
+      packageName = "lowercase-keys";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
+        sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306";
+      };
+    };
     "lowercase-keys-1.0.1" = {
       name = "lowercase-keys";
       packageName = "lowercase-keys";
@@ -2038,15 +2470,6 @@ let
         sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
       };
     };
-    "lowercase-keys-2.0.0" = {
-      name = "lowercase-keys";
-      packageName = "lowercase-keys";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz";
-        sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==";
-      };
-    };
     "lru-cache-4.1.5" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -2056,6 +2479,15 @@ let
         sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
       };
     };
+    "lru-queue-0.1.0" = {
+      name = "lru-queue";
+      packageName = "lru-queue";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz";
+        sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
+      };
+    };
     "makeerror-1.0.11" = {
       name = "makeerror";
       packageName = "makeerror";
@@ -2083,6 +2515,15 @@ let
         sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
       };
     };
+    "md5-2.2.1" = {
+      name = "md5";
+      packageName = "md5";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz";
+        sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9";
+      };
+    };
     "media-typer-0.3.0" = {
       name = "media-typer";
       packageName = "media-typer";
@@ -2092,13 +2533,13 @@ let
         sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
       };
     };
-    "mem-1.1.0" = {
-      name = "mem";
-      packageName = "mem";
-      version = "1.1.0";
+    "memoizee-0.4.14" = {
+      name = "memoizee";
+      packageName = "memoizee";
+      version = "0.4.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
-        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
+        url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz";
+        sha512 = "/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==";
       };
     };
     "merge-descriptors-1.0.1" = {
@@ -2164,15 +2605,6 @@ let
         sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
       };
     };
-    "mimic-fn-1.2.0" = {
-      name = "mimic-fn";
-      packageName = "mimic-fn";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
-        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
-      };
-    };
     "mimic-response-1.0.1" = {
       name = "mimic-response";
       packageName = "mimic-response";
@@ -2209,13 +2641,13 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "minipass-2.3.5" = {
+    "minipass-2.4.0" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.3.5";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz";
-        sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.4.0.tgz";
+        sha512 = "6PmOuSP4NnZXzs2z6rbwzLJu/c5gdzYg1mRI/WIYdx45iiX7T+a4esOzavD6V/KmBzAaopFSTZPZcUx73bqKWA==";
       };
     };
     "minizlib-1.2.1" = {
@@ -2263,6 +2695,15 @@ let
         sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
       };
     };
+    "ms-2.1.2" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+      };
+    };
     "murmur-hash-js-1.0.0" = {
       name = "murmur-hash-js";
       packageName = "murmur-hash-js";
@@ -2272,13 +2713,13 @@ let
         sha1 = "5041049269c96633c866386960b2f4289e75e5b0";
       };
     };
-    "mustache-2.3.2" = {
+    "mustache-3.0.3" = {
       name = "mustache";
       packageName = "mustache";
-      version = "2.3.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.2.tgz";
-        sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ==";
+        url = "https://registry.npmjs.org/mustache/-/mustache-3.0.3.tgz";
+        sha512 = "vM5FkMHamTYmVYeAujypihuPrJQDtaUIlKeeVb1AMJ73OZLtWiF7GprqrjxD0gJWT53W9JfqXxf97nXQjMQkqA==";
       };
     };
     "nan-2.14.0" = {
@@ -2308,6 +2749,15 @@ let
         sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
       };
     };
+    "next-tick-1.0.0" = {
+      name = "next-tick";
+      packageName = "next-tick";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz";
+        sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
+      };
+    };
     "nice-try-1.0.5" = {
       name = "nice-try";
       packageName = "nice-try";
@@ -2362,13 +2812,13 @@ let
         sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
       };
     };
-    "normalize-url-4.3.0" = {
+    "normalize-url-2.0.1" = {
       name = "normalize-url";
       packageName = "normalize-url";
-      version = "4.3.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz";
-        sha512 = "0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==";
+        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz";
+        sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==";
       };
     };
     "npm-conf-1.1.3" = {
@@ -2389,13 +2839,13 @@ let
         sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
       };
     };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
+    "npx-10.2.0" = {
+      name = "npx";
+      packageName = "npx";
+      version = "10.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+        url = "https://registry.npmjs.org/npx/-/npx-10.2.0.tgz";
+        sha512 = "DqjFkzET0DeaXYXNJnirnvEovwk4lBa33ZQCw1jxMuas4yH9jdU8q2U8L3cLaB2UqzgmW2Ssqk8lcGiPRL8pRg==";
       };
     };
     "oauth-sign-0.9.0" = {
@@ -2407,6 +2857,15 @@ let
         sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
       };
     };
+    "object-assign-4.1.1" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+      };
+    };
     "object-copy-0.1.0" = {
       name = "object-copy";
       packageName = "object-copy";
@@ -2416,6 +2875,15 @@ let
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
+    "object-keys-1.1.1" = {
+      name = "object-keys";
+      packageName = "object-keys";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
+        sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
+      };
+    };
     "object-visit-1.0.1" = {
       name = "object-visit";
       packageName = "object-visit";
@@ -2425,6 +2893,15 @@ let
         sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
       };
     };
+    "object.getownpropertydescriptors-2.0.3" = {
+      name = "object.getownpropertydescriptors";
+      packageName = "object.getownpropertydescriptors";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
+        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
+      };
+    };
     "object.pick-1.3.0" = {
       name = "object.pick";
       packageName = "object.pick";
@@ -2452,6 +2929,15 @@ let
         sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
+    "opn-5.3.0" = {
+      name = "opn";
+      packageName = "opn";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz";
+        sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==";
+      };
+    };
     "opn-5.4.0" = {
       name = "opn";
       packageName = "opn";
@@ -2461,6 +2947,15 @@ let
         sha512 = "YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==";
       };
     };
+    "opn-5.5.0" = {
+      name = "opn";
+      packageName = "opn";
+      version = "5.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz";
+        sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==";
+      };
+    };
     "options-0.0.6" = {
       name = "options";
       packageName = "options";
@@ -2479,15 +2974,6 @@ let
         sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
       };
     };
-    "os-locale-2.1.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==";
-      };
-    };
     "os-tmpdir-1.0.2" = {
       name = "os-tmpdir";
       packageName = "os-tmpdir";
@@ -2497,13 +2983,13 @@ let
         sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
       };
     };
-    "p-cancelable-1.1.0" = {
+    "p-cancelable-0.4.1" = {
       name = "p-cancelable";
       packageName = "p-cancelable";
-      version = "1.1.0";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz";
-        sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==";
+        url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz";
+        sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==";
       };
     };
     "p-finally-1.0.0" = {
@@ -2515,40 +3001,58 @@ let
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     };
-    "p-limit-1.3.0" = {
+    "p-is-promise-1.1.0" = {
+      name = "p-is-promise";
+      packageName = "p-is-promise";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz";
+        sha1 = "9c9456989e9f6588017b0434d56097675c3da05e";
+      };
+    };
+    "p-limit-2.2.1" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "1.3.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
-        sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz";
+        sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==";
       };
     };
-    "p-locate-2.0.0" = {
+    "p-locate-3.0.0" = {
       name = "p-locate";
       packageName = "p-locate";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
-        sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
+        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
       };
     };
-    "p-try-1.0.0" = {
+    "p-timeout-2.0.1" = {
+      name = "p-timeout";
+      packageName = "p-timeout";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz";
+        sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==";
+      };
+    };
+    "p-try-2.2.0" = {
       name = "p-try";
       packageName = "p-try";
-      version = "1.0.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz";
-        sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
+        url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
+        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
       };
     };
-    "package-json-6.4.0" = {
+    "package-json-5.0.0" = {
       name = "package-json";
       packageName = "package-json";
-      version = "6.4.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-6.4.0.tgz";
-        sha512 = "bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q==";
+        url = "https://registry.npmjs.org/package-json/-/package-json-5.0.0.tgz";
+        sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg==";
       };
     };
     "parseurl-1.3.3" = {
@@ -2614,6 +3118,15 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
+    "pem-1.13.2" = {
+      name = "pem";
+      packageName = "pem";
+      version = "1.13.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pem/-/pem-1.13.2.tgz";
+        sha512 = "MPJWuEb/r6AG+GpZi2JnfNtGAZDeL/8+ERKwXEWRuST5i+4lq/Uy36B352OWIUSPQGH+HR1HEDcIDi+8cKxXNg==";
+      };
+    };
     "performance-now-2.1.0" = {
       name = "performance-now";
       packageName = "performance-now";
@@ -2623,6 +3136,15 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
+    "picomatch-2.0.7" = {
+      name = "picomatch";
+      packageName = "picomatch";
+      version = "2.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz";
+        sha512 = "oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==";
+      };
+    };
     "pify-3.0.0" = {
       name = "pify";
       packageName = "pify";
@@ -2704,13 +3226,13 @@ let
         sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
       };
     };
-    "psl-1.2.0" = {
+    "psl-1.3.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz";
-        sha512 = "GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA==";
+        url = "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz";
+        sha512 = "avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==";
       };
     };
     "pump-3.0.0" = {
@@ -2767,6 +3289,24 @@ let
         sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
       };
     };
+    "query-string-5.1.1" = {
+      name = "query-string";
+      packageName = "query-string";
+      version = "5.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz";
+        sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==";
+      };
+    };
+    "querystringify-2.1.1" = {
+      name = "querystringify";
+      packageName = "querystringify";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz";
+        sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==";
+      };
+    };
     "range-parser-1.2.1" = {
       name = "range-parser";
       packageName = "range-parser";
@@ -2830,6 +3370,15 @@ let
         sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==";
       };
     };
+    "readdirp-3.1.2" = {
+      name = "readdirp";
+      packageName = "readdirp";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz";
+        sha512 = "8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw==";
+      };
+    };
     "regenerator-runtime-0.9.6" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
@@ -2857,13 +3406,13 @@ let
         sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==";
       };
     };
-    "registry-url-5.1.0" = {
+    "registry-url-3.1.0" = {
       name = "registry-url";
       packageName = "registry-url";
-      version = "5.1.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz";
-        sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==";
+        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
+        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
       };
     };
     "remove-trailing-separator-1.1.0" = {
@@ -2929,13 +3478,22 @@ let
         sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     };
-    "require-main-filename-1.0.1" = {
+    "require-main-filename-2.0.0" = {
       name = "require-main-filename";
       packageName = "require-main-filename";
-      version = "1.0.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
+        sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
+      };
+    };
+    "requires-port-1.0.0" = {
+      name = "requires-port";
+      packageName = "requires-port";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz";
+        sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
     "resolve-url-0.2.1" = {
@@ -2974,13 +3532,13 @@ let
         sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       };
     };
-    "rimraf-2.6.3" = {
+    "rimraf-2.7.1" = {
       name = "rimraf";
       packageName = "rimraf";
-      version = "2.6.3";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";
-        sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
+        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
       };
     };
     "rsvp-4.8.5" = {
@@ -3055,22 +3613,31 @@ let
         sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==";
       };
     };
-    "semver-5.7.0" = {
+    "semver-5.7.1" = {
       name = "semver";
       packageName = "semver";
-      version = "5.7.0";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
-        sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
-    "semver-6.2.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "6.2.0";
+    "semver-regex-1.0.0" = {
+      name = "semver-regex";
+      packageName = "semver-regex";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz";
-        sha512 = "jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==";
+        url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz";
+        sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9";
+      };
+    };
+    "semver-sort-0.0.4" = {
+      name = "semver-sort";
+      packageName = "semver-sort";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-sort/-/semver-sort-0.0.4.tgz";
+        sha1 = "34fdbddc6a6b2b4161398c3c4dba56243bfeaa8b";
       };
     };
     "send-0.16.2" = {
@@ -3091,6 +3658,15 @@ let
         sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==";
       };
     };
+    "serve-index-1.9.1" = {
+      name = "serve-index";
+      packageName = "serve-index";
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz";
+        sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239";
+      };
+    };
     "serve-static-1.13.2" = {
       name = "serve-static";
       packageName = "serve-static";
@@ -3208,6 +3784,15 @@ let
         sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==";
       };
     };
+    "sort-keys-2.0.0" = {
+      name = "sort-keys";
+      packageName = "sort-keys";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz";
+        sha1 = "658535584861ec97d730d6cf41822e1f56684128";
+      };
+    };
     "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
@@ -3298,22 +3883,22 @@ let
         sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b";
       };
     };
-    "string-width-1.0.2" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "1.0.2";
+    "strict-uri-encode-1.1.0" = {
+      name = "strict-uri-encode";
+      packageName = "strict-uri-encode";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+        url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
+        sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
       };
     };
-    "string-width-2.1.1" = {
+    "string-width-3.1.0" = {
       name = "string-width";
       packageName = "string-width";
-      version = "2.1.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
+        url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
+        sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
       };
     };
     "string_decoder-0.10.31" = {
@@ -3343,13 +3928,13 @@ let
         sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
-    "strip-ansi-4.0.0" = {
+    "strip-ansi-5.2.0" = {
       name = "strip-ansi";
       packageName = "strip-ansi";
-      version = "4.0.0";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
-        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
+        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
       };
     };
     "strip-eof-1.0.0" = {
@@ -3379,6 +3964,24 @@ let
         sha1 = "d78c14398297d604fe6588dc3b03deca7b91ba93";
       };
     };
+    "supervisor-0.12.0" = {
+      name = "supervisor";
+      packageName = "supervisor";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supervisor/-/supervisor-0.12.0.tgz";
+        sha1 = "de7e6337015b291851c10f3538c4a7f04917ecc1";
+      };
+    };
+    "supports-color-2.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+    };
     "supports-color-4.2.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -3442,6 +4045,15 @@ let
         sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9";
       };
     };
+    "through2-2.0.5" = {
+      name = "through2";
+      packageName = "through2";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz";
+        sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
+      };
+    };
     "timed-out-4.0.1" = {
       name = "timed-out";
       packageName = "timed-out";
@@ -3451,6 +4063,15 @@ let
         sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
       };
     };
+    "timers-ext-0.1.7" = {
+      name = "timers-ext";
+      packageName = "timers-ext";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz";
+        sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==";
+      };
+    };
     "tmp-0.0.31" = {
       name = "tmp";
       packageName = "tmp";
@@ -3487,15 +4108,6 @@ let
         sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af";
       };
     };
-    "to-readable-stream-1.0.0" = {
-      name = "to-readable-stream";
-      packageName = "to-readable-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz";
-        sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==";
-      };
-    };
     "to-regex-3.0.2" = {
       name = "to-regex";
       packageName = "to-regex";
@@ -3514,6 +4126,15 @@ let
         sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38";
       };
     };
+    "to-regex-range-5.0.1" = {
+      name = "to-regex-range";
+      packageName = "to-regex-range";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz";
+        sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
+      };
+    };
     "toidentifier-1.0.0" = {
       name = "toidentifier";
       packageName = "toidentifier";
@@ -3568,6 +4189,15 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
+    "type-1.0.3" = {
+      name = "type";
+      packageName = "type";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz";
+        sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==";
+      };
+    };
     "type-is-1.6.18" = {
       name = "type-is";
       packageName = "type-is";
@@ -3685,6 +4315,15 @@ let
         sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
       };
     };
+    "url-parse-1.4.3" = {
+      name = "url-parse";
+      packageName = "url-parse";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz";
+        sha512 = "rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==";
+      };
+    };
     "url-parse-lax-1.0.0" = {
       name = "url-parse-lax";
       packageName = "url-parse-lax";
@@ -3730,6 +4369,15 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
+    "util.promisify-1.0.0" = {
+      name = "util.promisify";
+      packageName = "util.promisify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz";
+        sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==";
+      };
+    };
     "utils-merge-1.0.1" = {
       name = "utils-merge";
       packageName = "utils-merge";
@@ -3739,13 +4387,13 @@ let
         sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
       };
     };
-    "uuid-3.3.2" = {
+    "uuid-3.3.3" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.3.2";
+      version = "3.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
-        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
+        sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
       };
     };
     "vary-1.1.2" = {
@@ -3793,13 +4441,13 @@ let
         sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
       };
     };
-    "wrap-ansi-2.1.0" = {
+    "wrap-ansi-5.1.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
-      version = "2.1.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
+        sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
       };
     };
     "wrappy-1.0.2" = {
@@ -3829,6 +4477,15 @@ let
         sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A==";
       };
     };
+    "ws-5.2.0" = {
+      name = "ws";
+      packageName = "ws";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz";
+        sha512 = "c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w==";
+      };
+    };
     "ws-5.2.2" = {
       name = "ws";
       packageName = "ws";
@@ -3838,13 +4495,13 @@ let
         sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==";
       };
     };
-    "ws-7.1.0" = {
+    "ws-6.2.1" = {
       name = "ws";
       packageName = "ws";
-      version = "7.1.0";
+      version = "6.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.1.0.tgz";
-        sha512 = "Swie2C4fs7CkwlHu1glMePLYJJsWjzhl1vm3ZaLplD0h7OMkZyZ6kLTB/OagiU923bZrPFXuDTeEqaEN4NWG4g==";
+        url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz";
+        sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==";
       };
     };
     "xmlbuilder-8.2.2" = {
@@ -3865,13 +4522,13 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-3.2.1" = {
+    "y18n-4.0.0" = {
       name = "y18n";
       packageName = "y18n";
-      version = "3.2.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz";
-        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
+        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
       };
     };
     "yallist-2.1.2" = {
@@ -3892,22 +4549,22 @@ let
         sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==";
       };
     };
-    "yargs-10.1.2" = {
+    "yargs-13.3.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "10.1.2";
+      version = "13.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz";
-        sha512 = "ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
+        sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
       };
     };
-    "yargs-parser-8.1.0" = {
+    "yargs-parser-13.1.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "8.1.0";
+      version = "13.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz";
-        sha512 = "yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
+        sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
       };
     };
     "yn-2.0.0" = {
@@ -3931,7 +4588,7 @@ in
       sha512 = "Qdy9QusZF+eT0203XBiT1Y/UhFeUjcSuyyzf3iyp32dsYpAfcoDTWHjlBVjia1CyvFauESQ4pc81nKaq6snClg==";
     };
     dependencies = [
-      sources."ajv-6.10.1"
+      sources."ajv-6.10.2"
       sources."ansi-styles-3.2.1"
       (sources."anymatch-2.0.0" // {
         dependencies = [
@@ -3959,7 +4616,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
       sources."binary-extensions-1.13.1"
-      sources."binwrap-0.2.1"
+      sources."binwrap-0.2.2"
       sources."bluebird-3.5.5"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
@@ -4073,7 +4730,7 @@ in
           sources."is-glob-3.1.0"
         ];
       })
-      sources."graceful-fs-4.2.0"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-flag-2.0.0"
@@ -4123,7 +4780,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.3.5" // {
+      (sources."minipass-2.4.0" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -4137,7 +4794,7 @@ in
       })
       sources."ms-2.0.0"
       sources."murmur-hash-js-1.0.0"
-      sources."mustache-2.3.2"
+      sources."mustache-3.0.3"
       sources."nan-2.14.0"
       sources."nanomatch-1.2.13"
       sources."node-elm-compiler-5.0.3"
@@ -4167,7 +4824,7 @@ in
       sources."posix-character-classes-0.1.1"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."psl-1.2.0"
+      sources."psl-1.3.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
@@ -4181,7 +4838,7 @@ in
       sources."request-promise-core-1.1.2"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
-      (sources."rimraf-2.6.3" // {
+      (sources."rimraf-2.7.1" // {
         dependencies = [
           sources."glob-7.1.4"
         ];
@@ -4297,7 +4954,7 @@ in
       sources."urix-0.1.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
@@ -4317,14 +4974,14 @@ in
   elm-verify-examples = nodeEnv.buildNodePackage {
     name = "elm-verify-examples";
     packageName = "elm-verify-examples";
-    version = "4.0.0";
+    version = "4.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-4.0.0.tgz";
-      sha512 = "oKptkeUX0MBbYJ2Yn5CwaT502O8hwJHubNbeO7redshHnoaLzVvCK3TCS9+Vx1mXW8/GuJ6bfM+PDXXPPX8MNA==";
+      url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-4.0.1.tgz";
+      sha512 = "YlkOLWIDnlgkKG8gnxQkKKJHkkx4MqyIXqjmYqvGPwatrPmLo46BJ2drOPHNIh43T7mh7c1K8vxrzV4seQtFUA==";
     };
     dependencies = [
-      sources."ajv-6.10.1"
-      sources."ansi-regex-3.0.0"
+      sources."ajv-6.10.2"
+      sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       (sources."anymatch-2.0.0" // {
         dependencies = [
@@ -4352,7 +5009,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
       sources."binary-extensions-1.13.1"
-      sources."binwrap-0.2.1"
+      sources."binwrap-0.2.2"
       sources."bluebird-3.5.5"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
@@ -4363,7 +5020,7 @@ in
       })
       sources."buffers-0.1.1"
       sources."cache-base-1.0.1"
-      sources."camelcase-4.1.0"
+      sources."camelcase-5.3.1"
       sources."caseless-0.12.0"
       sources."chainsaw-0.1.0"
       sources."chalk-2.4.2"
@@ -4390,8 +5047,7 @@ in
           sources."kind-of-5.1.0"
         ];
       })
-      sources."cliui-4.1.0"
-      sources."code-point-at-1.1.0"
+      sources."cliui-5.0.0"
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -4417,12 +5073,8 @@ in
         ];
       })
       sources."elmi-to-json-0.19.1"
+      sources."emoji-regex-7.0.3"
       sources."escape-string-regexp-1.0.5"
-      (sources."execa-0.7.0" // {
-        dependencies = [
-          sources."cross-spawn-5.1.0"
-        ];
-      })
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -4466,7 +5118,7 @@ in
         ];
       })
       sources."find-parent-dir-0.3.0"
-      sources."find-up-2.1.0"
+      sources."find-up-3.0.0"
       sources."firstline-1.2.1"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
@@ -4480,8 +5132,7 @@ in
       sources."fs-minipass-1.2.6"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.4"
-      sources."get-caller-file-1.0.3"
-      sources."get-stream-3.0.0"
+      sources."get-caller-file-2.0.5"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."glob-7.1.1"
@@ -4490,7 +5141,7 @@ in
           sources."is-glob-3.1.0"
         ];
       })
-      sources."graceful-fs-4.2.0"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-flag-3.0.0"
@@ -4503,7 +5154,6 @@ in
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."invert-kv-1.0.0"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
@@ -4511,7 +5161,7 @@ in
       sources."is-descriptor-1.0.2"
       sources."is-extendable-1.0.1"
       sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       (sources."is-number-3.0.0" // {
         dependencies = [
@@ -4519,7 +5169,6 @@ in
         ];
       })
       sources."is-plain-object-2.0.4"
-      sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
@@ -4534,20 +5183,17 @@ in
       sources."jsprim-1.4.1"
       sources."kind-of-6.0.2"
       sources."klaw-1.3.1"
-      sources."lcid-1.0.0"
-      sources."locate-path-2.0.0"
+      sources."locate-path-3.0.0"
       sources."lodash-4.17.11"
       sources."lru-cache-4.1.5"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
-      sources."mem-1.1.0"
       sources."micromatch-3.1.10"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.3.5" // {
+      (sources."minipass-2.4.0" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -4561,13 +5207,11 @@ in
       })
       sources."ms-2.0.0"
       sources."murmur-hash-js-1.0.0"
-      sources."mustache-2.3.2"
+      sources."mustache-3.0.3"
       sources."nan-2.14.0"
       sources."nanomatch-1.2.13"
       sources."node-elm-compiler-5.0.3"
       sources."normalize-path-3.0.0"
-      sources."npm-run-path-2.0.2"
-      sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.9.0"
       (sources."object-copy-0.1.0" // {
         dependencies = [
@@ -4585,22 +5229,19 @@ in
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
-      sources."os-locale-2.1.0"
       sources."os-tmpdir-1.0.2"
-      sources."p-finally-1.0.0"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
-      sources."p-try-1.0.0"
+      sources."p-limit-2.2.1"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.2.0"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-key-2.0.1"
       sources."performance-now-2.1.0"
       sources."posix-character-classes-0.1.1"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."psl-1.2.0"
+      sources."psl-1.3.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
@@ -4613,10 +5254,10 @@ in
       sources."request-promise-4.2.4"
       sources."request-promise-core-1.1.2"
       sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
+      sources."require-main-filename-2.0.0"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
-      (sources."rimraf-2.6.3" // {
+      (sources."rimraf-2.7.1" // {
         dependencies = [
           sources."glob-7.1.4"
         ];
@@ -4631,9 +5272,6 @@ in
           sources."is-extendable-0.1.1"
         ];
       })
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."signal-exit-3.0.2"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -4687,14 +5325,9 @@ in
         ];
       })
       sources."stealthy-require-1.1.1"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
+      sources."string-width-3.1.0"
       sources."string_decoder-1.1.1"
-      sources."strip-ansi-4.0.0"
-      sources."strip-eof-1.0.0"
+      sources."strip-ansi-5.2.0"
       sources."supports-color-5.5.0"
       (sources."tar-4.4.10" // {
         dependencies = [
@@ -4744,23 +5377,17 @@ in
       sources."urix-0.1.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."verror-1.10.0"
       sources."which-1.3.1"
       sources."which-module-2.0.0"
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
+      sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
       sources."xmlbuilder-8.2.2"
-      sources."y18n-3.2.1"
+      sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      sources."yargs-10.1.2"
-      sources."yargs-parser-8.1.0"
+      sources."yargs-13.3.0"
+      sources."yargs-parser-13.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -4774,15 +5401,14 @@ in
   elm-doc-preview = nodeEnv.buildNodePackage {
     name = "elm-doc-preview";
     packageName = "elm-doc-preview";
-    version = "2.0.4";
+    version = "3.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-2.0.4.tgz";
-      sha512 = "F6LlYWNs7BVQ9vLRHI6P/FDVf4hpNJPjHuL0sxGwC4KDcPEnjIwOC6jWxiUEC3226aYf/uY60qDDqzFNHgcPQg==";
+      url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-3.0.1.tgz";
+      sha512 = "NpAgEKNiYkQE932gMjFGC/BpcmUD9ohhrbSnGSoQBsC+VPRKCiGdmLJUiql/aPC2eXYIlWQJ5YJ5rFWI0iovbw==";
     };
     dependencies = [
       sources."@cnakazawa/watch-1.0.3"
-      sources."@sindresorhus/is-0.14.0"
-      sources."@szmarczak/http-timer-1.1.2"
+      sources."@sindresorhus/is-0.7.0"
       sources."accepts-1.3.7"
       sources."ansi-styles-3.2.1"
       sources."anymatch-2.0.0"
@@ -4792,7 +5418,7 @@ in
       sources."array-flatten-1.1.1"
       sources."array-unique-0.3.2"
       sources."assign-symbols-1.0.0"
-      sources."async-limiter-1.0.0"
+      sources."async-limiter-1.0.1"
       sources."atob-2.1.2"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
@@ -4800,6 +5426,7 @@ in
           sources."define-property-1.0.0"
         ];
       })
+      sources."batch-0.6.1"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
@@ -4810,10 +5437,9 @@ in
       sources."bser-2.1.0"
       sources."bytes-3.1.0"
       sources."cache-base-1.0.1"
-      (sources."cacheable-request-6.1.0" // {
+      (sources."cacheable-request-2.1.4" // {
         dependencies = [
-          sources."get-stream-5.1.0"
-          sources."lowercase-keys-2.0.0"
+          sources."lowercase-keys-1.0.0"
         ];
       })
       sources."capture-exit-2.0.0"
@@ -4839,7 +5465,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."commander-2.20.0"
+      sources."commander-3.0.0"
       sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
       sources."content-disposition-0.5.3"
@@ -4847,12 +5473,14 @@ in
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
       sources."copy-descriptor-0.1.1"
+      sources."core-js-3.2.1"
+      sources."core-util-is-1.0.2"
       sources."cross-spawn-6.0.5"
       sources."debug-2.6.9"
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.6.0"
-      sources."defer-to-connect-1.0.2"
+      sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
@@ -4860,11 +5488,17 @@ in
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
+      sources."es-abstract-1.13.0"
+      sources."es-to-primitive-1.2.0"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
       sources."exec-sh-0.3.2"
-      sources."execa-1.0.0"
+      (sources."execa-1.0.0" // {
+        dependencies = [
+          sources."get-stream-4.1.0"
+        ];
+      })
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -4911,28 +5545,37 @@ in
       sources."forwarded-0.1.2"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
+      sources."from2-2.3.0"
       sources."fs.realpath-1.0.0"
-      sources."get-stream-4.1.0"
+      sources."function-bind-1.1.1"
+      sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.4"
-      sources."got-9.6.0"
+      sources."got-8.3.2"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
+      sources."has-symbol-support-x-1.4.2"
+      sources."has-symbols-1.0.0"
+      sources."has-to-string-tag-x-1.4.1"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
           sources."kind-of-4.0.0"
         ];
       })
-      sources."http-cache-semantics-4.0.3"
+      sources."http-cache-semantics-3.8.1"
       sources."http-errors-1.7.2"
       sources."iconv-lite-0.4.24"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
+      sources."into-stream-3.1.0"
       sources."ipaddr.js-1.9.0"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.1.4"
       sources."is-data-descriptor-1.0.0"
+      sources."is-date-object-1.0.1"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
       (sources."is-number-3.0.0" // {
@@ -4940,16 +5583,23 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."is-object-1.0.1"
+      sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
+      sources."is-regex-1.0.4"
+      sources."is-retry-allowed-1.1.0"
       sources."is-stream-1.1.0"
+      sources."is-symbol-1.0.2"
       sources."is-windows-1.0.2"
+      sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
+      sources."isurl-1.0.0"
       sources."json-buffer-3.0.0"
-      sources."keyv-3.1.0"
+      sources."keyv-3.0.0"
       sources."kind-of-6.0.2"
-      sources."latest-version-5.1.0"
+      sources."latest-version-4.0.0"
       sources."lowercase-keys-1.0.1"
       sources."makeerror-1.0.11"
       sources."map-cache-0.2.2"
@@ -4975,8 +5625,10 @@ in
       sources."nice-try-1.0.5"
       sources."node-int64-0.4.0"
       sources."normalize-path-2.1.1"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-2.0.1"
       sources."npm-run-path-2.0.2"
+      sources."npx-10.2.0"
+      sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -4990,51 +5642,62 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
+      sources."object.getownpropertydescriptors-2.0.3"
       sources."object.pick-1.3.0"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
-      sources."p-cancelable-1.1.0"
+      sources."opn-5.5.0"
+      sources."p-cancelable-0.4.1"
       sources."p-finally-1.0.0"
-      (sources."package-json-6.4.0" // {
-        dependencies = [
-          sources."semver-6.2.0"
-        ];
-      })
+      sources."p-is-promise-1.1.0"
+      sources."p-timeout-2.0.1"
+      sources."package-json-5.0.0"
       sources."parseurl-1.3.3"
       sources."pascalcase-0.1.1"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
       sources."path-to-regexp-0.1.7"
+      sources."pify-3.0.0"
       sources."posix-character-classes-0.1.1"
       sources."prepend-http-2.0.0"
+      sources."process-nextick-args-2.0.1"
       sources."proxy-addr-2.0.5"
       sources."pump-3.0.0"
       sources."qs-6.7.0"
+      sources."query-string-5.1.1"
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.0"
       sources."rc-1.2.8"
+      sources."readable-stream-2.3.6"
       sources."regex-not-1.0.2"
       sources."registry-auth-token-3.4.0"
-      sources."registry-url-5.1.0"
+      sources."registry-url-3.1.0"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
       sources."ret-0.1.15"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."rsvp-4.8.5"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sane-4.1.0"
-      sources."semver-5.7.0"
+      sources."semver-5.7.1"
       (sources."send-0.17.1" // {
         dependencies = [
           sources."ms-2.1.1"
         ];
       })
+      (sources."serve-index-1.9.1" // {
+        dependencies = [
+          sources."http-errors-1.6.3"
+          sources."setprototypeof-1.1.0"
+        ];
+      })
       sources."serve-static-1.14.1"
       (sources."set-value-2.0.1" // {
         dependencies = [
@@ -5073,6 +5736,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."sort-keys-2.0.0"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
@@ -5095,9 +5759,12 @@ in
         ];
       })
       sources."statuses-1.5.0"
+      sources."strict-uri-encode-1.1.0"
+      sources."string_decoder-1.1.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
+      sources."timed-out-4.0.1"
       sources."tmp-0.1.0"
       sources."tmpl-1.0.4"
       (sources."to-object-path-0.3.0" // {
@@ -5105,7 +5772,6 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."to-readable-stream-1.0.0"
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
       sources."toidentifier-1.0.0"
@@ -5124,39 +5790,114 @@ in
       })
       sources."urix-0.1.0"
       sources."url-parse-lax-3.0.0"
+      sources."url-to-options-1.0.1"
       sources."use-3.1.1"
+      sources."util-deprecate-1.0.2"
+      sources."util.promisify-1.0.0"
       sources."utils-merge-1.0.1"
       sources."vary-1.1.2"
       sources."walker-1.0.7"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
-      sources."ws-7.1.0"
+      sources."ws-6.2.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Elm offline documentation previewer with hot reloading.";
       homepage = "https://github.com/dmy/elm-doc-preview#readme";
-      license = "SEE LICENSE IN LICENSE.md";
+      license = "BSD-3-Clause";
     };
     production = true;
     bypassCache = true;
     reconstructLock = true;
   };
-  elm-analyse = nodeEnv.buildNodePackage {
+  elm-upgrade = nodeEnv.buildNodePackage {
+    name = "elm-upgrade";
+    packageName = "elm-upgrade";
+    version = "0.19.6";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.6.tgz";
+      sha512 = "i7+z/6uAqKxOUD58nwyAJJGUCNKG7/wTBY1qBanveFSaQuX5vrfhQNH/3NWIGCufGoW3QEyADGhaLhAxNPVs5Q==";
+    };
+    dependencies = [
+      sources."balanced-match-1.0.0"
+      sources."bindings-1.5.0"
+      sources."brace-expansion-1.1.11"
+      sources."capture-stack-trace-1.0.1"
+      sources."caw-2.0.1"
+      sources."concat-map-0.0.1"
+      sources."config-chain-1.1.12"
+      sources."create-error-class-3.0.2"
+      sources."duplexer3-0.1.4"
+      sources."file-uri-to-path-1.0.0"
+      sources."fs-extra-0.30.0"
+      sources."fs.realpath-1.0.0"
+      sources."get-proxy-2.1.0"
+      sources."get-stream-3.0.0"
+      sources."glob-7.1.4"
+      sources."got-6.7.1"
+      sources."graceful-fs-4.2.2"
+      sources."has-symbol-support-x-1.4.2"
+      sources."has-to-string-tag-x-1.4.1"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."ini-1.3.5"
+      sources."is-object-1.0.1"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."is-stream-1.1.0"
+      sources."isexe-2.0.0"
+      sources."isurl-1.0.0"
+      sources."jsonfile-2.4.0"
+      sources."klaw-1.3.1"
+      sources."lowercase-keys-1.0.1"
+      sources."minimatch-3.0.4"
+      sources."nan-2.14.0"
+      sources."npm-conf-1.1.3"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."pify-3.0.0"
+      sources."prepend-http-1.0.4"
+      sources."proto-list-1.2.4"
+      sources."rimraf-2.7.1"
+      sources."safe-buffer-5.2.0"
+      sources."safename-1.0.2"
+      sources."semver-5.7.1"
+      sources."syncprompt-2.0.0"
+      sources."timed-out-4.0.1"
+      sources."tunnel-agent-0.6.0"
+      sources."unzip-response-2.0.1"
+      sources."url-parse-lax-1.0.0"
+      sources."url-to-options-1.0.1"
+      sources."which-1.3.1"
+      sources."wrappy-1.0.2"
+      sources."yn-2.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Upgrade Elm projects";
+      homepage = "https://github.com/avh4/elm-upgrade#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  "elm-analyse-0.16.3" = nodeEnv.buildNodePackage {
     name = "elm-analyse";
     packageName = "elm-analyse";
-    version = "0.16.4";
+    version = "0.16.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.4.tgz";
-      sha512 = "6F6JfcOfbRgTBJj7MF+CqGcatCep8ppZtfIAri+fpC76MsSohJAOfLgmbmd4BWOXcTiWCpvQaaFwUutm7cOlpA==";
+      url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.3.tgz";
+      sha512 = "JFlGT0d6v3EPk1UnB5xb6VYWrKzwGD76wBwr2R0xwA3T6Rju7zEnzfs8LiBo+b3gSH5cmRDfnK9BLRFiosWEfQ==";
     };
     dependencies = [
       sources."accepts-1.3.7"
-      sources."ajv-6.10.1"
+      sources."ajv-6.10.2"
       sources."array-flatten-1.1.1"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
-      sources."async-limiter-1.0.0"
+      sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
@@ -5201,7 +5942,7 @@ in
       sources."fresh-0.5.2"
       sources."fs-extra-2.0.0"
       sources."getpass-0.1.7"
-      sources."graceful-fs-4.2.0"
+      sources."graceful-fs-4.2.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."http-errors-1.6.3"
@@ -5242,7 +5983,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-1.0.7"
       sources."proxy-addr-2.0.5"
-      sources."psl-1.2.0"
+      sources."psl-1.3.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.1"
       sources."range-parser-1.2.1"
@@ -5287,7 +6028,7 @@ in
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
+      sources."uuid-3.3.3"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       (sources."ws-3.3.1" // {
@@ -5306,76 +6047,179 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  elm-upgrade = nodeEnv.buildNodePackage {
-    name = "elm-upgrade";
-    packageName = "elm-upgrade";
-    version = "0.19.6";
+  elm-live = nodeEnv.buildNodePackage {
+    name = "elm-live";
+    packageName = "elm-live";
+    version = "3.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.6.tgz";
-      sha512 = "i7+z/6uAqKxOUD58nwyAJJGUCNKG7/wTBY1qBanveFSaQuX5vrfhQNH/3NWIGCufGoW3QEyADGhaLhAxNPVs5Q==";
+      url = "https://registry.npmjs.org/elm-live/-/elm-live-3.4.1.tgz";
+      sha512 = "7J4MCV0uyzfnGznSdVzz9o2vgHQwHSVKgEW/NG7dG7nsDWWxqPudQ/FkHYJFWjkylnRtBZUAtB27ZwnLIsgRUw==";
     };
     dependencies = [
-      sources."balanced-match-1.0.0"
-      sources."bindings-1.5.0"
-      sources."brace-expansion-1.1.11"
-      sources."capture-stack-trace-1.0.1"
-      sources."caw-2.0.1"
-      sources."concat-map-0.0.1"
-      sources."config-chain-1.1.12"
-      sources."create-error-class-3.0.2"
-      sources."duplexer3-0.1.4"
-      sources."file-uri-to-path-1.0.0"
-      sources."fs-extra-0.30.0"
-      sources."fs.realpath-1.0.0"
-      sources."get-proxy-2.1.0"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."anymatch-3.0.3"
+      sources."async-each-1.0.3"
+      sources."async-limiter-1.0.1"
+      sources."binary-extensions-2.0.0"
+      sources."braces-3.0.2"
+      sources."chalk-1.1.3"
+      sources."charenc-0.0.2"
+      sources."chokidar-3.0.0"
+      sources."cli-color-1.2.0"
+      sources."commander-2.17.1"
+      sources."connect-pushstate-1.1.0"
+      sources."cross-spawn-5.0.1"
+      sources."crypt-0.0.2"
+      sources."d-1.0.1"
+      sources."debug-2.6.9"
+      sources."default-gateway-2.7.2"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."ee-first-1.1.1"
+      (sources."elm-serve-0.4.0" // {
+        dependencies = [
+          sources."commander-2.9.0"
+        ];
+      })
+      sources."encodeurl-1.0.2"
+      sources."es5-ext-0.10.50"
+      sources."es6-iterator-2.0.3"
+      sources."es6-promisify-6.0.2"
+      sources."es6-symbol-3.1.1"
+      sources."es6-weak-map-2.0.3"
+      sources."escape-html-1.0.3"
+      sources."escape-string-regexp-1.0.5"
+      sources."etag-1.8.1"
+      sources."event-emitter-0.3.5"
+      sources."eventemitter3-3.1.2"
+      (sources."execa-0.10.0" // {
+        dependencies = [
+          sources."cross-spawn-6.0.5"
+        ];
+      })
+      sources."fill-range-7.0.1"
+      sources."finalhandler-1.1.1"
+      (sources."follow-redirects-1.8.1" // {
+        dependencies = [
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."fresh-0.5.2"
+      sources."fsevents-2.0.7"
       sources."get-stream-3.0.0"
-      sources."glob-7.1.4"
-      sources."got-6.7.1"
-      sources."graceful-fs-4.2.0"
-      sources."has-symbol-support-x-1.4.2"
-      sources."has-to-string-tag-x-1.4.1"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.5"
-      sources."is-object-1.0.1"
-      sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."glob-parent-5.0.0"
+      sources."graceful-readlink-1.0.1"
+      sources."has-ansi-2.0.0"
+      sources."http-errors-1.6.3"
+      sources."http-proxy-1.17.0"
+      sources."inherits-2.0.3"
+      sources."internal-ip-3.0.1"
+      sources."ip-regex-2.1.0"
+      sources."ipaddr.js-1.9.1"
+      sources."is-binary-path-2.1.0"
+      sources."is-buffer-1.1.6"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.1"
+      sources."is-number-7.0.0"
+      sources."is-promise-2.1.0"
       sources."is-stream-1.1.0"
+      sources."is-wsl-1.1.0"
       sources."isexe-2.0.0"
-      sources."isurl-1.0.0"
-      sources."jsonfile-2.4.0"
-      sources."klaw-1.3.1"
-      sources."lowercase-keys-1.0.1"
-      sources."minimatch-3.0.4"
-      sources."nan-2.14.0"
-      sources."npm-conf-1.1.3"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."pify-3.0.0"
-      sources."prepend-http-1.0.4"
-      sources."proto-list-1.2.4"
-      sources."rimraf-2.6.3"
-      sources."safe-buffer-5.2.0"
-      sources."safename-1.0.2"
-      sources."semver-5.7.0"
-      sources."syncprompt-2.0.0"
-      sources."timed-out-4.0.1"
-      sources."tunnel-agent-0.6.0"
-      sources."unzip-response-2.0.1"
-      sources."url-parse-lax-1.0.0"
-      sources."url-to-options-1.0.1"
+      sources."lru-cache-4.1.5"
+      sources."lru-queue-0.1.0"
+      sources."md5-2.2.1"
+      sources."memoizee-0.4.14"
+      sources."mime-1.4.1"
+      sources."minimist-1.2.0"
+      sources."ms-2.0.0"
+      sources."next-tick-1.0.0"
+      sources."nice-try-1.0.5"
+      sources."normalize-path-3.0.0"
+      sources."npm-run-path-2.0.2"
+      sources."on-finished-2.3.0"
+      sources."opn-5.3.0"
+      sources."os-tmpdir-1.0.2"
+      sources."p-finally-1.0.0"
+      sources."parseurl-1.3.3"
+      sources."path-key-2.0.1"
+      sources."pem-1.13.2"
+      sources."picomatch-2.0.7"
+      sources."pseudomap-1.0.2"
+      sources."querystringify-2.1.1"
+      sources."range-parser-1.2.1"
+      sources."readdirp-3.1.2"
+      sources."requires-port-1.0.0"
+      sources."semver-5.7.1"
+      sources."send-0.16.2"
+      sources."serve-static-1.13.2"
+      sources."setprototypeof-1.1.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."statuses-1.4.0"
+      sources."strip-ansi-3.0.1"
+      sources."strip-eof-1.0.0"
+      sources."supervisor-0.12.0"
+      sources."supports-color-2.0.0"
+      sources."timers-ext-0.1.7"
+      sources."to-regex-range-5.0.1"
+      sources."type-1.0.3"
+      sources."unpipe-1.0.0"
+      sources."url-parse-1.4.3"
       sources."which-1.3.1"
-      sources."wrappy-1.0.2"
-      sources."yn-2.0.0"
+      sources."ws-5.2.0"
+      sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Upgrade Elm projects";
-      homepage = "https://github.com/avh4/elm-upgrade#readme";
+      description = "A flexible dev server for Elm. Live reload included!";
+      homepage = "https://github.com/wking-io/elm-live#readme";
       license = "MIT";
     };
     production = true;
     bypassCache = true;
     reconstructLock = true;
   };
+  elm-xref = nodeEnv.buildNodePackage {
+    name = "elm-xref";
+    packageName = "elm-xref";
+    version = "4.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/elm-xref/-/elm-xref-4.0.0.tgz";
+      sha512 = "9AjXLkznJBVLHHO+KErcgFMKeXe3tcudjj3PYIH6gWXG6W3PT+HF+t2zCflvgFPlhJO5H/wQCCo4rfCApltBzg==";
+    };
+    dependencies = [
+      sources."bluebird-3.5.5"
+      sources."core-util-is-1.0.2"
+      sources."fs-extra-6.0.1"
+      sources."graceful-fs-4.2.2"
+      sources."inherits-2.0.4"
+      sources."isarray-1.0.0"
+      sources."jsonfile-4.0.0"
+      sources."klaw-2.1.1"
+      sources."minimist-1.2.0"
+      sources."process-nextick-args-2.0.1"
+      sources."readable-stream-2.3.6"
+      sources."safe-buffer-5.1.2"
+      sources."semver-5.7.1"
+      sources."semver-regex-1.0.0"
+      sources."semver-sort-0.0.4"
+      sources."string_decoder-1.1.1"
+      sources."through2-2.0.5"
+      sources."universalify-0.1.2"
+      sources."util-deprecate-1.0.2"
+      sources."xtend-4.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Cross referencing tool for Elm - find usages and unused code";
+      homepage = "https://github.com/zwilias/elm-xref#readme";
+      license = "BSD-3-Clause";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
 }
\ No newline at end of file

From 47314cd665c8a4fb9bfb0ee77fa1db4d2c2ba4ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 27 Aug 2019 17:15:47 -0300
Subject: [PATCH 289/794] enlightenment.efl: 1.22.2 -> 1.22.3

---
 pkgs/desktops/enlightenment/efl.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index a7f5eaf6339..1876cce6c8a 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -7,12 +7,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "efl-${version}";
-  version = "1.22.2";
+  pname = "efl";
+  version = "1.22.3";
 
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "1l0wdgzxqm2y919277b1p9d37xzg808zwxxaw0nn44arh8gqk68n";
+    url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "1j1i8cwq4ym9z34ikv35mdmv5q7q69hdp494mc6l03g9n6cl2yky";
   };
 
   nativeBuildInputs = [ pkgconfig gtk3 ];

From ca15e26d4d858c6683c16f0d291af64b2aaf1dc9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 27 Aug 2019 21:46:43 +0200
Subject: [PATCH 290/794] appstream-glib: clean up dependencies

---
 .../libraries/appstream-glib/default.nix      | 59 +++++++++++++++----
 1 file changed, 49 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 4068e36badf..694d91d5a0a 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,7 +1,26 @@
-{ stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib
-, gtk-doc, libarchive, gobject-introspection, libxslt, pngquant
-, sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42
-, libuuid, json-glib, meson, gperf, ninja, gdk-pixbuf
+{ stdenv
+, fetchFromGitHub
+, substituteAll
+, docbook_xml_dtd_42
+, docbook_xsl
+, fontconfig
+, freetype
+, gdk-pixbuf
+, gettext
+, glib
+, gobject-introspection
+, gperf
+, gtk-doc
+, gtk3
+, json-glib
+, libarchive
+, libsoup
+, libuuid
+, libxslt
+, meson
+, ninja
+, pkgconfig
+, pngquant
 }:
 stdenv.mkDerivation rec {
   name = "appstream-glib-0.7.15";
@@ -12,19 +31,39 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "appstream-glib";
-    rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
+    rev = stdenv.lib.replaceStrings [ "." "-" ] [ "_" "_" ] name;
     sha256 = "16cqs1s7nqc551sipgaxbbzwap1km0n12s4lcgfbxzzl9bcjbp9m";
   };
 
   nativeBuildInputs = [
-    meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 gobject-introspection
+    docbook_xml_dtd_42
+    docbook_xsl
+    gettext
+    gobject-introspection
+    gperf
+    gtk-doc
+    libxslt
+    meson
+    ninja
+    pkgconfig
   ];
+
   buildInputs = [
-    glib gettext sqlite libsoup
-    attr acl libuuid json-glib
-    libarchive gperf gdk-pixbuf
+    fontconfig
+    freetype
+    gdk-pixbuf
+    glib
+    gtk3
+    json-glib
+    libarchive
+    libsoup
+    libuuid
+  ];
+
+  propagatedBuildInputs = [
+    glib
+    gdk-pixbuf
   ];
-  propagatedBuildInputs = [ gtk3 ];
 
   patches = [
     (substituteAll {

From 70f0d81861c71317828dde3262c0439c55dda83f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Aug 2019 22:37:17 +0200
Subject: [PATCH 291/794] androidStudioPackages.{dev,canary}: 3.6.0.7 ->
 3.6.0.8

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 7f57d24b263..4b9e2f40950 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -14,9 +14,9 @@ let
   };
   betaVersion = stableVersion;
   latestVersion = { # canary & dev
-    version = "3.6.0.7"; # "Android Studio 3.6 Canary 7"
-    build = "192.5807797";
-    sha256Hash = "1l47miiyd8z7v0hbvda06953pp9ilyrsma83gxqx35ghnc0n7g81";
+    version = "3.6.0.8"; # "Android Studio 3.6 Canary 8"
+    build = "192.5825043";
+    sha256Hash = "1nh8p880pz3x7hlwa3inkr9qkd95amkg0sv4f0m7bb70k9v5mnvv";
   };
 in rec {
   # Attributes are named by their corresponding release channels

From 81e643d2fdb843d2c1f5f005d9e210519a6808ea Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Aug 2019 22:38:46 +0200
Subject: [PATCH 292/794] python3Packages.glances: 3.1.1 -> 3.1.2

Changelog: https://github.com/nicolargo/glances/blob/v3.1.2/NEWS.rst#version-312

Note/TODO: Theoretically the IP test should work(?) now:

> Bugs corrected:
> - Error with IP Plugin : object has no attribute bug #1528
> - ip plugin empty interface bug #1509

but the test is still failing inside the Nix build sandbox.
---
 pkgs/development/python-modules/glances/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix
index dd5d90bb968..95c64e7187b 100644
--- a/pkgs/development/python-modules/glances/default.nix
+++ b/pkgs/development/python-modules/glances/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   name = "glances-${version}";
-  version = "3.1.1";
+  version = "3.1.2";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
     rev = "v${version}";
-    sha256 = "1x9gw7hzw3p8zki82wdf359yxj0ylfw2096a4y621kj0p4xqsr4q";
+    sha256 = "1z9sq0chhm8m4gq98yfknxj408cj017h7j375blngjk2zvhw39qd";
   };
 
   # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):

From 0a72c327232108a90153a9bd69f86271553039af Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Mon, 8 Jul 2019 06:49:41 -0600
Subject: [PATCH 293/794] libplacebo: init at 1.1.8.0

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

diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix
new file mode 100644
index 00000000000..3fd8f86612c
--- /dev/null
+++ b/pkgs/development/libraries/libplacebo/default.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, pkgconfig
+, vulkan-headers
+, vulkan-loader
+, shaderc
+, glslang
+, lcms2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libplacebo";
+  version = "1.18.0";
+
+  src = fetchFromGitLab {
+    domain = "code.videolan.org";
+    owner = "videolan";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ib12i2491piwiz0g5n5izr5jmn5fhwzicq97vfki3r7wrdb54mz";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkgconfig
+  ];
+
+  buildInputs = [
+    vulkan-headers
+    vulkan-loader
+    shaderc
+    glslang
+    lcms2
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Reusable library for GPU-accelerated video/image rendering primitives";
+    homepage = "https://code.videolan.org/videolan/libplacebo";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ tadeokondrak ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3abf9eaa090..69734fb117f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12268,6 +12268,8 @@ in
 
   libphonenumber = callPackage ../development/libraries/libphonenumber { };
 
+  libplacebo = callPackage ../development/libraries/libplacebo { };
+
   libpng = callPackage ../development/libraries/libpng { };
   libpng_apng = libpng.override { apngSupport = true; };
   libpng12 = callPackage ../development/libraries/libpng/12.nix { };

From 61ba5d88ef87fa5f484518054810c90da3835409 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Aug 2019 23:20:06 +0200
Subject: [PATCH 294/794] dav1d: Add optional Vulkan support (experimental)

---
 pkgs/development/libraries/dav1d/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index 5f7ca179d4a..d065554d7c9 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -1,8 +1,11 @@
 { stdenv, fetchFromGitLab
 , meson, ninja, nasm, pkgconfig
 , withTools ? false, SDL2
+, useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers
 }:
 
+assert useVulkan -> withTools;
+
 stdenv.mkDerivation rec {
   pname = "dav1d";
   version = "0.4.0";
@@ -17,7 +20,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja nasm pkgconfig ];
   # TODO: doxygen (currently only HTML and not build by default).
-  buildInputs = stdenv.lib.optional withTools SDL2;
+  buildInputs = stdenv.lib.optional withTools SDL2
+    ++ stdenv.lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ];
 
   mesonFlags= [
     "-Denable_tools=${stdenv.lib.boolToString withTools}"

From 09b1501d7ce05dfd70a333e6eb4113376f4e0931 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 27 Aug 2019 23:57:35 +0200
Subject: [PATCH 295/794] thanos: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index 28218b8f66d..ab2f187e504 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,13 +1,13 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "thanos";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
-    owner = "improbable-eng";
+    owner = "thanos-io";
     repo = "thanos";
-    sha256 = "0vcp7m8fsk4jyk49jh9wmbvkx5k03xw10f4lbsxfmwib1y5pz2x0";
+    sha256 = "06vy22cy81rd71py8057bia3265vjm6ffp16wpx06faramdazq6p";
   };
 
   modSha256 = "139b66jdryqv4s1hjbn9fzkyzn1160wr4z6a6wmmvm3f6p6wgjxp";
@@ -25,7 +25,7 @@ buildGoModule rec {
 
   meta = with stdenv.lib; {
     description = "Highly available Prometheus setup with long term storage capabilities";
-    homepage = "https://github.com/improbable-eng/thanos";
+    homepage = "https://github.com/thanos-io/thanos";
     license = licenses.asl20;
     maintainers = with maintainers; [ basvandijk ];
     platforms = platforms.unix;

From 6e672974ccb6ba12e80ca4c589a11dad85d19f95 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Tue, 27 Aug 2019 17:58:20 -0500
Subject: [PATCH 296/794] unixODBCDrivers.msodbcsql17: 17.2.0.1 -> 17.4.1.1

---
 .../libraries/unixODBCDrivers/default.nix            | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 7b72e12a66b..99535ec395e 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:
+{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
 
 # I haven't done any parameter tweaking.. So the defaults provided here might be bad
 
@@ -125,16 +125,16 @@
     version = "${versionMajor}.${versionMinor}.${versionAdditional}-1";
 
     versionMajor = "17";
-    versionMinor = "2";
-    versionAdditional = "0.1";
+    versionMinor = "4";
+    versionAdditional = "1.1";
 
     src = fetchurl {
       url = "https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb";
-      sha256 = "1966ymbbk0jsacqwzi3dmhxv2n8hfgnpjsx3hr3n7s9d88chgpx5";
+      sha256 = "0jb16irr7qlgd2zshg0vyia7zqipd0pcvwfcr6z807pss1mnzj8w";
     };
 
     nativeBuildInputs = [ autoPatchelfHook ];
-    buildInputs = [ unixODBC dpkg openssl kerberos curl libuuid stdenv.cc.cc ];
+    buildInputs = [ unixODBC dpkg kerberos libuuid stdenv.cc.cc ];
 
     unpackPhase = "dpkg -x $src ./";
     buildPhase = "";
@@ -142,8 +142,6 @@
     installPhase = ''
       mkdir -p $out
       mkdir -p $out/lib
-      ln -s ${lib.getLib openssl}/lib/libssl.so.1.0.0 $out/lib/libssl.so.1.0.2
-      ln -s ${lib.getLib openssl}/lib/libcrypto.so.1.0.0 $out/lib/libcrypto.so.1.0.2
       cp -r opt/microsoft/msodbcsql${versionMajor}/lib64 opt/microsoft/msodbcsql${versionMajor}/share $out/
     '';
 

From 3d321db0f25c6419357441398a64cdcbe9371244 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <js@alien8.de>
Date: Wed, 28 Aug 2019 01:00:33 +0200
Subject: [PATCH 297/794] cryptpad: 2.23.0 -> 2.25.0 (#67592)

Update to latest stable version. Remove patched load-config.js, because
it is no longer necessary.
---
 .../web-apps/cryptpad/bower-packages.nix      | 10 +-
 pkgs/servers/web-apps/cryptpad/default.nix    |  9 --
 .../cryptpad/node-packages-generated.nix      | 96 ++++++-------------
 .../web-apps/cryptpad/node-packages.json      |  2 +-
 .../web-apps/cryptpad/node-packages.nix       |  2 +-
 5 files changed, 37 insertions(+), 82 deletions(-)

diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
index 72511c16eeb..8d3d3def695 100644
--- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
@@ -5,7 +5,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g")
   (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1")
   (fetchbower "ckeditor" "4.7.3" "4.7.3" "02bism1gc0pccdxsp361hsrn9p4jh24dnxh40rv3xikr3g91b414")
-  (fetchbower "codemirror" "5.47.0" "^5.19.0" "0h9kjmljd9i5hsdk53f6klx3k8vf9kfn14j0s7k3ivb5d0x0r1p4")
+  (fetchbower "codemirror" "5.48.4" "^5.19.0" "1066jrf11dygdr8v7xv2nyzrq4ks7sc6j8wdqvrwl689pw3ycypf")
   (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli")
   (fetchbower "marked" "0.5.0" "0.5.0" "00lclh9xfbhbjzzbbfjnfpr949hmqmr04jx2hq7mdc9f74xinj1r")
   (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv")
@@ -22,7 +22,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556")
   (fetchbower "bootstrap" "4.3.1" "^v4.0.0" "081xw746bshhy8m14x7y8y6ryl38jz3l5545v62vjzr6b4609xd9")
   (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1")
-  (fetchbower "nthen" "0.1.7" "^0.1.5" "1bxfjw7qzs0sidv6wf1rjrj4fm0x0j7pr5yi3v4nw3d7cjjgd3wg")
+  (fetchbower "nthen" "0.1.10" "^0.1.5" "0ipaydp1g63hgjis9qpp4nzf7p0b06g0xnz8nlxnwarkknci55y8")
   (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf")
   (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6")
   (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811")
@@ -31,9 +31,9 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   (fetchbower "croppie" "2.6.4" "^2.5.0" "1lcdsjdc4xz7a3sii836g40wx15223sxng53mnf3g7h7s5y84h1x")
   (fetchbower "sortablejs" "1.9.0" "^1.6.0" "12gncd70fi3craqqpb3la12hg7pm2wf4y01l1r2vvmnzmb5apdan")
   (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi")
-  (fetchbower "jszip" "Stuk/jszip#3.2.0" "Stuk/jszip#^3.1.5" "1gyhm07dsqw2bmj6xddfk91f05gj7xd3gxjd94lsxy8z66z6zia5")
+  (fetchbower "jszip" "Stuk/jszip#3.2.2" "Stuk/jszip#^3.1.5" "1k0va2ps2x29d1virg51n5s5rdjk21zfh7h14nnljcfnvxvk3rpp")
   (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5")
-  (fetchbower "chainpad-netflux" "0.7.5" "^0.7.0" "1dgi1x00msbr203xf3lz8pqhd0w2h5nqa3pqzly1559jfxbyw8g0")
-  (fetchbower "netflux-websocket" "0.1.19" "^0.1.19" "0gzn4bxa6biad083aawn6qpwmg3raqb059mapzalaqjb9bvs8x26")
+  (fetchbower "chainpad-netflux" "0.7.6" "^0.7.0" "02qjk0qv423r2ksxma49i4l45p42j20ifr2rrr23dz0fq44j6llc")
+  (fetchbower "netflux-websocket" "0.1.20" "^0.1.19" "0bpkkg4vfyhiwwf2d2hxld6zsppjx4clknrwsivp4m0vx2ddc54s")
   (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz")
 ]; }
diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix
index 679cedf2522..f406aa83e35 100644
--- a/pkgs/servers/web-apps/cryptpad/default.nix
+++ b/pkgs/servers/web-apps/cryptpad/default.nix
@@ -45,12 +45,6 @@ let
     nodePackages
     ;
 
-  # Get the patched load-config.js that allows loading config from the env
-  dynamicConfig = fetchurl {
-    url = "https://raw.githubusercontent.com/zimbatm/cryptpad/35dd3abbb5ef6e3f9d5fb0b31b693c430d159b4a/lib/load-config.js";
-    sha256 = "1ch6r4fkcvyxhc501nmdc39zpnxcqwgwkj7nb39ayflkhil19f6a";
-  };
-
   combined = cryptpad.override {
     postInstall = ''
       out_cryptpad=$out/lib/node_modules/cryptpad
@@ -60,9 +54,6 @@ let
         ${bowerPackages}/bower_components \
         $out_cryptpad/www/bower_components
 
-      # patch the load-config.js file
-      cp ${dynamicConfig} $out_cryptpad/lib/load-config.js
-
       # add executable
       mkdir $out/bin
       cat <<EOF > $out/bin/cryptpad
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
index f53a1dcf66b..b2a943dc2df 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
@@ -22,13 +22,13 @@ let
         sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
       };
     };
-    "async-limiter-1.0.0" = {
+    "async-limiter-1.0.1" = {
       name = "async-limiter";
       packageName = "async-limiter";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
-        sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==";
+        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz";
+        sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==";
       };
     };
     "body-parser-1.18.3" = {
@@ -49,13 +49,13 @@ let
         sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
       };
     };
-    "chainpad-server-3.0.2" = {
+    "chainpad-server-3.0.3" = {
       name = "chainpad-server";
       packageName = "chainpad-server";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.2.tgz";
-        sha512 = "c5aEljVAapDKKs0+Rt2jymKAszm8X4ZeLFNJj1yxflwBqoh0jr8OANYvbfjtNaYFe2Wdflp/1i4gibYX4IMc+g==";
+        url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.3.tgz";
+        sha512 = "NRfV7FFBEYy4ZVX7h0P5znu55X8v5K4iGWeMGihkfWZLKu70GmCPUTwpBCP79dUvnCToKEa4/e8aoSPcvZC8pA==";
       };
     };
     "content-disposition-0.5.2" = {
@@ -220,13 +220,13 @@ let
         sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA==";
       };
     };
-    "graceful-fs-4.1.15" = {
+    "graceful-fs-4.2.2" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.1.15";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz";
-        sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
+        sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
       };
     };
     "http-errors-1.6.3" = {
@@ -364,13 +364,13 @@ let
         sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
       };
     };
-    "nthen-0.1.8" = {
+    "nthen-0.1.10" = {
       name = "nthen";
       packageName = "nthen";
-      version = "0.1.8";
+      version = "0.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz";
-        sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw==";
+        url = "https://registry.npmjs.org/nthen/-/nthen-0.1.10.tgz";
+        sha512 = "W5LOhoFlQZSVg9SnRUJHgm3lOiT3HV6xq+Qo0dGKju2FWsDrKPwcgbJ9o5CORGz7UKKVhPScY9wOJHUogVG2UA==";
       };
     };
     "on-finished-2.3.0" = {
@@ -382,15 +382,6 @@ let
         sha1 = "20f1336481b083cd75337992a16971aa2d906947";
       };
     };
-    "options-0.0.6" = {
-      name = "options";
-      packageName = "options";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
-        sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
-      };
-    };
     "parseurl-1.3.3" = {
       name = "parseurl";
       packageName = "parseurl";
@@ -418,13 +409,13 @@ let
         sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
       };
     };
-    "pull-stream-3.6.12" = {
+    "pull-stream-3.6.14" = {
       name = "pull-stream";
       packageName = "pull-stream";
-      version = "3.6.12";
+      version = "3.6.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.12.tgz";
-        sha512 = "+LO1XIVyTMmeoH26UHznpgrgX2npTVYccTkMpgk/EyiQjFt1FmoNm+w+/zMLuz9U3bpvT5sSUicMKEe/2JjgEA==";
+        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz";
+        sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew==";
       };
     };
     "qs-6.5.2" = {
@@ -571,15 +562,6 @@ let
         sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
       };
     };
-    "ultron-1.0.2" = {
-      name = "ultron";
-      packageName = "ultron";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz";
-        sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa";
-      };
-    };
     "ultron-1.1.1" = {
       name = "ultron";
       packageName = "ultron";
@@ -625,15 +607,6 @@ let
         sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
       };
     };
-    "ws-1.1.5" = {
-      name = "ws";
-      packageName = "ws";
-      version = "1.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz";
-        sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==";
-      };
-    };
     "ws-3.3.3" = {
       name = "ws";
       packageName = "ws";
@@ -646,26 +619,22 @@ let
   };
 in
 {
-  "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.23.0" = nodeEnv.buildNodePackage {
+  "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" = nodeEnv.buildNodePackage {
     name = "cryptpad";
     packageName = "cryptpad";
-    version = "2.23.0";
+    version = "2.25.0";
     src = fetchgit {
       url = "https://github.com/xwiki-labs/cryptpad.git";
-      rev = "980e3f964a5b8bcd7c33da92dbe005f42b20cb30";
-      sha256 = "a094708e4a275ee55ca3a59a2890f20f2f9f7dcfe50274b7e3ecd260502c583b";
+      rev = "0b17df3302fc4a7683a8790f305c8a2c7b1b4fe8";
+      sha256 = "261531da1745f9ff930bce3729afba2b7a52ee02f51340426ecf6b19204a21b7";
     };
     dependencies = [
       sources."accepts-1.3.7"
       sources."array-flatten-1.1.1"
-      sources."async-limiter-1.0.0"
+      sources."async-limiter-1.0.1"
       sources."body-parser-1.18.3"
       sources."bytes-3.0.0"
-      (sources."chainpad-server-3.0.2" // {
-        dependencies = [
-          sources."ws-3.3.3"
-        ];
-      })
+      sources."chainpad-server-3.0.3"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
@@ -684,7 +653,7 @@ in
       sources."fs-extra-7.0.1"
       sources."gar-1.0.4"
       sources."get-folder-size-2.0.1"
-      sources."graceful-fs-4.1.15"
+      sources."graceful-fs-4.2.2"
       sources."http-errors-1.6.3"
       sources."iconv-lite-0.4.23"
       sources."inherits-2.0.3"
@@ -700,13 +669,12 @@ in
       sources."mime-types-2.1.24"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
-      sources."nthen-0.1.8"
+      sources."nthen-0.1.10"
       sources."on-finished-2.3.0"
-      sources."options-0.0.6"
       sources."parseurl-1.3.3"
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-2.0.5"
-      sources."pull-stream-3.6.12"
+      sources."pull-stream-3.6.14"
       sources."qs-6.5.2"
       sources."range-parser-1.2.1"
       sources."raw-body-2.3.3"
@@ -728,11 +696,7 @@ in
       sources."unpipe-1.0.0"
       sources."utils-merge-1.0.1"
       sources."vary-1.1.2"
-      (sources."ws-1.1.5" // {
-        dependencies = [
-          sources."ultron-1.0.2"
-        ];
-      })
+      sources."ws-3.3.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json
index 9d2b233f767..c37d984ae12 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.json
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.json
@@ -1,3 +1,3 @@
 [
-  { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.23.0" }
+  { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" }
 ]
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index 75e28e2382e..36c5996286f 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {

From d15019d43919e1aa31b0d1b4e51183cc2960a403 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 27 Aug 2019 23:40:01 +0200
Subject: [PATCH 298/794] gnome2.libglade: make python2 build optional

Python2 is only needed for `libglade-convert`[1] which is a simple
script that converts old glade files into new glade files and for tests
and docs which we currently don't generate.

As Python2 is about to get EOLed and this is mostly a tool to migrate
old data, it shouldn't be built by default. With this change,
`xscreensaver` and `xsecurelock` don't depend on Python2 anymore.

[1] https://manpages.ubuntu.com/manpages/trusty/man1/libglade-convert.1.html
---
 pkgs/desktops/gnome-2/platform/libglade/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix
index c61ecc16f15..d51cccf7906 100644
--- a/pkgs/desktops/gnome-2/platform/libglade/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, pkgconfig, gtk2, libxml2, python, gettext}:
+{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }:
+
+assert withLibgladeConvert -> python2 != null;
 
 stdenv.mkDerivation {
   name = "libglade-2.6.4";
@@ -11,7 +13,8 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk2 python gettext ];
+  buildInputs = [ gtk2 gettext ]
+    ++ stdenv.lib.optional withLibgladeConvert python2;
 
   NIX_LDFLAGS = "-lgmodule-2.0";
 

From 1aee94dc428138cfb3e0c74451a88c60412c6e6f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 27 Aug 2019 22:40:43 -0500
Subject: [PATCH 299/794] cadvisor: 0.33.1 -> 0.34.0

---
 pkgs/servers/monitoring/cadvisor/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index 502a3026b2a..d6f3e18e49b 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cadvisor-${version}";
-  version = "0.33.1";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
     rev = "v${version}";
-    sha256 = "15wddg0xwkz42n5y2f72yq3imhbvnp83g1jq6p81ddw9qzbz62zs";
+    sha256 = "1hshmhsclja50ja2jqxx2f5lcvbs64n6aw6dw28wbnq3z9v0q8ad";
   };
 
   nativeBuildInputs = [ go ];
@@ -17,12 +17,15 @@ stdenv.mkDerivation rec {
     export GOCACHE="$TMPDIR/go-cache"
     mkdir -p Godeps/_workspace/src/github.com/google/
     ln -s $(pwd) Godeps/_workspace/src/github.com/google/cadvisor
-    GOPATH=$(pwd)/Godeps/_workspace go build -v -o cadvisor github.com/google/cadvisor
+    GOPATH=$(pwd)/Godeps/_workspace go build -v -o cadvisor -ldflags="-s -w -X github.com/google/cadvisor/version.Version=${version}" github.com/google/cadvisor
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    mv cadvisor $out/bin
+    runHook preInstall
+
+    install -Dm755 -t $out/bin cadvisor
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {

From 1f3aa24274b8628c799446d577b34802d1470846 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 27 Aug 2019 22:57:05 -0500
Subject: [PATCH 300/794] postgresqlPackages.plv8: 2.3.12 -> 2.3.13

Changes: https://github.com/plv8/plv8/compare/v2.3.12...v2.3.13
---
 pkgs/servers/sql/postgresql/ext/plv8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix
index 89138baa91c..b4f4c357d42 100644
--- a/pkgs/servers/sql/postgresql/ext/plv8.nix
+++ b/pkgs/servers/sql/postgresql/ext/plv8.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "plv8";
-  version = "2.3.12";
+  version = "2.3.13";
 
   nativeBuildInputs = [ perl ];
   buildInputs = [ v8 postgresql ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "plv8";
     repo = "plv8";
     rev = "v${version}";
-    sha256 = "1yi1ibiibvd0x4z5dm698w32ljrj3yr4j25jm1zkgkwd4ii8y644";
+    sha256 = "12xpcc1ylzyy75wi1m4vijknzv2gxab05w9z90jb03faq18cnlql";
   };
 
   makefile = "Makefile.shared";

From 53641dc81eef26b05ebf1c14d9f5a9892283d45b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 28 Aug 2019 00:00:00 -0500
Subject: [PATCH 301/794] wtf: 0.19.1 -> 0.20.0

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

diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 07538f749e8..52462d1c1f3 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -5,16 +5,18 @@
 
 buildGoModule rec {
   pname = "wtf";
-  version = "0.19.1";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "wtfutil";
     repo = pname;
     rev = "v${version}";
-    sha256 = "19qzg5blqm5p7rrnaqh4f9aj53i743mawjnd1h9lfahbgmil1d24";
+    sha256 = "03k3x3fnxz23b75n5x8mlr6srr063q3dwq05wh55b4bgqsf7lgzd";
   };
 
-  modSha256 = "1q21pc4yyiq4dihsb9n7261ssj52nnik8dq6fg4gvlnnpgcjp570";
+  modSha256 = "1nqnjpkrjbb75yfbzh3v3vc4xy5a2aqm9jr40hwq589a4l9p5pw2";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
   # As per https://github.com/wtfutil/wtf/issues/501, one of the
   # dependencies can't be fetched, so vendored dependencies should

From a86fe43558f226b4c748b71c037e82034bff771c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 21 Aug 2019 05:10:10 +0000
Subject: [PATCH 302/794] ocamlPackages.lambdaTerm: remove at 1.6

---
 .../ocaml-modules/lambda-term/1.6.nix         | 42 -------------------
 pkgs/top-level/ocaml-packages.nix             |  6 +--
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/lambda-term/1.6.nix

diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix
deleted file mode 100644
index c0532ff0325..00000000000
--- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, react, zed, camlp4 }:
-
-stdenv.mkDerivation rec {
-  version = "1.6";
-  name = "lambda-term-${version}";
-
-  src = fetchurl {
-    url = https://github.com/diml/lambda-term/archive/1.6.tar.gz;
-    sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09";
-  };
-
-  buildInputs = [ libev ocaml findlib ocamlbuild lwt react ];
-
-  propagatedBuildInputs = [ camlp4 zed ];
-
-  createFindlibDestdir = true;
-
-  meta = { description = "Terminal manipulation library for OCaml";
-    longDescription = ''
-    Lambda-term is a cross-platform library for
-    manipulating the terminal. It provides an abstraction for keys,
-    mouse events, colors, as well as a set of widgets to write
-    curses-like applications.
-
-    The main objective of lambda-term is to provide a higher level
-    functional interface to terminal manipulation than, for example,
-    ncurses, by providing a native OCaml interface instead of bindings to
-    a C library.
-
-    Lambda-term integrates with zed to provide text edition facilities in
-    console applications.
-    '';
-
-    homepage = https://github.com/diml/lambda-term;
-    license = stdenv.lib.licenses.bsd3;
-    platforms = ocaml.meta.platforms or [];
-    branch = "1.6";
-    maintainers = [
-      stdenv.lib.maintainers.gal_bolle
-    ];
-  };
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 16dd32a8a7a..7eabfccf85f 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -382,11 +382,7 @@ let
 
     lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { };
 
-    lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; };
-    lambdaTerm =
-      if lib.versionOlder "4.02" ocaml.version
-      then callPackage ../development/ocaml-modules/lambda-term { }
-      else lambdaTerm-1_6;
+    lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { };
 
     linenoise = callPackage ../development/ocaml-modules/linenoise { };
 

From f7387ad383926b37f40aa3a87e5383b7765e1448 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 21 Aug 2019 05:10:15 +0000
Subject: [PATCH 303/794] ocamlPackages.utop: 2.3.0 -> 2.4.1

ocamlPackages.zed: 1.6 -> 2.0.3

ocamlPackages.lambdaTerm: 1.13 -> 2.0.2
---
 .../ocaml-modules/lambda-term/default.nix          | 10 +++-------
 pkgs/development/ocaml-modules/zed/default.nix     | 14 ++++++++------
 pkgs/development/tools/ocaml/utop/default.nix      |  8 ++++----
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
index 18fe235710f..1b5594d5565 100644
--- a/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -2,20 +2,16 @@
 
 buildDunePackage rec {
   pname = "lambda-term";
-  version = "1.13";
-
-  minimumOCamlVersion = "4.02";
+  version = "2.0.2";
 
   src = fetchurl {
-    url = "https://github.com/diml/${pname}/archive/${version}.tar.gz";
-    sha256 = "1hy5ryagqclgdm9lzh1qil5mrynlypv7mn6qm858hdcnmz9zzn0l";
+    url = "https://github.com/ocaml-community/lambda-term/releases/download/${version}/lambda-term-${version}.tbz";
+    sha256 = "1p9yczrx78pf5hvhcg1qiqb2vdlmw6bmhhjsm4wiqjq2cc6piaqw";
   };
 
   buildInputs = [ libev ];
   propagatedBuildInputs = [ zed lwt_log lwt_react ];
 
-  hasSharedObjects = true;
-
   meta = { description = "Terminal manipulation library for OCaml";
     longDescription = ''
     Lambda-term is a cross-platform library for
diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix
index d9dcf1a5385..9fa42e68c56 100644
--- a/pkgs/development/ocaml-modules/zed/default.nix
+++ b/pkgs/development/ocaml-modules/zed/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune, charInfo_width }:
 
 let param =
   if stdenv.lib.versionAtLeast ocaml.version "4.02" then
   {
-    version = "1.6";
-    sha256 = "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v";
+    version = "2.0.3";
+    sha256 = "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55";
     buildInputs = [ dune ];
+    propagatedBuildInputs = [ charInfo_width ];
     extra = {
      buildPhase = "dune build -p zed";
      inherit (dune) installPhase; };
   } else {
     version = "1.4";
     sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w";
-    buildInputs = [];
+    buildInputs = [ ocamlbuild ];
+    propagatedBuildInputs = [ camomile ];
     extra = { createFindlibDestdir = true; };
   }
 ; in
@@ -26,9 +28,9 @@ stdenv.mkDerivation (rec {
     inherit (param) sha256;
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs;
+  buildInputs = [ ocaml findlib ] ++ param.buildInputs;
 
-  propagatedBuildInputs = [ react camomile ];
+  propagatedBuildInputs = [ react ] ++ param.propagatedBuildInputs;
 
   meta = {
     description = "Abstract engine for text edition in OCaml";
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index d9e563952ea..161c08a7f82 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune
+{ stdenv, fetchurl, ocaml, findlib, dune
 , lambdaTerm, cppo, makeWrapper
 }:
 
@@ -7,16 +7,16 @@ then throw "utop is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-  version = "2.3.0";
+  version = "2.4.1";
   name = "utop-${version}";
 
   src = fetchurl {
     url = "https://github.com/diml/utop/archive/${version}.tar.gz";
-    sha256 = "1g1xf19fhzwsikp33pv1wf6wb2qdc5y7dzqi46h8c4l850cwscjh";
+    sha256 = "0kbg7sfn7jaic7xcy7dm543yzsywirxbgpiv2rzwnp9ny2510f9g";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ ocaml findlib ocamlbuild cppo dune ];
+  buildInputs = [ ocaml findlib cppo dune ];
 
   propagatedBuildInputs = [ lambdaTerm ];
 

From d95dca26ab7c7a0031df89e555515afa94e1d137 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Wed, 28 Aug 2019 09:47:03 +0200
Subject: [PATCH 304/794] vault: 1.0.2 -> 1.2.2

This upgrades Vault to version 1.2.2. To accomplish this, we migrate to
using the `buildGoModule` helper, as since 1.0.2 the Vault build process
migrated to modules, and does not vendor its dependencies.

We also stop using the vault build script, and gox, as it only really
provides value for local development, where it configures GOOS/GOARCH
and installs into some convenient dev locations.
---
 pkgs/tools/security/vault/default.nix | 33 +++++++++------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 3f366a58320..dcded065276 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,36 +1,25 @@
-{ stdenv, fetchFromGitHub, go, gox, removeReferencesTo }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
-stdenv.mkDerivation rec {
+buildGoModule rec {
   name = "vault-${version}";
-  version = "1.1.3";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "0dylwvs95crvn1p7pbyzib979rxzp4ivzvi5k4f5ivp4ygnp597s";
+    sha256 = "1xljm7xmb4ldg3wx8s9kw1spffg4ywk4r1jqfa743czd2xxmqavl";
   };
 
-  nativeBuildInputs = [ go gox removeReferencesTo ];
+  modSha256 = "13pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q";
 
-  preBuild = ''
-    patchShebangs ./
-    substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}'
-    sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh
-
-    mkdir -p .git/hooks src/github.com/hashicorp
-    ln -s $(pwd) src/github.com/hashicorp/vault
-
-    export GOPATH=$(pwd)
-    export GOCACHE="$TMPDIR/go-cache"
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/bash-completion/completions
-
-    cp pkg/*/* $out/bin/
-    find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
+  buildFlagsArray = [
+    "-tags='vault'"
+    "-ldflags=\"-X github.com/hashicorp/vault/sdk/version.GitCommit='v${version}'\""
+  ];
 
+  postInstall = ''
+    mkdir -p $out/share/bash-completion/completions
     echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
   '';
 

From 0ecbc63bf0e333217d6315309c4ace92f5af1da7 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <708570+mmlb@users.noreply.github.com>
Date: Wed, 28 Aug 2019 04:01:23 -0400
Subject: [PATCH 305/794] zoom-us: 2.9.265650.0716 -> 3.0.285090.0826 (#67588)

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

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 8aa732fd6ba..5ce59adb2ae 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
 let
   inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
-  version = "2.9.265650.0716";
+  version = "3.0.285090.0826";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "1wg5yw8g0c6p9y0wcqxr1rndgclasg7v1ybbx8s1a2p98izjkcaa";
+      sha256 = "0brpb5i1lc1hwal0c5n2zh27wxrm4gfbqc6bm2dgwnck04y8i4c5";
     };
   };
 

From 83bac3d9740629b2c3dccca10dffb0e9156ff9a3 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Wed, 28 Aug 2019 11:44:57 +0300
Subject: [PATCH 306/794] kanshi: 2019-02-02 -> 1.0.0

---
 pkgs/tools/misc/kanshi/default.nix | 47 +++++++++++++-----------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/pkgs/tools/misc/kanshi/default.nix b/pkgs/tools/misc/kanshi/default.nix
index dac3b0c2c32..d3e0ba029f3 100644
--- a/pkgs/tools/misc/kanshi/default.nix
+++ b/pkgs/tools/misc/kanshi/default.nix
@@ -1,40 +1,33 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, udev }:
-rustPlatform.buildRustPackage 
-{
-  pname = "kanshi-unstable";
-  version = "2019-02-02";
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc, wayland }:
+
+stdenv.mkDerivation rec {
+  pname = "kanshi";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "kanshi";
-    rev = "970267e400c21a6bb51a1c80a0aadfd1e6660a7b";
-    sha256 = "10lfdan86bmwazpma6ixnv46z9cnf879gxln8gx87v7a1x3ss0bh";
+    rev = "v${version}";
+    sha256 = "0v50q1s105c2rar6mi1pijm8llsnsp62gv4swd3ddjn5rwallg46";
   };
 
-  buildInputs = [ pkgconfig udev ];
+  nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
+  buildInputs = [ wayland ];
 
-  cargoSha256 = "0pvkrdjrg9y38vsrqkrvsknzp78sknpmq14rskvij450a9mpihii";
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "Dynamic display configuration tool";
-    longDescription = 
-    ''
-    Kanshi uses a configuration file and a list of available displays to choose 
-    the right settings for each display. It's useful if your window manager 
-    doesn't support multiple display configurations (e.g. i3/Sway).
-    
-    For now, it only supports:
-    - sysfs as backend
-    - udev as notifier (optional)
-    - Configuration file
-      - GNOME (~/.config/monitors.xml)
-      - Kanshi (see below)
-    - Sway as frontend
+    longDescription = ''
+      kanshi allows you to define output profiles that are automatically enabled
+      and disabled on hotplug. For instance, this can be used to turn a laptop's
+      internal screen off when docked.
+
+      kanshi can be used on Wayland compositors supporting the
+      wlr-output-management protocol.
     '';
     homepage = "https://github.com/emersion/kanshi";
     downloadPage = "https://github.com/emersion/kanshi";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.balsoft ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ balsoft ];
+    platforms = platforms.linux;
   };
 }

From 74ed54cf0c4a589343ae56a4bcd78cb2036b44d9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Aug 2019 16:58:18 +0800
Subject: [PATCH 307/794] hidapi: 0.8.0-RC1 -> 0.9.0

---
 pkgs/development/libraries/hidapi/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix
index 05e180161c0..28e96244ba5 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/pkgs/development/libraries/hidapi/default.nix
@@ -1,25 +1,29 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb
 , darwin }:
 
 stdenv.mkDerivation rec {
-  name = "hidapi-0.8.0-rc1";
+  pname = "hidapi";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
-    owner = "signal11";
+    owner = "libusb";
     repo = "hidapi";
-    rev = name;
-    sha256 = "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj";
+    rev = "${pname}-${version}";
+    sha256 = "1p4g8lgwj4rki6lbn5l6rvwj0xlbn1xfh4d255bg5pvgczmwmc4i";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
   buildInputs = [ ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ udev libusb ];
+    ++ stdenv.lib.optionals stdenv.isLinux [ libusb systemd ];
+
+  enableParallelBuilding = true;
 
   propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]);
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/signal11/hidapi;
     description = "Library for communicating with USB and Bluetooth HID devices";
+    homepage = "https://github.com/libusb/hidapi";
     # Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal)
     license = licenses.bsd3;
     platforms = platforms.unix;

From 07054b42d8c49c2f4fcd71f666837ae2350f235d Mon Sep 17 00:00:00 2001
From: Michael Fellinger <github@manveru.dev>
Date: Wed, 28 Aug 2019 11:37:54 +0200
Subject: [PATCH 308/794] wayback_machine_downloader: init at 2.2.1 (#67533)

* wayback_machine_downloader: init at 2.2.1
* Fix description
---
 .../wayback_machine_downloader/Gemfile           |  5 +++++
 .../wayback_machine_downloader/Gemfile.lock      | 13 +++++++++++++
 .../wayback_machine_downloader/default.nix       | 16 ++++++++++++++++
 .../wayback_machine_downloader/gemset.nix        | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                  |  2 ++
 5 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/networking/wayback_machine_downloader/Gemfile
 create mode 100644 pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock
 create mode 100644 pkgs/applications/networking/wayback_machine_downloader/default.nix
 create mode 100644 pkgs/applications/networking/wayback_machine_downloader/gemset.nix

diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile b/pkgs/applications/networking/wayback_machine_downloader/Gemfile
new file mode 100644
index 00000000000..e519efbf570
--- /dev/null
+++ b/pkgs/applications/networking/wayback_machine_downloader/Gemfile
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org' do
+  gem 'wayback_machine_downloader'
+end
diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock b/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock
new file mode 100644
index 00000000000..86e064347b6
--- /dev/null
+++ b/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock
@@ -0,0 +1,13 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    wayback_machine_downloader (2.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  wayback_machine_downloader!
+
+BUNDLED WITH
+   1.17.2
diff --git a/pkgs/applications/networking/wayback_machine_downloader/default.nix b/pkgs/applications/networking/wayback_machine_downloader/default.nix
new file mode 100644
index 00000000000..49471ebf7e3
--- /dev/null
+++ b/pkgs/applications/networking/wayback_machine_downloader/default.nix
@@ -0,0 +1,16 @@
+{ lib, bundlerApp, bundlerUpdateScript }:
+bundlerApp {
+  pname = "wayback_machine_downloader";
+  exes = [ "wayback_machine_downloader" ];
+  gemdir = ./.;
+
+  passthru.updateScript = bundlerUpdateScript "wayback_machine_downloader";
+
+  meta = with lib; {
+    description = "Download websites from the Internet Archive Wayback Machine";
+    homepage = "https://github.com/hartator/wayback-machine-downloader";
+    license = licenses.mit;
+    maintainers = [ maintainers.manveru ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix b/pkgs/applications/networking/wayback_machine_downloader/gemset.nix
new file mode 100644
index 00000000000..615570f1f09
--- /dev/null
+++ b/pkgs/applications/networking/wayback_machine_downloader/gemset.nix
@@ -0,0 +1,12 @@
+{
+  wayback_machine_downloader = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12kb1qmvmmsaihqab1prn6cmynkn6cgb4vf41mgv22wkcgv5wgk2";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69734fb117f..1f996f185d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5738,6 +5738,8 @@ in
 
   qview = libsForQt5.callPackage ../applications/graphics/qview {};
 
+  wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { };
+
   wiggle = callPackage ../development/tools/wiggle { };
 
   radamsa = callPackage ../tools/security/radamsa { };

From 2d36aa63fdf5ca1dcd7b0ba36ea59c59a8864b03 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Sat, 24 Aug 2019 16:41:00 +0200
Subject: [PATCH 309/794] ripasso-cursive: init unstable at 2019-08-27

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

diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix
new file mode 100644
index 00000000000..9eac6b6e5ca
--- /dev/null
+++ b/pkgs/tools/security/ripasso/cursive.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, ncurses, python3, openssl, libgpgerror, gpgme, xorg }:
+
+with rustPlatform;
+buildRustPackage rec {
+  version = "unstable-2019-08-27";
+  pname = "ripasso-cursive";
+
+  src = fetchFromGitHub {
+    owner = "cortex";
+    repo = "ripasso";
+    rev  = "1b5ef4ae19f95f1422ba5cb09e9e689880599c40";
+    sha256 = "1lh1in8knpqz4vbsmdyd4hh8y4bfhxjciysfbq3qzdpdpihgj0nn";
+  };
+
+  cargoSha256 = "0dwaa106vj7jbgshhqpjabsr0zmkg1a5syzky7jcaasvc7r7njwl";
+  cargoBuildFlags = [ "-p ripasso-cursive" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    ncurses python3 openssl libgpgerror gpgme xorg.libxcb
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A simple password manager written in Rust";
+    homepage = "https://github.com/cortex/ripasso";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ sgo ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df43828460b..8f4fc4502ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1924,6 +1924,8 @@ in
     conf = config.riot-web.conf or null;
   };
 
+  ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix {};
+
   roundcube = callPackage ../servers/roundcube { };
 
   roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { });

From 4d11f5dabda5098e66a59fa1bd909befd39d841f Mon Sep 17 00:00:00 2001
From: Luka Blaskovic <lblasc@tvbeat.com>
Date: Sat, 24 Aug 2019 11:41:55 +0000
Subject: [PATCH 310/794] ljsyscall: init at 20180515

---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../lua-modules/generated-packages.nix        | 20 +++++++++++++++++++
 pkgs/development/lua-modules/overrides.nix    | 19 ++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 9117e6d1c55..0ec9ff3d84d 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -18,6 +18,7 @@ http,,,,,vcunat
 inspect,,,,,
 ldoc,,,,,
 lgi,,,,,
+ljsyscall,,,,lua5_1,lblasc
 lpeg,,,,,vyp
 lpeg_patterns,,,,,
 lpeglabel,,,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 348f5ef7529..4b8369456b7 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -412,6 +412,26 @@ lgi = buildLuarocksPackage {
     };
   };
 };
+ljsyscall = buildLuarocksPackage {
+  pname = "ljsyscall";
+  version = "0.12-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/ljsyscall-0.12-1.src.rock;
+    sha256 = "12gs81lnzpxi5d409lbrvjfflld5l2xsdkfhkz93xg7v65sfhh2j";
+  };
+  disabled = (lua.luaversion != "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.myriabit.com/ljsyscall/";
+    description = "LuaJIT Linux syscall FFI";
+    maintainers = with maintainers; [ lblasc ];
+    license = {
+      fullName = "MIT";
+    };
+  };
+};
 lpeg = buildLuarocksPackage {
   pname = "lpeg";
   version = "1.0.2-1";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index e765118464d..a4c1c7fa324 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -80,6 +80,25 @@ with super;
     */
   });
 
+  ljsyscall = super.ljsyscall.override(rec {
+    version = "unstable-20180515";
+    # package hasn't seen any release for a long time
+    src = pkgs.fetchFromGitHub {
+      owner = "justincormack";
+      repo = "ljsyscall";
+      rev = "e587f8c55aad3955dddab3a4fa6c1968037b5c6e";
+      sha256 = "06v52agqyziwnbp2my3r7liv245ddmb217zmyqakh0ldjdsr8lz4";
+    };
+    knownRockspec = "rockspec/ljsyscall-scm-1.rockspec";
+    # actually library works fine with lua 5.2
+    preConfigure = ''
+      sed -i 's/lua == 5.1/lua >= 5.1, < 5.3/' ${knownRockspec}
+    '';
+    disabled = luaOlder "5.1" || luaAtLeast "5.3";
+
+    propagatedBuildInputs = with pkgs.lib; optional (!isLuaJIT) luaffi;
+  });
+
   lgi = super.lgi.override({
     nativeBuildInputs = [
       pkgs.pkgconfig

From 75214a9c8b1def725560a8a5999695a11c0727f4 Mon Sep 17 00:00:00 2001
From: Chris Rendle-Short <chris@killred.net>
Date: Tue, 27 Aug 2019 21:28:56 +1000
Subject: [PATCH 311/794] qt5ct: fix missing app icon and name when running
 under Wayland

Patch has been upstreamed (https://sourceforge.net/p/qt5ct/code/549/)
and will be removed in the future.
---
 pkgs/tools/misc/qt5ct/default.nix   |  5 +++++
 pkgs/tools/misc/qt5ct/wayland.patch | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/misc/qt5ct/wayland.patch

diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index 9069821fe35..fbb56b98be7 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -15,6 +15,11 @@ mkDerivation rec {
 
   buildInputs = [ qtbase ];
 
+  # Wayland needs to know the desktop file name in order to show the app name and icon.
+  # Patch has been upstreamed and can be removed in the future.
+  # See: https://sourceforge.net/p/qt5ct/code/549/
+  patches = [ ./wayland.patch ];
+
   qmakeFlags = [
     "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease"
   ];
diff --git a/pkgs/tools/misc/qt5ct/wayland.patch b/pkgs/tools/misc/qt5ct/wayland.patch
new file mode 100644
index 00000000000..fe186cfa469
--- /dev/null
+++ b/pkgs/tools/misc/qt5ct/wayland.patch
@@ -0,0 +1,22 @@
+--- a/src/qt5ct/main.cpp
++++ b/src/qt5ct/main.cpp
+@@ -29,14 +29,18 @@
+ #include <QApplication>
+ #include <QLibraryInfo>
+ #include <QLocale>
+-#include "qt5ct.h"
++#include <QtGlobal>
+ #include <QTranslator>
+ #include <QtDebug>
++#include "qt5ct.h"
+ #include "mainwindow.h"
+ 
+ int main(int argc, char **argv)
+ {
+     QApplication app(argc, argv);
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
++    QGuiApplication::setDesktopFileName("qt5ct.desktop");
++#endif
+     QTranslator translator;
+     QString locale = Qt5CT::systemLanguageID();
+     translator.load(QString(":/qt5ct_") + locale);
\ No newline at end of file

From 182830f542ef693095cd9ba2db29a3d401705bb7 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 26 Aug 2019 11:33:44 +0200
Subject: [PATCH 312/794] nixos/magnetico: init service

---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/torrent/magnetico.nix | 214 +++++++++++++++++++
 2 files changed, 215 insertions(+)
 create mode 100644 nixos/modules/services/torrent/magnetico.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index db47e69bd4a..4fd75bab0ab 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -755,6 +755,7 @@
   ./services/system/uptimed.nix
   ./services/torrent/deluge.nix
   ./services/torrent/flexget.nix
+  ./services/torrent/magnetico.nix
   ./services/torrent/opentracker.nix
   ./services/torrent/peerflix.nix
   ./services/torrent/transmission.nix
diff --git a/nixos/modules/services/torrent/magnetico.nix b/nixos/modules/services/torrent/magnetico.nix
new file mode 100644
index 00000000000..02fa2ac0750
--- /dev/null
+++ b/nixos/modules/services/torrent/magnetico.nix
@@ -0,0 +1,214 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.magnetico;
+
+  dataDir = "/var/lib/magnetico";
+
+  credFile = with cfg.web;
+    if credentialsFile != null
+      then credentialsFile
+      else pkgs.writeText "magnetico-credentials"
+        (concatStrings (mapAttrsToList
+          (user: hash: "${user}:${hash}\n")
+          cfg.web.credentials));
+
+  # default options in magneticod/main.go
+  dbURI = concatStrings
+    [ "sqlite3://${dataDir}/database.sqlite3"
+      "?_journal_mode=WAL"
+      "&_busy_timeout=3000"
+      "&_foreign_keys=true"
+    ];
+
+  crawlerArgs = with cfg.crawler; escapeShellArgs
+    ([ "--database=${dbURI}"
+       "--indexer-addr=${address}:${toString port}"
+       "--indexer-max-neighbors=${toString maxNeighbors}"
+       "--leech-max-n=${toString maxLeeches}"
+     ] ++ extraOptions);
+
+  webArgs = with cfg.web; escapeShellArgs
+    ([ "--database=${dbURI}"
+       (if (cfg.web.credentialsFile != null || cfg.web.credentials != { })
+         then "--credentials=${toString credFile}"
+         else "--no-auth")
+     ] ++ extraOptions);
+
+in {
+
+  ###### interface
+
+  options.services.magnetico = {
+    enable = mkEnableOption "Magnetico, Bittorrent DHT crawler";
+
+    crawler.address = mkOption {
+      type = types.str;
+      default = "0.0.0.0";
+      example = "1.2.3.4";
+      description = ''
+        Address to be used for indexing DHT nodes.
+      '';
+    };
+
+    crawler.port = mkOption {
+      type = types.port;
+      default = 0;
+      description = ''
+        Port to be used for indexing DHT nodes.
+        This port should be added to
+        <option>networking.firewall.allowedTCPPorts</option>.
+      '';
+    };
+
+    crawler.maxNeighbors = mkOption {
+      type = types.ints.positive;
+      default = 1000;
+      description = ''
+        Maximum number of simultaneous neighbors of an indexer.
+        Be careful changing this number: high values can very
+        easily cause your network to be congested or even crash
+        your router.
+      '';
+    };
+
+    crawler.maxLeeches = mkOption {
+      type = types.ints.positive;
+      default = 200;
+      description = ''
+        Maximum number of simultaneous leeches.
+      '';
+    };
+
+    crawler.extraOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Extra command line arguments to pass to magneticod.
+      '';
+    };
+
+    web.address = mkOption {
+      type = types.str;
+      default = "localhost";
+      example = "1.2.3.4";
+      description = ''
+        Address the web interface will listen to.
+      '';
+    };
+
+    web.port = mkOption {
+      type = types.port;
+      default = 8080;
+      description = ''
+        Port the web interface will listen to.
+      '';
+    };
+
+    web.credentials = mkOption {
+      type = types.attrsOf types.str;
+      default = {};
+      example = lib.literalExample ''
+        {
+          myuser = "$2y$12$YE01LZ8jrbQbx6c0s2hdZO71dSjn2p/O9XsYJpz.5968yCysUgiaG";
+        }
+      '';
+      description = ''
+        The credentials to access the web interface, in case authentication is
+        enabled, in the format <literal>username:hash</literal>. If unset no
+        authentication will be required.
+
+        Usernames must start with a lowercase ([a-z]) ASCII character, might
+        contain non-consecutive underscores except at the end, and consists of
+        small-case a-z characters and digits 0-9.  The
+        <command>htpasswd</command> tool from the <package>apacheHttpd
+        </package> package may be used to generate the hash: <command>htpasswd
+        -bnBC 12 username password</command>
+
+        <warning>
+        <para>
+          The hashes will be stored world-readable in the nix store.
+          Consider using the <literal>credentialsFile</literal> option if you
+          don't want this.
+        </para>
+        </warning>
+      '';
+    };
+
+    web.credentialsFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        The path to the file holding the credentials to access the web
+        interface. If unset no authentication will be required.
+
+        The file must constain user names and password hashes in the format
+        <literal>username:hash </literal>, one for each line.  Usernames must
+        start with a lowecase ([a-z]) ASCII character, might contain
+        non-consecutive underscores except at the end, and consists of
+        small-case a-z characters and digits 0-9.
+        The <command>htpasswd</command> tool from the <package>apacheHttpd
+        </package> package may be used to generate the hash:
+        <command>htpasswd -bnBC 12 username password</command>
+      '';
+    };
+
+    web.extraOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Extra command line arguments to pass to magneticow.
+      '';
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.users.magnetico = {
+      description = "Magnetico daemons user";
+    };
+
+    systemd.services.magneticod = {
+      description = "Magnetico DHT crawler";
+      wantedBy = [ "multi-user.target" ];
+      after    = [ "network-online.target" ];
+
+      serviceConfig = {
+        User      = "magnetico";
+        Restart   = "on-failure";
+        ExecStart = "${pkgs.magnetico}/bin/magneticod ${crawlerArgs}";
+      };
+    };
+
+    systemd.services.magneticow = {
+      description = "Magnetico web interface";
+      wantedBy = [ "multi-user.target" ];
+      after    = [ "network-online.target" "magneticod.service"];
+
+      serviceConfig = {
+        User           = "magnetico";
+        StateDirectory = "magnetico";
+        Restart        = "on-failure";
+        ExecStart      = "${pkgs.magnetico}/bin/magneticow ${webArgs}";
+      };
+    };
+
+    assertions =
+    [
+      {
+        assertion = cfg.web.credentialsFile != null || cfg.web.credentials != { };
+        message = ''
+          The options services.magnetico.web.credentialsFile and
+          services.magnetico.web.credentials are mutually exclusives.
+        '';
+      }
+    ];
+
+  };
+
+}

From ea40c66bf5aa739d02f483921082fc3b8e3a0d1b Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 28 Aug 2019 10:34:29 +0200
Subject: [PATCH 313/794] nixos/magnetico: add test

---
 nixos/tests/magnetico.nix | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 nixos/tests/magnetico.nix

diff --git a/nixos/tests/magnetico.nix b/nixos/tests/magnetico.nix
new file mode 100644
index 00000000000..bc7aef653ee
--- /dev/null
+++ b/nixos/tests/magnetico.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "magnetico";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ rnhmjoj ];
+  };
+
+  machine = { ... }: {
+    imports = [ ../modules/profiles/minimal.nix ];
+
+    networking.firewall.allowedTCPPorts = [ 9000 ];
+
+    services.magnetico = {
+      enable = true;
+      crawler.port = 9000;
+      web.credentials.user = "$2y$12$P88ZF6soFthiiAeXnz64aOWDsY3Dw7Yw8fZ6GtiqFNjknD70zDmNe";
+    };
+  };
+
+  testScript =
+    ''
+      startAll;
+      $machine->waitForUnit("magneticod");
+      $machine->waitForUnit("magneticow");
+      $machine->succeed("${pkgs.curl}/bin/curl -u user:password http://localhost:8080");
+      $machine->succeed("${pkgs.curl}/bin/curl -u user:wrongpwd http://localhost:8080") =~ "Unauthorised." or die;
+      $machine->shutdown();
+    '';
+})

From 89b87cdb4431c2ce6a13e8e2387fa61b0ef6d858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 28 Aug 2019 09:40:12 -0300
Subject: [PATCH 314/794] enlightenment.rage: 0.3.0 -> 0.3.1

---
 pkgs/desktops/enlightenment/rage.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix
index a1de3f95131..8d99ce6e8e0 100644
--- a/pkgs/desktops/enlightenment/rage.nix
+++ b/pkgs/desktops/enlightenment/rage.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "rage-${version}";
-  version = "0.3.0";
+  pname = "rage";
+  version = "0.3.1";
 
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.xz";
-    sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy";
+    url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "04fdk23bbgvni212zrfy4ndg7vmshbsjgicrhckdvhay87pk9i75";
   };
 
   nativeBuildInputs = [

From eba686ddfad91d8f59d61e3ca0e26f1360ff9a81 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Wed, 31 Jul 2019 16:19:18 +0200
Subject: [PATCH 315/794] nixos-containers: add TimeoutStartSec option

Default is now 1m instead of global default of 15sec. It is also
configurable.

Fixes issue where start of many containers (40+) fail
https://github.com/NixOS/nixpkgs/issues/65001
---
 nixos/modules/virtualisation/containers.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index b65374c9257..b61558b2201 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -256,6 +256,10 @@ let
     RestartForceExitStatus = "133";
     SuccessExitStatus = "133";
 
+    # Some containers take long to start
+    # especially when you automatically start many at once
+    TimeoutStartSec = cfg.timeoutStartSec;
+
     Restart = "on-failure";
 
     Slice = "machine.slice";
@@ -423,6 +427,7 @@ let
       extraVeths = {};
       additionalCapabilities = [];
       ephemeral = false;
+      timeoutStartSec = "15s";
       allowedDevices = [];
       hostAddress = null;
       hostAddress6 = null;
@@ -595,6 +600,18 @@ in
               '';
             };
 
+		    timeoutStartSec = mkOption {
+		      type = types.str;
+		      default = "1min";
+		      description = ''
+		        Time for the container to start. In case of a timeout,
+		        the container processes get killed.
+		        See <citerefentry><refentrytitle>systemd.time</refentrytitle>
+		        <manvolnum>7</manvolnum></citerefentry>
+		        for more information about the format.
+		       '';
+		    };
+
             bindMounts = mkOption {
               type = with types; loaOf (submodule bindMountOpts);
               default = {};

From fe213736e99cb7d7c0b9ad1b6116d53dabde3134 Mon Sep 17 00:00:00 2001
From: Alex Rice <alexrice999@hotmail.co.uk>
Date: Wed, 28 Aug 2019 10:50:58 +0100
Subject: [PATCH 316/794] evtest-qt: use qt5's mkDerivation

See #65399
---
 pkgs/applications/misc/evtest-qt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/evtest-qt/default.nix b/pkgs/applications/misc/evtest-qt/default.nix
index de75c7b68a8..86f2d007092 100644
--- a/pkgs/applications/misc/evtest-qt/default.nix
+++ b/pkgs/applications/misc/evtest-qt/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, qtbase, cmake, fetchFromGitHub }:
+{ mkDerivation, lib, qtbase, cmake, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "evtest-qt";
   version = "0.2.0";
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple input device tester for linux with Qt GUI";
     homepage = "https://github.com/Grumbel/evtest-qt";
     maintainers = with maintainers; [ alexarice ];

From d7582c994d0cfe46e8a973bf5ec60117fc869b98 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Wed, 28 Aug 2019 15:01:36 +0200
Subject: [PATCH 317/794] dovecot: 2.3.7.1 -> 2.3.7.2 (CVE-2019-11500)

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

diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 780264cf42b..e3afd1f9879 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -9,7 +9,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.3.7.1";
+  name = "dovecot-2.3.7.2";
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs =
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dovecot.org/releases/2.3/${name}.tar.gz";
-    sha256 = "1hq333vj4px4xa9djl8c1v3c8rac98v2mrb9vx1wisg6frpiv9f5";
+    sha256 = "0q0jgcv3ni2znkgyhc966ffphj1wk73y76wssh0yciqafs2f0v36";
   };
 
   enableParallelBuilding = true;

From 674d71b6b584101da3ffad14c5157632c2bdcf4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 28 Aug 2019 10:19:09 -0300
Subject: [PATCH 318/794] enlightenment.enlightenment: define pname attribute

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

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 07aac3d611b..dc0469cd144 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "enlightenment-${version}";
+  pname = "enlightenment";
   version = "0.22.4";
 
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
+    url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
     sha256 = "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r";
   };
 

From 722b2158a65497172b0c0b28087445cd905c7316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 28 Aug 2019 10:21:04 -0300
Subject: [PATCH 319/794] enlightenment.enlightenment: 0.22.4 -> 0.23.0

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

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index dc0469cd144..6e55d73e24f 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "enlightenment";
-  version = "0.22.4";
+  version = "0.23.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r";
+    sha256 = "1y7x594gvyvl5zbb1rnf3clj2pm6j97n8wl5mp9x6xjmhx0d1idq";
   };
 
   nativeBuildInputs = [

From b6d906732c823b0e5f55b3a9309a9cc120c977aa Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Wed, 28 Aug 2019 09:48:48 -0400
Subject: [PATCH 320/794] aggregateModules: use stdenvNoCC instead of stdenv
 (#67579)

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

diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix
index afa8867dd07..4da87a557cb 100644
--- a/pkgs/os-specific/linux/kmod/aggregator.nix
+++ b/pkgs/os-specific/linux/kmod/aggregator.nix
@@ -1,4 +1,4 @@
-{ stdenv, kmod, modules, buildEnv, name ? "kernel-modules" }:
+{ stdenvNoCC, kmod, modules, buildEnv, name ? "kernel-modules" }:
 
 buildEnv {
   inherit name;
@@ -7,7 +7,7 @@ buildEnv {
 
   postBuild =
     ''
-      source ${stdenv}/setup
+      source ${stdenvNoCC}/setup
 
       if ! test -d "$out/lib/modules"; then
         echo "No modules found."

From 722746c0567e5e0a104aca79637e07019a66a5d3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 28 Aug 2019 09:57:01 -0400
Subject: [PATCH 321/794] rl-1909: add note about Xfce 4.14

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

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 6493bb99596..2111b25930e 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -48,6 +48,15 @@
      To gain root privileges use <literal>sudo -i</literal> without a password.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      We've updated to Xfce 4.14, which brings a new module <option>services.xserver.desktopManager.xfce4-14</option>.
+      If you'd like to upgrade, please switch from the <option>services.xserver.desktopManager.xfce</option> module as it
+      will be deprecated in a future release. They're incompatibilities with the current Xfce module; it doesn't support
+      <option>thunarPlugins</option> and it isn't recommended to use <option>services.xserver.desktopManager.xfce</option>
+      and <option>services.xserver.desktopManager.xfce4-14</option> simultaneously or to downgrade from Xfce 4.14 after upgrading.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 3595e93f6f046f543159de85c43926f2a5c46718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 28 Aug 2019 11:13:17 -0300
Subject: [PATCH 322/794] enlightenment.enlightenment: bluetooth support

---
 pkgs/desktops/enlightenment/enlightenment.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 6e55d73e24f..13aa0eb7858 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
   xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
   luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa,
-  xkeyboard_config, pcre
+  xkeyboard_config, pcre,
+
+  bluetoothSupport ? true, bluez5,
 }:
 
 stdenv.mkDerivation rec {
@@ -36,8 +38,10 @@ stdenv.mkDerivation rec {
     pcre
     mesa
     xkeyboard_config
-  ] ++
-    stdenv.lib.optionals stdenv.isLinux [ libcap ];
+  ]
+  ++ stdenv.lib.optional stdenv.isLinux libcap
+  ++ stdenv.lib.optional bluetoothSupport bluez5
+  ;
 
   patches = [
     # Some programs installed by enlightenment (to set the cpu frequency,

From a23798e4788c093f34df3d6e547ce3be5ce71b69 Mon Sep 17 00:00:00 2001
From: Hugo Geoffroy <pistache@lebib.org>
Date: Sat, 15 Jun 2019 05:22:35 +0200
Subject: [PATCH 323/794] nixos/x11: provide selected session to custom session

The custom session script is always executed (when it exists). This change
passes the selected session script and select session name to the custom session
script, so that it can defer to the selected session script based on the value
of the selected session name.
---
 nixos/modules/services/x11/display-managers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 0e87e6adbab..bf6b048654b 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -109,7 +109,7 @@ let
 
       # Allow the user to setup a custom session type.
       if test -x ~/.xsession; then
-          exec ~/.xsession
+          eval exec ~/.xsession "$@"
       fi
 
       if test "$1"; then

From 9e04b3173ea53b2445d65be53b4c93049a52e77a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 28 Aug 2019 12:45:09 -0300
Subject: [PATCH 324/794] enlightenment.enlightenment: pulseaudio support

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

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 13aa0eb7858..b2a9d398709 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -4,6 +4,7 @@
   xkeyboard_config, pcre,
 
   bluetoothSupport ? true, bluez5,
+  pulseSupport ? !stdenv.isDarwin, libpulseaudio,
 }:
 
 stdenv.mkDerivation rec {
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
   ]
   ++ stdenv.lib.optional stdenv.isLinux libcap
   ++ stdenv.lib.optional bluetoothSupport bluez5
+  ++ stdenv.lib.optional pulseSupport libpulseaudio
   ;
 
   patches = [

From c9c2aed2ac70e5ae53ddea8892622672c9decc4b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 10:03:49 +0200
Subject: [PATCH 325/794] LTS Haskell 14.3

---
 .../configuration-hackage2nix.yaml            | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b279652a5d5..82d567cf4f0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 14.2
+  # LTS Haskell 14.3
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -70,7 +70,7 @@ default-package-overrides:
   - aeson-utils ==0.3.0.2
   - aeson-yak ==0.1.1.3
   - al ==0.1.4.2
-  - alarmclock ==0.7.0.1
+  - alarmclock ==0.7.0.2
   - alerts ==0.1.2.0
   - alex ==3.2.4
   - alg ==0.2.10.0
@@ -91,7 +91,7 @@ default-package-overrides:
   - ANum ==0.2.0.2
   - aos-signature ==0.1.1
   - apecs ==0.8.1
-  - apecs-gloss ==0.2.2
+  - apecs-gloss ==0.2.3
   - apecs-physics ==0.4.2
   - api-field-json-th ==0.1.0.2
   - appar ==0.1.8
@@ -144,7 +144,7 @@ default-package-overrides:
   - aws-cloudfront-signed-cookies ==0.2.0.1
   - aws-lambda-haskell-runtime ==2.0.1
   - backprop ==0.2.6.3
-  - bank-holidays-england ==0.2.0.1
+  - bank-holidays-england ==0.2.0.2
   - barbies ==1.1.3.0
   - barrier ==0.1.1
   - base16-bytestring ==0.1.1.6
@@ -639,7 +639,7 @@ default-package-overrides:
   - explicit-exception ==0.1.10
   - exp-pairs ==0.2.0.0
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.17
+  - extra ==1.6.18
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.3
   - fail ==4.9.0.0
@@ -774,7 +774,7 @@ default-package-overrides:
   - ghc-lib ==8.8.0.20190424
   - ghc-lib-parser ==8.8.0.20190424
   - ghc-parser ==0.2.0.3
-  - ghc-paths ==0.1.0.9
+  - ghc-paths ==0.1.0.12
   - ghc-prof ==1.4.1.5
   - ghc-syntax-highlighter ==0.0.4.0
   - ghc-tcplugins-extra ==0.3
@@ -963,7 +963,7 @@ default-package-overrides:
   - hsinstall ==2.2
   - HSlippyMap ==3.0.1
   - hslogger ==1.2.12
-  - hslua ==1.0.3.1
+  - hslua ==1.0.3.2
   - hslua-aeson ==1.0.0
   - hslua-module-system ==0.2.1
   - hslua-module-text ==0.2.1
@@ -1258,7 +1258,7 @@ default-package-overrides:
   - loopbreaker ==0.1.1.0
   - lrucache ==1.2.0.1
   - lrucaching ==0.3.3
-  - lsp-test ==0.6.0.0
+  - lsp-test ==0.6.1.0
   - lucid ==2.9.11
   - lucid-extras ==0.2.2
   - lxd-client-config ==0.1.0.1
@@ -1415,6 +1415,7 @@ default-package-overrides:
   - netlib-comfort-array ==0.0.0.1
   - netlib-ffi ==0.1.1
   - netpbm ==1.0.3
+  - netrc ==0.2.0.0
   - nettle ==0.3.0
   - netwire ==5.0.3
   - netwire-input ==0.0.7
@@ -1510,7 +1511,7 @@ default-package-overrides:
   - pandoc-csv2table ==1.0.7
   - pandoc-markdown-ghci-filter ==0.1.0.0
   - pandoc-pyplot ==2.1.5.1
-  - pandoc-types ==1.17.5.4
+  - pandoc-types ==1.17.6
   - pantry ==0.1.1.1
   - parallel ==3.2.2.0
   - parallel-io ==0.3.3
@@ -1808,9 +1809,9 @@ default-package-overrides:
   - safe-json ==0.1.0
   - safe-money ==0.9
   - SafeSemaphore ==0.10.1
-  - salak ==0.3.4.1
-  - salak-toml ==0.3.4.1
-  - salak-yaml ==0.3.4.1
+  - salak ==0.3.5.1
+  - salak-toml ==0.3.5.1
+  - salak-yaml ==0.3.5.1
   - saltine ==0.1.0.2
   - salve ==1.0.6
   - sample-frame ==0.0.3
@@ -1824,7 +1825,7 @@ default-package-overrides:
   - scalpel-core ==0.6.0
   - scanf ==0.1.0.0
   - scanner ==0.3
-  - scheduler ==1.4.1
+  - scheduler ==1.4.2
   - scientific ==0.3.6.2
   - scotty ==0.11.4
   - scrypt ==0.5.0
@@ -1957,6 +1958,7 @@ default-package-overrides:
   - sox ==0.2.3.1
   - soxlib ==0.0.3.1
   - sparse-linear-algebra ==0.3.1
+  - sparse-tensor ==0.2.1
   - spatial-math ==0.5.0.1
   - special-values ==0.1.0.0
   - speculate ==0.3.5
@@ -2418,7 +2420,7 @@ default-package-overrides:
   - xmonad-extras ==0.15.1
   - xss-sanitize ==0.3.6
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.11.1.0
+  - yaml ==0.11.1.1
   - yeshql ==4.1.0.1
   - yeshql-core ==4.1.0.2
   - yeshql-hdbc ==4.1.0.2

From 30a31cc908f48c3336c26f37cb4a4976ad7d8a4f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 10:00:55 +0200
Subject: [PATCH 326/794] hackage2nix: keep ghc-lib-parser-8.8.0.20190723 until
 hlint updates its dependencies

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 82d567cf4f0..9da89156df6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2486,6 +2486,7 @@ extra-packages:
   - dbus <1                             # for xmonad-0.26
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
   - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
+  - ghc-lib-parser == 8.8.0.20190723    # required by hlint-2.2.2
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
   - haddock < 2.17                      # required on GHC 7.10.x
   - haddock == 2.17.*                   # required on GHC 8.0.x

From 4792a6db4cbadf40f7d855b4504b1820631b3d9a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 25 Aug 2019 04:20:00 -0500
Subject: [PATCH 327/794] haskell-dhall-json: disable broken test suite to fix
 the build

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d920baa0daf..c37667af558 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1059,9 +1059,11 @@ self: super: {
       dontCheck super.dhall
   );
 
+  # Missing test files in source distribution, fixed once 1.4.0 is bumped
+  # https://github.com/dhall-lang/dhall-haskell/pull/997
   dhall-json =
     generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (
-      super.dhall-json
+      dontCheck super.dhall-json
   );
 
   dhall-nix =

From ecea5f47285245d5e5eda8b0ee70401adde3e262 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 25 Aug 2019 04:21:00 -0500
Subject: [PATCH 328/794] hackage2nix: unbreak dhall-json build

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 pkgs/development/haskell-modules/hackage-packages.nix           | 2 --
 2 files changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 9da89156df6..c689b9303de 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4283,7 +4283,6 @@ broken-packages:
   - dgim
   - dgs
   - dhall-check
-  - dhall-json
   - dhall-lsp-server
   - dhall-nix
   - dhall-to-cabal
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 68925186925..a85d4a046b0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -67316,8 +67316,6 @@ self: {
        ];
        description = "Convert between Dhall and JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-json_1_4_0" = callPackage

From 034dcc2ab8ae1e03834402db7f50ba1821b2dfee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 10:11:34 +0200
Subject: [PATCH 329/794] hackage2nix: disable builds depended on broken
 packages that break evaluation on Hydra

---
 .../haskell-modules/configuration-hackage2nix.yaml            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c689b9303de..db9e9c2f6ad 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3464,6 +3464,8 @@ broken-packages:
   - boombox
   - boomslang
   - boots-app
+  - boots-cloud
+  - boots-web
   - borel
   - boring-window-switcher
   - bot
@@ -3525,6 +3527,7 @@ broken-packages:
   - bv-sized
   - bytable
   - byteslice
+  - bytesmith
   - bytestring-builder-varword
   - bytestring-class
   - bytestring-csv
@@ -7617,6 +7620,7 @@ broken-packages:
   - notcpp
   - notmuch-haskell
   - notmuch-web
+  - now-haskell
   - np-linear
   - nptools
   - ntha

From 1b8e14b38d25074fcbe6e5140ab98b0b23f48c68 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 15:29:15 +0000
Subject: [PATCH 330/794] hackage2nix: keep resolv-0.1.1.2 around for ghc
 versions prior to 8.8.x

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index db9e9c2f6ad..0a269acbdb6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2519,6 +2519,7 @@ extra-packages:
   - proto-lens-protobuf-types == 0.2.*  # required for tensorflow-proto-0.1.x on GHC 8.2.x
   - proto-lens-protoc == 0.2.*          # required for tensorflow-proto-0.1.x on GHC 8.2.x
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
+  - resolv == 0.1.1.2                   # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
   - resourcet ==1.1.*                   # pre-lts-11.x versions neeed by git-annex 6.20180227
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x

From 0fc727c3e1833e512103c6fb9198de1cb96b665c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Aug 2019 02:30:55 +0200
Subject: [PATCH 331/794] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.14.4-7-ga804c35 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/f3caaa39bd8e093c5142acad87b17c51fb7a207d.
---
 .../haskell-modules/hackage-packages.nix      | 1537 ++++++++++++-----
 1 file changed, 1124 insertions(+), 413 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a85d4a046b0..a6fd9209005 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1243,22 +1243,23 @@ self: {
   "BNFC" = callPackage
     ({ mkDerivation, alex, array, base, containers, deepseq, directory
      , doctest, filepath, happy, hspec, HUnit, mtl, pretty, process
-     , QuickCheck, temporary
+     , QuickCheck, semigroups, temporary, time
      }:
      mkDerivation {
        pname = "BNFC";
-       version = "2.8.2";
-       sha256 = "1n4zgm6gls6lpasn8y5hy0m75qkkbk6mj18g2yhjrw8514a5860h";
+       version = "2.8.3";
+       sha256 = "00w8g0kn4sgjyiq4hykkz8k0kl5b5861v7d9g2021vca78gif6wl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
        executableHaskellDepends = [
          array base containers deepseq directory filepath mtl pretty process
+         semigroups time
        ];
        executableToolDepends = [ alex happy ];
        testHaskellDepends = [
          array base containers deepseq directory doctest filepath hspec
-         HUnit mtl pretty process QuickCheck temporary
+         HUnit mtl pretty process QuickCheck semigroups temporary time
        ];
        description = "A compiler front-end generator";
        license = stdenv.lib.licenses.gpl2;
@@ -12698,8 +12699,8 @@ self: {
      }:
      mkDerivation {
        pname = "Map";
-       version = "0.0.2.0";
-       sha256 = "1imnnd5plp3dqpfrpviwgabd0c47fxfxvh10gyxvssmslxi1k27p";
+       version = "0.1.1.0";
+       sha256 = "0x5sy115f5yx580g8pl8jkjwzd0ih2n4fbvh5f5ch2i749l4dyq1";
        libraryHaskellDepends = [
          base containers either-both filtrable util
        ];
@@ -15740,8 +15741,8 @@ self: {
      }:
      mkDerivation {
        pname = "PyF";
-       version = "0.8.0.0";
-       sha256 = "0np08pyx5kd1wbnrxbzcbp6zryvh38iy2mbz1xbb6ldfmn98r78p";
+       version = "0.8.0.1";
+       sha256 = "1bv57hi26nmrhcdr4hki62ycd0k5p0i0jdwcdcxi7vmhjavnyq08";
        libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta megaparsec
          template-haskell text
@@ -24327,24 +24328,6 @@ self: {
      }) {inherit (pkgs) openal;};
 
   "alarmclock" = callPackage
-    ({ mkDerivation, async, base, clock, hspec, stm, time
-     , unbounded-delays
-     }:
-     mkDerivation {
-       pname = "alarmclock";
-       version = "0.7.0.1";
-       sha256 = "08y3qzm1z28k819xg2qz3dbj0kpynxmhs5bwa6rmgw52sxbiwlnf";
-       libraryHaskellDepends = [
-         async base clock stm time unbounded-delays
-       ];
-       testHaskellDepends = [
-         async base clock hspec stm time unbounded-delays
-       ];
-       description = "Wake up and perform an action at a certain time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "alarmclock_0_7_0_2" = callPackage
     ({ mkDerivation, async, base, clock, hspec, stm, time
      , unbounded-delays
      }:
@@ -24360,7 +24343,6 @@ self: {
        ];
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alea" = callPackage
@@ -29266,8 +29248,8 @@ self: {
      }:
      mkDerivation {
        pname = "apecs-gloss";
-       version = "0.2.2";
-       sha256 = "0p8r8hraqa49f13p045j54kzyrcvgscppgqllwnqgdx0in8j71cf";
+       version = "0.2.3";
+       sha256 = "0f2cvjlsf00w69a6m52pwcp9srk441qfzbpdvdwh8pm2vl6nax69";
        libraryHaskellDepends = [
          apecs apecs-physics base containers gloss linear
        ];
@@ -35216,18 +35198,6 @@ self: {
      }) {};
 
   "bank-holidays-england" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
-     mkDerivation {
-       pname = "bank-holidays-england";
-       version = "0.2.0.1";
-       sha256 = "0vnadqs924k54f5zdm0airnss47gafqbrak59wvrmc667xn01k0h";
-       libraryHaskellDepends = [ base containers time ];
-       testHaskellDepends = [ base containers hspec QuickCheck time ];
-       description = "Calculation of bank holidays in England and Wales";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bank-holidays-england_0_2_0_2" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
      mkDerivation {
        pname = "bank-holidays-england";
@@ -35237,7 +35207,6 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck time ];
        description = "Calculation of bank holidays in England and Wales";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "banwords" = callPackage
@@ -35540,6 +35509,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base-noprelude_4_13_0_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-noprelude";
+       version = "4.13.0.0";
+       sha256 = "1ld1phm7jpyvm33dj568gy28inbiklrj00yvb83v5y7rn01w32kp";
+       libraryHaskellDepends = [ base ];
+       doHaddock = false;
+       description = "\"base\" package sans \"Prelude\" module";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-orphans" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
      }:
@@ -36229,6 +36211,25 @@ self: {
        broken = true;
      }) {};
 
+  "bcp47" = callPackage
+    ({ mkDerivation, aeson, base, containers, country, doctest
+     , generic-arbitrary, hspec, iso639, megaparsec, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "bcp47";
+       version = "0.1.0.0";
+       sha256 = "1cy2wdp97mvyg1fvkmi6vzd8vd9v8645nd5cfzgp4whhy0v5y7rj";
+       libraryHaskellDepends = [
+         aeson base containers country generic-arbitrary iso639 megaparsec
+         QuickCheck text
+       ];
+       testHaskellDepends = [
+         aeson base containers country doctest hspec iso639 QuickCheck text
+       ];
+       description = "Language tags as specified by BCP 47";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bcrypt" = callPackage
     ({ mkDerivation, base, bytestring, data-default, entropy, memory }:
      mkDerivation {
@@ -37230,6 +37231,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bifunctors_5_5_5" = callPackage
+    ({ mkDerivation, base, base-orphans, comonad, containers, hspec
+     , hspec-discover, QuickCheck, tagged, template-haskell
+     , th-abstraction, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "bifunctors";
+       version = "5.5.5";
+       sha256 = "0rn47q8dzv0g1fyams99p4py6q0asxdc50q9k0nj497brk738xcb";
+       libraryHaskellDepends = [
+         base base-orphans comonad containers tagged template-haskell
+         th-abstraction transformers
+       ];
+       testHaskellDepends = [
+         base hspec QuickCheck template-haskell transformers
+         transformers-compat
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Bifunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bighugethesaurus" = callPackage
     ({ mkDerivation, base, HTTP, split }:
      mkDerivation {
@@ -39924,8 +39948,8 @@ self: {
        pname = "bitwise";
        version = "1.0.0.1";
        sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn";
-       revision = "1";
-       editedCabalFile = "1h6dbjmznd3pvz7j5f8xwaaxxhx57fxszli2k430wcn65bc9y0zs";
+       revision = "2";
+       editedCabalFile = "1mnh3629kgfivjwbbqwrkcyvg6iah5pncc5jzgq3ka5cq0kg09gz";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ array base bytestring criterion ];
@@ -41600,12 +41624,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "boots_0_1_1" = callPackage
+  "boots_0_2" = callPackage
     ({ mkDerivation, base, exceptions, hspec, mtl }:
      mkDerivation {
        pname = "boots";
-       version = "0.1.1";
-       sha256 = "1z9h8i1r0jccqn0230nzn97yqzrlsapc84dnwhczzvdbaryykhbz";
+       version = "0.2";
+       sha256 = "0v7p2pfs4kcczc4wpswb0rgl2ak9xijq7ha9c6lagyb1av17sx9r";
        libraryHaskellDepends = [ base exceptions mtl ];
        testHaskellDepends = [ base exceptions hspec mtl ];
        description = "IoC Monad in Haskell";
@@ -41615,28 +41639,64 @@ self: {
 
   "boots-app" = callPackage
     ({ mkDerivation, base, boots, data-default, exceptions, fast-logger
-     , hspec, menshen, microlens, monad-logger, mtl, salak, salak-yaml
-     , splitmix, text, unliftio-core, vault
+     , menshen, microlens, mtl, salak, salak-yaml, splitmix, text, time
+     , unliftio-core, unordered-containers
      }:
      mkDerivation {
        pname = "boots-app";
-       version = "0.1.1";
-       sha256 = "1v8qbap22mpasjpmi9bd0n14q4vz80ksmlmk67yw840f2ly8sn0d";
+       version = "0.2";
+       sha256 = "0rnlb9fzaxcx4lvacqklv1kr2ygzgssgz1xzcfmbgkqpzp08nxqx";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base boots data-default exceptions fast-logger menshen microlens
-         monad-logger mtl salak salak-yaml splitmix text unliftio-core vault
+         mtl salak salak-yaml splitmix text unliftio-core
+         unordered-containers
        ];
-       testHaskellDepends = [
-         base boots data-default exceptions fast-logger hspec menshen
-         microlens monad-logger mtl salak salak-yaml splitmix text
-         unliftio-core vault
-       ];
-       description = "Startup factories using IoC monad";
+       executableHaskellDepends = [ base time ];
+       description = "Factory for quickly building an application";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
 
+  "boots-cloud" = callPackage
+    ({ mkDerivation, aeson, base, boots, boots-app, boots-web
+     , bytestring, http-client, salak, servant, servant-client, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "boots-cloud";
+       version = "0.2";
+       sha256 = "0wfbzf753h3bgfdw0gfh4cwi40qv2ghyyznfahwxkh9aabrwckqp";
+       libraryHaskellDepends = [
+         aeson base boots boots-app boots-web bytestring http-client salak
+         servant servant-client text unordered-containers
+       ];
+       description = "Factory for quickly building a microservice";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "boots-web" = callPackage
+    ({ mkDerivation, aeson, base, boots, boots-app, bytestring
+     , containers, ekg-core, http-types, microlens, monad-logger, salak
+     , servant-server, servant-swagger, swagger2, text, time
+     , unordered-containers, vault, wai, warp
+     }:
+     mkDerivation {
+       pname = "boots-web";
+       version = "0.2";
+       sha256 = "00f55k7gc4dirzxmgngw9vpcl0w8fgklsyscy5h584pbhd84x4mj";
+       libraryHaskellDepends = [
+         aeson base boots boots-app bytestring containers ekg-core
+         http-types microlens monad-logger salak servant-server
+         servant-swagger swagger2 text time unordered-containers vault wai
+         warp
+       ];
+       description = "Factory for quickly building a web application";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bootstrap-types" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -41911,8 +41971,8 @@ self: {
     ({ mkDerivation, base, containers, GLUT, hosc, hsc3, random }:
      mkDerivation {
        pname = "bowntz";
-       version = "1";
-       sha256 = "0b5fv59v7c896g56ixyhip8cnbfw2p2qvdmgj2dg97jvgjkxwpfn";
+       version = "2";
+       sha256 = "0i8fi5xq04s9mzyy1vdshmlyybzhim0sr9nyxxfdbvcaai796i5z";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42691,6 +42751,8 @@ self: {
        pname = "bsb-http-chunked";
        version = "0.0.0.4";
        sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql";
+       revision = "1";
+       editedCabalFile = "07k9422yaw7rz66awmc20ni17xw2bd1pn48ja79c66d5va89f6wz";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          attoparsec base blaze-builder bytestring doctest hedgehog tasty
@@ -43516,6 +43578,8 @@ self: {
        pname = "butterflies";
        version = "0.3.0.2";
        sha256 = "0syykvrgq6i0zxy1pn934j1r9glv4yypva1mfkn0vc0nikh9fm31";
+       revision = "1";
+       editedCabalFile = "1xxdc352fp11b8mhhr3rwj5kffkglvbry2smwwfj1f10wr749zn9";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -43715,6 +43779,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytes_0_16" = callPackage
+    ({ mkDerivation, base, binary, binary-orphans, bytestring, Cabal
+     , cabal-doctest, cereal, containers, directory, doctest, filepath
+     , hashable, mtl, scientific, text, time, transformers
+     , transformers-compat, unordered-containers, void
+     }:
+     mkDerivation {
+       pname = "bytes";
+       version = "0.16";
+       sha256 = "1m8nkviq4ckqi9v1w1fxzicdzmvb3wfxcmqmppjrrmkwawn4c6i9";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base binary binary-orphans bytestring cereal containers hashable
+         mtl scientific text time transformers transformers-compat
+         unordered-containers void
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       description = "Sharing code for serialization between binary and cereal";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "byteset" = callPackage
     ({ mkDerivation, base, binary }:
      mkDerivation {
@@ -43751,6 +43837,8 @@ self: {
        testHaskellDepends = [ base byteslice primitive ];
        description = "Nonresumable byte parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring_0_10_10_0" = callPackage
@@ -44716,27 +44804,23 @@ self: {
   "cabal-debian" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal
      , containers, data-default, debian, deepseq, Diff, directory
-     , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl
-     , network-uri, newtype-generics, optparse-applicative, parsec
-     , pretty, process, pureMD5, regex-tdfa, set-extra, syb, text, unix
-     , Unixutils, utf8-string
+     , exceptions, filepath, hsemail, HUnit, lens, mtl, network-uri
+     , newtype-generics, optparse-applicative, parsec, pretty, process
+     , pureMD5, regex-tdfa, syb, text, unix, unliftio, utf8-string
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.39";
-       sha256 = "0cp1q9pa6wdij23bq7c3dac1byxxdr7maxvjj3jyi3v4d2mhgyvp";
+       version = "5.0";
+       sha256 = "1brbn45zg8ki54xl429qlzhzn30mgy7i1sidq1imd54c0rnai46v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base bifunctors Cabal containers data-default debian
-         deepseq Diff directory exceptions filepath hsemail HUnit lens
-         memoize mtl network-uri newtype-generics optparse-applicative
-         parsec pretty process pureMD5 regex-tdfa set-extra syb text unix
-         Unixutils utf8-string
-       ];
-       executableHaskellDepends = [
-         base Cabal debian lens mtl pretty Unixutils
+         deepseq Diff directory exceptions filepath hsemail HUnit lens mtl
+         network-uri newtype-generics optparse-applicative parsec pretty
+         process pureMD5 regex-tdfa syb text unix unliftio utf8-string
        ];
+       executableHaskellDepends = [ base Cabal debian lens mtl pretty ];
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44812,6 +44896,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-doctest_1_0_7" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "cabal-doctest";
+       version = "1.0.7";
+       sha256 = "1v5dlwsxd9kdll07x5apnf76j2g2pqfp138pacc64j6agrgyv00h";
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       description = "A Setup.hs helper for doctests running";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-file-th" = callPackage
     ({ mkDerivation, base, Cabal, directory, pretty, template-haskell
      }:
@@ -44966,15 +45062,12 @@ self: {
      , bytestring, Cabal, containers, cryptohash-sha256, deepseq
      , directory, echo, edit-distance, filepath, hackage-security
      , hashable, HTTP, mtl, network, network-uri, parsec, pretty
-     , process, random, resolv, stm, tar, text, time, unix, zip-archive
-     , zlib
+     , process, random, resolv, stm, tar, text, time, unix, zlib
      }:
      mkDerivation {
        pname = "cabal-install";
-       version = "2.4.1.0";
-       sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39";
-       revision = "3";
-       editedCabalFile = "1mnm6mfrgavq3blvkm3wz45pqrj10apjihg1g9cds58qp19m9r1h";
+       version = "3.0.0.0";
+       sha256 = "1wda29ifkn50376jidj6ihfk60a64y0bsd7lh3yw15py7a2sfcm4";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath process ];
@@ -44982,8 +45075,7 @@ self: {
          array async base base16-bytestring binary bytestring Cabal
          containers cryptohash-sha256 deepseq directory echo edit-distance
          filepath hackage-security hashable HTTP mtl network network-uri
-         parsec pretty process random resolv stm tar text time unix
-         zip-archive zlib
+         parsec pretty process random resolv stm tar text time unix zlib
        ];
        doCheck = false;
        postInstall = ''
@@ -48881,6 +48973,25 @@ self: {
        license = "LGPL";
      }) {};
 
+  "chart-cli" = callPackage
+    ({ mkDerivation, attoparsec, base, Chart, Chart-cairo, colour
+     , data-default-class, dates, filepath, hashable, lens
+     , optparse-applicative, text, time
+     }:
+     mkDerivation {
+       pname = "chart-cli";
+       version = "0.1.0.0";
+       sha256 = "0z90jzhw0k1z20gn227r0jcpnfj6ajr9y54y5g7phb6cy1ff2iv3";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base Chart Chart-cairo colour data-default-class dates
+         filepath hashable lens optparse-applicative text time
+       ];
+       description = "Command-line utility to draw charts from input data easily";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "chart-histogram" = callPackage
     ({ mkDerivation, base, Chart }:
      mkDerivation {
@@ -51018,8 +51129,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.25.0";
-       sha256 = "1jgxchshpkpbgpkn31iymswb08wjjfmvqglv5brs0zw4ialirrh9";
+       version = "0.25.2";
+       sha256 = "087k0n6ri0pg5wmjnw3gkjaz5d627519vby9kmiagck7id7f89q9";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
@@ -54374,8 +54485,8 @@ self: {
        pname = "complex-generic";
        version = "0.1.1.1";
        sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz";
-       revision = "3";
-       editedCabalFile = "0vm0i25bib0bzlw7fw209pqn3963y5hx0vkri049q4v7y0qld8k9";
+       revision = "4";
+       editedCabalFile = "00v0mr5fc090wph3s9ks3ppf81nqbkd0yfa347fkn3zrq3daqr8f";
        libraryHaskellDepends = [ base template-haskell ];
        description = "complex numbers with non-mandatory RealFloat";
        license = stdenv.lib.licenses.bsd3;
@@ -56810,15 +56921,15 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "constraints_0_11" = callPackage
+  "constraints_0_11_1" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
      , hspec-discover, mtl, semigroups, transformers
      , transformers-compat
      }:
      mkDerivation {
        pname = "constraints";
-       version = "0.11";
-       sha256 = "1ik97w6ci9kw5ppw9nmh65j6ldqq2az8c37jlg3h5x3prn2cds1d";
+       version = "0.11.1";
+       sha256 = "15768bcd8z70wq0b2igvz8mrl62bqaqad6cpdp9p4awyylba37y6";
        libraryHaskellDepends = [
          base binary deepseq ghc-prim hashable mtl semigroups transformers
          transformers-compat
@@ -58666,15 +58777,15 @@ self: {
      }) {};
 
   "cpsa" = callPackage
-    ({ mkDerivation, base, containers, parallel }:
+    ({ mkDerivation, base, containers, directory, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "3.6.2";
-       sha256 = "0byrfj9lqv4k5d0s3d7ib6bwcz50bl23qnk2nk8bzk9s1356g6yi";
+       version = "3.6.3";
+       sha256 = "121lrj9zhlcs4r2xghxw8cah705s5k9jkcl9g3mj5ixzki3b2bdm";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       executableHaskellDepends = [ base containers parallel ];
+       executableHaskellDepends = [ base containers directory parallel ];
        description = "Symbolic cryptographic protocol analyzer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -60255,8 +60366,8 @@ self: {
        pname = "cryptohash-sha256";
        version = "0.11.101.0";
        sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj";
-       revision = "2";
-       editedCabalFile = "0m5h68xm60wrjv88gg6cn1q5qki5674mxl4d6sn3vxpbcj9b5417";
+       revision = "3";
+       editedCabalFile = "1arhz4y792kx439s2zv9x291gvvl2zxcfx9sq0nxsjlz7c3hpyp1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -65263,28 +65374,26 @@ self: {
 
   "debian" = callPackage
     ({ mkDerivation, base, bytestring, bzlib, Cabal, containers
-     , directory, either, exceptions, filepath, HaXml, hostname, HUnit
-     , lens, ListLike, mtl, network-uri, old-locale, parsec, pretty
-     , process, process-extras, pureMD5, QuickCheck, regex-compat
-     , regex-tdfa, SHA, syb, template-haskell, text, th-lift, th-orphans
-     , time, unix, Unixutils, utf8-string, zlib
+     , directory, either, exceptions, filepath, hostname, HUnit, lens
+     , ListLike, mtl, network-uri, old-locale, parsec, pretty, process
+     , process-extras, pureMD5, QuickCheck, regex-compat, regex-tdfa
+     , SHA, syb, template-haskell, temporary, text, th-lift, th-orphans
+     , time, unix, utf8-string, zlib
      }:
      mkDerivation {
        pname = "debian";
-       version = "3.95.1";
-       sha256 = "1sfvjq9vilibvvcpm404z6j64ic54bd1s7yri8plfg849miynh95";
+       version = "4.0.0";
+       sha256 = "1gshvsgbgghskl4csngffdpnf49z27yhap86bwqnkp4asbh553h6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring bzlib Cabal containers directory either exceptions
-         filepath HaXml hostname HUnit lens ListLike mtl network-uri
-         old-locale parsec pretty process process-extras pureMD5 QuickCheck
-         regex-compat regex-tdfa SHA syb template-haskell text th-lift
-         th-orphans time unix Unixutils utf8-string zlib
-       ];
-       executableHaskellDepends = [
-         base directory filepath HaXml pretty process unix
+         filepath hostname HUnit lens ListLike mtl network-uri old-locale
+         parsec pretty process process-extras pureMD5 QuickCheck
+         regex-compat regex-tdfa SHA syb template-haskell temporary text
+         th-lift th-orphans time unix utf8-string zlib
        ];
+       executableHaskellDepends = [ base directory filepath process ];
        testHaskellDepends = [
          base Cabal HUnit parsec pretty regex-tdfa text
        ];
@@ -65512,14 +65621,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "decidable_0_2_0_0" = callPackage
+  "decidable_0_2_1_0" = callPackage
     ({ mkDerivation, base, functor-products, microlens, singletons
      , vinyl
      }:
      mkDerivation {
        pname = "decidable";
-       version = "0.2.0.0";
-       sha256 = "1b0mnkgk60qm84wim9lq6hlgm2ijxjx0s4gahvd5fjkccdryz2h2";
+       version = "0.2.1.0";
+       sha256 = "1l307j4n9xagarbqqa48c729fs63qlzy5sqzgfyzfqwnas8yrqhx";
        libraryHaskellDepends = [
          base functor-products microlens singletons vinyl
        ];
@@ -66355,12 +66464,13 @@ self: {
      }:
      mkDerivation {
        pname = "dependent-sum-aeson-orphans";
-       version = "0.2.0.0";
-       sha256 = "0cb3yhrqn2mwa3spfz6sky9bh9kh92kl4959187d6kqvvhqqmafj";
+       version = "0.2.1.0";
+       sha256 = "04flfszrn4ah9vrm6hyp2pk0sbldcjp0jjibdny7lxdmv0fskzj5";
        libraryHaskellDepends = [
          aeson base constraints constraints-extras dependent-map
          dependent-sum
        ];
+       description = "JSON instances for DSum, DMap, and Some";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -66744,6 +66854,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "deriving-compat_0_5_7" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, containers
+     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
+     , template-haskell, th-abstraction, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "deriving-compat";
+       version = "0.5.7";
+       sha256 = "0bp4f0is84cv139s35669dv23mcp6lhp2wall72yvkk12lp2l2mg";
+       libraryHaskellDepends = [
+         base containers ghc-boot-th ghc-prim template-haskell
+         th-abstraction transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base base-compat base-orphans hspec QuickCheck tagged
+         template-haskell transformers transformers-compat
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Backports of GHC deriving extensions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "derp" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -67346,7 +67480,6 @@ self: {
        description = "Convert between Dhall and JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-lex" = callPackage
@@ -71113,6 +71246,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doclayout" = callPackage
+    ({ mkDerivation, base, criterion, mtl, safe, tasty, tasty-golden
+     , tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "doclayout";
+       version = "0.1";
+       sha256 = "1dmjj3z15vr5czy5gkwzs5zvz23ap1qpya3qlqfs5phslpbsada3";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base mtl safe text ];
+       testHaskellDepends = [
+         base mtl tasty tasty-golden tasty-hunit text
+       ];
+       benchmarkHaskellDepends = [ base criterion mtl text ];
+       description = "A prettyprinting library for laying out text documents";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "docopt" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
      , HUnit, parsec, split, template-haskell, text, th-lift
@@ -71165,23 +71316,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "doctemplates_0_3_0_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, filepath
-     , Glob, mtl, parsec, scientific, tasty, tasty-golden, tasty-hunit
-     , temporary, text, unordered-containers, vector
+  "doctemplates_0_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , doclayout, filepath, Glob, mtl, parsec, safe, scientific, tasty
+     , tasty-golden, tasty-hunit, temporary, text, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "doctemplates";
-       version = "0.3.0.1";
-       sha256 = "11xvrmk9qb2izq8y61pna0lxlsfr5yb94nlk5ih8z1fcdn7ghl3j";
+       version = "0.5";
+       sha256 = "0xdma2j1bim31mvkqc6362rbmv193fyznd3y4ipdgd113zkj7hy6";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base containers filepath mtl parsec scientific text
-         unordered-containers vector
+         aeson base containers doclayout filepath mtl parsec safe scientific
+         text unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring filepath Glob mtl tasty tasty-golden
-         tasty-hunit temporary text
+         aeson base bytestring filepath Glob tasty tasty-golden tasty-hunit
+         temporary text
+       ];
+       benchmarkHaskellDepends = [
+         aeson base containers criterion filepath mtl text
        ];
        description = "Pandoc-style document templates";
        license = stdenv.lib.licenses.bsd3;
@@ -71216,6 +71371,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doctest_0_16_2" = callPackage
+    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
+     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
+     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
+     }:
+     mkDerivation {
+       pname = "doctest";
+       version = "0.16.2";
+       sha256 = "0lk4cjfzi5bx2snfzw1zi06li0gvgz3ckfh2kwa98l7nxfdl39ag";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       executableHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       testHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         hspec HUnit mockery process QuickCheck setenv silently
+         stringbuilder syb transformers
+       ];
+       description = "Test interactive Haskell examples";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
@@ -73126,6 +73310,19 @@ self: {
        broken = true;
      }) {};
 
+  "dyepack" = callPackage
+    ({ mkDerivation, base, generics-sop }:
+     mkDerivation {
+       pname = "dyepack";
+       version = "0.1.0.0";
+       sha256 = "02kdcfnagp0aadfjhn17b47pz9bknl0yisyqpnf79v7g27szb74a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base generics-sop ];
+       description = "Programatically identify space leaks in your program";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dynamic" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava
      , containers, http-conduit, text, unordered-containers, vector
@@ -73434,6 +73631,41 @@ self: {
        broken = true;
      }) {};
 
+  "dzen-dhall" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, dhall, directory
+     , file-embed-lzma, filepath, generic-random, hashable, hourglass
+     , hspec, http-conduit, http-types, HUnit, megaparsec, microlens
+     , microlens-th, network-uri, optparse-applicative, parsec, parsers
+     , pipes, prettyprinter, prettyprinter-ansi-terminal, process
+     , QuickCheck, random, tasty, tasty-hspec, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, transformers, unix
+     , unordered-containers, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "dzen-dhall";
+       version = "1.0.0";
+       sha256 = "0im78kvjwanlbi097pyvvpj2isssf3iblqbbqsk2iccvdqjyqf5z";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring dhall directory file-embed-lzma
+         filepath hashable hourglass http-conduit http-types megaparsec
+         microlens microlens-th network-uri optparse-applicative parsec
+         parsers pipes prettyprinter prettyprinter-ansi-terminal process
+         random text transformers unix unordered-containers utf8-string
+         vector
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base dhall filepath generic-random hspec HUnit microlens
+         network-uri optparse-applicative parsec QuickCheck tasty
+         tasty-hspec tasty-hunit tasty-quickcheck template-haskell text
+         unordered-containers vector
+       ];
+       description = "Configure dzen2 bars in Dhall language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dzen-utils" = callPackage
     ({ mkDerivation, base, colour, process }:
      mkDerivation {
@@ -74925,6 +75157,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "eliminators_0_6" = callPackage
+    ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
+     , singletons, template-haskell, th-abstraction, th-desugar
+     }:
+     mkDerivation {
+       pname = "eliminators";
+       version = "0.6";
+       sha256 = "1mxjp2ygf72k3yaiqpfi4lrmhwhx69zkm5kznrb6wainw5r6h0if";
+       libraryHaskellDepends = [
+         base extra singleton-nats singletons template-haskell
+         th-abstraction th-desugar
+       ];
+       testHaskellDepends = [ base hspec singleton-nats singletons ];
+       testToolDepends = [ hspec-discover ];
+       description = "Dependently typed elimination functions using singletons";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "elision" = callPackage
     ({ mkDerivation, base, profunctors }:
      mkDerivation {
@@ -78596,6 +78847,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exceptions_0_10_3" = callPackage
+    ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "exceptions";
+       version = "0.10.3";
+       sha256 = "1w25j4ys5s6v239vbqlbipm9fdwxl1j2ap2lzms7f7rgnik5ir24";
+       libraryHaskellDepends = [
+         base mtl stm template-haskell transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck stm template-haskell test-framework
+         test-framework-hunit test-framework-quickcheck2 transformers
+         transformers-compat
+       ];
+       description = "Extensible optionally-pure exceptions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exchangerates" = callPackage
     ({ mkDerivation, aeson, base, containers, directory, genvalidity
      , genvalidity-containers, genvalidity-hspec
@@ -79588,22 +79861,6 @@ self: {
      }) {};
 
   "extra" = callPackage
-    ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, semigroups, time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.6.17";
-       sha256 = "1zgp64ich4sjg59vwv6rgfz5amhhydcplv9l8k50p1mc49h2h2vc";
-       libraryHaskellDepends = [
-         base clock directory filepath process semigroups time unix
-       ];
-       testHaskellDepends = [ base directory filepath QuickCheck unix ];
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_6_18" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, semigroups, time, unix
      }:
@@ -79617,7 +79874,6 @@ self: {
        testHaskellDepends = [ base directory filepath QuickCheck unix ];
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -85703,6 +85959,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "free_5_1_2" = callPackage
+    ({ mkDerivation, base, comonad, containers, distributive
+     , exceptions, mtl, profunctors, semigroupoids, template-haskell
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "free";
+       version = "5.1.2";
+       sha256 = "0vlf3f2ckl3cr7z2zl8c9c8qkdlfgvmh04gxkp2fg0z9dz80nlyb";
+       libraryHaskellDepends = [
+         base comonad containers distributive exceptions mtl profunctors
+         semigroupoids template-haskell transformers transformers-base
+       ];
+       description = "Monads for free";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "free-algebras" = callPackage
     ({ mkDerivation, base, constraints, containers, data-fix, dlist
      , free, groups, hedgehog, kan-extensions, mtl, natural-numbers
@@ -89050,6 +89324,18 @@ self: {
        broken = true;
      }) {};
 
+  "generic-constraints" = callPackage
+    ({ mkDerivation, base, HUnit, template-haskell, th-abstraction }:
+     mkDerivation {
+       pname = "generic-constraints";
+       version = "1.1.0";
+       sha256 = "1f7d1z8l68f89p1kfiylwv3qb6n2x7njni4rhlxk9vvyllxgnqcb";
+       libraryHaskellDepends = [ base template-haskell th-abstraction ];
+       testHaskellDepends = [ base HUnit ];
+       description = "Constraints via Generic";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "generic-data" = callPackage
     ({ mkDerivation, base, base-orphans, contravariant, criterion
      , deepseq, generic-lens, one-liner, show-combinators, tasty
@@ -89130,6 +89416,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generic-deriving_1_13" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
+     , template-haskell, th-abstraction
+     }:
+     mkDerivation {
+       pname = "generic-deriving";
+       version = "1.13";
+       sha256 = "0k4av4jamgpavn82q54g345la5i2ckfbq2w9nnf2a6vhvk1lnw8g";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell th-abstraction
+       ];
+       testHaskellDepends = [ base hspec template-haskell ];
+       testToolDepends = [ hspec-discover ];
+       description = "Generic programming library for generalised deriving";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-enum" = callPackage
     ({ mkDerivation, array, base, bytestring, hspec }:
      mkDerivation {
@@ -89442,6 +89746,8 @@ self: {
        pname = "generics-sop";
        version = "0.5.0.0";
        sha256 = "18dkdain2g46b1637f3pbv0fkzg4b1a8frm16hfqvhpfk46i7rzc";
+       revision = "1";
+       editedCabalFile = "10zfjhcipm77zfx32ls7bc8vk3affa5v7cyphwpw93d6sfqc9wym";
        libraryHaskellDepends = [
          base ghc-prim sop-core template-haskell
        ];
@@ -90927,15 +91233,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-lib_8_8_0_20190723" = callPackage
+  "ghc-lib_8_8_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
      , haskeline, hpc, pretty, process, time, transformers, unix
      }:
      mkDerivation {
        pname = "ghc-lib";
-       version = "8.8.0.20190723";
-       sha256 = "161qmm41vayks22vxbji436by1rfbx0x5m2zm4cc11pjcjrd4p63";
+       version = "8.8.1";
+       sha256 = "0lilr12pamss6x2vkqb700zy7yd15vd4y8f0h4q8fdp068bxn177";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -90992,6 +91298,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghc-lib-parser_8_8_1" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
+     , process, time, transformers, unix
+     }:
+     mkDerivation {
+       pname = "ghc-lib-parser";
+       version = "8.8.1";
+       sha256 = "12aicsvc45ld2hv2qq0wdky4qa2mg8s6hhamilavcbp0da2s6wnh";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         ghc-prim hpc pretty process time transformers unix
+       ];
+       libraryToolDepends = [ alex happy ];
+       description = "The GHC API, decoupled from GHC versions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-make" = callPackage
     ({ mkDerivation, base, process, shake, unordered-containers }:
      mkDerivation {
@@ -91148,20 +91474,6 @@ self: {
      }) {};
 
   "ghc-paths" = callPackage
-    ({ mkDerivation, base, Cabal, directory }:
-     mkDerivation {
-       pname = "ghc-paths";
-       version = "0.1.0.9";
-       sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
-       revision = "4";
-       editedCabalFile = "1fp0jyvi6prqsv0dxn010c7q4mmiwlcy1xk6ppd4d539adxxy67d";
-       setupHaskellDepends = [ base Cabal directory ];
-       libraryHaskellDepends = [ base ];
-       description = "Knowledge of GHC's installation directories";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-paths_0_1_0_12" = callPackage
     ({ mkDerivation, base, Cabal, directory }:
      mkDerivation {
        pname = "ghc-paths";
@@ -91171,7 +91483,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-pkg-autofix" = callPackage
@@ -91420,8 +91731,8 @@ self: {
        pname = "ghc-tcplugins-extra";
        version = "0.3";
        sha256 = "0k1ph8za52mx6f146xhaakn630xrzk42ylchv4b9r04hslhzvb1h";
-       revision = "1";
-       editedCabalFile = "0x2d4bp5lhyfrqjshmgbirdn2ihc057a8a6khqmz91jj9zlhf7vb";
+       revision = "2";
+       editedCabalFile = "1hrbvixm25x1dx1ljy9x7f63kcan4ffz885xj6qsl8l070wj96s1";
        libraryHaskellDepends = [ base ghc ];
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
@@ -91494,6 +91805,30 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-extra_0_3_1" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-prim
+     , ghc-tcplugins-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-extra";
+       version = "0.3.1";
+       sha256 = "0v29lqz6q6wsdrhbcljyvcfdz1i7bvrp341816m2n5kbrkrk48ha";
+       libraryHaskellDepends = [
+         base containers ghc ghc-prim ghc-tcplugins-extra
+         ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp
+         transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
+         tasty-hunit
+       ];
+       description = "Additional type-level operations on GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-knownnat" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
@@ -91514,6 +91849,27 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-knownnat_0_7" = callPackage
+    ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
+     , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-knownnat";
+       version = "0.7";
+       sha256 = "00f8m3kmp572r8jr246m8r6lwzxmiqj4hml06w09l9n3lzvjwv7b";
+       libraryHaskellDepends = [
+         base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise
+         template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Derive KnownNat constraints from other KnownNat constraints";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-natnormalise" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell, transformers
@@ -91530,6 +91886,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-natnormalise_0_7" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
+     , integer-gmp, tasty, tasty-hunit, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-natnormalise";
+       version = "0.7";
+       sha256 = "1rfw67hhhka3ga8v3224ain7jvdc390glz5cr7vvxm1yqs1wgwx4";
+       libraryHaskellDepends = [
+         base containers ghc ghc-tcplugins-extra integer-gmp transformers
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
+       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-presburger" = callPackage
     ({ mkDerivation, base, containers, equational-reasoning, ghc
      , ghc-tcplugins-extra, mtl, pretty, reflection, singletons, syb
@@ -93449,11 +93822,13 @@ self: {
          inherit (pkgs) which;};
 
   "git-brunch" = callPackage
-    ({ mkDerivation, base, brick, microlens, process, vector, vty }:
+    ({ mkDerivation, base, brick, hspec, microlens, process, vector
+     , vty
+     }:
      mkDerivation {
        pname = "git-brunch";
-       version = "1.0.4.0";
-       sha256 = "1ss2axjwjx7pqx9dq7mxhbnn43k1g1zj7n54f2xq7zwq2ngd5x8f";
+       version = "1.0.5.0";
+       sha256 = "0bnag71l6vjygn5bbfav229pk44xn491jzj13n7m8xdc7nvh7zz1";
        isLibrary = false;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93462,7 +93837,9 @@ self: {
        executableHaskellDepends = [
          base brick microlens process vector vty
        ];
-       testHaskellDepends = [ base brick microlens process vector vty ];
+       testHaskellDepends = [
+         base brick hspec microlens process vector vty
+       ];
        doHaddock = false;
        description = "git checkout command-line tool";
        license = stdenv.lib.licenses.bsd3;
@@ -100587,8 +100964,8 @@ self: {
      }:
      mkDerivation {
        pname = "gscholar-rss";
-       version = "0.2.1.0";
-       sha256 = "0a4hhcggfbgxraq2jj40gvrg64nw37h7y6jj7pgswa623m85040j";
+       version = "0.2.2.0";
+       sha256 = "1h8zg9yyyckyp5irw9gcbzfysav67hn2rlrkwakyh3ghb1rnl71k";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107343,12 +107720,13 @@ self: {
      }) {};
 
   "haskell-holes-th" = callPackage
-    ({ mkDerivation, base, template-haskell }:
+    ({ mkDerivation, base, template-haskell, transformers }:
      mkDerivation {
        pname = "haskell-holes-th";
-       version = "1.0.0.0";
-       sha256 = "13xyxck9f15mwi641zs9zw77cnrgh30p2771f66haby96k8wx9jf";
-       libraryHaskellDepends = [ base template-haskell ];
+       version = "2.0.0.0";
+       sha256 = "045spgarz68bay5yqd5cfllkmzja2jax9swcqhxc7gw5msfgxxw1";
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [ base template-haskell transformers ];
        description = "Infer haskell code by given type";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114774,8 +115152,8 @@ self: {
        pname = "hgmp";
        version = "0.1.1";
        sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr";
-       revision = "3";
-       editedCabalFile = "0z2xbqzyrgm9apy3xl353wgwhbnc3hdb1giw2j6fyvv705fmpb62";
+       revision = "4";
+       editedCabalFile = "00rg7f223716dlqk0w92ixnyj7a9imj6yqcs5qx833jv7lk8lbyj";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell interface to GMP";
@@ -117559,25 +117937,28 @@ self: {
      }) {};
 
   "hmatrix-sundials" = callPackage
-    ({ mkDerivation, base, containers, diagrams-lib
-     , diagrams-rasterific, hmatrix, hspec, inline-c, lens, plots
+    ({ mkDerivation, base, bytestring, cassava, clock, containers
+     , deepseq, diagrams-lib, diagrams-rasterific, hmatrix, hspec
+     , inline-c, lens, optparse-applicative, plots, split
      , sundials_arkode, sundials_cvode, template-haskell, vector
      }:
      mkDerivation {
        pname = "hmatrix-sundials";
-       version = "0.19.1.0";
-       sha256 = "1vbpx8661nnj15vrg177qwaylfvlp0fxdnpzncwkm4ka81v65hb5";
-       revision = "1";
-       editedCabalFile = "0vl85crf6zpbjpvrkydi5qk7ziaxcwr3bpm15cbxw6k94a3y9lvx";
+       version = "0.20.1.0";
+       sha256 = "0ysh3zamv8vm3i1a9bz0iqikfdxpmh95g4b0k8kgayjchhs3l6yn";
        libraryHaskellDepends = [
-         base containers hmatrix inline-c template-haskell vector
+         base containers deepseq hmatrix inline-c split template-haskell
+         vector
        ];
        librarySystemDepends = [ sundials_arkode sundials_cvode ];
        testHaskellDepends = [
          base containers diagrams-lib diagrams-rasterific hmatrix hspec
-         inline-c lens plots template-haskell vector
+         inline-c lens plots split template-haskell vector
        ];
        testSystemDepends = [ sundials_arkode sundials_cvode ];
+       benchmarkHaskellDepends = [
+         base bytestring cassava clock hmatrix optparse-applicative
+       ];
        description = "hmatrix interface to sundials";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119050,8 +119431,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.17.10";
-       sha256 = "12s3n3l6lf2vwmh4jbxnra694fpnzjgd8c236pnan0jdcb6x82vl";
+       version = "5.0.17.11";
+       sha256 = "1svp8z9pad8z2j386pr0dda0ds8ddxab0salnz4gm51q877w93p1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -121318,8 +121699,8 @@ self: {
      }:
      mkDerivation {
        pname = "hs-rqlite";
-       version = "0.1.0.0";
-       sha256 = "04q9vnwil3f30972pljs613wq1kb71w61jivdyxxy9i14grfcxsq";
+       version = "0.1.2.0";
+       sha256 = "1xfsbpfcy0s340jzdkl0bnx7isgx8dxhxvfdkrr9fpsga4s0l9bd";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers HTTP scientific text
          unordered-containers
@@ -121894,6 +122275,27 @@ self: {
        broken = true;
      }) {};
 
+  "hsc2hs_0_68_6" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, process
+     , tasty, tasty-hspec
+     }:
+     mkDerivation {
+       pname = "hsc2hs";
+       version = "0.68.6";
+       sha256 = "1clj6bgs9vmiv3mjzp82lvyyik5zr5411nxab7hydbrgq94pbk70";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         base containers directory filepath process
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       description = "A preprocessor that helps with writing Haskell bindings to C code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hsc3" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-ordlist, directory, filepath, hosc, murmur-hash, network
@@ -123040,8 +123442,8 @@ self: {
     ({ mkDerivation, base, directory, ghc, ghc-boot, ghc-paths, time }:
      mkDerivation {
        pname = "hsinspect";
-       version = "0.0.1";
-       sha256 = "13z7dk42cnwdxfqnadis56m2wy0s5kyzw2dv55dnspd77hd5v28k";
+       version = "0.0.3";
+       sha256 = "11jn8knnh859wvzfqljkhlsaqsrm20m4ryf3ncg7rhs6jcm3vknr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory ghc ghc-boot time ];
@@ -123239,29 +123641,6 @@ self: {
      }) {};
 
   "hslua" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances
-     , tasty, tasty-hunit, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "hslua";
-       version = "1.0.3.1";
-       sha256 = "1w11d5csjl5jdzjzcq8gkd7lzyfsgaxmby5gq97jaj6r32l3zy9m";
-       configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
-       libraryHaskellDepends = [
-         base bytestring containers exceptions fail mtl text
-       ];
-       librarySystemDepends = [ lua5_3 ];
-       testHaskellDepends = [
-         base bytestring containers exceptions fail mtl QuickCheck
-         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
-       description = "Bindings to Lua, an embeddable scripting language";
-       license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) lua5_3;};
-
-  "hslua_1_0_3_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances
      , tasty, tasty-hunit, tasty-quickcheck, text
@@ -123282,7 +123661,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Bindings to Lua, an embeddable scripting language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) lua5_3;};
 
   "hslua-aeson" = callPackage
@@ -124115,6 +124493,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hspec-parsec" = callPackage
+    ({ mkDerivation, base, hspec, hspec-expectations, parsec }:
+     mkDerivation {
+       pname = "hspec-parsec";
+       version = "0";
+       sha256 = "1q5484dzc9vpbwv7bpx83xha9ly7lsbwn4zjd6z8z5j4p8r5mk6y";
+       revision = "1";
+       editedCabalFile = "03nsxwc5p6whq21dqwba0289g8fqqqws453kyanwgb6vvg1f0s9l";
+       libraryHaskellDepends = [ base hspec-expectations parsec ];
+       testHaskellDepends = [ base hspec parsec ];
+       description = "Hspec expectations for testing Parsec parsers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hspec-pg-transact" = callPackage
     ({ mkDerivation, base, bytestring, hspec, pg-transact
      , postgresql-simple, resource-pool, text, tmp-postgres
@@ -126111,6 +126503,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client-overrides" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, network-uri, tasty, tasty-hunit
+     , text, yaml
+     }:
+     mkDerivation {
+       pname = "http-client-overrides";
+       version = "0.1.0.0";
+       sha256 = "1s6qblbw4z9afzdy43hk8rfhgxj3k60x03p3y0dmp1l2i712x89g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-types network-uri text yaml
+       ];
+       executableHaskellDepends = [ base http-client http-client-tls ];
+       testHaskellDepends = [
+         base bytestring http-client tasty tasty-hunit text
+       ];
+       description = "HTTP client overrides";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "http-client-request-modifiers" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, http-client
      , http-media, http-types, network, network-uri
@@ -127821,6 +128235,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hvega-theme" = callPackage
+    ({ mkDerivation, base, hvega, text }:
+     mkDerivation {
+       pname = "hvega-theme";
+       version = "0.1.0.0";
+       sha256 = "03rm4fl8vgl3yv60wx6vrj1dfbwsxwksm1dbiz0wzz1scdax1gc4";
+       libraryHaskellDepends = [ base hvega text ];
+       description = "Theme for hvega";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "hw-aeson" = callPackage
     ({ mkDerivation, aeson, base, hedgehog, hspec, text }:
      mkDerivation {
@@ -136928,6 +137353,17 @@ self: {
        broken = true;
      }) {};
 
+  "joint" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "joint";
+       version = "0.1.0";
+       sha256 = "0hzbczwy1w1mw8c4lf52nm6ighjlpiyj91siy9fmqih4fv22a1p2";
+       libraryHaskellDepends = [ base ];
+       description = "Trying to compose non-composable";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "jonathanscard" = callPackage
     ({ mkDerivation, base, bytestring, containers, HTTP, json, mtl
      , network, old-locale, time
@@ -147277,28 +147713,44 @@ self: {
     ({ mkDerivation, base, bytestring, bytestring-conversion
      , case-insensitive, either, exceptions, hspec, http-types
      , io-streams, mtl, QuickCheck, quickcheck-classes
-     , quickcheck-instances, text, transformers, uri-encode, utf8-string
-     , wai, warp
+     , quickcheck-instances, text, transformers, uri-encode, wai, warp
      }:
      mkDerivation {
        pname = "linnet";
-       version = "0.1.0.0";
-       sha256 = "0ikrw7xm490rs46l7555mirkly3h5565kadwfrdjbqgrqv1cjx7k";
+       version = "0.1.0.1";
+       sha256 = "074np5a8xx25k88c82spmvmwiwcm993pvfbwfhjjkcqjqxwwgglf";
        libraryHaskellDepends = [
          base bytestring bytestring-conversion case-insensitive either
          exceptions http-types io-streams mtl text transformers uri-encode
-         utf8-string wai warp
+         wai warp
        ];
        testHaskellDepends = [
          base bytestring bytestring-conversion case-insensitive either
          exceptions hspec http-types io-streams mtl QuickCheck
          quickcheck-classes quickcheck-instances text transformers
-         uri-encode utf8-string wai warp
+         uri-encode wai warp
        ];
        description = "Lightweight library for building HTTP API";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "linnet-aeson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, linnet, QuickCheck
+     , quickcheck-classes, quickcheck-instances, text
+     }:
+     mkDerivation {
+       pname = "linnet-aeson";
+       version = "0.1.0.1";
+       sha256 = "1syfi3ha3z2l1g8qdy5rpla6xafw6dqcwicgns1xy9q9d8jrcjs3";
+       libraryHaskellDepends = [ aeson base bytestring linnet ];
+       testHaskellDepends = [
+         aeson base bytestring hspec linnet QuickCheck quickcheck-classes
+         quickcheck-instances text
+       ];
+       description = "Aeson JSON support for Linnet";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "linode" = callPackage
     ({ mkDerivation, aeson, async, base, binary, bytestring, containers
      , errors, lens, process, retry, safe, tasty, tasty-hunit
@@ -148017,14 +148469,14 @@ self: {
        broken = true;
      }) {};
 
-  "list-witnesses_0_1_2_0" = callPackage
+  "list-witnesses_0_1_3_2" = callPackage
     ({ mkDerivation, base, decidable, functor-products, microlens
      , profunctors, singletons, vinyl
      }:
      mkDerivation {
        pname = "list-witnesses";
-       version = "0.1.2.0";
-       sha256 = "10bflmrj747xs2ga8s0vw7hb419wvrwnm0bakxw7x1l7bcaa7z7m";
+       version = "0.1.3.2";
+       sha256 = "1hzm8ijx8id5ij199dg362ai1wmdrs8mr10qkv57639hv61almyq";
        libraryHaskellDepends = [
          base decidable functor-products microlens profunctors singletons
          vinyl
@@ -149357,8 +149809,8 @@ self: {
      }:
      mkDerivation {
        pname = "log4hs";
-       version = "0.0.7.0";
-       sha256 = "0f05sqjrfg3wkr1avdwljfllfs40bakyims9xd5kn9fv48fzvran";
+       version = "0.1.0.0";
+       sha256 = "12crsq6gxhvamsn9ks3qn2r7aihf92aw1fcvck2wzjw9vps0y3ra";
        libraryHaskellDepends = [
          aeson base containers data-default directory filepath generic-lens
          lens template-haskell text time
@@ -149991,8 +150443,8 @@ self: {
        pname = "long-double";
        version = "0.1";
        sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j";
-       revision = "1";
-       editedCabalFile = "12vmzzrxgb4yqf9axf1fildl4m0dfm3zqxk4vg6k6m5qi6haz1yn";
+       revision = "2";
+       editedCabalFile = "03x83ycib19k2lmd3spwq2zmylfl5ihammb406fxxqqbyv4jw1mg";
        libraryHaskellDepends = [ base integer-gmp ];
        description = "FFI bindings for C long double";
        license = stdenv.lib.licenses.bsd3;
@@ -150296,8 +150748,8 @@ self: {
      }:
      mkDerivation {
        pname = "lp-diagrams";
-       version = "2.1.0";
-       sha256 = "1gipdhbnyb7sll30ffcl42k8rqqwphi970ls7rn2g98yb39jk498";
+       version = "2.1.1";
+       sha256 = "0dynm0kib4lgyz00gbg4gi0ds5cgpbdx40davk53cknwxv7icri0";
        libraryHaskellDepends = [
          base containers gasp graphviz labeled-tree lens mtl parsek
          polynomials-bernstein process reflection text typography-geometry
@@ -150409,8 +150861,8 @@ self: {
      }:
      mkDerivation {
        pname = "lsp-test";
-       version = "0.6.0.0";
-       sha256 = "01l5i41907rqxrndhqmnb2kcp62k4mz1dpbamp7zvff22pyd5zzv";
+       version = "0.6.1.0";
+       sha256 = "195p9m4992l01k8xsc8yxwsx3g74xfn6rdi00bwlzxw4ijy06lfi";
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal async base bytestring conduit
          conduit-parse containers data-default Diff directory filepath
@@ -153187,8 +153639,8 @@ self: {
      }:
      mkDerivation {
        pname = "marxup";
-       version = "3.1.0.0";
-       sha256 = "0bszb1czqm7pvz8m24z06irzfrw4ch8bm8g59apdgvmp8y0yvp91";
+       version = "3.1.1.0";
+       sha256 = "0b22mf14qajkpf7hlm6086d951g0wgihlyiw93m0nh4yl1kmgf5q";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -157378,8 +157830,8 @@ self: {
      }:
      mkDerivation {
        pname = "mixpanel-client";
-       version = "0.2.0";
-       sha256 = "1c0lgysznql57wff90r5s6mwq7gwah0j6pw10i4wppqs6pdiiwik";
+       version = "0.2.1";
+       sha256 = "1gangs1ivbg0hyc804flmxq7fgai3qlf2fnsw1r9dyjb5d91smp1";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring http-client http-client-tls
          servant servant-client string-conv text time
@@ -159898,14 +160350,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "monoidal-containers_0_5_0_1" = callPackage
+  "monoidal-containers_0_6" = callPackage
     ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens
      , newtype, semialign, semigroups, these, unordered-containers
      }:
      mkDerivation {
        pname = "monoidal-containers";
-       version = "0.5.0.1";
-       sha256 = "1d7a4kkwv86f69zv5g6wxq9bkxq3bxarb26rr5q9gxkyx9m5rwd3";
+       version = "0.6";
+       sha256 = "1ii09s068g6bj2j10ig3g3ymv1ci6zg596pmmaw6als15j9bybc9";
        libraryHaskellDepends = [
          aeson base containers deepseq hashable lens newtype semialign
          semigroups these unordered-containers
@@ -160272,32 +160724,35 @@ self: {
      }) {};
 
   "morpheus-graphql" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, megaparsec
-     , mtl, scientific, scotty, tasty, tasty-hunit, text, transformers
-     , unordered-containers, uuid, vector, wai, wai-websockets, warp
-     , websockets
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , filepath, lens, megaparsec, mtl, optparse-applicative, scientific
+     , scotty, tasty, tasty-hunit, template-haskell, text, transformers
+     , unordered-containers, utf8-string, uuid, vector, wai
+     , wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "morpheus-graphql";
-       version = "0.1.1";
-       sha256 = "1sp7dpbqd9kksldcqc2z43zv0g39qs4qxv9xxy1zg7hw4rwislfn";
+       version = "0.2.1";
+       sha256 = "1qdd21mwxsn3yw9c0vxcsmx6ixp90lpy2ghk6ix2s06cs4d5s3h9";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers megaparsec mtl scientific text
-         transformers unordered-containers uuid vector wai-websockets
-         websockets
+         aeson attoparsec base bytestring containers lens megaparsec mtl
+         scientific template-haskell text transformers unordered-containers
+         utf8-string uuid vector wai-websockets websockets
        ];
        executableHaskellDepends = [
-         aeson base bytestring containers megaparsec mtl scientific scotty
-         text transformers unordered-containers uuid vector wai
-         wai-websockets warp websockets
+         aeson attoparsec base bytestring containers filepath lens
+         megaparsec mtl optparse-applicative scientific scotty
+         template-haskell text transformers unordered-containers utf8-string
+         uuid vector wai wai-websockets warp websockets
        ];
        testHaskellDepends = [
-         aeson base bytestring containers megaparsec mtl scientific tasty
-         tasty-hunit text transformers unordered-containers uuid vector
-         wai-websockets websockets
+         aeson attoparsec base bytestring containers lens megaparsec mtl
+         scientific tasty tasty-hunit template-haskell text transformers
+         unordered-containers utf8-string uuid vector wai-websockets
+         websockets
        ];
        description = "Morpheus GraphQL";
        license = stdenv.lib.licenses.bsd3;
@@ -160926,8 +161381,8 @@ self: {
      }:
      mkDerivation {
        pname = "ms-tds";
-       version = "0.3.0.0";
-       sha256 = "0pdv9x6743qaqk6fcm02hfrr09ckwbd9fpgzgmgmgnqhqxm0y9y6";
+       version = "0.4.0.0";
+       sha256 = "0smdr7inwix9hbllj5r217pa17i6ha0wbciqnq9cjsjs9wjnybhh";
        libraryHaskellDepends = [
          array base binary bytestring crypto-random data-default-class mtl
          network template-haskell text time tls uuid-types x509-store
@@ -161063,20 +161518,20 @@ self: {
      }) {};
 
   "mssql-simple" = callPackage
-    ({ mkDerivation, base, binary, bytestring, hostname, ms-tds
-     , network, template-haskell, text, time, tls
+    ({ mkDerivation, base, binary, bytestring, hostname, ms-tds, mtl
+     , network, template-haskell, text, time, tls, uuid-types
      }:
      mkDerivation {
        pname = "mssql-simple";
-       version = "0.4.0.2";
-       sha256 = "0pa1q404xlq23ywdwkx9w1v8dn2nznkpng9ijwixkcd520bnx043";
+       version = "0.5.0.0";
+       sha256 = "0k0j87h37hya42fv045z44p9issic0a0wswy75ymclizsbip1fl4";
        libraryHaskellDepends = [
-         base binary bytestring hostname ms-tds network template-haskell
-         text time tls
+         base binary bytestring hostname ms-tds mtl network template-haskell
+         text time tls uuid-types
        ];
        testHaskellDepends = [
-         base binary bytestring hostname ms-tds network template-haskell
-         text time tls
+         base binary bytestring hostname ms-tds mtl network template-haskell
+         text time tls uuid-types
        ];
        description = "SQL Server client library implemented in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -168095,6 +168550,8 @@ self: {
        ];
        description = "Zeit Now haskell-side integration and introspection tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nowdoc" = callPackage
@@ -173189,6 +173646,7 @@ self: {
        pname = "pandoc-placetable";
        version = "0.5.1";
        sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112";
+       configureFlags = [ "-finlineMarkdown" ];
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -173295,10 +173753,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.17.5.4";
-       sha256 = "09wk2zskr0r2llsyif3s0x7vix05l1ya7qacsmmkrlhba5naib1j";
-       revision = "1";
-       editedCabalFile = "0bpd2iqmriajl5qg44j4z9c4agb9gsdwbn5l4c5yry6flivysq3c";
+       version = "1.17.6";
+       sha256 = "1c4yf284wd2zbskhrqk0lhqkdyry40db087cdy86b5ywr0yy1li7";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
          transformers
@@ -173551,6 +174007,59 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pantry_0_1_1_2" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
+     , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
+     , containers, contravariant, cryptonite, cryptonite-conduit
+     , deepseq, digest, directory, exceptions, filelock, filepath
+     , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog
+     , hpack, hspec, http-client, http-client-tls, http-conduit
+     , http-download, http-types, integer-gmp, memory, mono-traversable
+     , mtl, network, network-uri, path, path-io, persistent
+     , persistent-sqlite, persistent-template, primitive, QuickCheck
+     , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
+     , safe, syb, tar-conduit, template-haskell, text, text-metrics
+     , th-lift, th-lift-instances, th-orphans, th-reify-many
+     , th-utilities, time, transformers, unix-compat, unliftio
+     , unordered-containers, vector, yaml, zip-archive
+     }:
+     mkDerivation {
+       pname = "pantry";
+       version = "0.1.1.2";
+       sha256 = "1m1sps9kc7y8zpba486lv5z8an3z8493zxb1qhghql6pybsprsgi";
+       libraryHaskellDepends = [
+         aeson ansi-terminal array base base-orphans base64-bytestring
+         bytestring Cabal conduit conduit-extra containers contravariant
+         cryptonite cryptonite-conduit deepseq digest directory filelock
+         filepath generic-deriving ghc-prim hackage-security hashable hpack
+         http-client http-client-tls http-conduit http-download http-types
+         integer-gmp memory mono-traversable mtl network network-uri path
+         path-io persistent persistent-sqlite persistent-template primitive
+         resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit
+         template-haskell text text-metrics th-lift th-lift-instances
+         th-orphans th-reify-many th-utilities time transformers unix-compat
+         unliftio unordered-containers vector yaml zip-archive
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal array base base-orphans base64-bytestring
+         bytestring Cabal conduit conduit-extra containers contravariant
+         cryptonite cryptonite-conduit deepseq digest directory exceptions
+         filelock filepath generic-deriving ghc-prim hackage-security
+         hashable hedgehog hpack hspec http-client http-client-tls
+         http-conduit http-download http-types integer-gmp memory
+         mono-traversable mtl network network-uri path path-io persistent
+         persistent-sqlite persistent-template primitive QuickCheck
+         raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb
+         tar-conduit template-haskell text text-metrics th-lift
+         th-lift-instances th-orphans th-reify-many th-utilities time
+         transformers unix-compat unliftio unordered-containers vector yaml
+         zip-archive
+       ];
+       description = "Content addressable Haskell package management";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pantry-tmp" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
      , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
@@ -176585,29 +177094,28 @@ self: {
 
   "perceptual-hash" = callPackage
     ({ mkDerivation, base, containers, cpphs, criterion, filepath, hip
-     , optparse-applicative, par-traverse, pHash, primitive, repa, stm
+     , hspec, optparse-applicative, par-traverse, primitive, repa, stm
      , vector, vector-algorithms
      }:
      mkDerivation {
        pname = "perceptual-hash";
-       version = "0.1.1.0";
-       sha256 = "107f5xb4wg4zmwqldw8a04byazqyzd0vkn6zl5iv4f5ii2sdb5yh";
-       revision = "1";
-       editedCabalFile = "001nr9brgk05bbhz9lw8viqrc6rgfy0rjp08fcdhn302j55j33i3";
+       version = "0.1.2.0";
+       sha256 = "0wj5bnm4f2n2fd1ykf0n5cbf974x34nzy16dh7z2wxv2yn7b4f9r";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base hip primitive repa vector vector-algorithms
        ];
        executableHaskellDepends = [
          base containers filepath optparse-applicative par-traverse stm
        ];
-       benchmarkHaskellDepends = [ base criterion ];
-       benchmarkPkgconfigDepends = [ pHash ];
+       testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion filepath ];
        benchmarkToolDepends = [ cpphs ];
        description = "Find duplicate images";
        license = stdenv.lib.licenses.bsd3;
-     }) {pHash = null;};
+     }) {};
 
   "perdure" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, cognimeta-utils
@@ -178677,6 +179185,17 @@ self: {
        broken = true;
      }) {};
 
+  "pickle" = callPackage
+    ({ mkDerivation, base, containers, network, text }:
+     mkDerivation {
+       pname = "pickle";
+       version = "0.1.0.0";
+       sha256 = "1jai9ys9mznc8v6z9jsh1yc4xdf12cr3gw7ci2nx9xzjspn4qy8z";
+       libraryHaskellDepends = [ base containers network text ];
+       description = "Instant StatsD in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "picologic" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, picosat, pretty
      , QuickCheck
@@ -179156,6 +179675,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes_4_3_12" = callPackage
+    ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
+     , optparse-applicative, QuickCheck, semigroups, test-framework
+     , test-framework-quickcheck2, transformers, void
+     }:
+     mkDerivation {
+       pname = "pipes";
+       version = "4.3.12";
+       sha256 = "0ni5szs9jl4map05lcyl97dgb69g2xk1a1rdiw8p4024vfyskp8c";
+       libraryHaskellDepends = [
+         base exceptions mmorph mtl semigroups transformers void
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck test-framework test-framework-quickcheck2
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         base criterion mtl optparse-applicative transformers
+       ];
+       description = "Compositional pipelines";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes
      , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers
@@ -182712,6 +183255,17 @@ self: {
        broken = true;
      }) {};
 
+  "postgres-options" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "postgres-options";
+       version = "0.1.0.0";
+       sha256 = "17a2w4fb85mp9v1rghgkm0cvgzxvvahcvfi3vmlzrdqhlsm0si7c";
+       libraryHaskellDepends = [ base ];
+       description = "An Options type representing options for postgres connections";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgres-tmp" = callPackage
     ({ mkDerivation, base, bytestring, postgresql-simple, text }:
      mkDerivation {
@@ -182978,10 +183532,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "3.5.0";
-       sha256 = "1sh8kgfqy1kipz99v74xkxzfggbxxjq2gwswa94m1spy6r7k7avp";
-       revision = "1";
-       editedCabalFile = "11clkx7j4k3wgk6h1g0flq7frvkfxhh4dhbjjrchc5f7rd5gmjbp";
+       version = "3.6.0";
+       sha256 = "1mf9441yb72jl1gm9zpfgwwjdiipcl0gghnazf1871dgvahbx3jz";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default exceptions file-embed haskell-src-meta hreader hset
@@ -187537,8 +188089,8 @@ self: {
      }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20190630";
-       sha256 = "0b35jayk5n8p7zn2nkgzvqgpiai0h7g3pf27i5bzxlaw2zwm9320";
+       version = "0.20190826";
+       sha256 = "1z6apxnp88jjpf5q7zg04r18lja7rafwlx1w2cy7d74qfrh1v2b7";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion random ];
@@ -192417,8 +192969,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana-automation";
-       version = "0.5.1";
-       sha256 = "0wflw7rpknjj6qpf2ma1cxd03xg5v25rmfrmnli472h55jdcwdnz";
+       version = "0.5.2";
+       sha256 = "1gd6d3r0dsawi6zkr4fnkyrszikg1xzgfavxsaaswl4rw09znr7x";
        libraryHaskellDepends = [
          base reactive-banana stm time transformers
        ];
@@ -193782,6 +194334,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reflection_2_1_5" = callPackage
+    ({ mkDerivation, base, hspec, hspec-discover, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "reflection";
+       version = "2.1.5";
+       sha256 = "0xr947nj1vww5b8fwqmypxm3y3j5sxl4z8wnf834f83jzfzyjbi7";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
+       description = "Reifies arbitrary terms into types that can be reflected back into terms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reflection-extras" = callPackage
     ({ mkDerivation, aeson, base, constraints, lens, reflection, tagged
      }:
@@ -193817,26 +194385,26 @@ self: {
      , filepath, haskell-src-exts, haskell-src-meta, hlint, lens
      , loch-th, MemoTrie, monad-control, monoidal-containers, mtl
      , prim-uniq, primitive, process, profunctors, random, ref-tf
-     , reflection, semigroupoids, semigroups, split, stm, syb
-     , template-haskell, these, time, transformers, transformers-compat
+     , reflection, semialign, semigroupoids, split, stm, syb
+     , template-haskell, these, these-lens, time, transformers
      , unbounded-delays, witherable
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.6.2.1";
-       sha256 = "0s8saim58bqqhg1nbrrdw2blnph7jrhqw97wxf73g4r1d8jacg3z";
+       version = "0.6.2.4";
+       sha256 = "1gm8w2ri16apy3b13i2f17pk1nsrsi0vbcrkckd1abbm4r4i16cd";
        libraryHaskellDepends = [
          base bifunctors comonad constraints-extras containers data-default
          dependent-map dependent-sum exception-transformers haskell-src-exts
          haskell-src-meta lens MemoTrie monad-control monoidal-containers
          mtl prim-uniq primitive profunctors random ref-tf reflection
-         semigroupoids semigroups stm syb template-haskell these time
-         transformers transformers-compat unbounded-delays witherable
+         semialign semigroupoids stm syb template-haskell these time
+         transformers unbounded-delays witherable
        ];
        testHaskellDepends = [
          base bifunctors containers deepseq dependent-map dependent-sum
          directory filemanip filepath hlint lens monoidal-containers mtl
-         ref-tf semigroups split these transformers
+         ref-tf semialign split these these-lens transformers
        ];
        benchmarkHaskellDepends = [
          base containers criterion deepseq dependent-map dependent-sum
@@ -194182,8 +194750,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-vty";
-       version = "0.1.1.0";
-       sha256 = "1nhi33d0yqx2pjccrcbsgwp2l56sdmqpl11vpvkvx4wkxckyz2qf";
+       version = "0.1.1.1";
+       sha256 = "1qhmpdfwavr4vip39p1ih3hz0yb1b308g3m24w80n3zw7xqnqz6j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -196143,6 +196711,18 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "replace-megaparsec" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }:
+     mkDerivation {
+       pname = "replace-megaparsec";
+       version = "1.0.1.0";
+       sha256 = "18aipcrmic0xgfjg1cia6zs7m5a9xq7srm1r713qxri9pm5ynqd6";
+       libraryHaskellDepends = [ base megaparsec ];
+       testHaskellDepends = [ base bytestring Cabal megaparsec text ];
+       description = "Stream editing with parsers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "replica" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, Diff
      , file-embed, http-types, QuickCheck, quickcheck-instances
@@ -196609,7 +197189,7 @@ self: {
        broken = true;
      }) {};
 
-  "resolv" = callPackage
+  "resolv_0_1_1_2" = callPackage
     ({ mkDerivation, base, base16-bytestring, binary, bytestring
      , containers, directory, filepath, tasty, tasty-hunit
      }:
@@ -196625,6 +197205,25 @@ self: {
        ];
        description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "resolv" = callPackage
+    ({ mkDerivation, base, base16-bytestring, binary, bytestring
+     , containers, directory, filepath, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "resolv";
+       version = "0.1.1.3";
+       sha256 = "10y9x63m2w87qfmx9fxjfliq9881cp1x8zkf94sb0hq52rgxd3r4";
+       libraryHaskellDepends = [
+         base base16-bytestring binary bytestring containers
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath tasty tasty-hunit
+       ];
+       description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
+       license = stdenv.lib.licenses.gpl2Plus;
      }) {};
 
   "resolve" = callPackage
@@ -198101,6 +198700,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rio_0_1_12_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
+     , process, QuickCheck, text, time, typed-process, unix, unliftio
+     , unliftio-core, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "rio";
+       version = "0.1.12.0";
+       sha256 = "0xzjkh6aavynpyskikhs8dmv0zhkiqiwz9zdn80zbd25b2182pif";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         hashable microlens mtl primitive process text time typed-process
+         unix unliftio unliftio-core unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         hashable hspec microlens mtl primitive process QuickCheck text time
+         typed-process unix unliftio unliftio-core unordered-containers
+         vector
+       ];
+       description = "A standard library for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rio-orphans" = callPackage
     ({ mkDerivation, base, exceptions, fast-logger, hspec
      , monad-control, monad-logger, resourcet, rio, transformers-base
@@ -200811,37 +201436,6 @@ self: {
      }) {};
 
   "salak" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion
-     , data-default, directory, dlist, exceptions, filepath, hashable
-     , heaps, hspec, hspec-discover, megaparsec, menshen, mtl
-     , QuickCheck, random, scientific, text, time, unliftio-core
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "salak";
-       version = "0.3.4.1";
-       sha256 = "178vjvyqvs2m6671wckw8yb5s5xy0nvdivxvyxqq9w8ckdnnk1q0";
-       libraryHaskellDepends = [
-         base bytestring containers data-default directory dlist exceptions
-         filepath hashable heaps megaparsec menshen mtl scientific text time
-         unliftio-core unordered-containers
-       ];
-       testHaskellDepends = [
-         base bytestring containers data-default directory dlist exceptions
-         filepath hashable heaps hspec megaparsec menshen mtl QuickCheck
-         random scientific text time unliftio-core unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion data-default directory dlist
-         exceptions filepath hashable heaps megaparsec menshen mtl
-         scientific text time unliftio-core unordered-containers
-       ];
-       description = "Configuration (re)Loader and Parser";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "salak_0_3_5_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion
      , data-default, directory, dlist, exceptions, filepath, hashable
      , heaps, hspec, hspec-discover, megaparsec, menshen, mtl
@@ -200870,34 +201464,38 @@ self: {
        ];
        description = "Configuration (re)Loader and Parser";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "salak_0_3_5_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , data-default, directory, dlist, exceptions, filepath, hashable
+     , heaps, hspec, hspec-discover, megaparsec, menshen, mtl
+     , QuickCheck, random, scientific, text, time, unliftio-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "salak";
+       version = "0.3.5.2";
+       sha256 = "1zz1dy3350amn9mbkmpysk4ykz8x40bmhrbbkbswrqf5kaa2d7xn";
+       libraryHaskellDepends = [
+         base bytestring containers data-default directory dlist exceptions
+         filepath hashable heaps megaparsec menshen mtl scientific text time
+         unliftio-core unordered-containers
+       ];
+       testHaskellDepends = [
+         base hspec mtl QuickCheck random scientific text
+         unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base criterion data-default mtl text time
+       ];
+       description = "Configuration (re)Loader and Parser";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salak-toml" = callPackage
-    ({ mkDerivation, base, criterion, exceptions, hspec, mtl
-     , QuickCheck, salak, text, time, tomland, unordered-containers
-     }:
-     mkDerivation {
-       pname = "salak-toml";
-       version = "0.3.4.1";
-       sha256 = "1gsgl6wzrzhpgbz1paig9xbxknm9g5z3g3cq47i198qzxnmqad7c";
-       libraryHaskellDepends = [
-         base salak text time tomland unordered-containers
-       ];
-       testHaskellDepends = [
-         base exceptions hspec mtl QuickCheck salak text time tomland
-         unordered-containers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion salak text time tomland unordered-containers
-       ];
-       description = "Configuration Loader for toml";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "salak-toml_0_3_5_1" = callPackage
     ({ mkDerivation, base, criterion, exceptions, hspec, mtl
      , QuickCheck, salak, text, time, tomland, unordered-containers
      }:
@@ -200922,25 +201520,6 @@ self: {
      }) {};
 
   "salak-yaml" = callPackage
-    ({ mkDerivation, base, conduit, criterion, exceptions, hspec
-     , libyaml, mtl, QuickCheck, salak, text
-     }:
-     mkDerivation {
-       pname = "salak-yaml";
-       version = "0.3.4.1";
-       sha256 = "083ba1pdv6pnlzc9ijh9pzvxn056yjhy46283jf49m4sbma105w4";
-       libraryHaskellDepends = [ base conduit libyaml salak text ];
-       testHaskellDepends = [
-         base conduit exceptions hspec libyaml mtl QuickCheck salak text
-       ];
-       benchmarkHaskellDepends = [
-         base conduit criterion libyaml salak text
-       ];
-       description = "Configuration Loader for yaml";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "salak-yaml_0_3_5_1" = callPackage
     ({ mkDerivation, base, conduit, criterion, exceptions, hspec
      , libyaml, mtl, QuickCheck, salak, text
      }:
@@ -200957,7 +201536,6 @@ self: {
        ];
        description = "Configuration Loader for yaml";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "saltine" = callPackage
@@ -202088,32 +202666,6 @@ self: {
      }) {};
 
   "scheduler" = callPackage
-    ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest
-     , criterion, deepseq, doctest, exceptions, fib, hspec, monad-par
-     , mwc-random, parallel, primitive, QuickCheck, streamly
-     , template-haskell, unliftio, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "scheduler";
-       version = "1.4.1";
-       sha256 = "1m8l780pv9il661faa0angq05a5db9jpkyxxkil73285fx459fkl";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         atomic-primops base deepseq exceptions primitive unliftio-core
-       ];
-       testHaskellDepends = [
-         base deepseq doctest hspec mwc-random QuickCheck template-haskell
-         unliftio vector
-       ];
-       benchmarkHaskellDepends = [
-         async base criterion deepseq fib monad-par parallel streamly
-         unliftio
-       ];
-       description = "Work stealing scheduler";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scheduler_1_4_2" = callPackage
     ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest
      , criterion, deepseq, doctest, exceptions, fib, genvalidity-hspec
      , hspec, monad-par, mwc-random, parallel, primitive, QuickCheck
@@ -202137,7 +202689,6 @@ self: {
        ];
        description = "Work stealing scheduler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "schedyield" = callPackage
@@ -204098,6 +204649,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semigroupoids_5_3_3" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, Cabal
+     , cabal-doctest, comonad, containers, contravariant, distributive
+     , doctest, hashable, tagged, template-haskell, transformers
+     , transformers-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "semigroupoids";
+       version = "5.3.3";
+       sha256 = "016hc4imr9l4szs3p7f1aahvxr5wv4clvr3qzrm3nibssg5vrs61";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base base-orphans bifunctors comonad containers contravariant
+         distributive hashable tagged template-haskell transformers
+         transformers-compat unordered-containers
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "Semigroupoids: Category sans id";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "semigroupoids-syntax" = callPackage
     ({ mkDerivation, base, comonad, containers, contravariant
      , directory, distributive, doctest, filepath, QuickCheck
@@ -204133,12 +204706,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "semigroups_0_19" = callPackage
+  "semigroups_0_19_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "semigroups";
-       version = "0.19";
-       sha256 = "1ficdd32y0v6bi0dxzjn9fph03ql0nmyjy0x3ahr8c4508xh779r";
+       version = "0.19.1";
+       sha256 = "0j36cha1wb9vxnd8axfna92b2q5hnrn3ap8d8yin89c69gk63rvr";
        libraryHaskellDepends = [ base ];
        description = "Anything that associates";
        license = stdenv.lib.licenses.bsd3;
@@ -204651,8 +205224,8 @@ self: {
      }:
      mkDerivation {
        pname = "sequence-formats";
-       version = "1.3.2";
-       sha256 = "0ghmhn9cmgxwn9nix309q300ma23snkvhmhg4vsl5gnx6bhg7caj";
+       version = "1.3.2.1";
+       sha256 = "0fl3sg4znmnil08vbjf50xcbs5blh9pvg1jakbhikj1aab68vpp5";
        libraryHaskellDepends = [
          attoparsec base bytestring containers errors exceptions foldl
          lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
@@ -208417,8 +208990,8 @@ self: {
     ({ mkDerivation, base, directory, shake }:
      mkDerivation {
        pname = "shake-ext";
-       version = "3.1.0.0";
-       sha256 = "1lbdz4bv95d0rwfpk1l494lrfd5qp029awbfiv1wpydbvvspdvx6";
+       version = "3.1.0.2";
+       sha256 = "04nhjq2s7iycjabh33jwbdc8pxdyxnfrwjvl1mxmwrx0zx96dbi9";
        libraryHaskellDepends = [ base directory shake ];
        description = "Helper functions for linting with shake";
        license = stdenv.lib.licenses.bsd3;
@@ -211094,6 +211667,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singleton-nats_0_4_3" = callPackage
+    ({ mkDerivation, base, singletons }:
+     mkDerivation {
+       pname = "singleton-nats";
+       version = "0.4.3";
+       sha256 = "0xj5w6dszm832y90qxmwqnyiwpav30q199cjcdbdxr7q1d4klszi";
+       libraryHaskellDepends = [ base singletons ];
+       description = "Unary natural numbers relying on the singletons infrastructure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "singleton-typelits" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -211126,6 +211711,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singletons_2_6" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory, filepath
+     , ghc-boot-th, mtl, pretty, process, syb, tasty, tasty-golden
+     , template-haskell, text, th-desugar, transformers, turtle
+     }:
+     mkDerivation {
+       pname = "singletons";
+       version = "2.6";
+       sha256 = "1lc6p1f3h0j4nq5ppqwjihrjlgcwl5sx5fsw449m9lvs07vp39xy";
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       libraryHaskellDepends = [
+         base containers ghc-boot-th mtl pretty syb template-haskell text
+         th-desugar transformers
+       ];
+       testHaskellDepends = [
+         base filepath process tasty tasty-golden text turtle
+       ];
+       description = "A framework for generating singleton types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "singnal" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -215504,6 +216111,30 @@ self: {
        broken = true;
      }) {};
 
+  "sparse-tensor_0_2_1_1" = callPackage
+    ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers
+     , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise
+     , hmatrix, parallel, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, tf-random, zlib
+     }:
+     mkDerivation {
+       pname = "sparse-tensor";
+       version = "0.2.1.1";
+       sha256 = "1bjia89as14i2cif9nf7rsifazg305l7cl040gb7xbi3szlc621y";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         ad base bytestring cereal containers deepseq ghc-typelits-knownnat
+         ghc-typelits-natnormalise hmatrix parallel tf-random zlib
+       ];
+       testHaskellDepends = [
+         base hmatrix QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "typesafe tensor algebra library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "sparsebit" = callPackage
     ({ mkDerivation, base, haskell98 }:
      mkDerivation {
@@ -215619,8 +216250,8 @@ self: {
      }:
      mkDerivation {
        pname = "spdx";
-       version = "1";
-       sha256 = "1vw6pqj86slgzgbrd6kmsn5xlbxln0cys9qxxa47ypfy4spxmfkd";
+       version = "1.0.0.1";
+       sha256 = "00j0dqx9hrlpqy1jml85nykg0xl108q45ljan385bzb5nnap36l6";
        libraryHaskellDepends = [ base Cabal containers transformers ];
        testHaskellDepends = [
          base base-compat Cabal tasty tasty-quickcheck
@@ -217400,6 +218031,19 @@ self: {
        broken = true;
      }) {};
 
+  "stack-fix" = callPackage
+    ({ mkDerivation, base, options, text, turtle }:
+     mkDerivation {
+       pname = "stack-fix";
+       version = "0.1.0.0";
+       sha256 = "13x4pd1h2f2akpja5mxnqx0pw1ax57r2q76gsb3fs1f6kxykypwl";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base options text turtle ];
+       description = "Console program used to fix Stack build errors automatically";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "stack-hpc-coveralls" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , directory, docopt, filepath, hlint, hpc, hspec, hspec-contrib
@@ -225629,6 +226273,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tar_0_5_1_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, bytestring-handle
+     , containers, criterion, deepseq, directory, filepath, QuickCheck
+     , tasty, tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "tar";
+       version = "0.5.1.1";
+       sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq directory filepath time
+       ];
+       testHaskellDepends = [
+         array base bytestring bytestring-handle containers deepseq
+         directory filepath QuickCheck tasty tasty-quickcheck time
+       ];
+       benchmarkHaskellDepends = [
+         array base bytestring containers criterion deepseq directory
+         filepath time
+       ];
+       description = "Reading, writing and manipulating \".tar\" archive files.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tar-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, containers, criterion, deepseq, directory
@@ -229842,6 +230511,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-desugar_1_10" = callPackage
+    ({ mkDerivation, base, containers, fail, ghc-prim, hspec, HUnit
+     , mtl, ordered-containers, semigroups, syb, template-haskell
+     , th-abstraction, th-expand-syns, th-lift, th-orphans
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "th-desugar";
+       version = "1.10";
+       sha256 = "1g3v427qlpxl1m4klsbqzg2xas5sj4059j5pdx0vpbshpq9v3x8v";
+       libraryHaskellDepends = [
+         base containers fail ghc-prim mtl ordered-containers semigroups syb
+         template-haskell th-abstraction th-lift th-orphans
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers hspec HUnit mtl syb template-haskell th-expand-syns
+         th-lift th-orphans
+       ];
+       description = "Functions to desugar Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-dict-discovery" = callPackage
     ({ mkDerivation, base, constraints, template-haskell }:
      mkDerivation {
@@ -231091,8 +231784,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal";
-       version = "1.4.0";
-       sha256 = "0zh1d5apjsayqjwl019qcd4b7v2f2w14amq3rysdwqx8cz7z5045";
+       version = "1.4.3";
+       sha256 = "1nj5pgzan7q070c8qhcq51mnrwpkxi51ixmmp7b4n4fxfc80v68g";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bifunctors bytestring clock colour containers deepseq hosc
@@ -237963,13 +238656,13 @@ self: {
      }:
      mkDerivation {
        pname = "typography-geometry";
-       version = "1.0.0.1";
-       sha256 = "1mrack0n940idy5rv7mm0gfif8xri6z59npxwkq1kgi606vazbpd";
+       version = "1.0.1.0";
+       sha256 = "0vi2ggpvvarqimrga985cks5wq67dqyrr5nh3a0ghy0mbdrb72ps";
        libraryHaskellDepends = [
          base containers parallel polynomials-bernstein vector
        ];
        description = "Drawings for printed text documents";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -253019,8 +253712,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.11.1.0";
-       sha256 = "1kd64j2ka246n8c0z30rckq75998ajaja6ylmpdc74pzn23iydq9";
+       version = "0.11.1.1";
+       sha256 = "0zshpjggz3agzvqwirywpz79q4wq43vsz0pw1iq4dhf4ajjrmzrp";
        configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
@@ -253039,7 +253732,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "yaml_0_11_1_1" = callPackage
+  "yaml_0_11_1_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , conduit, containers, directory, filepath, hspec, HUnit, libyaml
      , mockery, mtl, raw-strings-qq, resourcet, scientific
@@ -253048,8 +253741,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.11.1.1";
-       sha256 = "0zshpjggz3agzvqwirywpz79q4wq43vsz0pw1iq4dhf4ajjrmzrp";
+       version = "0.11.1.2";
+       sha256 = "028pz77n92l6kjgjv263h4b6yhw1iibdbf3a3dkn5qnz537xpzhc";
        configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
@@ -257347,8 +258040,8 @@ self: {
      }:
      mkDerivation {
        pname = "zeromq4-simple";
-       version = "0.0.0";
-       sha256 = "04i8ksdyf19yywjb0gfkbc0mx90vzvrld5ba7lbnlxvx6iwmah66";
+       version = "0.0.0.1";
+       sha256 = "0h16chz3x0ipdbw935fvfhpdljbknczk1ivf87519dkrl3c1ypjv";
        libraryHaskellDepends = [
          aeson base bytestring constraints hashable uuid zeromq4-haskell
        ];
@@ -257788,6 +258481,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
 
+  "zlib_0_6_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, zlib
+     }:
+     mkDerivation {
+       pname = "zlib";
+       version = "0.6.2.1";
+       sha256 = "1l11jraslcrp9d4wnhwfyhwk4fsiq1aq8i6vj81vcq1m2zzi1y7h";
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
+       testHaskellDepends = [
+         base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Compression and decompression in the gzip and zlib formats";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zlib;};
+
   "zlib-bindings" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
      mkDerivation {

From 83bc9776ca3bd2ce00ecb17f6201db61ddffc12f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 15:18:55 +0000
Subject: [PATCH 332/794] cabal-install: version 3.x is out officially

---
 .../haskell-modules/configuration-common.nix  |  3 --
 .../configuration-ghc-8.8.x.nix               |  4 --
 .../haskell-modules/non-hackage-packages.nix  | 39 -------------------
 3 files changed, 46 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c37667af558..9fcc18ab2b0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -32,9 +32,6 @@ self: super: {
   # compiled on Linux. We provide the name to avoid evaluation errors.
   unbuildable = throw "package depends on meta package 'unbuildable'";
 
-  # Use the latest version of the Cabal library.
-  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_4_1_0; });
-
   # The test suite depends on old versions of tasty and QuickCheck.
   hackage-security = dontCheck super.hackage-security;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 417fc0b3a44..9dcc76fc26c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -41,10 +41,6 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # Use the cabal-install 3.0.0.0 beta release.
-  cabal-install = self.cabal-install-3;
-  Cabal_3_0_0_0 = null;    # Our compiler has this already.
-
   # Ignore overly restrictive upper version bounds.
   async = doJailbreak super.async;
   ChasingBottoms = doJailbreak super.ChasingBottoms;
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 1793299bf6c..8b667a1e669 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -13,43 +13,4 @@ self: super: {
   # https://github.com/channable/vaultenv/issues/1
   vaultenv = self.callPackage ../tools/haskell/vaultenv { };
 
-  cabal-install-3 = (self.callPackage
-    ({ mkDerivation, array, async, base, base16-bytestring, binary
-     , bytestring, Cabal, containers, cryptohash-sha256, deepseq
-     , directory, echo, edit-distance, filepath, hackage-security
-     , hashable, HTTP, mtl, network, network-uri, parsec, pretty
-     , process, random, resolv, stdenv, stm, tar, text, time, unix, zlib
-     , fetchFromGitHub
-     }:
-     mkDerivation {
-       pname = "cabal-install";
-       version = "3.0.0.0";
-       src = fetchFromGitHub {
-         owner = "haskell";
-         repo = "cabal";
-         rev = "b0e52fa173573705e861b129d9675e59de891e46";
-         sha256 = "1fbph6crsn9ji8ps1k8dsxvgqn38rp4ffvv6nia1y7rbrdv90ass";
-       };
-       postUnpack = "sourceRoot+=/cabal-install";
-       isLibrary = false;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal filepath process ];
-       executableHaskellDepends = [
-         array async base base16-bytestring binary bytestring Cabal
-         containers cryptohash-sha256 deepseq directory echo edit-distance
-         filepath hackage-security hashable HTTP mtl network network-uri
-         parsec pretty process random resolv stm tar text time unix zlib
-       ];
-       doCheck = false;
-       postInstall = ''
-         mkdir $out/etc
-         mv bash-completion $out/etc/bash_completion.d
-       '';
-       homepage = "http://www.haskell.org/cabal/";
-       description = "The command-line interface for Cabal and Hackage";
-       license = stdenv.lib.licenses.bsd3;
-     }) {}).overrideScope (self: super: {
-       Cabal = self.Cabal_3_0_0_0;
-     });
-
 }

From 9d4300b4b2def7a1e3fc5ffe009c03f649089e85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 15:19:35 +0000
Subject: [PATCH 333/794] haskell-resolv: drop obsolete patches for ghc 8.8.x

---
 .../haskell-modules/configuration-ghc-8.8.x.nix      | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 9dcc76fc26c..35b7c004637 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -81,18 +81,6 @@ self: super: {
       sed -i -e 's/time < 1.9/time < 2/' tar.cabal
     '';
   });
-  resolv = overrideCabal (overrideSrc super.resolv {
-    version = "20180411-git";
-    src = pkgs.fetchFromGitHub {
-      owner = "haskell-hvr";
-      repo = "resolv";
-      rev = "a22f9dd900cb276b3dd70f4781fb436d617e2186";
-      sha256 = "1j2jyywmxjhyk46kxff625yvg5y37knv7q6y0qkwiqdwdsppccdk";
-    };
-  }) (drv: {
-    buildTools = with pkgs; [autoconf];
-    preConfigure = "autoreconf --install";
-  });
   dlist = appendPatch (doJailbreak super.dlist) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch";
     sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc";

From e2dfa9f721be4aabdb5719aff46ecd8acaffb9b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 15:20:33 +0000
Subject: [PATCH 334/794] haskell-QuickCheck: drop obsolete patches for ghc
 8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 35b7c004637..f6e26aafa34 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -93,10 +93,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cabal-doctest-1.0.6.patch";
     sha256 = "0735mkxhv557pgnfvdjakkw9r85l5gy28grdwg929m26ghbf9s8j";
   });
-  QuickCheck = appendPatch super.QuickCheck (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/QuickCheck-2.13.1.patch";
-    sha256 = "138yrp3x5cnvncimrnhnkawz6clyk7fj3sr3y93l5szfr11kcvbl";
-  });
   regex-base = appendPatch super.regex-base (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
     sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";

From 7304dc14799ae2f9b1e07347cb141c7ca5168dc8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 15:21:17 +0000
Subject: [PATCH 335/794] haskell-regex-base: jailbreak build for ghc 8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index f6e26aafa34..07e23d4782b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -93,9 +93,11 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cabal-doctest-1.0.6.patch";
     sha256 = "0735mkxhv557pgnfvdjakkw9r85l5gy28grdwg929m26ghbf9s8j";
   });
-  regex-base = appendPatch super.regex-base (pkgs.fetchpatch {
+  regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
     sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";
+  })) (drv: {
+    preConfigure = "sed -i -e 's/base >=4 && < 4.13,/base,/' regex-base.cabal";
   });
   regex-posix = appendPatch super.regex-posix (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";

From 5137dc389ac893d459f152399698266f84e31639 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 15:24:56 +0000
Subject: [PATCH 336/794] haskell-HTTP: drop obsolete patches for ghc 8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 07e23d4782b..2413c592660 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -119,10 +119,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
     sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y";
   });
-  HTTP = appendPatch (doJailbreak super.HTTP) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/HTTP-4000.3.13.patch";
-    sha256 = "1fadi529x7dnmbfmls5969qfn9d4z954nc4lbqxmrwgirphkpmn4";
-  });
   hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
     sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";

From a9dd9c7c2f1900db1808debe3b465bf15b63652c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 15:38:36 +0000
Subject: [PATCH 337/794] haskell-resolv: add overrides for older compilers

---
 pkgs/development/haskell-modules/configuration-common.nix    | 1 +
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9fcc18ab2b0..f0e53b97266 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1005,6 +1005,7 @@ self: super: {
 
   # https://github.com/haskell-hvr/resolv/issues/1
   resolv = dontCheck super.resolv;
+  resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2;
 
   # spdx 0.2.2.0 needs older tasty
   # was fixed in spdx master (4288df6e4b7840eb94d825dcd446b42fef25ef56)
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index e8c138e594c..eba62c95be9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -76,4 +76,7 @@ self: super: {
   aeson = addBuildDepend super.aeson self.contravariant;
   base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant;
 
+  # Newer versions don't compile.
+  resolv = self.resolv_0_1_1_2;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 8d0582a8d06..4e70648b71a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -88,4 +88,7 @@ self: super: {
     version = "0.8.6.0-pre-release";
   };
 
+  # Newer versions don't compile.
+  resolv = self.resolv_0_1_1_2;
+
 }

From 374a39e598815c27d470f4ff57496eccb521f3de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 15:25:53 +0000
Subject: [PATCH 338/794] cabal-install: jailbreak build for ghc 8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 2413c592660..0ba27168ce4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -43,6 +43,7 @@ self: super: {
 
   # Ignore overly restrictive upper version bounds.
   async = doJailbreak super.async;
+  cabal-install = doJailbreak super.cabal-install;
   ChasingBottoms = doJailbreak super.ChasingBottoms;
   cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
   Diff = dontCheck super.Diff;

From 2e08ac73ca0098bf6dead801631c909d3a6b8e85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 15:45:06 +0000
Subject: [PATCH 339/794] cabal-install: override native Cabal version on older
 compilers

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index eba62c95be9..0919292d44a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -40,6 +40,9 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # Needs Cabal 3.0.x.
+  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
+
   # Restricts aeson to <1.4
   # https://github.com/purescript/purescript/pull/3537
   purescript = doJailbreak super.purescript;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 4e70648b71a..4addc834040 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -41,6 +41,9 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # Needs Cabal 3.0.x.
+  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
+
   # https://github.com/tibbe/unordered-containers/issues/214
   unordered-containers = dontCheck super.unordered-containers;
 

From 995d0782f523bab0ed4e83fed84c74fedcddbe0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 15:25:27 +0000
Subject: [PATCH 340/794] configuration-ghc-8.8.x.nix: cosmetic

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 0ba27168ce4..2209f570732 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -50,6 +50,7 @@ self: super: {
   doctest = doJailbreak super.doctest;
   hashable = doJailbreak super.hashable;
   hashable-time = doJailbreak super.hashable-time;
+  hledger-lib = doJailbreak super.hledger-lib;  # base >=4.8 && <4.13, easytest >=0.2.1 && <0.3
   integer-logarithms = doJailbreak super.integer-logarithms;
   lucid = doJailbreak super.lucid;
   parallel = doJailbreak super.parallel;
@@ -59,7 +60,6 @@ self: super: {
   tasty-expected-failure = doJailbreak super.tasty-expected-failure;
   test-framework = doJailbreak super.test-framework;
   th-lift = self.th-lift_0_8_0_1;
-  hledger-lib = doJailbreak super.hledger-lib;  # base >=4.8 && <4.13, easytest >=0.2.1 && <0.3
 
   # These packages don't work and need patching and/or an update.
   primitive = overrideSrc (doJailbreak super.primitive) {

From 38a581902eb795da6bd5b2b49faac32f75e8882b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2019 15:52:04 +0000
Subject: [PATCH 341/794] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.14.4-7-ga804c35 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/222d2ffb871617615c537b4f6fefcefc3d338e7a.
---
 .../development/haskell-modules/hackage-packages.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a6fd9209005..eaa0f799f92 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1511,8 +1511,8 @@ self: {
      }:
      mkDerivation {
        pname = "BiobaseBlast";
-       version = "0.3.0.0";
-       sha256 = "1p6ammx4fw5a9bvw503g46smmw5rx4rrpvlf8lmw7c73aczm9ga1";
+       version = "0.3.1.0";
+       sha256 = "153bxf221jga58ibxgd660465klbqj49qr3rk6ni77v7sb4qgrg0";
        libraryHaskellDepends = [
          aeson attoparsec base binary BiobaseENA BiobaseTypes BiobaseXNA
          bytestring cereal containers deepseq directory file-embed lens
@@ -41675,6 +41675,8 @@ self: {
        ];
        description = "Factory for quickly building a microservice";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boots-web" = callPackage
@@ -41695,6 +41697,8 @@ self: {
        ];
        description = "Factory for quickly building a web application";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bootstrap-types" = callPackage
@@ -89328,8 +89332,8 @@ self: {
     ({ mkDerivation, base, HUnit, template-haskell, th-abstraction }:
      mkDerivation {
        pname = "generic-constraints";
-       version = "1.1.0";
-       sha256 = "1f7d1z8l68f89p1kfiylwv3qb6n2x7njni4rhlxk9vvyllxgnqcb";
+       version = "1.1.1";
+       sha256 = "0ifia4yw495ikkvjn70c386z3w40vyl2wracmcij025yc9bz4w9q";
        libraryHaskellDepends = [ base template-haskell th-abstraction ];
        testHaskellDepends = [ base HUnit ];
        description = "Constraints via Generic";

From 46ff96c05b24fe5f7b82ff0f188d367bb84bc40c Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 28 Aug 2019 17:57:57 +0200
Subject: [PATCH 342/794] dovecot-pigeonhole: 0.5.7.1 -> 0.5.7.2
 (CVE-2019-11500)

This is a followup on #67623
---
 pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index 3d0f921409c..dce0b917409 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dovecot-pigeonhole-${version}";
-  version = "0.5.7.1";
+  version = "0.5.7.2";
 
   src = fetchurl {
     url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
-    sha256 = "0a10mam68pmdh3fw8fnv5jff6xj1k770hvadym2c39vm3x6b4w1j";
+    sha256 = "1c0ijjmdskxydmvfk8ixxgg8ndnxx1smvycbp7jjd895a9f0r7fm";
   };
 
   buildInputs = [ dovecot openssl ];

From fb68a01449eec0f1764ed8c3f46020886161ff57 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Thu, 29 Aug 2019 00:33:33 +0800
Subject: [PATCH 343/794] eksctl: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index aaf59d72f98..4a4d738f04d 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "0vyz02yli2lnzzzzy8dv9y5g69ljr671p1lgx84z8ys2ihwj3yc3";
+    sha256 = "1h7fyxlwa9f9r08rpl05r62ap7h7viaqchldbnv7j3vs2j23k127";
   };
 
   modSha256 = "17bb1k18x1xfq9bi9qbm8pln6h6pkhaqzy07qdvnhinmspll1695";

From 06073ae7df9f0202c864a7d91ed9ac40b388fd4a Mon Sep 17 00:00:00 2001
From: Vika <kisik21@fireburn.ru>
Date: Mon, 26 Aug 2019 13:40:21 +0300
Subject: [PATCH 344/794] libargon2: fixed cross-compilation

Makefile had a hardcoded unprefixed ar. I wrote a patch (sending it
upstream) and added an optional make flag to override it in case we're
cross-compiling.

Unfortunately, this causes a rebuild of native packages.

This commit also fixes the pkg-config file to be generated correctly,
patch was provided by @worldofpeace.
---
 .../libraries/libargon2/default.nix           | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix
index c0dd406dd31..9bf05a679cc 100644
--- a/pkgs/development/libraries/libargon2/default.nix
+++ b/pkgs/development/libraries/libargon2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "libargon2";
@@ -11,18 +11,21 @@ stdenv.mkDerivation rec {
     sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i";
   };
 
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/lib/pkgconfig
-    substitute libargon2.pc $out/lib/pkgconfig/libargon2.pc \
-      --replace @UPSTREAM_VER@ "${version}"                 \
-      --replace @HOST_MULTIARCH@ ""                         \
-      --replace 'prefix=/usr' "prefix=$out"
+  patches = [
+    # TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released
+    (fetchpatch {
+      url = "https://github.com/P-H-C/phc-winner-argon2/commit/cd1c1d8d204e4ec4557e358013567c097cb70562.patch";
+      sha256 = "0whqv8b6q9602n7vxpzbd8bk8wz22r1jz9x5lrm9z7ib3wz81c8a";
+    })
+  ];
 
-    make install PREFIX=$out LIBRARY_REL=lib
-    ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0
-    runHook postInstall
-  '';
+  makeFlags = [
+    "AR=${stdenv.cc.targetPrefix}ar" # Fix cross-compilation
+    "PREFIX=${placeholder "out"}"
+    "ARGON2_VERSION=${version}"
+    "LIBRARY_REL=lib"
+    "PKGCONFIG_REL=lib"
+  ];
 
   meta = with stdenv.lib; {
     description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015";

From 4b99f9ba0bac82b2d3391ad115d4941b483986f5 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Wed, 28 Aug 2019 18:42:18 +0200
Subject: [PATCH 345/794] vault: add raft backend to vault service

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

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index 8176c168ca9..d5962ba9af9 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -70,7 +70,7 @@ in
       };
 
       storageBackend = mkOption {
-        type = types.enum [ "inmem" "file" "consul" "zookeeper" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs" ];
+        type = types.enum [ "inmem" "file" "consul" "zookeeper" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs" "raft" ];
         default = "inmem";
         description = "The name of the type of storage backend";
       };

From cd7142b2886356c49765352bb43a1ab81dc0d767 Mon Sep 17 00:00:00 2001
From: Vika <kisik21@fireburn.ru>
Date: Wed, 28 Aug 2019 20:17:34 +0300
Subject: [PATCH 346/794] lr: add myself (@kisik21) as maintainer

As an answer to #67638, I'm adopting this package, adding myself as a
maintainer.
---
 maintainers/maintainer-list.nix  | 10 ++++++++++
 pkgs/tools/system/lr/default.nix |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aca54c9f102..7db37f7f1f1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6640,6 +6640,16 @@
     githubId = 5837359;
     name = "Adrian Pistol";
   };
+  vika_nezrimaya = {
+    email = "vika@fireburn.ru";
+    github = "kisik21";
+    githubId = 7953163;
+    name = "Vika Shleina";
+    keys = [{
+      longkeyid = "rsa4096/0x5402B9B5497BACDB";
+      fingerprint = "A03C D09C 36CF D9F6 1ADF  AF11 5402 B9B5 497B ACDB";
+    }];
+  };
   vinymeuh = {
     email = "vinymeuh@gmail.com";
     github = "vinymeuh";
diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
index 38fe1e6347f..39cd429e1f9 100644
--- a/pkgs/tools/system/lr/default.nix
+++ b/pkgs/tools/system/lr/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     description = "List files recursively";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = [ ];
+    maintainers = with maintainers; [ vika_nezrimaya ];
   };
 }

From 0c4cb4c10267cdf74d6d51e285a74914cf300b4e Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 28 Aug 2019 16:38:15 +0200
Subject: [PATCH 347/794] prometheus-cups-exporter: init at unstable-2019-03-17

---
 .../monitoring/prometheus/cups-exporter.nix   | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/cups-exporter.nix

diff --git a/pkgs/servers/monitoring/prometheus/cups-exporter.nix b/pkgs/servers/monitoring/prometheus/cups-exporter.nix
new file mode 100644
index 00000000000..9ba73b3d210
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/cups-exporter.nix
@@ -0,0 +1,36 @@
+{ lib, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "prometheus-cups-exporter-unstable";
+  version = "2019-03-17";
+
+  format = "other";
+
+  src = fetchFromGitHub {
+    owner = "ThoreKr";
+    repo = "cups_exporter";
+    rev = "8fd1c2517e9878b7b7c73a450e5e546f437954a9";
+    sha256 = "1cwk2gbw2svqjlzgwv5wqzhq7fxwrwsrr0kkbnqn4mfb0kq6pa8m";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ prometheus_client pycups ];
+
+  installPhase = ''
+    mkdir -p $out/share/
+    cp cups_exporter.py $out/share/
+  '';
+
+  fixupPhase = ''
+    makeWrapper "${python3Packages.python.interpreter}" "$out/bin/prometheus-cups-exporter" \
+          --set PYTHONPATH "$PYTHONPATH" \
+          --add-flags "$out/share/cups_exporter.py"
+  '';
+
+  meta = with lib; {
+    description = "A simple prometheus exporter for cups implemented in python";
+    homepage = "https://github.com/ThoreKr/cups_exporter";
+    license = licenses.unfree;
+    maintainers = [ maintainers.mmahut ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b345fc29746..d4721b8d3ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15011,6 +15011,7 @@ in
   prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { };
   prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
+  prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { };
   prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
   prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
   prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };

From 7863697575813b68a90ce25599a6349d6c179d5c Mon Sep 17 00:00:00 2001
From: Imuli <i@imu.li>
Date: Wed, 28 Aug 2019 14:30:18 -0400
Subject: [PATCH 348/794] fly: 5.3.0 -> 5.4.1 (#67633)

---
 .../tools/continuous-integration/fly/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix
index 47af70b3702..3f394472c40 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "fly";
-  version = "5.3.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
     rev = "v${version}";
-    sha256 = "06ns98k47nafhkkj7gkmxp7msn4ssypyss6ll0fm6380vq2cavnj";
+    sha256 = "15lkhdvxqcryn5k7qflkby666ddj66gpqzga13yxjgjjp7zx2mi3";
   };
 
-  modSha256 = "11rnlmn5hp9nsgkmd716dsjmkr273035j9gzfhjxjsfpiax60i0a";
+  modSha256 = "0wz0v7w2di23cvqpg35zzqs2hvsbjgcrl7pr90ymmpsspq97fkf7";
 
   subPackages = [ "fly" ];
 

From 88723457e6ed9afd92c1d37d88e097e3b6a83708 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Wed, 28 Aug 2019 15:22:12 -0400
Subject: [PATCH 349/794] rclone: 1.49.0 -> 1.49.1

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

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index ce676566577..52527f79303 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "rclone";
-  version = "1.49.0";
+  version = "1.49.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "13xzz6nl4863dyn9w1qczap77bbiwzp4znbifa9hg91qys0nj5ga";
+    sha256 = "0mjwp1j70dqa8k3zxhcnw85ddhagkpr7c59mv8kradv6mqqzmq9c";
   };
 
   modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03";

From a4ca80771e302361e271def6f95453184f76636c Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Wed, 28 Aug 2019 19:29:17 +0000
Subject: [PATCH 350/794] =?UTF-8?q?one=5Fgadget:=201.6.2=20=E2=86=92=201.7?=
 =?UTF-8?q?.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/misc/one_gadget/Gemfile.lock | 6 +++---
 pkgs/development/tools/misc/one_gadget/gemset.nix   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/pkgs/development/tools/misc/one_gadget/Gemfile.lock
index 3e02f085ae6..ea31cc3704f 100644
--- a/pkgs/development/tools/misc/one_gadget/Gemfile.lock
+++ b/pkgs/development/tools/misc/one_gadget/Gemfile.lock
@@ -2,10 +2,10 @@ GEM
   remote: https://rubygems.org/
   specs:
     bindata (2.4.4)
-    elftools (1.0.2)
+    elftools (1.1.0)
       bindata (~> 2)
-    one_gadget (1.6.2)
-      elftools (~> 1.0.2)
+    one_gadget (1.7.2)
+      elftools (>= 1.0.2, < 1.2.0)
 
 PLATFORMS
   ruby
diff --git a/pkgs/development/tools/misc/one_gadget/gemset.nix b/pkgs/development/tools/misc/one_gadget/gemset.nix
index 485ddf940fd..26507a26e91 100644
--- a/pkgs/development/tools/misc/one_gadget/gemset.nix
+++ b/pkgs/development/tools/misc/one_gadget/gemset.nix
@@ -15,10 +15,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ajymn59fr9117dkwf5xl8vmr737h6xmrcf1033zjlj2l5qkxn4a";
+      sha256 = "0kdf0ck4rzxpd006y09rfwppdrqb3sxww4gzfpv2053yq4mkimbn";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.1.0";
   };
   one_gadget = {
     dependencies = ["elftools"];
@@ -26,9 +26,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wacvysd7ddnbx2jl1vhzbkb28y974riyns7bpx889518zaa09z0";
+      sha256 = "07s2nigjw1yik895gliz3a7ps0m9j5nccq82zwdd30sv740jmf5b";
       type = "gem";
     };
-    version = "1.6.2";
+    version = "1.7.2";
   };
 }
\ No newline at end of file

From 02ed974bbad4bf8dfca02f4d1251df217a89e2b1 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 28 Aug 2019 22:27:28 +0200
Subject: [PATCH 351/794] nixos/gitlab-runner: add missing HOME to environment
 (#67450)

Gitlab runner fails to start if HOME is not set.
---
 .../services/continuous-integration/gitlab-runner.nix        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 3ceaa6f5ff3..3d307b1abcf 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -111,7 +111,10 @@ in
   config = mkIf cfg.enable {
     systemd.services.gitlab-runner = {
       path = cfg.packages;
-      environment = config.networking.proxy.envVars;
+      environment = config.networking.proxy.envVars // {
+        # Gitlab runner will not start if the HOME variable is not set
+        HOME = cfg.workDir;
+      };
       description = "Gitlab Runner";
       after = [ "network.target" ]
         ++ optional hasDocker "docker.service";

From 33b67761be99c21b151b9a3b8c5c8bd6398671a9 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Wed, 28 Aug 2019 16:28:46 -0400
Subject: [PATCH 352/794] zerotierone: 1.4.2 -> 1.4.4 (#67648)

---
 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 59bab468c53..367c518ad82 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zerotierone";
-  version = "1.4.2";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "zerotier";
     repo = "ZeroTierOne";
     rev = version;
-    sha256 = "1b78jr33xawdkn8dcs884g6klj0zg4dazwhr1qhrj7x54bs7gizr";
+    sha256 = "1b9qm01ximz2j6yimp7bs86h4kaz8jsjxxb6c2js43dzp98k0m94";
   };
 
   preConfigure = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Create flat virtual Ethernet networks of almost unlimited size";
     homepage = https://www.zerotier.com;
-    license = licenses.gpl3;
+    license = licenses.bsl11;
     maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz ];
     platforms = platforms.x86_64 ++ platforms.aarch64;
   };

From 819696bb0cee6085e5f4393aa437184db1026280 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 29 Aug 2019 01:51:25 +0200
Subject: [PATCH 353/794] evcxr: 0.4.3 -> 0.4.4

https://github.com/google/evcxr/releases/tag/v0.4.4
---
 pkgs/development/interpreters/evcxr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index 84ebc49a221..54ee243cb33 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/pkgs/development/interpreters/evcxr/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "evcxr";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "evcxr";
     rev = "v${version}";
-    sha256 = "08zsdl6pkg6dx7k0ns8cd070v7ydsxkscd2ms8wh9r68c08vwzcp";
+    sha256 = "1j2vsqgljqw7415rgjlnc1w3nmr9ghizx2mncbm1yipwj8xbrmf6";
   };
 
-  cargoSha256 = "1hqlagwl94xcybfqq5h2mrz9296mjns2l598d6jclls7ac5wsdfc";
+  cargoSha256 = "0ckxpmi547y7q4w287znimpxgaj3mjkgmkcs2n9cp4m8cw143hly";
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [ zeromq ] ++ stdenv.lib.optional stdenv.isDarwin Security;

From 7f6a9eef2602a9ddb369ec3318ee99e98054989b Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Thu, 29 Aug 2019 03:31:14 +0200
Subject: [PATCH 354/794] crystal: Fix runtime by switching to openssl_1_0_2

This makes `crystal play` work
---
 pkgs/development/compilers/crystal/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index c7a74880e44..2bc3d396da6 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
-, coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml
+, coreutils, git, gmp, nettools, openssl_1_0_2, readline, tzdata, libxml2, libyaml
 , boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib
 , callPackage }:
 
@@ -20,7 +20,7 @@ let
 
   arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
-  checkInputs = [ git gmp openssl readline libxml2 libyaml ];
+  checkInputs = [ git gmp openssl_1_0_2 readline libxml2 libyaml ];
 
   genericBinary = { version, sha256s, rel ? 1 }:
   stdenv.mkDerivation rec {
@@ -73,7 +73,7 @@ let
 
     buildInputs = [
       boehmgc libatomic_ops pcre libevent libyaml
-      llvm zlib openssl
+      llvm zlib openssl_1_0_2
     ] ++ stdenv.lib.optionals stdenv.isDarwin [
       libiconv
     ];

From 8d3c2c8538e812d8ca11aa27852e8f1cc68091cd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Aug 2019 15:48:04 +0800
Subject: [PATCH 355/794] gcompris: use Qt mkDerivation

---
 pkgs/games/gcompris/default.nix | 56 ++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix
index 8d41070a61e..23d12602759 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/pkgs/games/gcompris/default.nix
@@ -1,37 +1,55 @@
-{stdenv, cmake, qtbase, fetchurl, qtdeclarative, qtmultimedia, qttools, qtsensors, qmlbox2d, gettext, qtquickcontrols, qtgraphicaleffects, qtxmlpatterns, makeWrapper,
-  gst_all_1, ninja
+{ mkDerivation
+, cmake
+, fetchurl
+, gettext
+, gst_all_1
+, lib
+, ninja
+, qmlbox2d
+, qtbase
+, qtdeclarative
+, qtgraphicaleffects
+, qtmultimedia
+, qtquickcontrols
+, qtsensors
+, qttools
+, qtxmlpatterns
 }:
-stdenv.mkDerivation rec {
+
+mkDerivation rec {
+  pname = "gcompris";
   version = "0.96";
-  name = "gcompris-${version}";
 
   src = fetchurl {
     url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
     sha256 = "06483il59l46ny2w771sg45dgzjwv1ph7vidzzbj0wb8wbk2rg52";
   };
 
-  cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0";
+  cmakeFlags = [
+    "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0"
+  ];
 
-  nativeBuildInputs = [ cmake ninja makeWrapper ];
-  buildInputs = [ qtbase qtdeclarative qttools qtsensors qmlbox2d gettext qtquickcontrols qtmultimedia qtgraphicaleffects qtxmlpatterns] ++ soundPlugins;
-  soundPlugins = with gst_all_1; [gst-plugins-good gstreamer gst-plugins-base gst-plugins-bad];
+  nativeBuildInputs = [ cmake gettext ninja qttools ];
+
+  buildInputs = [
+    qmlbox2d qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtsensors qtxmlpatterns
+  ] ++ (with gst_all_1; [
+    gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
+  ]);
 
   postInstall = ''
-    # install .desktop and icon file
-    mkdir -p $out/share/applications/
-    mkdir -p $out/share/icons/hicolor/256x256/apps/
-    cp ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop
-    cp -r ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png
+    install -Dm444 ../org.kde.gcompris.desktop        $out/share/applications/gcompris.desktop
+    install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png
+    install -Dm444 ../org.kde.gcompris.appdata.xml -t $out/share/metainfo
 
-    wrapProgram "$out/bin/gcompris-qt" \
-       --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
-    '';
+    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+  '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A high quality educational software suite, including a large number of activities for children aged 2 to 10";
     homepage = "https://gcompris.net/";
-    maintainers = [ maintainers.guibou ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
     license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ guibou ];
+    platforms = platforms.linux;
   };
 }

From 392763aea636fa9a59889b2d0162d959b11de0da Mon Sep 17 00:00:00 2001
From: Chris Rendle-Short <chris@killred.net>
Date: Wed, 28 Aug 2019 10:08:28 +1000
Subject: [PATCH 356/794] qtpass: fix missing app icon and name when running
 under Wayland

Patch has been upstreamed and should be safe to remove in versions >
1.3.0
---
 pkgs/applications/misc/qtpass/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 462114ed272..cbe24f7183a 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, mkDerivation, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
+{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch
+, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper
+}:
 
 mkDerivation rec {
   pname = "qtpass";
@@ -15,6 +17,15 @@ mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper qmake ];
 
+  # Fix missing app icon on Wayland. Has been upstreamed and should be safe to
+  # remove in versions > 1.3.0
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/IJHack/QtPass/commit/aba8c4180f0ab3d66c44f88b21f137b19d17bde8.patch";
+      sha256 = "009bcq0d75khmaligzd7736xdzy6a8s1m9dgqybn70h801h92fcr";
+    })
+  ];
+
   enableParallelBuilding = true;
 
   qtWrapperArgs = [

From 8de860b60d0deb6aa0a13f0e16723bbce70f1a67 Mon Sep 17 00:00:00 2001
From: Chris Rendle-Short <chris@killred.net>
Date: Thu, 29 Aug 2019 08:25:52 +1000
Subject: [PATCH 357/794] qtpass: 1.2.3 -> 1.3.0

---
 pkgs/applications/misc/qtpass/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index cbe24f7183a..1fccada4200 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch
-, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper
+{ stdenv, lib, mkDerivation, fetchFromGitHub, fetchpatch
+, git, gnupg, pass, qtbase, qtsvg, qttools, qmake
 }:
 
 mkDerivation rec {
   pname = "qtpass";
-  version = "1.2.3";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner  = "IJHack";
     repo   = "QtPass";
     rev    = "v${version}";
-    sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky";
+    sha256 = "0v3ca4fdjk6l24vc9wlc0i7r6fdj85kjmnb7jvicd3f8xi9mvhnv";
   };
 
   buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
 
-  nativeBuildInputs = [ makeWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
 
   # Fix missing app icon on Wayland. Has been upstreamed and should be safe to
   # remove in versions > 1.3.0
@@ -29,9 +29,7 @@ mkDerivation rec {
   enableParallelBuilding = true;
 
   qtWrapperArgs = [
-    "--suffix PATH : ${git}/bin"
-    "--suffix PATH : ${gnupg}/bin"
-    "--suffix PATH : ${pass}/bin"
+    "--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}"
   ];
 
   postInstall = ''

From 7ba8b728dc1100b4a114d92974a17587a02f0c21 Mon Sep 17 00:00:00 2001
From: Matthew Glazar <strager.nds@gmail.com>
Date: Wed, 28 Aug 2019 22:31:57 -0700
Subject: [PATCH 358/794] include-what-you-use: 0.10 -> 0.12

Release notes:
https://github.com/include-what-you-use/include-what-you-use/releases/tag/clang_8.0

IWYU version 0.12 is based on LLVM/Clang version 8.0.
---
 .../tools/analysis/include-what-you-use/default.nix         | 6 +++---
 pkgs/top-level/all-packages.nix                             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 4222f72248a..019a449ebcd 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
   name = "include-what-you-use-${version}";
   # Also bump llvmPackages in all-packages.nix to the supported version!
-  version = "0.10";
+  version = "0.12";
 
   src = fetchurl {
-    sha256 = "16alan9rwbhpyfxmlpc7gbfnbqd877wdqrkvgqrjb1jlqkzpg55s";
+    sha256 = "09b0h704fh7r4f5h92p5997cj3zk1v04bqp4jk1j1f6cmfq2z2d5";
     url = "${meta.homepage}/downloads/${name}.src.tar.gz";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     substituteInPlace $out/bin/iwyu_tool.py \
-      --replace "['include-what-you-use']" "['$out/bin/include-what-you-use']"
+      --replace "'include-what-you-use'" "'$out/bin/include-what-you-use'"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06dd2829570..493aa3bead8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9352,7 +9352,7 @@ in
   };
 
   include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
-    llvmPackages = llvmPackages_6;
+    llvmPackages = llvmPackages_8;
   };
 
   indent = callPackage ../development/tools/misc/indent { };

From 3f632253094adbf884e7e33a82f7289555bcb734 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 21 Aug 2019 19:53:02 +0000
Subject: [PATCH 359/794] ocamlPackages.batteries: 2.9.0 -> 2.10.0

Ensures compatibility with OCaml 4.08.
---
 pkgs/development/ocaml-modules/batteries/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index 473c30b4345..3b511c7f1cc 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest, num }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }:
 
-let version = "2.9.0"; in
+let version = "2.10.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-batteries-${version}";
 
-  src = fetchzip {
-    url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
-    sha256 = "1wianim29kkkf4c31k7injjp3ji69ki5krrp6csq8ycswg791dby";
+  src = fetchurl {
+    url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz";
+    sha256 = "08ghw87d56h1a6y1nnh3x2wy9xj25jqfk5sp6ma9nsyd37babb0h";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild qtest ];
   propagatedBuildInputs = [ num ];
 
-  doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.07" && !stdenv.isAarch64;
+  doCheck = stdenv.lib.versions.majorMinor ocaml.version != "4.07" && !stdenv.isAarch64;
   checkTarget = "test test";
 
   createFindlibDestdir = true;

From 7f88d0feb7a049de8eaf701f1d39e920c47306b1 Mon Sep 17 00:00:00 2001
From: Serhii Khoma <srghma@gmail.com>
Date: Thu, 29 Aug 2019 09:49:25 +0300
Subject: [PATCH 360/794] hubstaff: 1.4.9 -> 1.4.10

---
 pkgs/applications/misc/hubstaff/revision.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json
index 513e5bef442..3170a63379c 100644
--- a/pkgs/applications/misc/hubstaff/revision.json
+++ b/pkgs/applications/misc/hubstaff/revision.json
@@ -1,5 +1,5 @@
 {
-  "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.9-86828309/Hubstaff-1.4.9-86828309.sh",
-  "version": "1.4.9-86828309",
-  "sha256": "0p9b7s2damzxmbrm8m97bj06g0faslbjw51dmxq8icz6ldbqsspx"
+  "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.10-848554d6/Hubstaff-1.4.10-848554d6.sh",
+  "version": "1.4.10-848554d6",
+  "sha256": "1hwncdzpzawrwswr3ibhxny0aa5k9f8f2qf636bdzqilwhv6342z"
 }

From f24c729196a36aa16d87d14e6203c57abe946252 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 29 Aug 2019 03:00:00 -0500
Subject: [PATCH 361/794] postgresqlPackages.plv8: narrow platforms to
 x86_64-linux

plv8 uses a custom version v8 version, which is reported to only build
on x86_64-linux. The next major version plv8 should drop the custom v8.
---
 pkgs/development/libraries/v8/plv8_6_x.nix | 6 ++++--
 pkgs/servers/sql/postgresql/ext/plv8.nix   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix
index 8d2276def70..e0ca0e14b66 100644
--- a/pkgs/development/libraries/v8/plv8_6_x.nix
+++ b/pkgs/development/libraries/v8/plv8_6_x.nix
@@ -1,6 +1,8 @@
 # NOTE: this expression is NOT exported from the top-level of all-packages.nix,
-# it is exclusively used by the 'plv8' PostgreSQL extension, which requires a
-# very exact version.
+# it is exclusively used by the 'plv8' PostgreSQL extension.
+# Since plv8 2.3.2, plv8 no longer requires this specific version, but as of
+# 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which
+# is a bit outdated.  plv8 3.x is planned to support v8 7.x
 
 { stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig
 , doCheck ? false
diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix
index b4f4c357d42..9f88f9de045 100644
--- a/pkgs/servers/sql/postgresql/ext/plv8.nix
+++ b/pkgs/servers/sql/postgresql/ext/plv8.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL";
     homepage = "https://plv8.github.io/";
     maintainers = with maintainers; [ volth ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     license = licenses.postgresql;
   };
 }

From 2af98a46c14f8a9dc24e5c4bfe6671b2ef1b33e9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 29 Aug 2019 03:00:00 -0500
Subject: [PATCH 362/794] 1password: 0.5.7 -> 0.6.1

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

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

From 964974bbb7ec6b153afff0ec46f78984b4af0e96 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 29 Aug 2019 03:01:00 -0500
Subject: [PATCH 363/794] postgresqlPackages.plv8: add marsam as maintainer

---
 pkgs/servers/sql/postgresql/ext/plv8.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix
index 9f88f9de045..75a2853e2c0 100644
--- a/pkgs/servers/sql/postgresql/ext/plv8.nix
+++ b/pkgs/servers/sql/postgresql/ext/plv8.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL";
     homepage = "https://plv8.github.io/";
-    maintainers = with maintainers; [ volth ];
+    maintainers = with maintainers; [ volth marsam ];
     platforms = [ "x86_64-linux" ];
     license = licenses.postgresql;
   };

From e6e3270bd44ddc7d94df6b054a1e4e543055ca05 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 29 Aug 2019 10:34:36 +0200
Subject: [PATCH 364/794] kea: 1.5.0 -> 1.5.0-P1 (security)

Fixes:

* CVE-2019-6472 affects the Kea DHCPv6 server, which can exit
  with an assertion failure if the DHCPv6 server process receives
  a request containing DUID value which is too large.
  (https://kb.isc.org/docs/cve-2019-6474)

* CVE-2019-6473 affects the Kea DHCPv4 server, which can exit with
  an assertion failure if it receives a packed containing a malformed
  option.  (https://kb.isc.org/docs/cve-2019-6473)

* CVE-2019-6474 can cause a condition where the server cannot be
  restarted without manual operator intervention to correct a problem
  that can be deliberately introduced into the stored leases.
  CVE-2019-6474 can only affect servers which are using memfile
  for lease storage.  (https://kb.isc.org/docs/cve-2019-6474)

Annoucement: https://www.openwall.com/lists/oss-security/2019/08/29/1
---
 pkgs/tools/networking/kea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index a1c156475fb..0d1bd462d3b 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "kea";
-  version = "1.5.0";
+  version = "1.5.0-P1";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz";
-    sha256 = "1v5a3prgrplw6dp9124f9gpy0kz0jrjwhnvzrw3zcynad2mlzkpd";
+    sha256 = "0bqxzp3f7cmraa5davj2az1hx1gbbchqzlz3ai26c802agzafyhz";
   };
 
   patches = [ ./dont-create-var.patch ];

From 298439f4fae2d96afbbd72100219c1c80e4bea4a Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Thu, 29 Aug 2019 11:08:10 +0200
Subject: [PATCH 365/794] kinetic-cpp-client: use openssl_1_0_2

---
 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 d290cb592e1..5d6a747f0c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11461,7 +11461,9 @@ in
     automake = automake111x;
   };
 
-  kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
+  kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client {
+    openssl = openssl_1_0_2;
+  };
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
     inherit (buildPackages.darwin) bootstrap_cmds;

From 48c153d57f7076a27d477649c645d6f4b47855e3 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Thu, 29 Aug 2019 11:13:41 +0200
Subject: [PATCH 366/794] atlassian-confluence: 6.15.6 -> 6.15.8

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

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

From e2eef8d28dc460cd2779a74357a3a3df66961bf5 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Thu, 29 Aug 2019 12:20:01 +0300
Subject: [PATCH 367/794] escrotum: 2017-01-28 -> 2019-06-10

---
 pkgs/tools/graphics/escrotum/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix
index 2a4f3c9cbff..16f33251dd6 100644
--- a/pkgs/tools/graphics/escrotum/default.nix
+++ b/pkgs/tools/graphics/escrotum/default.nix
@@ -4,17 +4,24 @@
 }:
 
 buildPythonApplication {
-  name = "escrotum-2017-01-28";
+  name = "escrotum-2019-06-10";
 
   src = fetchFromGitHub {
     owner  = "Roger";
     repo   = "escrotum";
-    rev    = "a51e330f976c1c9e1ac6932c04c41381722d2171";
-    sha256 = "0vbpyihqgm0fyh22ashy4lhsrk67n31nw3bs14d1wr7ky0l3rdnj";
+    rev    = "f6c300315cb4402e37f16b56aad2d206e24c5281";
+    sha256 = "0x7za74lkwn3v6j9j04ifgdwdlx9akh1izkw7vkkzj9ag9qjrzb0";
   };
 
   propagatedBuildInputs = [ pygtk numpy ];
 
+  outputs = [ "out" "man" ];
+
+  postInstall = ''
+    mkdir -p $man/share/man/man1
+    cp man/escrotum.1 $man/share/man/man1/
+  '';
+
   meta = with lib; {
     homepage = https://github.com/Roger/escrotum;
     description = "Linux screen capture using pygtk, inspired by scrot";

From b5977ddd8e04ef6102020f96292abdac24d97595 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Thu, 29 Aug 2019 18:03:52 +0800
Subject: [PATCH 368/794] cargo-web: 0.6.25 -> 0.6.26

---
 pkgs/development/tools/cargo-web/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix
index fa45ba689df..7ed75d3f6e6 100644
--- a/pkgs/development/tools/cargo-web/default.nix
+++ b/pkgs/development/tools/cargo-web/default.nix
@@ -4,16 +4,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-web";
-  version = "0.6.25";
+  version = "0.6.26";
 
   src = fetchFromGitHub {
     owner = "koute";
     repo = pname;
     rev = version;
-    sha256 = "0q77bryc7ap8gb4rzp9xk8ngqwxh106qn7899g30lwxycnyii0mf";
+    sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd";
   };
 
-  cargoSha256 = "1f4sj260q4rlzbajwimya1yhh90hmmbhr47yfg9i8xcv5cg0cqjn";
+  cargoSha256 = "1cbyy9rc33f69hbs0ff00v0v3p92f3lqq8ma5aqid5dm6d8l2dx5";
 
   nativeBuildInputs = [ openssl perl pkgconfig ];
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     description = "A Cargo subcommand for the client-side Web";
     homepage = https://github.com/koute/cargo-web;
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = [ maintainers.kevincox ];
+    maintainers = with maintainers; [ kevincox ];
     platforms = platforms.all;
   };
 }

From 7dfe735465b715cf409dfffefb45253d4b516bae Mon Sep 17 00:00:00 2001
From: Valerio Besozzi <valebes@gmail.com>
Date: Thu, 29 Aug 2019 12:13:36 +0200
Subject: [PATCH 369/794] waybar: 0.7.2 -> 0.8.0

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

diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix
index d6cbb442b89..002bdef7333 100644
--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, meson, pkgconfig, ninja
-, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, spdlog
+, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog
 , traySupport  ? true,  libdbusmenu-gtk3
 , pulseSupport ? false, libpulseaudio
 , nlSupport    ? true,  libnl
@@ -9,17 +9,17 @@
 }:
   stdenv.mkDerivation rec {
     pname = "waybar";
-    version = "0.7.2";
+    version = "0.8.0";
 
     src = fetchFromGitHub {
       owner = "Alexays";
       repo = "Waybar";
       rev = version;
-      sha256 = "15biyr422s5f2csw395fz9cikir9wffdwqq8y0i6ayzpymzsqbzs";
+      sha256 = "0s8ck7qxka0l91ayma6amp9sc8cidi43byqgzcavi3a6id983r1z";
     };
 
     nativeBuildInputs = [
-      meson ninja pkgconfig
+      meson ninja pkgconfig scdoc
     ];
 
     buildInputs = with stdenv.lib;

From 38aa8faa3061d0e515dc181225cc39c250416313 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 29 Aug 2019 13:30:59 +0200
Subject: [PATCH 370/794] maintainers: update rnhmjoj information

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 397e15c3f06..ed2ce773983 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5340,10 +5340,16 @@
     name = "Richard Lupton";
   };
   rnhmjoj = {
-    email = "micheleguerinirocco@me.com";
+    email = "rnhmjoj@inventati.org";
     github = "rnhmjoj";
     githubId = 2817565;
     name = "Michele Guerini Rocco";
+    keys =
+    [
+      { longkeyid   = "ed25519/0xBFBAF4C975F76450";
+        fingerprint = "92B2 904F D293 C94D C4C9  3E6B BFBA F4C9 75F7 6450";
+      }
+    ];
   };
   rob = {
     email = "rob.vermaas@gmail.com";

From dc18715e76031a99510ba8bb0dd0dd32363b3392 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 29 Aug 2019 13:31:23 +0200
Subject: [PATCH 371/794] rxvt_unicode: add rnhmjoj as maintainer

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

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 053eaf6e54c..17cea90ac27 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (rec {
     inherit description;
     homepage = http://software.schmorp.de/pkg/rxvt-unicode.html;
     downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/";
-    maintainers = [ ];
+    maintainers = with maintainers; [ rnhmjoj ];
     platforms = platforms.unix;
     license = licenses.gpl3;
   };

From 72682e46546d6d024a29e2fde009372e03b45b9f Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Wed, 28 Aug 2019 10:37:52 -0700
Subject: [PATCH 372/794] tree: rename altcoins to blockchains

Signed-off-by: William Casarin <jb55@jb55.com>
---
 .../aeon/default.nix                          |  0
 .../{altcoins => blockchains}/bitcoin-abc.nix |  0
 .../bitcoin-classic.nix                       |  0
 .../bitcoin-unlimited.nix                     |  0
 .../{altcoins => blockchains}/bitcoin.nix     |  0
 .../{altcoins => blockchains}/btc1.nix        |  0
 .../{altcoins => blockchains}/clightning.nix  |  0
 .../cryptop/default.nix                       |  0
 .../{altcoins => blockchains}/dashpay.nix     |  0
 .../{altcoins => blockchains}/dcrd.nix        |  0
 .../{altcoins => blockchains}/dcrwallet.nix   |  0
 .../{altcoins => blockchains}/default.nix     |  0
 .../{altcoins => blockchains}/dero.nix        |  0
 .../{altcoins => blockchains}/dogecoin.nix    |  0
 .../{altcoins => blockchains}/ethabi.nix      |  0
 .../exodus/default.nix                        |  0
 .../fix-bitcoin-qt-build.patch                |  0
 .../{altcoins => blockchains}/freicoin.nix    |  0
 .../go-ethereum-classic/default.nix           |  0
 .../go-ethereum-classic/deps.nix              |  0
 .../{altcoins => blockchains}/go-ethereum.nix |  0
 .../jormungandr/default.nix                   |  0
 .../ledger-live-desktop/default.nix           |  0
 .../{altcoins => blockchains}/litecoin.nix    |  0
 .../{altcoins => blockchains}/lnd.nix         |  0
 .../{altcoins => blockchains}/masari.nix      |  0
 .../{altcoins => blockchains}/mist.nix        |  0
 .../monero-gui/default.nix                    |  0
 .../monero-gui/move-log-file.patch            |  0
 .../monero/default.nix                        |  0
 .../{altcoins => blockchains}/namecoin.nix    |  0
 .../nano-wallet/CMakeLists.txt.patch          |  0
 .../nano-wallet/default.nix                   |  0
 .../parity-ui/default.nix                     |  0
 .../parity-ui/env.nix                         |  0
 .../{altcoins => blockchains}/parity/beta.nix |  0
 .../parity/default.nix                        |  0
 .../parity/parity.nix                         |  0
 .../particl/particl-core.nix                  |  0
 .../{altcoins => blockchains}/pivx.nix        |  0
 .../polkadot/default.nix                      |  0
 .../stellar-core-dirty-version.patch          |  0
 .../stellar-core.nix                          |  0
 .../{altcoins => blockchains}/sumokoin.nix    |  0
 .../wasabiwallet/default.nix                  |  0
 .../{altcoins => blockchains}/wownero.nix     |  0
 .../zcash/default.nix                         |  0
 .../zcash/librustzcash/default.nix            |  0
 pkgs/top-level/all-packages.nix               | 35 ++++---------------
 49 files changed, 7 insertions(+), 28 deletions(-)
 rename pkgs/applications/{altcoins => blockchains}/aeon/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/bitcoin-abc.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/bitcoin-classic.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/bitcoin-unlimited.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/bitcoin.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/btc1.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/clightning.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/cryptop/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/dashpay.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/dcrd.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/dcrwallet.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/dero.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/dogecoin.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/ethabi.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/exodus/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/fix-bitcoin-qt-build.patch (100%)
 rename pkgs/applications/{altcoins => blockchains}/freicoin.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/go-ethereum-classic/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/go-ethereum-classic/deps.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/go-ethereum.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/jormungandr/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/ledger-live-desktop/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/litecoin.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/lnd.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/masari.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/mist.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/monero-gui/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/monero-gui/move-log-file.patch (100%)
 rename pkgs/applications/{altcoins => blockchains}/monero/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/namecoin.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/nano-wallet/CMakeLists.txt.patch (100%)
 rename pkgs/applications/{altcoins => blockchains}/nano-wallet/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/parity-ui/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/parity-ui/env.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/parity/beta.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/parity/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/parity/parity.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/particl/particl-core.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/pivx.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/polkadot/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/stellar-core-dirty-version.patch (100%)
 rename pkgs/applications/{altcoins => blockchains}/stellar-core.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/sumokoin.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/wasabiwallet/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/wownero.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/zcash/default.nix (100%)
 rename pkgs/applications/{altcoins => blockchains}/zcash/librustzcash/default.nix (100%)

diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/aeon/default.nix
rename to pkgs/applications/blockchains/aeon/default.nix
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix
similarity index 100%
rename from pkgs/applications/altcoins/bitcoin-abc.nix
rename to pkgs/applications/blockchains/bitcoin-abc.nix
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix
similarity index 100%
rename from pkgs/applications/altcoins/bitcoin-classic.nix
rename to pkgs/applications/blockchains/bitcoin-classic.nix
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix
similarity index 100%
rename from pkgs/applications/altcoins/bitcoin-unlimited.nix
rename to pkgs/applications/blockchains/bitcoin-unlimited.nix
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix
similarity index 100%
rename from pkgs/applications/altcoins/bitcoin.nix
rename to pkgs/applications/blockchains/bitcoin.nix
diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/blockchains/btc1.nix
similarity index 100%
rename from pkgs/applications/altcoins/btc1.nix
rename to pkgs/applications/blockchains/btc1.nix
diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/blockchains/clightning.nix
similarity index 100%
rename from pkgs/applications/altcoins/clightning.nix
rename to pkgs/applications/blockchains/clightning.nix
diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/cryptop/default.nix
rename to pkgs/applications/blockchains/cryptop/default.nix
diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix
similarity index 100%
rename from pkgs/applications/altcoins/dashpay.nix
rename to pkgs/applications/blockchains/dashpay.nix
diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/blockchains/dcrd.nix
similarity index 100%
rename from pkgs/applications/altcoins/dcrd.nix
rename to pkgs/applications/blockchains/dcrd.nix
diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix
similarity index 100%
rename from pkgs/applications/altcoins/dcrwallet.nix
rename to pkgs/applications/blockchains/dcrwallet.nix
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/blockchains/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/default.nix
rename to pkgs/applications/blockchains/default.nix
diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/blockchains/dero.nix
similarity index 100%
rename from pkgs/applications/altcoins/dero.nix
rename to pkgs/applications/blockchains/dero.nix
diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix
similarity index 100%
rename from pkgs/applications/altcoins/dogecoin.nix
rename to pkgs/applications/blockchains/dogecoin.nix
diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix
similarity index 100%
rename from pkgs/applications/altcoins/ethabi.nix
rename to pkgs/applications/blockchains/ethabi.nix
diff --git a/pkgs/applications/altcoins/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/exodus/default.nix
rename to pkgs/applications/blockchains/exodus/default.nix
diff --git a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch b/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch
similarity index 100%
rename from pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
rename to pkgs/applications/blockchains/fix-bitcoin-qt-build.patch
diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix
similarity index 100%
rename from pkgs/applications/altcoins/freicoin.nix
rename to pkgs/applications/blockchains/freicoin.nix
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/blockchains/go-ethereum-classic/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/go-ethereum-classic/default.nix
rename to pkgs/applications/blockchains/go-ethereum-classic/default.nix
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/deps.nix b/pkgs/applications/blockchains/go-ethereum-classic/deps.nix
similarity index 100%
rename from pkgs/applications/altcoins/go-ethereum-classic/deps.nix
rename to pkgs/applications/blockchains/go-ethereum-classic/deps.nix
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
similarity index 100%
rename from pkgs/applications/altcoins/go-ethereum.nix
rename to pkgs/applications/blockchains/go-ethereum.nix
diff --git a/pkgs/applications/altcoins/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/jormungandr/default.nix
rename to pkgs/applications/blockchains/jormungandr/default.nix
diff --git a/pkgs/applications/altcoins/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/ledger-live-desktop/default.nix
rename to pkgs/applications/blockchains/ledger-live-desktop/default.nix
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix
similarity index 100%
rename from pkgs/applications/altcoins/litecoin.nix
rename to pkgs/applications/blockchains/litecoin.nix
diff --git a/pkgs/applications/altcoins/lnd.nix b/pkgs/applications/blockchains/lnd.nix
similarity index 100%
rename from pkgs/applications/altcoins/lnd.nix
rename to pkgs/applications/blockchains/lnd.nix
diff --git a/pkgs/applications/altcoins/masari.nix b/pkgs/applications/blockchains/masari.nix
similarity index 100%
rename from pkgs/applications/altcoins/masari.nix
rename to pkgs/applications/blockchains/masari.nix
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/blockchains/mist.nix
similarity index 100%
rename from pkgs/applications/altcoins/mist.nix
rename to pkgs/applications/blockchains/mist.nix
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/monero-gui/default.nix
rename to pkgs/applications/blockchains/monero-gui/default.nix
diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/blockchains/monero-gui/move-log-file.patch
similarity index 100%
rename from pkgs/applications/altcoins/monero-gui/move-log-file.patch
rename to pkgs/applications/blockchains/monero-gui/move-log-file.patch
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/monero/default.nix
rename to pkgs/applications/blockchains/monero/default.nix
diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix
similarity index 100%
rename from pkgs/applications/altcoins/namecoin.nix
rename to pkgs/applications/blockchains/namecoin.nix
diff --git a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch
similarity index 100%
rename from pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch
rename to pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/nano-wallet/default.nix
rename to pkgs/applications/blockchains/nano-wallet/default.nix
diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/blockchains/parity-ui/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/parity-ui/default.nix
rename to pkgs/applications/blockchains/parity-ui/default.nix
diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/blockchains/parity-ui/env.nix
similarity index 100%
rename from pkgs/applications/altcoins/parity-ui/env.nix
rename to pkgs/applications/blockchains/parity-ui/env.nix
diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix
similarity index 100%
rename from pkgs/applications/altcoins/parity/beta.nix
rename to pkgs/applications/blockchains/parity/beta.nix
diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/parity/default.nix
rename to pkgs/applications/blockchains/parity/default.nix
diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix
similarity index 100%
rename from pkgs/applications/altcoins/parity/parity.nix
rename to pkgs/applications/blockchains/parity/parity.nix
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix
similarity index 100%
rename from pkgs/applications/altcoins/particl/particl-core.nix
rename to pkgs/applications/blockchains/particl/particl-core.nix
diff --git a/pkgs/applications/altcoins/pivx.nix b/pkgs/applications/blockchains/pivx.nix
similarity index 100%
rename from pkgs/applications/altcoins/pivx.nix
rename to pkgs/applications/blockchains/pivx.nix
diff --git a/pkgs/applications/altcoins/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/polkadot/default.nix
rename to pkgs/applications/blockchains/polkadot/default.nix
diff --git a/pkgs/applications/altcoins/stellar-core-dirty-version.patch b/pkgs/applications/blockchains/stellar-core-dirty-version.patch
similarity index 100%
rename from pkgs/applications/altcoins/stellar-core-dirty-version.patch
rename to pkgs/applications/blockchains/stellar-core-dirty-version.patch
diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/blockchains/stellar-core.nix
similarity index 100%
rename from pkgs/applications/altcoins/stellar-core.nix
rename to pkgs/applications/blockchains/stellar-core.nix
diff --git a/pkgs/applications/altcoins/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix
similarity index 100%
rename from pkgs/applications/altcoins/sumokoin.nix
rename to pkgs/applications/blockchains/sumokoin.nix
diff --git a/pkgs/applications/altcoins/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/wasabiwallet/default.nix
rename to pkgs/applications/blockchains/wasabiwallet/default.nix
diff --git a/pkgs/applications/altcoins/wownero.nix b/pkgs/applications/blockchains/wownero.nix
similarity index 100%
rename from pkgs/applications/altcoins/wownero.nix
rename to pkgs/applications/blockchains/wownero.nix
diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/zcash/default.nix
rename to pkgs/applications/blockchains/zcash/default.nix
diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
similarity index 100%
rename from pkgs/applications/altcoins/zcash/librustzcash/default.nix
rename to pkgs/applications/blockchains/zcash/librustzcash/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31c35347800..43fd7a32d4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2975,7 +2975,7 @@ in
 
   exiftool = perlPackages.ImageExifTool;
 
-  exodus = callPackage ../applications/altcoins/exodus { };
+  exodus = callPackage ../applications/blockchains/exodus { };
 
   ext4magic = callPackage ../tools/filesystems/ext4magic { };
 
@@ -4480,7 +4480,7 @@ in
 
   leatherman = callPackage ../development/libraries/leatherman { };
 
-  ledger-live-desktop = callPackage ../applications/altcoins/ledger-live-desktop { };
+  ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { };
 
   ledmon = callPackage ../tools/system/ledmon { };
 
@@ -4906,7 +4906,7 @@ in
 
   namazu = callPackage ../tools/text/namazu { };
 
-  nano-wallet = libsForQt5.callPackage ../applications/altcoins/nano-wallet { };
+  nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };
 
   nasty = callPackage ../tools/security/nasty { };
 
@@ -6808,7 +6808,7 @@ in
 
   wal_e = callPackage ../tools/backup/wal-e { };
 
-  wasabiwallet = callPackage ../applications/altcoins/wasabiwallet { };
+  wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { };
 
   watchexec = callPackage ../tools/misc/watchexec {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
@@ -17355,14 +17355,6 @@ in
 
   schismtracker = callPackage ../applications/audio/schismtracker { };
 
-  altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } );
-
-  bitcoin = altcoins.bitcoin;
-  clightning = altcoins.clightning;
-  lnd = altcoins.lnd;
-
-  cryptop = altcoins.cryptop;
-
   jnetmap = callPackage ../applications/networking/jnetmap {};
 
   libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix {
@@ -17375,19 +17367,6 @@ in
   libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { };
 
 
-  go-ethereum = res.altcoins.go-ethereum;
-  ethabi = res.altcoins.ethabi;
-
-  parity = res.altcoins.parity;
-  parity-beta = res.altcoins.parity-beta;
-  parity-ui = res.altcoins.parity-ui;
-
-  polkadot = res.altcoins.polkadot;
-
-  stellar-core = res.altcoins.stellar-core;
-
-  particl-core = res.altcoins.particl-core;
-
   aumix = callPackage ../applications/audio/aumix {
     gtkGUI = false;
   };
@@ -19109,7 +19088,7 @@ in
 
   josm = callPackage ../applications/misc/josm { };
 
-  jormungandr = callPackage ../applications/altcoins/jormungandr { };
+  jormungandr = callPackage ../applications/blockchains/jormungandr { };
 
   jbrout = callPackage ../applications/graphics/jbrout { };
 
@@ -19557,11 +19536,11 @@ in
 
   mod-distortion = callPackage ../applications/audio/mod-distortion { };
 
-  monero = callPackage ../applications/altcoins/monero {
+  monero = callPackage ../applications/blockchains/monero {
     inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
   };
 
-  monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui {
+  monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
     boost = boost16x;
   };
 

From 8d6cb26e41287f986ea86a95d487f2c0546d27df Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Wed, 28 Aug 2019 10:48:13 -0700
Subject: [PATCH 373/794] all-packages: add blockchains section

Signed-off-by: William Casarin <jb55@jb55.com>
---
 pkgs/top-level/all-packages.nix | 88 +++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43fd7a32d4b..2b4eaa2c7fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21792,6 +21792,94 @@ in
 
   zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };
 
+  ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS
+
+  aeon = callPackage ../applications/blockchains/aeon { };
+
+  bitcoin  = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
+  bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; };
+  clightning = callPackage ../applications/blockchains/clightning.nix { };
+
+  bitcoin-abc  = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; };
+  bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = false; };
+
+  bitcoin-unlimited  = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix {
+    inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
+    withGui = true;
+  };
+  bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited.nix {
+    inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
+    withGui = false;
+  };
+
+  bitcoin-classic  = libsForQt5.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; };
+  bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; };
+
+  btc1 = callPackage ../applications/blockchains/btc1.nix {
+    inherit (darwin.apple_sdk.frameworks) AppKit;
+    boost = boost165;
+  };
+  btc1d = btc1.override { withGui = false; };
+
+  cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
+
+  dashpay = callPackage ../applications/blockchains/dashpay.nix { };
+
+  dcrd = callPackage ../applications/blockchains/dcrd.nix { };
+  dcrwallet = callPackage ../applications/blockchains/dcrwallet.nix { };
+
+  dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; };
+
+  dogecoin  = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; };
+  dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; };
+
+
+  freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; };
+  go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix {
+    inherit (darwin) libobjc;
+    inherit (darwin.apple_sdk.frameworks) IOKit;
+  };
+  go-ethereum-classic = callPackage ../applications/blockchains/go-ethereum-classic {
+    buildGoPackage = buildGo110Package;
+  };
+
+  litecoin  = callPackage ../applications/blockchains/litecoin.nix {
+    inherit (darwin.apple_sdk.frameworks) AppKit;
+  };
+  litecoind = litecoin.override { withGui = false; };
+
+  lnd = callPackage ../applications/blockchains/lnd.nix { };
+
+  masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; };
+
+  mist = callPackage ../applications/blockchains/mist.nix { };
+
+  namecoin  = callPackage ../applications/blockchains/namecoin.nix  { withGui = true; };
+  namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; };
+
+  pivx = libsForQt59.callPackage ../applications/blockchains/pivx.nix { withGui = true; };
+  pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; };
+
+  ethabi = callPackage ../applications/blockchains/ethabi.nix { };
+
+  stellar-core = callPackage ../applications/blockchains/stellar-core.nix { };
+
+  sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; };
+
+  wownero = callPackage ../applications/blockchains/wownero.nix {};
+
+  zcash = callPackage ../applications/blockchains/zcash {
+    withGui = false;
+  };
+
+  parity = callPackage ../applications/blockchains/parity { };
+  parity-beta = callPackage ../applications/blockchains/parity/beta.nix { };
+  parity-ui = callPackage ../applications/blockchains/parity-ui { };
+
+  polkadot = callPackage ../applications/blockchains/polkadot { };
+
+  particl-core = callPackage ../applications/blockchains/particl/particl-core.nix { miniupnpc = miniupnpc_2; };
+
   ### GAMES
 
   _2048-in-terminal = callPackage ../games/2048-in-terminal { };

From 04ef817479dfcef0a3a1453dc8ed0fe648d4e9d5 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Wed, 28 Aug 2019 10:49:04 -0700
Subject: [PATCH 374/794] blockchains: remove default.nix

This is no longer needed

Signed-off-by: William Casarin <jb55@jb55.com>
---
 pkgs/applications/blockchains/default.nix | 90 -----------------------
 1 file changed, 90 deletions(-)
 delete mode 100644 pkgs/applications/blockchains/default.nix

diff --git a/pkgs/applications/blockchains/default.nix b/pkgs/applications/blockchains/default.nix
deleted file mode 100644
index 5b5bfb897cf..00000000000
--- a/pkgs/applications/blockchains/default.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{ callPackage, boost155, boost165, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }:
-
-rec {
-
-  aeon = callPackage ./aeon { };
-
-  bitcoin  = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
-  bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; };
-  clightning = callPackage ./clightning.nix { };
-
-  bitcoin-abc  = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; };
-  bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; };
-
-  bitcoin-unlimited  = libsForQt5.callPackage ./bitcoin-unlimited.nix {
-    inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
-    withGui = true;
-  };
-  bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix {
-    inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
-    withGui = false;
-  };
-
-  bitcoin-classic  = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; };
-  bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; };
-
-  btc1 = callPackage ./btc1.nix {
-    inherit (darwin.apple_sdk.frameworks) AppKit;
-    boost = boost165;
-  };
-  btc1d = btc1.override { withGui = false; };
-
-  cryptop = python3.pkgs.callPackage ./cryptop { };
-
-  dashpay = callPackage ./dashpay.nix { };
-
-  dcrd = callPackage ./dcrd.nix { };
-  dcrwallet = callPackage ./dcrwallet.nix { };
-
-  dero = callPackage ./dero.nix { boost = boost165; };
-
-  dogecoin  = callPackage ./dogecoin.nix { boost = boost165; withGui = true; };
-  dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; };
-
-
-  freicoin = callPackage ./freicoin.nix { boost = boost155; };
-  go-ethereum = callPackage ./go-ethereum.nix {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) IOKit;
-  };
-  go-ethereum-classic = callPackage ./go-ethereum-classic {
-    buildGoPackage = buildGo110Package;
-  };
-
-  litecoin  = callPackage ./litecoin.nix {
-    inherit (darwin.apple_sdk.frameworks) AppKit;
-  };
-  litecoind = litecoin.override { withGui = false; };
-
-  lnd = callPackage ./lnd.nix { };
-
-  masari = callPackage ./masari.nix { boost = boost165; };
-
-  mist = callPackage ./mist.nix { };
-
-  namecoin  = callPackage ./namecoin.nix  { withGui = true; };
-  namecoind = callPackage ./namecoin.nix { withGui = false; };
-
-  pivx = libsForQt59.callPackage ./pivx.nix { withGui = true; };
-  pivxd = callPackage ./pivx.nix { withGui = false; };
-
-  ethabi = callPackage ./ethabi.nix { };
-
-  stellar-core = callPackage ./stellar-core.nix { };
-
-  sumokoin = callPackage ./sumokoin.nix { boost = boost165; };
-
-  wownero = callPackage ./wownero.nix {};
-
-  zcash = callPackage ./zcash {
-    withGui = false;
-  };
-
-  parity = callPackage ./parity { };
-  parity-beta = callPackage ./parity/beta.nix { };
-  parity-ui = callPackage ./parity-ui { };
-
-  polkadot = callPackage ./polkadot { };
-
-  particl-core = callPackage ./particl/particl-core.nix { miniupnpc = miniupnpc_2; };
-}

From 8f4216bd97a415df932ea74a9361dd991e635101 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Thu, 29 Aug 2019 05:05:24 -0700
Subject: [PATCH 375/794] move wallet software into the blockchains section

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b4eaa2c7fb..215f72c7a20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2975,8 +2975,6 @@ in
 
   exiftool = perlPackages.ImageExifTool;
 
-  exodus = callPackage ../applications/blockchains/exodus { };
-
   ext4magic = callPackage ../tools/filesystems/ext4magic { };
 
   extract_url = callPackage ../applications/misc/extract_url { };
@@ -4480,8 +4478,6 @@ in
 
   leatherman = callPackage ../development/libraries/leatherman { };
 
-  ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { };
-
   ledmon = callPackage ../tools/system/ledmon { };
 
   leela = callPackage ../tools/graphics/leela { };
@@ -4906,8 +4902,6 @@ in
 
   namazu = callPackage ../tools/text/namazu { };
 
-  nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };
-
   nasty = callPackage ../tools/security/nasty { };
 
   nat-traverse = callPackage ../tools/networking/nat-traverse { };
@@ -6808,8 +6802,6 @@ in
 
   wal_e = callPackage ../tools/backup/wal-e { };
 
-  wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { };
-
   watchexec = callPackage ../tools/misc/watchexec {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -19088,8 +19080,6 @@ in
 
   josm = callPackage ../applications/misc/josm { };
 
-  jormungandr = callPackage ../applications/blockchains/jormungandr { };
-
   jbrout = callPackage ../applications/graphics/jbrout { };
 
   jwm = callPackage ../applications/window-managers/jwm { };
@@ -19536,14 +19526,6 @@ in
 
   mod-distortion = callPackage ../applications/audio/mod-distortion { };
 
-  monero = callPackage ../applications/blockchains/monero {
-    inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
-  };
-
-  monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
-    boost = boost16x;
-  };
-
   xmr-stak = callPackage ../applications/misc/xmr-stak {
     stdenvGcc6 = gcc6Stdenv;
   };
@@ -21833,6 +21815,7 @@ in
   dogecoin  = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; };
   dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; };
 
+  exodus = callPackage ../applications/blockchains/exodus { };
 
   freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; };
   go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix {
@@ -21843,6 +21826,10 @@ in
     buildGoPackage = buildGo110Package;
   };
 
+  jormungandr = callPackage ../applications/blockchains/jormungandr { };
+
+  ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { };
+
   litecoin  = callPackage ../applications/blockchains/litecoin.nix {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
@@ -21850,10 +21837,20 @@ in
 
   lnd = callPackage ../applications/blockchains/lnd.nix { };
 
+  monero = callPackage ../applications/blockchains/monero {
+    inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
+  };
+
+  monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
+    boost = boost16x;
+  };
+
   masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; };
 
   mist = callPackage ../applications/blockchains/mist.nix { };
 
+  nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };
+
   namecoin  = callPackage ../applications/blockchains/namecoin.nix  { withGui = true; };
   namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; };
 
@@ -21866,6 +21863,8 @@ in
 
   sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; };
 
+  wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { };
+
   wownero = callPackage ../applications/blockchains/wownero.nix {};
 
   zcash = callPackage ../applications/blockchains/zcash {

From 17e833d8e5c766b2398dfd7c09a880d84a8bfa5c Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Thu, 29 Aug 2019 20:08:20 +0800
Subject: [PATCH 376/794] cargo-bloat: 0.8.2 -> 0.8.3

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

diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix
index e7c8e869c87..b5c6f19ddc3 100644
--- a/pkgs/development/tools/rust/cargo-bloat/default.nix
+++ b/pkgs/development/tools/rust/cargo-bloat/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-bloat";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "RazrFalcon";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1r8d3mqzaiasvhxmry8va55ggq817y82x8yb3vzih84lxq134y8n";
+    sha256 = "088px2kdcfjdb8zfmk7g409h7ij9dngywz336hj2ny82lrdjzazc";
   };
 
-  cargoSha256 = "1ys3wd1k39vkll25c56sfv767rcd53yb46adwgzdkkyl2pjphf1r";
+  cargoSha256 = "11q8j8y7m59gc8047qhz6pp2825qjcpg9xwgj09l8a5aijf25avb";
 
   meta = with lib; {
     description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable";

From 066bd13613b1ce70b439608c4ee1c91150bfa2f6 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 20 Aug 2019 20:49:10 +0300
Subject: [PATCH 377/794] libvirt-glib: remove unused packages

---
 .../libraries/libvirt-glib/default.nix        | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 9dd89133f4b..1803ce1dc20 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -1,12 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
-, nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl
-, libapparmor, vala
-, xenSupport ? false, xen ? null
+{ stdenv, fetchurl, pkgconfig, gobject-introspection, intltool, vala
+, libcap_ng, libvirt, libxml2
 }:
 
-let
-  inherit (pythonPackages) python pygobject2;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "libvirt-glib-2.0.0";
 
   outputs = [ "out" "dev" ];
@@ -16,15 +12,11 @@ in stdenv.mkDerivation rec {
     sha256 = "0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l";
   };
 
-  nativeBuildInputs = [ pkgconfig vala ];
-  buildInputs = [
-    libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
-    python pygobject2 gobject-introspection libcap_ng numactl libapparmor
-  ] ++ stdenv.lib.optionals xenSupport [
-    xen
-  ];
+  nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ];
+  buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ];
 
   enableParallelBuilding = true;
+  strictDeps = true;
 
   meta = with stdenv.lib; {
     description = "Library for working with virtual machines";
@@ -36,7 +28,7 @@ in stdenv.mkDerivation rec {
       - libvirt-gconfig - GObjects for manipulating libvirt XML documents
       - libvirt-gobject - GObjects for managing libvirt objects
     '';
-    homepage = http://libvirt.org/;
+    homepage = https://libvirt.org/;
     license = licenses.lgpl2Plus;
     platforms = platforms.linux;
   };

From 4471efd9e0881273f01d9d96ca30bc9e316994e5 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 20 Aug 2019 21:48:38 +0300
Subject: [PATCH 378/794] virt-viewer: remove unused packages

---
 .../virtualization/virt-viewer/default.nix     | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index eb5d53c2b89..3d058903200 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,10 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp
-, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl
-, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl
-, libapparmor, gst_all_1
+{ stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook
+, glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte
 , spiceSupport ? true
 , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
-, xenSupport ? false, xen ? null
 }:
 
 assert spiceSupport ->
@@ -22,13 +19,9 @@ stdenv.mkDerivation rec {
     sha256 = "1vdnjmhrva7r1n9nv09j8gc12hy0j9j5l4rka4hh0jbsbpnmiwyw";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
+  nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ];
   buildInputs = [
-    glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info
-    libvirt yajl gsettings-desktop-schemas libvirt-glib
-    libcap_ng numactl libapparmor
-  ] ++ optionals xenSupport [
-    xen
+    glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte
   ] ++ optionals spiceSupport [
     spice-gtk spice-protocol libcap gdbm
   ];
@@ -36,6 +29,9 @@ stdenv.mkDerivation rec {
   # Required for USB redirection PolicyKit rules file
   propagatedUserEnvPkgs = optional spiceSupport spice-gtk;
 
+  strictDeps = true;
+  enableParallelBuilding = true;
+
   meta = {
     description = "A viewer for remote virtual machines";
     maintainers = [ maintainers.raskin ];

From 4b5fc2cfae20913472aceb0a08bda11c93d63578 Mon Sep 17 00:00:00 2001
From: Vika <kisik21@fireburn.ru>
Date: Thu, 29 Aug 2019 17:12:06 +0300
Subject: [PATCH 379/794] redis: Try to fix cross-compilation

**Note**: This makes redis use libc malloc when cross-compiling to
ARM. This may or may not degrade performance.

The reason for this is vendored jemalloc with Redis' patches. The
makefile for deps has hardcoded configure flags for jemalloc, and as a
result, it is unable to cross-compile it.
---
 pkgs/servers/nosql/redis/default.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 20a6321e0a8..118edb60156 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lua }:
+{ stdenv, fetchurl, lua, jemalloc }:
 
 stdenv.mkDerivation rec {
   version = "5.0.5";
@@ -9,8 +9,21 @@ stdenv.mkDerivation rec {
     sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91";
   };
 
+  # Cross-compiling fixes
+  configurePhase = ''
+    ${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+      # This fixes hiredis, which has the AR awkwardly coded.
+      # Probably a good candidate for a patch upstream.
+      makeFlagsArray+=('STLIB_MAKE_CMD=${stdenv.cc.targetPrefix}ar rcs $(STLIBNAME)')
+    ''}
+  '';
+
   buildInputs = [ lua ];
-  makeFlags = "PREFIX=$(out)";
+  # More cross-compiling fixes.
+  # Note: this enables libc malloc as a temporary fix for cross-compiling.
+  # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator.
+  # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!
+  makeFlags = "PREFIX=$(out)" + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " AR=${stdenv.cc.targetPrefix}ar RANLIB=${stdenv.cc.targetPrefix}ranlib MALLOC=libc";
 
   enableParallelBuilding = true;
 

From abd1172a6fba7669de9487003e2de6d88b12b016 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 29 Aug 2019 10:19:55 -0400
Subject: [PATCH 380/794] emacs: 26.2 -> 26.3; emacs-mac: 26.2-7.6 -> 26.3-7.7

---
 pkgs/applications/editors/emacs/default.nix | 4 ++--
 pkgs/applications/editors/emacs/macport.nix | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 4c95681c43d..29a6a8773ef 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -31,12 +31,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "emacs-${version}${versionModifier}";
-  version = "26.2";
+  version = "26.3";
   versionModifier = "";
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${name}.tar.xz";
-    sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m";
+    sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index d51391595f4..649997171e9 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -4,19 +4,19 @@
 }:
 
 stdenv.mkDerivation rec {
-  emacsVersion = "26.2";
+  emacsVersion = "26.3";
   emacsName = "emacs-${emacsVersion}";
-  macportVersion = "7.6";
+  macportVersion = "7.7";
   name = "emacs-mac-${emacsVersion}-${macportVersion}";
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${emacsName}.tar.xz";
-    sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m";
+    sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
   };
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
-    sha256 = "00szqb74ds89m34sx5mq0gxhsrz64j691sxyvqncj10hw17d0y61";
+    sha256 = "18jadknm47ymbl7skrgc7y8xsdldcbgnlfl7qpgzm1ym8d92as6j";
   };
 
   hiresSrc = fetchurl {

From 604b7c139f4d44d9fb0e84d812efdfcf5dda3448 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Thu, 29 Aug 2019 16:32:59 +0200
Subject: [PATCH 381/794] Fix letsencrypt (#60219)

* nixos/acme: Fix ordering of cert requests

When subsequent certificates would be added, they would
not wake up nginx correctly due to target units only being triggered
once. We now added more fine-grained systemd dependencies to make sure
nginx always is aware of new certificates and doesn't restart too early
resulting in a crash.

Furthermore, the acme module has been refactored. Mostly to get
rid of the deprecated PermissionStartOnly systemd options which were
deprecated. Below is a summary of changes made.

* Use SERVICE_RESULT to determine status
This was added in systemd v232. we don't have to keep track
of the EXITCODE ourselves anymore.

* Add regression test for requesting mutliple domains

* Deprecate 'directory' option
We now use systemd's StateDirectory option to manage
create and permissions of the acme state directory.

* The webroot is created using a systemd.tmpfiles.rules rule
instead of the preStart script.

* Depend on certs directly

By getting rid of the target units, we make sure ordering
is correct in the case that you add new certs after already
having deployed some.

Reason it broke before:  acme-certificates.target would
be in active state, and if you then add a new cert, it
would still be active and hence nginx would restart
without even requesting a new cert. Not good!  We
make the dependencies more fine-grained now. this should fix that

* Remove activationDelay option

It complicated the code a lot, and is rather arbitrary. What if
your activation script takes more than activationDelay seconds?

Instead, one should use systemd dependencies to make sure some
action happens before setting the certificate live.

e.g. If you want to wait until your cert is published in DNS DANE /
TLSA, you could create a unit that blocks until it appears in DNS:

```
RequiredBy=acme-${cert}.service
After=acme-${cert}.service
ExecStart=publish-wait-for-dns-script
```
---
 nixos/doc/manual/release-notes/rl-1909.xml    |  23 ++-
 nixos/modules/rename.nix                      |   5 +
 nixos/modules/security/acme.nix               | 152 ++++--------------
 nixos/modules/security/acme.xml               |   4 +-
 .../services/web-servers/nginx/default.nix    |  21 +--
 nixos/tests/acme.nix                          |  98 +++++++++--
 6 files changed, 161 insertions(+), 142 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 36bea28530b..60f756b78c6 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -318,7 +318,28 @@
       <listitem><para><link linkend="opt-services.strongswan-swanctl.enable"><literal>services.strongswan-swanctl</literal></link></para></listitem>
       <listitem><para><link linkend="opt-services.httpd.enable"><literal>services.httpd</literal></link></para></listitem>
      </itemizedlist>
-    </para>
+   </para>
+   <listitem>
+     <para>
+       The <option>security.acme.directory</option> option has been replaced by a read-only <option>security.acme.certs.&lt;cert&gt;.directory</option> option for each certificate you define. This will be
+       a subdirectory of <literal>/var/lib/acme</literal>. You can use this read-only option to figure out where the certificates are stored for a specific certificate. For example,
+       the <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option>  option will use this directory option to find the certs for the virtual host.
+     </para>
+     <para>
+       <option>security.acme.preDelay</option> and <option>security.acme.activationDelay</option> options have been removed. To execute a service before certificates
+       are provisioned or renewed add a <literal>RequiredBy=acme-${cert}.service</literal> to any service.
+     </para>
+     <para>
+       Furthermore, the acme module will not automatically add a dependency on <literal>lighttpd.service</literal> anymore. If you are using certficates provided by letsencrypt
+       for lighttpd, then you should depend on the certificate service <literal>acme-${cert}.service></literal> manually.
+     </para>
+     <para>
+       For nginx, the dependencies are still automatically managed when <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs,
+       instead of depending on the catch-all <literal>acme-certificates.target</literal>. This target unit was also removed from the codebase.
+       This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal
+       ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at 
+        <link xlink:href="https://github.com/NixOS/nixpkgs/issues/60180">NixOS/nixpkgs#60180</link>.
+     </para>
    </listitem>
   </itemizedlist>
  </section>
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 348ad094e5a..1048c2af2ea 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -256,6 +256,11 @@ with lib;
 
     # binfmt
     (mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])
+    
+    # ACME
+    (mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
+    (mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
+    (mkRemovedOptionModule [ "security" "acme" "activationDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
 
     # KSM
     (mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ])
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 092704c6fc3..feb54affbf8 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -80,25 +80,11 @@ let
         '';
       };
 
-      activationDelay = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = ''
-          Systemd time span expression to delay copying new certificates to main
-          state directory. See <citerefentry><refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>7</manvolnum></citerefentry>.
-        '';
-      };
-
-      preDelay = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Commands to run after certificates are re-issued but before they are
-          activated. Typically the new certificate is published to DNS.
-
-          Executed in the same directory with the new certificate.
-        '';
+      directory = mkOption {
+        type = types.str;
+        readOnly = true;
+        default = "/var/lib/acme/${name}";
+        description = "Directory where certificate and other state is stored.";
       };
 
       extraDomains = mkOption {
@@ -126,13 +112,6 @@ in
 
   options = {
     security.acme = {
-      directory = mkOption {
-        default = "/var/lib/acme";
-        type = types.str;
-        description = ''
-          Directory where certs and other state will be stored by default.
-        '';
-      };
 
       validMin = mkOption {
         type = types.int;
@@ -181,7 +160,11 @@ in
         default = { };
         type = with types; attrsOf (submodule certOpts);
         description = ''
-          Attribute set of certificates to get signed and renewed.
+          Attribute set of certificates to get signed and renewed. Creates
+          <literal>acme-''${cert}.{service,timer}</literal> systemd units for
+          each certificate defined here. Other services can add dependencies
+          to those units if they rely on the certificates being present,
+          or trigger restarts of the service if certificates get renewed.
         '';
         example = literalExample ''
           {
@@ -209,8 +192,7 @@ in
           servicesLists = mapAttrsToList certToServices cfg.certs;
           certToServices = cert: data:
               let
-                cpath = lpath + optionalString (data.activationDelay != null) ".staging";
-                lpath = "${cfg.directory}/${cert}";
+                lpath = "acme/${cert}";
                 rights = if data.allowKeysForGroup then "750" else "700";
                 cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
                           ++ optionals (data.email != null) [ "--email" data.email ]
@@ -224,79 +206,27 @@ in
                   serviceConfig = {
                     Type = "oneshot";
                     SuccessExitStatus = [ "0" "1" ];
-                    PermissionsStartOnly = true;
                     User = data.user;
                     Group = data.group;
                     PrivateTmp = true;
+                    StateDirectory = lpath;
+                    StateDirectoryMode = rights;
+                    WorkingDirectory = "/var/lib/${lpath}";
+                    ExecStart = "${pkgs.simp_le}/bin/simp_le ${escapeShellArgs cmdline}";
+                    ExecStopPost = 
+                      let
+                        script = pkgs.writeScript "acme-post-stop" ''
+                          #!${pkgs.runtimeShell} -e
+                          ${data.postRun}
+                        '';
+                      in
+                        "+${script}";
                   };
-                  path = with pkgs; [ simp_le systemd ];
-                  preStart = ''
-                    mkdir -p '${cfg.directory}'
-                    chown 'root:root' '${cfg.directory}'
-                    chmod 755 '${cfg.directory}'
-                    if [ ! -d '${cpath}' ]; then
-                      mkdir '${cpath}'
-                    fi
-                    chmod ${rights} '${cpath}'
-                    chown -R '${data.user}:${data.group}' '${cpath}'
-                    mkdir -p '${data.webroot}/.well-known/acme-challenge'
-                    chown -R '${data.user}:${data.group}' '${data.webroot}/.well-known/acme-challenge'
-                  '';
-                  script = ''
-                    cd '${cpath}'
-                    set +e
-                    simp_le ${escapeShellArgs cmdline}
-                    EXITCODE=$?
-                    set -e
-                    echo "$EXITCODE" > /tmp/lastExitCode
-                    exit "$EXITCODE"
-                  '';
-                  postStop = ''
-                    cd '${cpath}'
 
-                    if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then
-                      ${if data.activationDelay != null then ''
-
-                      ${data.preDelay}
-
-                      if [ -d '${lpath}' ]; then
-                        systemd-run --no-block --on-active='${data.activationDelay}' --unit acme-setlive-${cert}.service
-                      else
-                        systemctl --wait start acme-setlive-${cert}.service
-                      fi
-                      '' else data.postRun}
-
-                      # noop ensuring that the "if" block is non-empty even if
-                      # activationDelay == null and postRun == ""
-                      true
-                    fi
-                  '';
-
-                  before = [ "acme-certificates.target" ];
-                  wantedBy = [ "acme-certificates.target" ];
-                };
-                delayService = {
-                  description = "Set certificate for ${cert} live";
-                  path = with pkgs; [ rsync ];
-                  serviceConfig = {
-                    Type = "oneshot";
-                  };
-                  script = ''
-                    rsync -a --delete-after '${cpath}/' '${lpath}'
-                  '';
-                  postStop = data.postRun;
                 };
                 selfsignedService = {
                   description = "Create preliminary self-signed certificate for ${cert}";
                   path = [ pkgs.openssl ];
-                  preStart = ''
-                      if [ ! -d '${cpath}' ]
-                      then
-                        mkdir -p '${cpath}'
-                        chmod ${rights} '${cpath}'
-                        chown '${data.user}:${data.group}' '${cpath}'
-                      fi
-                  '';
                   script =
                     ''
                       workdir="$(mktemp -d)"
@@ -318,50 +248,41 @@ in
                         -out $workdir/server.crt
 
                       # Copy key to destination
-                      cp $workdir/server.key ${cpath}/key.pem
+                      cp $workdir/server.key /var/lib/${lpath}/key.pem
 
                       # Create fullchain.pem (same format as "simp_le ... -f fullchain.pem" creates)
-                      cat $workdir/{server.crt,ca.crt} > "${cpath}/fullchain.pem"
+                      cat $workdir/{server.crt,ca.crt} > "/var/lib/${lpath}/fullchain.pem"
 
                       # Create full.pem for e.g. lighttpd
-                      cat $workdir/{server.key,server.crt,ca.crt} > "${cpath}/full.pem"
+                      cat $workdir/{server.key,server.crt,ca.crt} > "/var/lib/${lpath}/full.pem"
 
                       # Give key acme permissions
-                      chown '${data.user}:${data.group}' "${cpath}/"{key,fullchain,full}.pem
-                      chmod ${rights} "${cpath}/"{key,fullchain,full}.pem
+                      chown '${data.user}:${data.group}' "/var/lib/${lpath}/"{key,fullchain,full}.pem
+                      chmod ${rights} "/var/lib/${lpath}/"{key,fullchain,full}.pem
                     '';
                   serviceConfig = {
                     Type = "oneshot";
-                    PermissionsStartOnly = true;
                     PrivateTmp = true;
+                    StateDirectory = lpath;
                     User = data.user;
                     Group = data.group;
                   };
                   unitConfig = {
                     # Do not create self-signed key when key already exists
-                    ConditionPathExists = "!${cpath}/key.pem";
+                    ConditionPathExists = "!/var/lib/${lpath}/key.pem";
                   };
-                  before = [
-                    "acme-selfsigned-certificates.target"
-                  ];
-                  wantedBy = [
-                    "acme-selfsigned-certificates.target"
-                  ];
                 };
               in (
                 [ { name = "acme-${cert}"; value = acmeService; } ]
                 ++ optional cfg.preliminarySelfsigned { name = "acme-selfsigned-${cert}"; value = selfsignedService; }
-                ++ optional (data.activationDelay != null) { name = "acme-setlive-${cert}"; value = delayService; }
               );
           servicesAttr = listToAttrs services;
-          injectServiceDep = {
-            after = [ "acme-selfsigned-certificates.target" ];
-            wants = [ "acme-selfsigned-certificates.target" "acme-certificates.target" ];
-          };
         in
-          servicesAttr //
-          (if config.services.nginx.enable then { nginx = injectServiceDep; } else {}) //
-          (if config.services.lighttpd.enable then { lighttpd = injectServiceDep; } else {});
+          servicesAttr;
+
+      systemd.tmpfiles.rules =
+        flip mapAttrsToList cfg.certs
+        (cert: data: "d ${data.webroot}/.well-known/acme-challenge - ${data.user} ${data.group}");
 
       systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair
         ("acme-${cert}")
@@ -377,9 +298,6 @@ in
           };
         })
       );
-
-      systemd.targets."acme-selfsigned-certificates" = mkIf cfg.preliminarySelfsigned {};
-      systemd.targets."acme-certificates" = {};
     })
 
   ];
diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index ef71fe53d0c..9d0a1995e0f 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -59,10 +59,8 @@ http {
   <para>
    The private key <filename>key.pem</filename> and certificate
    <filename>fullchain.pem</filename> will be put into
-   <filename>/var/lib/acme/foo.example.com</filename>. The target directory can
-   be configured with the option <xref linkend="opt-security.acme.directory"/>.
+   <filename>/var/lib/acme/foo.example.com</filename>.
   </para>
-
   <para>
    Refer to <xref linkend="ch-options" /> for all available configuration
    options for the <link linkend="opt-security.acme.certs">security.acme</link>
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index c1a51fbf8b4..5c65a2388d6 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -4,23 +4,25 @@ with lib;
 
 let
   cfg = config.services.nginx;
+  certs = config.security.acme.certs;
+  vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts;
+  acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME && vhostConfig.useACMEHost == null) vhostsConfigs;
   virtualHosts = mapAttrs (vhostName: vhostConfig:
     let
       serverName = if vhostConfig.serverName != null
         then vhostConfig.serverName
         else vhostName;
-      acmeDirectory = config.security.acme.directory;
     in
     vhostConfig // {
       inherit serverName;
     } // (optionalAttrs vhostConfig.enableACME {
-      sslCertificate = "${acmeDirectory}/${serverName}/fullchain.pem";
-      sslCertificateKey = "${acmeDirectory}/${serverName}/key.pem";
-      sslTrustedCertificate = "${acmeDirectory}/${serverName}/fullchain.pem";
+      sslCertificate = "${certs.${serverName}.directory}/fullchain.pem";
+      sslCertificateKey = "${certs.${serverName}.directory}/key.pem";
+      sslTrustedCertificate = "${certs.${serverName}.directory}/full.pem";
     }) // (optionalAttrs (vhostConfig.useACMEHost != null) {
-      sslCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem";
-      sslCertificateKey = "${acmeDirectory}/${vhostConfig.useACMEHost}/key.pem";
-      sslTrustedCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem";
+      sslCertificate = "${certs.${vhostConfig.useACMEHost}.directory}/fullchain.pem";
+      sslCertificateKey = "${certs.${vhostConfig.useACMEHost}.directory}/key.pem";
+      sslTrustedCertificate = "${certs.${vhostConfig.useACMEHost}.directory}/fullchain.pem";
     })
   ) cfg.virtualHosts;
   enableIPv6 = config.networking.enableIPv6;
@@ -646,8 +648,9 @@ in
 
     systemd.services.nginx = {
       description = "Nginx Web Server";
-      after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
+      wants = concatLists (map (vhostConfig: ["acme-${vhostConfig.serverName}.service" "acme-selfsigned-${vhostConfig.serverName}.service"]) acmeEnabledVhosts);
+      after = [ "network.target" ] ++ map (vhostConfig: "acme-selfsigned-${vhostConfig.serverName}.service") acmeEnabledVhosts;
       stopIfChanged = false;
       preStart =
         ''
@@ -680,8 +683,6 @@ in
 
     security.acme.certs = filterAttrs (n: v: v != {}) (
       let
-        vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts;
-        acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME && vhostConfig.useACMEHost == null) vhostsConfigs;
         acmePairs = map (vhostConfig: { name = vhostConfig.serverName; value = {
             user = cfg.user;
             group = lib.mkDefault cfg.group;
diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index 4669a092433..8cfdea4a16e 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -3,19 +3,49 @@ let
 in import ./make-test.nix {
   name = "acme";
 
-  nodes = {
+  nodes = rec {
     letsencrypt = ./common/letsencrypt;
 
+    acmeStandalone = { config, pkgs, ... }: {
+      imports = [ commonConfig ];
+      networking.firewall.allowedTCPPorts = [ 80 ];
+      networking.extraHosts = ''
+        ${config.networking.primaryIPAddress} standalone.com
+      '';
+      security.acme.certs."standalone.com" = {
+        webroot = "/var/lib/acme/acme-challenges";
+      };
+      systemd.targets."acme-finished-standalone.com" = {};
+      systemd.services."acme-standalone.com" = {
+        wants = [ "acme-finished-standalone.com.target" ];
+        before = [ "acme-finished-standalone.com.target" ];
+      };
+      services.nginx.enable = true;
+      services.nginx.virtualHosts."standalone.com" = {
+        locations."/.well-known/acme-challenge".root = "/var/lib/acme/acme-challenges";
+      };
+    };
+
     webserver = { config, pkgs, ... }: {
       imports = [ commonConfig ];
       networking.firewall.allowedTCPPorts = [ 80 443 ];
 
       networking.extraHosts = ''
-        ${config.networking.primaryIPAddress} example.com
+        ${config.networking.primaryIPAddress} a.example.com
+        ${config.networking.primaryIPAddress} b.example.com
       '';
 
+      # A target remains active. Use this to probe the fact that
+      # a service fired eventhough it is not RemainAfterExit
+      systemd.targets."acme-finished-a.example.com" = {};
+      systemd.services."acme-a.example.com" = {
+        wants = [ "acme-finished-a.example.com.target" ];
+        before = [ "acme-finished-a.example.com.target" ];
+      };
+
       services.nginx.enable = true;
-      services.nginx.virtualHosts."example.com" = {
+
+      services.nginx.virtualHosts."a.example.com" = {
         enableACME = true;
         forceSSL = true;
         locations."/".root = pkgs.runCommand "docroot" {} ''
@@ -23,17 +53,63 @@ in import ./make-test.nix {
           echo hello world > "$out/index.html"
         '';
       };
+
+      nesting.clone = [
+        ({pkgs, ...}: {
+
+          networking.extraHosts = ''
+            ${config.networking.primaryIPAddress} b.example.com
+          '';
+          systemd.targets."acme-finished-b.example.com" = {};
+          systemd.services."acme-b.example.com" = {
+            wants = [ "acme-finished-b.example.com.target" ];
+            before = [ "acme-finished-b.example.com.target" ];
+          };
+          services.nginx.virtualHosts."b.example.com" = {
+            enableACME = true;
+            forceSSL = true;
+            locations."/".root = pkgs.runCommand "docroot" {} ''
+              mkdir -p "$out"
+              echo hello world > "$out/index.html"
+            '';
+          };
+        })
+      ];
     };
 
     client = commonConfig;
   };
 
-  testScript = ''
-    $letsencrypt->waitForUnit("default.target");
-    $letsencrypt->waitForUnit("boulder.service");
-    $webserver->waitForUnit("default.target");
-    $webserver->waitForUnit("acme-certificates.target");
-    $client->waitForUnit("default.target");
-    $client->succeed('curl https://example.com/ | grep -qF "hello world"');
-  '';
+  testScript = {nodes, ...}: 
+    let
+      newServerSystem = nodes.webserver2.config.system.build.toplevel;
+      switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test";
+    in
+    # Note, waitForUnit does not work for oneshot services that do not have RemainAfterExit=true,
+    # this is because a oneshot goes from inactive => activating => inactive, and never
+    # reaches the active state. To work around this, we create some mock target units which
+    # get pulled in by the oneshot units. The target units linger after activation, and hence we
+    # can use them to probe that a oneshot fired. It is a bit ugly, but it is the best we can do
+    ''
+      $client->waitForUnit("default.target");
+      $letsencrypt->waitForUnit("default.target");
+      $letsencrypt->waitForUnit("boulder.service");
+
+      subtest "can request certificate with HTTPS-01 challenge", sub {
+        $acmeStandalone->waitForUnit("default.target");
+        $acmeStandalone->succeed("systemctl start acme-standalone.com.service");
+        $acmeStandalone->waitForUnit("acme-finished-standalone.com.target");
+      };
+
+      subtest "Can request certificate for nginx service", sub {
+        $webserver->waitForUnit("acme-finished-a.example.com.target");
+        $client->succeed('curl https://a.example.com/ | grep -qF "hello world"');
+      };
+
+      subtest "Can add another certificate for nginx service", sub {
+        $webserver->succeed("/run/current-system/fine-tune/child-1/bin/switch-to-configuration test");
+        $webserver->waitForUnit("acme-finished-b.example.com.target");
+        $client->succeed('curl https://b.example.com/ | grep -qF "hello world"');
+      };
+    '';
 }

From ccc1613a11ee84cd33b8097c90266e2425200377 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 29 Aug 2019 17:05:46 +0200
Subject: [PATCH 382/794] documize-community: 3.1.1 -> 3.2.0

https://github.com/documize/community/releases/tag/v3.2.0
https://github.com/documize/community/releases/tag/v3.1.2
---
 pkgs/servers/documize-community/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix
index f6ac1924518..317783e4f8f 100644
--- a/pkgs/servers/documize-community/default.nix
+++ b/pkgs/servers/documize-community/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "documize-community";
-  version = "3.1.1";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "documize";
     repo = "community";
     rev = "v${version}";
-    sha256 = "1w57akmc3kb8rzgrjv5d4rjfr6vvam1wjs8792265ggnx6xhpgg9";
+    sha256 = "13r0x1mbprhk19a1cikq8cl553xdrxin9arw90am69iv6rcps3w3";
   };
 
   goPackagePath = "github.com/documize/community";

From c323b0ea59f98edc80e247112ef5c770fe404048 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 29 Aug 2019 17:16:47 +0200
Subject: [PATCH 383/794] grafana: 6.3.3 -> 6.3.4, update url for static source

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 19807c3c2bd..910c8915779 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "6.3.3";
+  version = "6.3.4";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -11,12 +11,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "006j39n42l91krd1p87dpan1s7dvjjhpidccpxkic189lwg7fbxs";
+    sha256 = "06xbz6y1vmj44ppm2gbb71qiv8myd5ysygi3s06d6dia07ngw3v2";
   };
 
   srcStatic = fetchurl {
-    url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "0n4fkzj3bnq3x08vw18a8lqxjggqsy5l2rgk494i87yaf1pa4gpf";
+    url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
+    sha256 = "0lhfy3crwis6464icxq0h3hgxvk2dgk6w7k6z2mmaxqm0j15scc8";
   };
 
   postPatch = ''

From dd7ec2ea97cc6fff5c425f205ed9374c4fca2af6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 29 Aug 2019 17:23:10 +0200
Subject: [PATCH 384/794] =?UTF-8?q?python2Packages.nototools:=202017-09-25?=
 =?UTF-8?q?=20=E2=86=92=202019-03-20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/data/fonts/noto-fonts/tools.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix
index a9d45128c5b..376a47434e1 100644
--- a/pkgs/data/fonts/noto-fonts/tools.nix
+++ b/pkgs/data/fonts/noto-fonts/tools.nix
@@ -1,14 +1,14 @@
 { fetchFromGitHub, pythonPackages, lib }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "2017-09-25";
+  version = "unstable-2019-03-20";
   name = "nototools-${version}";
 
   src = fetchFromGitHub {
-    owner = "googlei18n";
+    owner = "googlefonts";
     repo = "nototools";
-    rev = "v2017-09-25-tooling-for-phase3-update";
-    sha256 = "03nzvcvwmrhfrcjhg218q2f3hfrm3vlivp4rk19sc397kh3hisiz";
+    rev = "9c4375f07c9adc00c700c5d252df6a25d7425870";
+    sha256 = "0z9i23vl6xar4kvbqbc8nznq3s690mqc5zfv280l1c02l5n41smc";
   };
 
   propagatedBuildInputs = with pythonPackages; [ fonttools numpy ];
@@ -26,6 +26,6 @@ pythonPackages.buildPythonPackage rec {
   meta = {
     description = "Noto fonts support tools and scripts plus web site generation";
     license = lib.licenses.asl20;
-    homepage = https://github.com/googlei18n/nototools;
+    homepage = https://github.com/googlefonts/nototools;
   };
 }

From af9e10155eabf436095c6b7db18145fa3ce3ec74 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Aug 2019 12:23:42 -0400
Subject: [PATCH 385/794] linux: 4.14.140 -> 4.14.141

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

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

From da9405adb85190a63b5a8951aedf03ce2a34590d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Aug 2019 12:24:09 -0400
Subject: [PATCH 386/794] linux: 4.19.68 -> 4.19.69

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

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

From aa4a0623823fac83179d2126cbfa0b771dca591f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Aug 2019 12:24:23 -0400
Subject: [PATCH 387/794] linux: 5.2.10 -> 5.2.11

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

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

From 8116f653ff96ceb6bb2bc30fe765517fef752881 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Aug 2019 12:35:15 -0400
Subject: [PATCH 388/794] zoom-us: 3.0.285090.0826 -> 3.0.287250.0828

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

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 5ce59adb2ae..f6231766659 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
 let
   inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
-  version = "3.0.285090.0826";
+  version = "3.0.287250.0828";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "0brpb5i1lc1hwal0c5n2zh27wxrm4gfbqc6bm2dgwnck04y8i4c5";
+      sha256 = "0k4h43wydbcyx7b7gwxkmvbph8qc6kjpcypd7vwz8rph1l7kl1y1";
     };
   };
 

From 3e30f3e1f95667185972bcb4efd8d217cd200e98 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Aug 2019 12:40:21 -0400
Subject: [PATCH 389/794] jenkins: 2.176.2 -> 2.176.3

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 04352660a76..a381d65b357 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.176.2";
+  version = "2.176.3";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "19chl7dq25hjn73qgx5cd4azs68kg16r30zx563rrppq3hbc79ik";
+    sha256 = "18wsggb4fhlacpxpxkd04zwj56gqjccrbkhs35vkyixwwazcf1ll";
   };
 
   buildCommand = ''

From 5f74970e286facf32042c10f1d387eafa135ce5f Mon Sep 17 00:00:00 2001
From: Justin Wood <me@ankhers.dev>
Date: Thu, 29 Aug 2019 12:55:26 -0400
Subject: [PATCH 390/794] Update my email address in maintainers-list.nix

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ce6ff26a819..9e67e8657d0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -478,7 +478,7 @@
     name = "Stanislas Lange";
   };
   ankhers = {
-    email = "justin.k.wood@gmail.com";
+    email = "me@ankhers.dev";
     github = "ankhers";
     githubId = 750786;
     name = "Justin Wood";

From e3492eff4675585a44c7034e6e7eda3a94a49fad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2019 18:37:20 +0200
Subject: [PATCH 391/794] mailman: build full paths to postmap and lynx into
 the package

No more need to rely on $PATH.
---
 ...ols-via-PATH-rather-than-hard-coding.patch | 51 -------------------
 pkgs/servers/mail/mailman/core.nix            | 11 ++--
 2 files changed, 8 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch

diff --git a/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch b/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch
deleted file mode 100644
index b8a5476c055..00000000000
--- a/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 47469af384a6d4a0877c76d3c52013b40ab61f04 Mon Sep 17 00:00:00 2001
-From: Peter Simons <simons@cryp.to>
-Date: Mon, 26 Aug 2019 16:10:04 +0200
-Subject: [PATCH] Find external tools via $PATH rather than hard-coding
- /usr/bin.
-
----
- src/mailman/config/mhonarc.cfg | 2 +-
- src/mailman/config/postfix.cfg | 2 +-
- src/mailman/config/schema.cfg  | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/mailman/config/mhonarc.cfg b/src/mailman/config/mhonarc.cfg
-index b00f93aea..096e9521b 100644
---- a/src/mailman/config/mhonarc.cfg
-+++ b/src/mailman/config/mhonarc.cfg
-@@ -24,4 +24,4 @@ base_url: http://$hostname/archives/$fqdn_listname
- 
- # If the archiver works by calling a command on the local machine, this is the
- # command to call.
--command: /usr/bin/mhonarc -outdir /path/to/archive/$listname -add
-+command: mhonarc -outdir /path/to/archive/$listname -add
-diff --git a/src/mailman/config/postfix.cfg b/src/mailman/config/postfix.cfg
-index cddda220a..934c9a977 100644
---- a/src/mailman/config/postfix.cfg
-+++ b/src/mailman/config/postfix.cfg
-@@ -5,7 +5,7 @@
- # db file, from the associated plain text files.  The file being updated will
- # be appended to this string (with a separating space), so it must be
- # appropriate for os.system().
--postmap_command: /usr/sbin/postmap
-+postmap_command: postmap
- 
- # This variable describes the type of transport maps that will be generated by
- # mailman to be used with postfix for LMTP transport. By default, it is set to
-diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg
-index fa06ccced..406999e13 100644
---- a/src/mailman/config/schema.cfg
-+++ b/src/mailman/config/schema.cfg
-@@ -65,7 +65,7 @@ filtered_messages_are_preservable: no
- # where the substitution variable $filename is filled in by Mailman, and
- # contains the path to the temporary file that the command should read from.
- # The command should print the converted text to stdout.
--html_to_plain_text_command: /usr/bin/lynx -dump $filename
-+html_to_plain_text_command: lynx -dump $filename
- 
- # Specify what characters are allowed in list names.  Characters outside of
- # the class [-_.+=!$*{}~0-9a-z] matched case insensitively are never allowed,
--- 
-2.22.0
-
diff --git a/pkgs/servers/mail/mailman/core.nix b/pkgs/servers/mail/mailman/core.nix
index fcd594270db..1ba220039ea 100644
--- a/pkgs/servers/mail/mailman/core.nix
+++ b/pkgs/servers/mail/mailman/core.nix
@@ -1,15 +1,13 @@
 { stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython
 , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib
 , requests, zope_configuration, click, falcon, importlib-resources
-, zope_component
+, zope_component, lynx, postfix
 }:
 
 buildPythonPackage rec {
   pname = "mailman";
   version = "3.2.2";
 
-  patches = [ ./0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch ];
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6";
@@ -21,6 +19,13 @@ buildPythonPackage rec {
     zope_component
   ];
 
+  patchPhase = ''
+    substituteInPlace src/mailman/config/postfix.cfg \
+      --replace /usr/sbin/postmap ${postfix}/bin/postmap
+    substituteInPlace src/mailman/config/schema.cfg \
+      --replace /usr/bin/lynx ${lynx}/bin/lynx
+  '';
+
   # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping
   # them in shell code breaks this assumption. The proper way to use mailman is
   # to create a specialized python interpreter:

From 8ca970d6a7f290982d0bcf6c5dbb9d1e2ae649f7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 28 Aug 2019 22:46:51 +0200
Subject: [PATCH 392/794] cage: init at 0.1.1

---
 .../window-managers/cage/default.nix          | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/window-managers/cage/default.nix

diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix
new file mode 100644
index 00000000000..be45d68dc5d
--- /dev/null
+++ b/pkgs/applications/window-managers/cage/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub
+, meson, ninja, pkgconfig, makeWrapper
+, wlroots, wayland, wayland-protocols, pixman, libxkbcommon
+, systemd, mesa, libX11
+, xwayland ? null
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cage";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "Hjdskes";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1vp4mfkflrjmlgyx5mkbzdi3iq58m76q7l9dfrsk85xn0642d6q1";
+  };
+
+  nativeBuildInputs = [ meson ninja pkgconfig makeWrapper ];
+
+  buildInputs = [
+    wlroots wayland wayland-protocols pixman libxkbcommon
+    # TODO: Not specified but required:
+    systemd mesa libX11
+  ];
+
+  enableParallelBuilding = true;
+
+  mesonFlags = [ "-Dxwayland=${stdenv.lib.boolToString (xwayland != null)}" ];
+
+  postFixup = stdenv.lib.optionalString (xwayland != null) ''
+    wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Wayland kiosk";
+    homepage    = https://www.hjdskes.nl/projects/cage/;
+    license     = licenses.mit;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69734fb117f..503c89144a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17535,6 +17535,8 @@ in
 
   bviplus = callPackage ../applications/editors/bviplus { };
 
+  cage = callPackage ../applications/window-managers/cage { };
+
   calf = callPackage ../applications/audio/calf {
       inherit (gnome2) libglade;
       stdenv = gcc5Stdenv;

From 56d001a5ca6736f1409900260a10aa888459c67e Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 29 Aug 2019 13:32:29 -0400
Subject: [PATCH 393/794] starship: 0.12.0 -> 0.13.1

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

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index e0bd36b2195..487858e6187 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -2,19 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.12.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
     rev = "v${version}";
-    sha256 = "0zq99ll0vyafr2piffazprhvbs3sxb6863cp2qw596ilqg7ffi04";
+    sha256 = "0y6ixl3i1brak226hh02da1zzlcv41f0kb648dqii6dzyhrwhrld";
   };
 
   buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
   nativeBuildInputs = [ pkgconfig ];
 
-  cargoSha256 = "0qlgng5j6l1r9j5vn3wnq25qr6f4nh10x90awiqyzz8jypb0ng2c";
+  cargoSha256 = "1xk4ngxhgww921fk40d4ziprnzgp927lhdwwzcifcb0hdyl0854p";
   checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
 
   meta = with stdenv.lib; {

From 87f818d9b21b16b067048a6ee0178b782886f0f0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 29 Aug 2019 20:24:17 +0200
Subject: [PATCH 394/794] citrix_workspace: add 1908
 (`citrix_workspace_19_8_0`)

New release:
https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html
(unfortunately there's no version-specific link for the latest version).

Also added `preferLocalBuild = true;` to the derivation, due to
`requireFile` you have to build it yourself anyway, however I use
distributed builds by default and figured that this shouldn't be needed
since the longest part of the build would be the upload of the source
archive in that case.
---
 .../remote/citrix-workspace/default.nix           | 15 ++++++++++++++-
 pkgs/top-level/all-packages.nix                   |  4 ++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix
index cf89666a379..33f1f06e0b3 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/default.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix
@@ -23,7 +23,7 @@
 , gtk_engines
 , alsaLib
 , zlib
-, version ? "19.6.0"
+, version ? "19.8.0"
 }:
 
 let
@@ -50,6 +50,17 @@ let
         x86suffix = "60";
         homepage  = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html;
       };
+
+      "19.8.0" = {
+        major     = "19";
+        minor     = "8";
+        patch     = "0";
+        x64hash   = "0f8djw8lp5wihb23y09yac1mh09w1qp422h72r6zfx9k1lqfsdbw";
+        x86hash   = "0afcqirb4q349r3izy88vqkszg6y2wg14iwypk6nrmvwgvcl6jdn";
+        x64suffix = "20";
+        x86suffix = "20";
+        homepage  = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html;
+      };
     };
 
     # Copied this file largely from the citrix-receiver package
@@ -75,6 +86,8 @@ let
 
       prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
 
+      preferLocalBuild = true;
+
       src = requireFile rec {
         name    = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz";
         sha256  = if stdenv.is64bit then x64hash else x86hash;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d290cb592e1..ed31149ebbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2229,12 +2229,16 @@ in
   };
 
   citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { };
+  citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; };
   citrix_workspace_unwrapped_19_6_0 = citrix_workspace_unwrapped.override { version = "19.6.0"; };
   citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; };
 
   citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix {
     citrix_workspace = citrix_workspace_unwrapped;
   };
+  citrix_workspace_19_8_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix {
+    citrix_workspace = citrix_workspace_unwrapped_19_8_0;
+  };
   citrix_workspace_19_6_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix {
     citrix_workspace = citrix_workspace_unwrapped_19_6_0;
   };

From 19a1e15501e9f47eb48a6bc39cd2e3085c319e86 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2019 20:27:39 +0200
Subject: [PATCH 395/794] rl-1909.xml: fix XML syntax error that broke the
 NixOS manual

---
 nixos/doc/manual/release-notes/rl-1909.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 60f756b78c6..166be1f1c28 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -318,7 +318,8 @@
       <listitem><para><link linkend="opt-services.strongswan-swanctl.enable"><literal>services.strongswan-swanctl</literal></link></para></listitem>
       <listitem><para><link linkend="opt-services.httpd.enable"><literal>services.httpd</literal></link></para></listitem>
      </itemizedlist>
-   </para>
+    </para>
+   </listitem>
    <listitem>
      <para>
        The <option>security.acme.directory</option> option has been replaced by a read-only <option>security.acme.certs.&lt;cert&gt;.directory</option> option for each certificate you define. This will be

From c1c1ce72213da207cf9e64ea707079993757b08e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Aug 2019 16:55:24 +0200
Subject: [PATCH 396/794] mailman: add NixOS module to install and deploy the
 mailing list server

---
 nixos/modules/module-list.nix           |   1 +
 nixos/modules/services/mail/mailman.nix | 120 ++++++++++++++++++++++++
 nixos/modules/services/mail/postfix.nix |  11 ++-
 3 files changed, 127 insertions(+), 5 deletions(-)
 create mode 100644 nixos/modules/services/mail/mailman.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 75df6c8d453..22fd5d7609d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -376,6 +376,7 @@
   ./services/mail/mail.nix
   ./services/mail/mailcatcher.nix
   ./services/mail/mailhog.nix
+  ./services/mail/mailman.nix
   ./services/mail/mlmmj.nix
   ./services/mail/offlineimap.nix
   ./services/mail/opendkim.nix
diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
new file mode 100644
index 00000000000..df654c74cc8
--- /dev/null
+++ b/nixos/modules/services/mail/mailman.nix
@@ -0,0 +1,120 @@
+{ config, pkgs, lib, ... }:          # mailman.nix
+
+with lib;
+
+let
+
+  cfg = config.services.mailman;
+
+  pythonEnv = pkgs.python3.withPackages (ps: [ps.mailman]);
+
+  mailmanExe = with pkgs; stdenv.mkDerivation {
+    name = "mailman-" + python3Packages.mailman.version;
+    unpackPhase = ":";
+    installPhase = ''
+      mkdir -p $out/bin
+      sed >"$out/bin/mailman" <"${pythonEnv}/bin/mailman" \
+        -e "2 iexport MAILMAN_CONFIG_FILE=/etc/mailman.cfg"
+      chmod +x $out/bin/mailman
+    '';
+  };
+
+  mailmanCfg = ''
+    [mailman]
+    site_owner: ${cfg.siteOwner}
+    layout: fhs
+
+    [paths.fhs]
+    bin_dir: ${pkgs.python3Packages.mailman}/bin
+    var_dir: /var/lib/mailman
+    queue_dir: $var_dir/queue
+    log_dir: $var_dir/log
+    lock_dir: $var_dir/lock
+    etc_dir: /etc
+    ext_dir: $etc_dir/mailman.d
+    pid_file: /run/mailman/master.pid
+  '';
+
+in {
+
+  ###### interface
+
+  options = {
+
+    services.mailman = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable Mailman on this host. Requires an active Postfix installation.";
+      };
+
+      siteOwner = mkOption {
+        type = types.str;
+        default = "postmaster";
+        description = ''
+          Certain messages that must be delivered to a human, but which can't
+          be delivered to a list owner (e.g. a bounce from a list owner), will
+          be sent to this address. It should point to a human.
+        '';
+      };
+
+
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    assertions = [
+      { assertion = cfg.enable -> config.services.postfix.enable;
+        message = "Mailman requires Postfix";
+      }
+      { assertion = config.services.postfix.recipientDelimiter == "+";
+        message = "Postfix's recipientDelimiter must be set to '+'.";
+      }
+    ];
+
+    users.users = singleton {
+      name = "mailman";
+      group = "mailman";
+      uid = config.ids.uids.mailman;
+    };
+
+    users.groups = singleton {
+      name = "mailman";
+      gid = config.ids.gids.mailman;
+    };
+
+    environment = {
+      systemPackages = [ mailmanExe ];
+      etc."mailman.cfg".text = mailmanCfg;
+    };
+
+    services.postfix.config = {
+      # Mailman uses recipient delimiters, so we don't need special handling.
+      owner_request_special = "no";
+    };
+
+    systemd.services.mailman = {
+      description = "GNU Mailman Master Process";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${mailmanExe}/bin/mailman start";
+        ExecStop = "${mailmanExe}/bin/mailman stop";
+        User = "mailman";
+        Group = "mailman";
+        Type = "forking";
+        StateDirectory = "mailman";
+        StateDirectoryMode = "0750";
+        RuntimeDirectory = "mailman";
+        PIDFile = "/run/mailman/master.pid";
+      };
+
+    };
+
+  };
+
+}
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 2b08ab1e6aa..bcf90778346 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -11,9 +11,10 @@ let
 
   haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != ""
                       || cfg.extraAliases != "";
-  haveTransport = cfg.transport != "";
+  haveTransport = cfg.transport != "" || config.services.mailman.enable;
   haveVirtual = cfg.virtual != "";
-  haveLocalRecipients = cfg.localRecipients != null;
+  haveLocalRecipients = cfg.localRecipients != null || config.services.mailman.enable;
+  haveRelayDomains = cfg.relayDomains != null || config.services.mailman.enable;
 
   clientAccess =
     optional (cfg.dnsBlacklistOverrides != "")
@@ -752,12 +753,12 @@ in
       // optionalAttrs (cfg.domain != "") { mydomain = cfg.domain; }
       // optionalAttrs (cfg.origin != "") { myorigin =  cfg.origin; }
       // optionalAttrs (cfg.destination != null) { mydestination = cfg.destination; }
-      // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; }
+      // optionalAttrs haveRelayDomains { relay_domains = optionals (cfg.relayDomains != null) cfg.relayDomains ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_domains"; }
       // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; }
       // optionalAttrs haveAliases { alias_maps = [ "${cfg.aliasMapType}:/etc/postfix/aliases" ]; }
-      // optionalAttrs haveTransport { transport_maps = [ "hash:/etc/postfix/transport" ]; }
+      // optionalAttrs haveTransport { transport_maps = [ "hash:/etc/postfix/transport" ] ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_lmtp"; }
       // optionalAttrs haveVirtual { virtual_alias_maps = [ "${cfg.virtualMapType}:/etc/postfix/virtual" ]; }
-      // optionalAttrs haveLocalRecipients { local_recipient_maps = [ "hash:/etc/postfix/local_recipients" ] ++ optional haveAliases "$alias_maps"; }
+      // optionalAttrs haveLocalRecipients { local_recipient_maps = [ "hash:/etc/postfix/local_recipients" ] ++ optional haveAliases "$alias_maps" ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_lmtp"; }
       // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; }
       // optionalAttrs cfg.useSrs {
         sender_canonical_maps = [ "tcp:127.0.0.1:10001" ];

From 40cb97d944fa7328091c023e64b34d7279a98cc9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2019 20:38:27 +0200
Subject: [PATCH 397/794] simplescreenrecorder: fix Qt runtime error

 | qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
 |
 | This application failed to start because no Qt platform plugin could be
 | initialized. Reinstalling the application may fix this problem.
---
 pkgs/applications/video/simplescreenrecorder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index b456d8ee9a6..c3ef5eae676 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras
+{ stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras
 , libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "simplescreenrecorder-${version}";
   version = "0.3.11";
 

From af1c07b6792aeefd83e657a147a9080b2a618e9e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Aug 2019 17:22:24 +0200
Subject: [PATCH 398/794] nixos/fwupd: add package option

---
 nixos/modules/services/hardware/fwupd.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index cad9fa20de0..223adfee96e 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -8,8 +8,8 @@ let
   cfg = config.services.fwupd;
   originalEtc =
     let
-      mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; };
-    in listToAttrs (map mkEtcFile pkgs.fwupd.filesInstalledToEtc);
+      mkEtcFile = n: nameValuePair n { source = "${cfg.package}/etc/${n}"; };
+    in listToAttrs (map mkEtcFile cfg.package.filesInstalledToEtc);
   extraTrustedKeys =
     let
       mkName = p: "pki/fwupd/${baseNameOf (toString p)}";
@@ -24,7 +24,7 @@ let
     "fwupd/remotes.d/fwupd-tests.conf" = {
       source = pkgs.runCommand "fwupd-tests-enabled.conf" {} ''
         sed "s,^Enabled=false,Enabled=true," \
-        "${pkgs.fwupd.installedTests}/etc/fwupd/remotes.d/fwupd-tests.conf" > "$out"
+        "${cfg.package.installedTests}/etc/fwupd/remotes.d/fwupd-tests.conf" > "$out"
       '';
     };
   } else {};
@@ -77,13 +77,21 @@ in {
           <link xlink:href="https://github.com/hughsie/fwupd/blob/master/data/installed-tests/README.md">installed tests</link>.
         '';
       };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.fwupd;
+        description = ''
+          Which fwupd package to use.
+        '';
+      };
     };
   };
 
 
   ###### implementation
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.fwupd ];
+    environment.systemPackages = [ cfg.package ];
 
     environment.etc = {
       "fwupd/daemon.conf" = {
@@ -102,11 +110,11 @@ in {
 
     } // originalEtc // extraTrustedKeys // testRemote;
 
-    services.dbus.packages = [ pkgs.fwupd ];
+    services.dbus.packages = [ cfg.package ];
 
-    services.udev.packages = [ pkgs.fwupd ];
+    services.udev.packages = [ cfg.package ];
 
-    systemd.packages = [ pkgs.fwupd ];
+    systemd.packages = [ cfg.package ];
 
     systemd.tmpfiles.rules = [
       "d /var/lib/fwupd 0755 root root -"

From a39b76308017b475615a2b55d40d90dada6e359c Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 29 Aug 2019 09:33:37 +0200
Subject: [PATCH 399/794] falkon: use qt5's mkDerivation

See #65399
---
 pkgs/applications/networking/browsers/falkon/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index c721a61591a..6e21456a9a9 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
+{ stdenv, mkDerivation, lib, fetchFromGitHub
+, cmake, extra-cmake-modules, pkgconfig, qmake
 , libpthreadstubs, libxcb, libXdmcp
 , qtsvg, qttools, qtwebengine, qtx11extras
 , qtwayland
 , kwallet
 }:
 
-stdenv.mkDerivation rec {
-  name = "falkon-${version}";
+mkDerivation rec {
+  pname = "falkon";
   version = "3.1.0";
 
   src = fetchFromGitHub {

From b5fc76e753e15a4e278fc531ba7b5e0b0416efee Mon Sep 17 00:00:00 2001
From: Valerio Besozzi <valebes@gmail.com>
Date: Thu, 29 Aug 2019 21:21:27 +0200
Subject: [PATCH 400/794] rsclock: 0.1.0 -> 0.1.4

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

diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
index 81c001509f3..c427eda8c77 100644
--- a/pkgs/applications/misc/rsclock/default.nix
+++ b/pkgs/applications/misc/rsclock/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rsClock";
-  version = "0.1.0";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "valebes";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1fpidswkgpf9yr4vxqn38livz6r3z5i0lhg7ngj9f1ki4yqxn9zh";
+    sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2";
   };
    
-  cargoSha256 = "1m0lm8xh1qp0cbx870xy2m0bv047mb00vcwzq7r5gxqx8n61qm4n";
+  cargoSha256 = "0zg5q2p9snpfyxl0gx87ix1f46afrfm5jq0m6c7s8qw2x9hpvxzr";
 
   meta = with stdenv.lib; {
     description = "A simple terminal clock written in Rust";

From 3162cc132063bfefd403eb7bcb7a482ec90be837 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Thu, 29 Aug 2019 21:22:51 +0200
Subject: [PATCH 401/794] plex-media-player: 2.36.0.988 -> 2.40.0.1007

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

diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index 4bd4d5fdaad..d55c3882f30 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -9,41 +9,41 @@ let
   # plex-media-player is updated, the versions for these files are changed,
   # so the build IDs (and SHAs) below will need to be updated!
   depSrcs = rec {
-    webClientBuildId = "129-669a5eed7ae231";
-    webClientDesktopBuildId = "3.100.1-d7ae231";
-    webClientTvBuildId = "3.105.0-669a5ee";
+    webClientBuildId = "141-4af71961b12c68";
+    webClientDesktopBuildId = "3.104.2-1b12c68";
+    webClientTvBuildId = "4.3.0-4af7196";
 
     webClient = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
-      sha256 = "0gd7x0rf7sf696zd24y6pji9iam851vjjqbpm4xkqwpadwrwzhwk";
+      sha256 = "0fpkd1s49dbiqqlijxbillqd71a78p8y2sc23mwp0lvcmxrg265p";
     };
     webClientDesktopHash = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
-      sha256 = "136hk7p6gxxmhq1d09jfjljkv76b5h2p16s5jwf28xixkp0ab2jg";
+      sha256 = "0sb0j44lwqz9zbm98nba4x6c1jxdzvs36ynwfg527avkxxna0f8f";
     };
     webClientDesktop = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
-      sha256 = "0yvjqar72jq58jllsp51b8ybiv6kad8w51bfzss87m1cv3qdbzpa";
+      sha256 = "0dxa0ka0igfsryzda4r5clwdl47ah78nmlmgj9d5pgsvyvzjp87z";
     };
     webClientTvHash = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
-      sha256 = "0kkw9dd0kr5n4ip1pwfs2dkfjwrph88i0dlw64dca9i885gyjvhd";
+      sha256 = "086w1bavk2aqsyhv9zi5fynk31zf61sl91r6gjrdrz656wfk5bxa";
     };
     webClientTv = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
-      sha256 = "0yssii01nx6ixg3mikqjn8hz34dalma0rfr8spj115xwr7aq8ixk";
+      sha256 = "12vbgsfnj0j2y5jd73dpi08hqsr9888sma41nvd4ydsd7qblm455";
     };
   };
 in mkDerivation rec {
   name = "plex-media-player-${version}";
-  version = "2.36.0.988";
-  vsnHash = "0150ae52";
+  version = "2.40.0.1007";
+  vsnHash = "5482132c";
 
   src = fetchFromGitHub {
     owner = "plexinc";
     repo = "plex-media-player";
     rev = "v${version}-${vsnHash}";
-    sha256 = "104arb0afv3jz0bvj8ij5s7av289ms9n91b4y4077la2wd6r1bq0";
+    sha256 = "0ibdh5g8x32iy74q97jfsmxd08wnyrzs3gfiwjfgc10vaa1qdhli";
   };
 
   nativeBuildInputs = [ pkgconfig cmake python3 ];

From 4e4d67b79f0b898d7eb806664b8cab308a911508 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 29 Aug 2019 17:23:47 +0200
Subject: [PATCH 402/794] twitter-color-emoji: init at 12.1.2

---
 .../fonts/twitter-color-emoji/default.nix     | 122 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 2 files changed, 124 insertions(+)
 create mode 100644 pkgs/data/fonts/twitter-color-emoji/default.nix

diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix
new file mode 100644
index 00000000000..5c01283d3e9
--- /dev/null
+++ b/pkgs/data/fonts/twitter-color-emoji/default.nix
@@ -0,0 +1,122 @@
+# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/tree/454acad50ba584d9602ccd4238fc5e585abc15c9
+# The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig)
+
+{ stdenv
+, fetchFromGitHub
+, cairo
+, imagemagick
+, pkg-config
+, pngquant
+, python2
+, which
+, zopfli
+}:
+
+let
+  version = "12.1.2";
+
+  # Cannot use noto-fonts-emoji.src since it is too old
+  # and still tries to use vendored pngquant.
+  notoSrc = fetchFromGitHub {
+    name = "noto";
+    owner = "googlefonts";
+    repo = "noto-emoji";
+    rev = "833a43d03246a9325e748a2d783006454d76ff66";
+    sha256 = "1g6ikzk8banm3ihqm9g27ggjq2mn1b1hq3zhpl13lxid6mp60s4a";
+  };
+
+  twemojiSrc = fetchFromGitHub {
+    name = "twemoji";
+    owner = "twitter";
+    repo = "twemoji";
+    rev = "v${version}";
+    sha256 = "0vzmlp83vnk4njcfkn03jcc1vkg2rf12zf5kj3p3a373xr4ds1zn";
+  };
+
+  python = python2.withPackages (pp: with pp; [
+    nototools
+  ]);
+in
+stdenv.mkDerivation rec {
+  pname = "twitter-color-emoji";
+  inherit version;
+
+  srcs = [
+    notoSrc
+    twemojiSrc
+  ];
+
+  sourceRoot = notoSrc.name;
+
+  postUnpack = ''
+    chmod -R +w ${twemojiSrc.name}
+    mv ${twemojiSrc.name} ${notoSrc.name}
+  '';
+
+  nativeBuildInputs = [
+    cairo
+    imagemagick
+    pkg-config
+    pngquant
+    python
+    which
+    zopfli
+  ];
+
+  postPatch = let
+    templateSubstitutions = stdenv.lib.concatStringsSep "; " [
+      ''s#Noto Color Emoji#Twitter Color Emoji#''
+      ''s#NotoColorEmoji#TwitterColorEmoji#''
+      ''s#Copyright .* Google Inc\.#Twitter, Inc and other contributors.#''
+      ''s# Version .*# ${version}#''
+      ''s#.*is a trademark.*##''
+      ''s#Google, Inc\.#Twitter, Inc and other contributors#''
+      ''s#http://www.google.com/get/noto/#https://twemoji.twitter.com/#''
+      ''s#.*is licensed under.*#      Creative Commons Attribution 4.0 International#''
+      ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#''
+    ];
+  in ''
+    patchShebangs ./flag_glyph_name.py
+
+    sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl
+    pushd ${twemojiSrc.name}/assets/72x72/
+    for png in *.png; do
+        mv $png emoji_u''${png//-/_}
+    done
+    popd
+  '';
+
+  makeFlags = [
+    "EMOJI=TwitterColorEmoji"
+    "EMOJI_SRC_DIR=${twemojiSrc.name}/assets/72x72"
+    "BODY_DIMENSIONS=76x72"
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    install -Dm644 TwitterColorEmoji.ttf $out/share/fonts/truetype/TwitterColorEmoji.ttf
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Color emoji font with a flat visual style, designed and used by Twitter";
+    longDescription = ''
+      A bitmap color emoji font built from the Twitter Emoji for
+      Everyone artwork with support for ZWJ, skin tone diversity and country
+      flags.
+
+      This font uses Google’s CBDT format making it work on Android and Linux graphical stack.
+    '';
+    homepage = "https://twemoji.twitter.com/";
+    # In noto-emoji-fonts source
+    ## noto-emoji code is in ASL 2.0 license
+    ## Emoji fonts are under OFL license
+    ### third_party color-emoji code is in ASL 2.0 license
+    ### third_party region-flags code is in Public Domain license
+    # In twemoji source
+    ## Artwork is Creative Commons Attribution 4.0 International
+    ## Non-artwork is MIT
+    license = with licenses; [ asl20 ofl cc-by-40 mit ];
+    maintainers = with maintainers; [ jtojnar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25a2e16cf46..6a01d06ba3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17137,6 +17137,8 @@ in
     inherit (nodePackages) svgo;
   };
 
+  twitter-color-emoji = callPackage ../data/fonts/twitter-color-emoji { };
+
   tzdata = callPackage ../data/misc/tzdata { };
 
   ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };

From 875edee495786c9d7225db62f00d58e24cfc7de0 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 29 Aug 2019 21:46:42 +0200
Subject: [PATCH 403/794] plex: 1.16.5.1488 -> 1.16.5.1554

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

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 16007c3e8fc..36b4bd96fbd 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,14 +8,14 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.16.5.1488-deeb86e7f";
+  version = "1.16.5.1554-1e5ff713d";
   pname = "plexmediaserver";
   name = "${pname}-${version}";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "0kgcbq3jfvmigza8a9ak215q2cpi18vh96gx01hppk51m9ibkrwi";
+    sha256 = "1h2f8dgwz9bnvj7h4nk61a5rpl62918nwq6v85d97miwjfc1mv6n";
   };
 
   outputs = [ "out" "basedb" ];

From 360b2314b8651e9ea2ba75ed6ec9677ef6ad1007 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 29 Aug 2019 22:00:18 +0200
Subject: [PATCH 404/794] irssi: 1.2.1 -> 1.2.2 (CVE-2019-15717)

https://irssi.org/security/irssi_sa_2019_08.txt
---
 pkgs/applications/networking/irc/irssi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 5aca2c49d14..0994fa049dd 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.1";
+  version = "1.2.2";
   name = "irssi-${version}";
 
   src = fetchurl {
     url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
-    sha256 = "01lay6bxgsk2vzkiknw12zr8gvgnvk9xwg992496knsgakr0x2zx";
+    sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 844200a06f2b5d27955c39c05163711e9263bb99 Mon Sep 17 00:00:00 2001
From: Vika <kisik21@fireburn.ru>
Date: Fri, 30 Aug 2019 00:28:57 +0300
Subject: [PATCH 405/794] nixos/bash: Improve Emacs detection for PS1

That's one of my itches - when I'm sshing from Emacs' term to a NixOS
machine, it doesn't detect that I'm running emacs and showing a title
escape sequence. This commit fixes it, checking against $TERM to
prevent this from ever bothering anyone again.
---
 nixos/modules/programs/bash/bash.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index a7e57b8608d..99daec5ff5b 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -98,7 +98,7 @@ in
           if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then
             PROMPT_COLOR="1;31m"
             let $UID && PROMPT_COLOR="1;32m"
-            if [ -n "$INSIDE_EMACS" ]; then
+            if [ -n "$INSIDE_EMACS" -o "$TERM" == "eterm" -o "$TERM" == "eterm-color" ]; then
               # Emacs term mode doesn't support xterm title escape sequence (\e]0;)
               PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
             else

From 8d084f6f45250060513b5fa10ca1ae17e342dd74 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Thu, 29 Aug 2019 15:09:36 -0700
Subject: [PATCH 406/794] ffsend: v0.2.50 -> v0.2.51

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

diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 73734ee5ea0..90092c9b0c0 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -16,16 +16,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   pname = "ffsend";
-  version = "0.2.50";
+  version = "0.2.51";
 
   src = fetchFromGitLab {
     owner = "timvisee";
     repo = "ffsend";
     rev = "v${version}";
-    sha256 = "06virzmg3prvwk5gilr19qrpi93wvv7jq096kgsbn3rmnv3ys1zh";
+    sha256 = "1ckzgzbv2fh5y7c5r0b9n6y2migmsrnlwdg7dybr0c82s39swr7f";
   };
 
-  cargoSha256 = "1g72nz3nha41cvsb514z4k78yw7xcsh3nm0bl2wqy9dvdzgp1lm1";
+  cargoSha256 = "1x4hxar60lwimldpsi0frdlssgsb72qahn3dmb980sj6cmbq3f0b";
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ openssl ]

From 3155fbff0adcd8abf762a5689de4af1c7b93b974 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 29 Aug 2019 18:22:00 -0400
Subject: [PATCH 407/794] emacs-irony: shrink closure

Goes from 1.6G -> 154M
---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 9574ec43a61..1a647466abd 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -131,6 +131,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         irony = super.irony.overrideAttrs (old: {
           cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
+          NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
           preConfigure = ''
             cd server
           '';
@@ -144,6 +145,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             make check
             cd ../..
           '';
+          preFixup = ''
+            rm -rf $out/share/emacs/site-lisp/elpa/*/server
+          '';
           dontUseCmakeBuildDir = true;
           doCheck = true;
           packageRequires = [ self.emacs ];

From b98adbc2d5c590c8c327ea9eb3052c33523872f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 29 Aug 2019 21:14:06 -0300
Subject: [PATCH 408/794] cmst: use pname

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

diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index cc88153bab9..2e7570ea649 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, qmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "cmst-${version}";
+  pname = "cmst";
   version = "2019.01.13";
 
   src = fetchFromGitHub {
     repo = "cmst";
     owner = "andrew-bibb";
-    rev = name;
+    rev = "cmst-${version}";
     sha256 = "13739f0ddld34dcqlfhylzn1zqz5a7jbp4a4id7gj7pcxjx1lafh";
   };
 

From a92f096bb6d005196b252983894877a77680ee60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 29 Aug 2019 21:15:23 -0300
Subject: [PATCH 409/794] cmst: use Qt mkDerivation

---
 pkgs/tools/networking/cmst/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index 2e7570ea649..ee561840da8 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase }:
+{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "cmst";
   version = "2019.01.13";
 
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "QT GUI for Connman with system tray icon";
     homepage = https://github.com/andrew-bibb/cmst;
-    maintainers = [ stdenv.lib.maintainers.matejc ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.matejc ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
   };
 }

From d2512c134ad9020ca29275aa06ff8bd631e19419 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Fri, 30 Aug 2019 10:29:18 +1000
Subject: [PATCH 410/794] libhandy: 0.0.10. -> 0.0.11

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

diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 9c3d9faf1f4..4883b39b7cf 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "libhandy";
-  version = "0.0.10";
+  version = "0.0.11";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
     owner = "Librem5";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1702hbdqhfpgw0c4vj2ag08vgl83byiryrbngbq11b9azmj3jhzs";
+    sha256 = "0622zp5wrvn5bvgardijxd11y76g1i54fs32y03dw9nrar7i6vb0";
   };
 
   nativeBuildInputs = [

From 1e8e8d1867afed7ffd175721c4021a5111226103 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Fri, 30 Aug 2019 03:44:33 +0200
Subject: [PATCH 411/794] pithos: 1.1.2 -> 1.4.1

---
 pkgs/applications/audio/pithos/default.nix | 24 +++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix
index f2c798d1e6e..5d86e37dec8 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@@ -1,33 +1,29 @@
-{ fetchFromGitHub, stdenv, pythonPackages, gtk3, gobject-introspection, libnotify
-, gst_all_1, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, appstream-glib
+, wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection
+, libnotify, libsecret, gst_all_1 }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "pithos";
-  version = "1.1.2";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo  = pname;
     rev = version;
-    sha256 = "0zk9clfawsnwmgjbk7y5d526ksxd1pkh09ln6sb06v4ygaiifcxp";
+    sha256 = "0vaw0rfcdh4bsp9b8la9bs36kw0iwia54y5x060byxhff9av6nj4";
   };
 
-  # No tests in repo
-  doCheck = false;
+  format = "other";
 
   postPatch = ''
-    substituteInPlace setup.py --replace "/usr/share" "$out/share"
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
   '';
 
-  postInstall = ''
-    mkdir -p $out/share/applications
-    cp -v data/pithos.desktop $out/share/applications
-  '';
-
-  buildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja pkgconfig appstream-glib wrapGAppsHook ];
 
   propagatedBuildInputs =
-    [ gtk3 gobject-introspection libnotify ] ++
+    [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++
     (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++
     (with pythonPackages; [ pygobject3 pylast ]);
 

From 366db822680ba9e0533916b605ed230ae2b1cbdc Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Fri, 30 Aug 2019 04:17:02 +0200
Subject: [PATCH 412/794] nfs-utils: 2.3.4 -> 2.4.1

---
 pkgs/os-specific/linux/nfs-utils/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 7984e357c82..12fdbabcc0b 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -9,11 +9,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "nfs-utils-${version}";
-  version = "2.3.4";
+  version = "2.4.1";
 
   src = fetchurl {
     url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz";
-    sha256 = "1kcn11glc3rma1gvykbk1s542mgz36ipi7yqxlk9jyh8hsiqncpq";
+    sha256 = "0dkp11a7i01c378ri68bf6k56z27kz8zzvpqm7mip6s7jkd4l9w5";
   };
 
   # libnfsidmap is built together with nfs-utils from the same source,
@@ -47,14 +47,7 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen";
 
-  patches = [
-    # Fixes build on i686.
-    (fetchpatch {
-      name = "sqlite.c-Use-PRIx64-macro-to-print-64-bit-integers.patch";
-      url = "http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff_plain;h=a8133e1fd174267536cd459e19cfe0a1cbbe037c;hp=a709f25c1da4a2fb44a1f3fd060298fbbd88aa3c";
-      sha256 = "03azkw13xhp8f49777p08xziy0d7crz65qrisjbkzjnx1wczdqy5";
-    })
-  ] ++ lib.optionals stdenv.hostPlatform.isMusl [
+  patches = lib.optionals stdenv.hostPlatform.isMusl [
     (fetchpatch {
       url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch";
       sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid";

From 9a2f83feb953f5b2f4cfe1d3d696ed500de2745d Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Fri, 30 Aug 2019 04:36:35 +0200
Subject: [PATCH 413/794] gradle: 5.3.1 -> 5.6.1

---
 .../tools/build-managers/gradle/default.nix            | 10 +++++-----
 pkgs/top-level/all-packages.nix                        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 0ec57cc8b82..902c74a08b4 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -51,15 +51,15 @@ rec {
     };
   };
 
-  gradle_latest = gradle_5_3;
+  gradle_latest = gradle_5_6;
 
-  gradle_5_3 = gradleGen rec {
-    name = "gradle-5.3.1";
-    nativeVersion = "0.17";
+  gradle_5_6 = gradleGen rec {
+    name = "gradle-5.6.1";
+    nativeVersion = "0.18";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "0dkl6f17zl9pc6y2xm8xqz23x53fck4p2648vpq8572f0mxa2n8w";
+      sha256 = "04pccfcry5c59xwm6rr4r3baanwbfr5yrwhxv4r5v8z4414291h9";
     };
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c3af89bc8d..d04329080ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9605,7 +9605,7 @@ in
   gradle_2 = gradle_2_14;
   gradle_3 = gradle_3_5;
   gradle_4 = gradle_4_10;
-  gradle_5 = res.gradleGen.gradle_5_3;
+  gradle_5 = res.gradleGen.gradle_5_6;
 
   gperf = callPackage ../development/tools/misc/gperf { };
   # 3.1 changed some parameters from int to size_t, leading to mismatches.

From c56e7a20b1c657049b2a6e3cd5669a2212fd4c16 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Fri, 30 Aug 2019 05:24:41 +0200
Subject: [PATCH 414/794] robo3t: 1.1.1 -> 1.3.1

---
 pkgs/applications/misc/robo3t/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
index be365cb94e4..cfafd239b60 100644
--- a/pkgs/applications/misc/robo3t/default.nix
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -3,11 +3,12 @@
 
 stdenv.mkDerivation rec {
   name = "robo3t-${version}";
-  version = "1.1.1";
+  version = "1.3.1";
+  rev = "7419c406";
 
   src = fetchurl {
-    url = "https://download.robomongo.org/1.1.1/linux/robo3t-${version}-linux-x86_64-c93c6b0.tar.gz";
-    sha256 = "140cn80vg7c8vpdjasqi4b3kyqj4n033lcm3ikz5674x3jr7r5zs";
+    url = "https://download-test.robomongo.org/linux/robo3t-${version}-linux-x86_64-${rev}.tar.gz";
+    sha256 = "1mp5i8iahd4qkwgi5ix98hlg17ivw5da27n0drnr0wk458wn99hi";
   };
 
   icon = fetchurl {

From 5fe68fd14238ea9b01b1293466864926513e09ef Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 28 Aug 2019 17:53:43 -0700
Subject: [PATCH 415/794] pythonPackage.nixpart0: disable for python3

---
 pkgs/tools/filesystems/nixpart/0.4/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 6a1c12e3e72..129283e83eb 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -54,11 +54,12 @@ let
   };
 
 in buildPythonApplication rec {
-  name = "nixpart-${version}";
+  pname = "nixpart";
   version = "0.4.1";
+  disabled = python.isPy3k;
 
   src = fetchurl {
-    url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
+    url = "https://github.com/NixOS/nixpart/archive/v${version}.tar.gz";
     sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp";
   };
 
@@ -66,10 +67,11 @@ in buildPythonApplication rec {
 
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "NixOS storage manager/partitioner";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.aszlig ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://github.com/NixOS/nixpart";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.aszlig ];
+    platforms = platforms.linux;
   };
 }

From a7a6528c611351fc38bb3e42a25550ce4943b106 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Thu, 29 Aug 2019 00:17:25 +0200
Subject: [PATCH 416/794] lsof: 4.91 -> 4.93.2

---
 .../tools/misc/lsof/darwin-dfile.patch        | 12 -------
 pkgs/development/tools/misc/lsof/default.nix  | 34 ++++++-------------
 2 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/lsof/darwin-dfile.patch

diff --git a/pkgs/development/tools/misc/lsof/darwin-dfile.patch b/pkgs/development/tools/misc/lsof/darwin-dfile.patch
deleted file mode 100644
index 9952228e613..00000000000
--- a/pkgs/development/tools/misc/lsof/darwin-dfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c
---- a/dialects/darwin/libproc/dfile.c	2018-02-14 09:28:06.000000000 -0500
-+++ b/dialects/darwin/libproc/dfile.c	2018-04-16 18:52:40.828715293 -0400
-@@ -43,7 +43,7 @@
- #include "lsof.h"
- 
- #if	defined(PROC_FP_GUARDED)
--#extern	struct pff_tab	Pgf_tab[];
-+extern	struct pff_tab	Pgf_tab[];
- #endif	/* defined(PROC_FP_GUARDED) */
- 
- 
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 63003f338eb..98acccb252a 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -1,34 +1,22 @@
-{ stdenv, fetchurl, buildPackages, ncurses }:
+{ stdenv, fetchFromGitHub, buildPackages, ncurses }:
 
 let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in
 
 stdenv.mkDerivation rec {
-  name = "lsof-${version}";
-  version = "4.91";
+  pname = "lsof";
+  version = "4.93.2";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = [ ncurses ];
 
-  src = fetchurl {
-    urls = ["https://fossies.org/linux/misc/lsof_${version}.tar.bz2"] ++ # Mirrors seem to be down...
-      ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"]
-      ++ map (
-        # the tarball is moved after new version is released
-        isOld: "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/"
-        + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2"
-      ) [ false true ]
-      ++ map (
-        # the tarball is moved after new version is released
-        isOld: "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-        + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2"
-      ) [ false true ]
-      ;
-    sha256 = "18sh4hbl9jw2szkf0gvgan8g13f3g4c6s2q9h3zq5gsza9m99nn9";
+  src = fetchFromGitHub {
+    owner = "lsof-org";
+    repo = "lsof";
+    rev = "${version}";
+    sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv";
   };
 
-  unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
-
-  patches = [ ./no-build-info.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch;
+  patches = [ ./no-build-info.patch ];
 
   postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1
@@ -47,12 +35,12 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin $out/man/man8
-    cp lsof.8 $out/man/man8/
+    cp Lsof.8 $out/man/man8/lsof.8
     cp lsof $out/bin
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://people.freebsd.org/~abe/;
+    homepage = "https://github.com/lsof-org/lsof";
     description = "A tool to list open files";
     longDescription = ''
       List open files. Can show what process has opened some file,

From 984acf8004dadf8b7d9b3d18b3d6425f62140301 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Fri, 23 Aug 2019 12:26:08 +0200
Subject: [PATCH 417/794] yq-go: init at 2.4.0

---
 pkgs/development/tools/yq-go/default.nix | 31 +++++++++++++
 pkgs/development/tools/yq-go/deps.nix    | 57 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 3 files changed, 90 insertions(+)
 create mode 100644 pkgs/development/tools/yq-go/default.nix
 create mode 100644 pkgs/development/tools/yq-go/deps.nix

diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
new file mode 100644
index 00000000000..3180131c6f7
--- /dev/null
+++ b/pkgs/development/tools/yq-go/default.nix
@@ -0,0 +1,31 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+# buildGoModule is not supported by the project
+# See https://github.com/mikefarah/yq/issues/227
+buildGoPackage rec {
+  pname = "yq-go";
+  version = "2.4.0";
+
+  goPackagePath = "gopkg.in/mikefarah/yq.v2";
+
+  src = fetchFromGitHub {
+    owner = "mikefarah";
+    rev = version;
+    repo = "yq";
+    sha256 = "0nizg08mdpb8g6hj887kk5chljba6x9v0f5ysqf28py511yp0dym";
+  };
+
+  goDeps = ./deps.nix;
+
+  postInstall = ''
+    mv $bin/bin/yq.v2 $bin/bin/yq
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Portable command-line YAML processor";
+    homepage = http://mikefarah.github.io/yq/;
+    license = [ licenses.mit ];
+    maintainers = [ maintainers.lewo ];
+  };
+}
diff --git a/pkgs/development/tools/yq-go/deps.nix b/pkgs/development/tools/yq-go/deps.nix
new file mode 100644
index 00000000000..ec2057964ec
--- /dev/null
+++ b/pkgs/development/tools/yq-go/deps.nix
@@ -0,0 +1,57 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7";
+      sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "972238283c0625cf3e881de7699ba8f2524c340a";
+      sha256 = "194h0lq3s27wcxcgahjl350x46v116x81zgkgh98q9v5iydig28l";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/imdario/mergo.v0";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/imdario/mergo.v0";
+      rev = "7c29201646fa3de8506f701213473dd407f19646";
+      sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/mikefarah/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/mikefarah/yaml.v2";
+      rev = "1a71b09ff830e9b158685a8657c85f6462559726";
+      sha256 = "0rvix49in3bm3i90v1dp1s49b14m1pyyqm3fv27mgg0spvcqy7vr";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/op/go-logging.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/op/go-logging.v1";
+      rev = "b2cb9fa56473e98db8caba80237377e83fe44db5";
+      sha256 = "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/spf13/cobra.v0";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/spf13/cobra.v0";
+      rev = "f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5";
+      sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4498ce8b13..8f77b5722cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10118,6 +10118,8 @@ in
     inherit (python3Packages) buildPythonApplication fetchPypi pyyaml xmltodict;
   };
 
+  yq-go = callPackage ../development/tools/yq-go { };
+
   winpdb = callPackage ../development/tools/winpdb { };
 
   grabserial = callPackage ../development/tools/grabserial { };

From a278d1d0c3db1b6dc9e8d0e84322c8efce5d0e6c Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 30 Aug 2019 20:11:21 +0900
Subject: [PATCH 418/794] firefox-bin: add maintainer

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 2f79f6900cd..dea752874dd 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -205,6 +205,6 @@ stdenv.mkDerivation {
       url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
     };
     platforms = builtins.attrNames mozillaPlatforms;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ taku0 ];
   };
 }

From 359a5ca5eb13071814378da026f2567cc1eb9ddb Mon Sep 17 00:00:00 2001
From: Quentin Vaucher <quentin.vaucher@protonmail.com>
Date: Fri, 30 Aug 2019 13:39:59 +0200
Subject: [PATCH 419/794] ephemeral: 5.2.1 -> 5.3.0

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

diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix
index 6226cb338d9..369689520d8 100644
--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/pkgs/applications/networking/browsers/ephemeral/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ephemeral";
-  version = "5.2.1";
+  version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ephemeral";
     rev = version;
-    sha256 = "01mj5gksz2qcwhp28zyk8qswmrw93db1g7mw3mg4klz99vzcry74";
+    sha256 = "1xglhv4rpl6vqryvliyvr9y8mqli4x4bjcfjsl1v8gdxkzkwfy39";
   };
 
   nativeBuildInputs = [

From 4b67e77e1596c0e3bccedf408c6674054a6b302d Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 30 Aug 2019 08:01:27 -0400
Subject: [PATCH 420/794] nvidia_x11: 430.40 -> 435.21

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 2290a7e80a1..c41ce5994a1 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -20,16 +20,16 @@ if ((!lib.versionOlder args.version "391")
 in
 rec {
   # Policy: use the highest stable version as the default (on our master).
-  stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_430 else legacy_390;
+  stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_43x else legacy_390;
 
   # No active beta right now
   beta = stable;
 
-  stable_430 = generic {
-    version = "430.40";
-    sha256_64bit = "1myzhy1mf27dcx0admm3pbbkfdd9p66lw0cq2mz1nwds92gqj07p";
-    settingsSha256 = "0rg9dxg02pnpi0a1yi3a41wn6kmlk0dm6dvfbazyqi4gbzr12qrl";
-    persistencedSha256 = "0findlrs5v1m7gl0vxkpd04lh54pib80w5vp4j77qb5snhgvckhq";
+  stable_43x = generic {
+    version = "435.21";
+    sha256_64bit = "0v3pq677ab01qdmwl5dawk8hn39qlwj05p8s9qzh9irmrlnc1izs";
+    settingsSha256 = "1p13cz79kncwx5067a3d7dbz6a1ibp611zynp1qdxpa65hwp2pxa";
+    persistencedSha256 = "0br8znxhz2ryzdj0j4jhqzvdgw9h899q8yz0p9429xz4wxkavgdr";
   };
 
   # Last one supporting x86

From 131910992beecf518df8d2420750978d343d2e9c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2019 14:23:02 +0200
Subject: [PATCH 421/794] python-HyperKitty: initial version 1.2.2

Package the mail archiver for GNU Mailman. I liberally borrowed code
from @globin's repository [1].

[1] https://github.com/mayflower/nixexprs/tree/master/pkgs/python
---
 .../python-modules/cssmin/default.nix         | 20 ++++++++++
 .../django-paintstore/default.nix             | 20 ++++++++++
 .../python-modules/django-q/default.nix       | 24 ++++++++++++
 .../robot-detection/default.nix               | 22 +++++++++++
 pkgs/servers/mail/mailman/hyperkitty.nix      | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 10 +++++
 6 files changed, 134 insertions(+)
 create mode 100644 pkgs/development/python-modules/cssmin/default.nix
 create mode 100644 pkgs/development/python-modules/django-paintstore/default.nix
 create mode 100644 pkgs/development/python-modules/django-q/default.nix
 create mode 100644 pkgs/development/python-modules/robot-detection/default.nix
 create mode 100644 pkgs/servers/mail/mailman/hyperkitty.nix

diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix
new file mode 100644
index 00000000000..7cb01001fac
--- /dev/null
+++ b/pkgs/development/python-modules/cssmin/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "cssmin";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1dk723nfm2yf8cp4pj785giqlwv42l0kj8rk40kczvq1hk6g04p0";
+  };
+
+  # no tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A Python port of the YUI CSS compression algorithm";
+    homepage = http://github.com/zacharyvoase/cssmin;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/django-paintstore/default.nix b/pkgs/development/python-modules/django-paintstore/default.nix
new file mode 100644
index 00000000000..096215a70ab
--- /dev/null
+++ b/pkgs/development/python-modules/django-paintstore/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib
+, django, python3-openid }:
+
+buildPythonPackage rec {
+  pname = "django-paintstore";
+  version = "0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "12wxgwv1qbkfq7w5i7bm7aidv655c2sxp0ym73qf8606dxbjcwwg";
+  };
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Django app that integrates jQuery ColorPicker with the Django admin";
+    homepage = https://github.com/gsiegman/django-paintstore;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix
new file mode 100644
index 00000000000..f671674ffe2
--- /dev/null
+++ b/pkgs/development/python-modules/django-q/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow
+, blessed, django, future }:
+
+buildPythonPackage rec {
+  pname = "django-q";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17mqxiacsp2yszak6j48fm7vx0w44pcg86flc63r9y5yhx490n5r";
+  };
+
+  propagatedBuildInputs = [
+    django-picklefield arrow blessed django future
+  ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A multiprocessing distributed task queue for Django";
+    homepage = https://django-q.readthedocs.org;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix
new file mode 100644
index 00000000000..81428b44ad9
--- /dev/null
+++ b/pkgs/development/python-modules/robot-detection/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, six }:
+
+buildPythonPackage rec {
+  pname = "robot-detection";
+  version = "0.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1xd2jm3yn31bnk1kqzggils2rxj26ylxsfz3ap7bhr3ilhnbg3rx";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  # no tests in archive
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Library for detecting if a HTTP User Agent header is likely to be a bot";
+    homepage = https://github.com/rory/robot-detection;
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix
new file mode 100644
index 00000000000..8f060da3446
--- /dev/null
+++ b/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchPypi, coverage, mock
+, robot-detection, django_extensions, rjsmin, cssmin, django-mailman3
+, django-haystack, lockfile, networkx, dateutil, defusedxml
+, django-paintstore, djangorestframework, django, django-q
+, django_compressor, beautifulsoup4, six, psycopg2, whoosh
+}:
+
+buildPythonPackage rec {
+  pname = "HyperKitty";
+  version = "1.2.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1z2zswlml6nppxhzw9a4nrj7i5wsxd29s3q78ka1rwr5m5n7s1rz";
+  };
+
+  buildInputs = [ coverage mock ];
+  propagatedBuildInputs = [
+    robot-detection django_extensions rjsmin cssmin django-mailman3
+    django-haystack lockfile networkx dateutil defusedxml
+    django-paintstore djangorestframework django django-q
+    django_compressor beautifulsoup4 six psycopg2 whoosh
+  ];
+
+  checkPhase = ''
+    cd $NIX_BUILD_TOP/$sourceRoot
+    PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test \
+      --settings=hyperkitty.tests.settings_test hyperkitty
+  '';
+
+  meta = {
+    homepage = "http://www.gnu.org/software/mailman/";
+    description = "Archiver for GNU Mailman v3";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ peti globin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e8dca7c924b..bdaae932f68 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2720,6 +2720,16 @@ in {
 
   sunpy = callPackage ../development/python-modules/sunpy { };
 
+  hyperkitty = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/hyperkitty.nix { });
+
+  robot-detection = callPackage ../development/python-modules/robot-detection {};
+
+  cssmin = callPackage ../development/python-modules/cssmin {};
+
+  django-paintstore = callPackage ../development/python-modules/django-paintstore {};
+
+  django-q = callPackage ../development/python-modules/django-q {};
+
   hyperlink = callPackage ../development/python-modules/hyperlink {};
 
   zope_copy = callPackage ../development/python-modules/zope_copy {};

From ad530918a543f54ad6ac94ee0d2675bfac0a743c Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Thu, 29 Aug 2019 15:13:16 -0400
Subject: [PATCH 422/794] nixUnstable: 2.3pre6779_324a5dc9 ->
 2.3pre6895_84de821

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index aa212d655f8..a5501e88ed9 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -181,12 +181,12 @@ in rec {
 
   nixUnstable = lib.lowPrio (callPackage common rec {
     name = "nix-2.3${suffix}";
-    suffix = "pre6779_324a5dc9";
+    suffix = "pre6895_84de821";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "324a5dc92f8e50e6b637c5e67dea48c80be10837";
-      sha256 = "1g8gbam585q4kx8ilbx23ip64jw0r829i374qy0l8kvr8mhvj55r";
+      rev = "84de8210040580ce7189332b43038d52c56a9689";
+      sha256 = "062pdly0m2hk8ly8li5psvpbj1mi7m1a15k8wyzf79q7294l5li3";
     };
     fromGit = true;
 

From 786804a1048b87d0b17ec4833af127652f16425a Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 30 Aug 2019 08:29:34 -0400
Subject: [PATCH 423/794] nixFlakes: pre20190712_aa82f8b -> pre20190829_ebc4dae

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a5501e88ed9..58662f4c045 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -195,12 +195,12 @@ in rec {
 
   nixFlakes = lib.lowPrio (callPackage common rec {
     name = "nix-2.3${suffix}";
-    suffix = "pre20190712_aa82f8b";
+    suffix = "pre20190829_ebc4dae";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "aa82f8b2d2a2c42f0d713e8404b668cef1a4b108";
-      hash = "sha256-MRY2CCjnTPSWIv0/aguZcg5U+DA+ODLKl9vjB/qXFpU=";
+      rev = "ebc4dae51761cb54c1db28cf4d328d3f2f55b758";
+      hash = "sha256-yfp56L7lu0DIhskzxooF/26T9d4ufl5/k5LlXMI0PSM=";
     };
     fromGit = true;
 

From 8c7c18992f6bb20bd7ec61cdbfcd683c881baf49 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2019 14:46:20 +0200
Subject: [PATCH 424/794] CODEOWNERS: add myself as a reviewer for mail/dns
 related NixOS modules

---
 .github/CODEOWNERS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 51cca15632d..1b3acbf6f7a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -139,3 +139,9 @@
 
 # Bazel
 /pkgs/development/tools/build-managers/bazel @mboes @Profpatsch
+
+# NixOS modules for e-mail and dns services
+/nixos/modules/services/mail/mailman.nix    @peti
+/nixos/modules/services/mail/postfix.nix    @peti
+/nixos/modules/services/networking/bind.nix @peti
+/nixos/modules/services/mail/rspamd.nix     @peti

From 00ab4f8c8069131c6e585d0f8fa68c0d26a14e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Fri, 30 Aug 2019 14:50:52 +0200
Subject: [PATCH 425/794] mirage: fix build failure

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

diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix
index 515b834b41e..c06a7972709 100644
--- a/pkgs/applications/graphics/mirage/default.nix
+++ b/pkgs/applications/graphics/mirage/default.nix
@@ -11,6 +11,8 @@ pythonPackages.buildPythonApplication rec {
 
     doCheck = false;
 
+    nativeBuildInputs = [ gettext ];
+
     buildInputs = [ stdenv libX11 gettext ];
 
     patchPhase = ''

From 5a81797119c98758908f4c4b99f5f756481d3f39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2019 15:38:43 +0200
Subject: [PATCH 426/794] nixos/mailman: cosmetic

---
 nixos/modules/services/mail/mailman.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
index df654c74cc8..cae59cb52cc 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@@ -112,7 +112,6 @@ in {
         RuntimeDirectory = "mailman";
         PIDFile = "/run/mailman/master.pid";
       };
-
     };
 
   };

From 28dee92fffaa0745d9dce8a70623fa3f04885d08 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2019 15:39:50 +0200
Subject: [PATCH 427/794] nixos/redis: move 'redis_init.service' into the
 preStart hook of 'redis.service'

---
 nixos/modules/services/databases/redis.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index c04cc1283b2..3f2857100f5 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -224,26 +224,17 @@ in
 
     environment.systemPackages = [ cfg.package ];
 
-    systemd.services.redis_init =
-      { description = "Redis Server Initialisation";
-
-        wantedBy = [ "redis.service" ];
-        before = [ "redis.service" ];
-
-        serviceConfig.Type = "oneshot";
-
-        script = ''
-          install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
-          chown -R ${cfg.user} ${cfg.dbpath}
-        '';
-      };
-
     systemd.services.redis =
       { description = "Redis Server";
 
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
 
+        preStart = ''
+          install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
+          chown -R ${cfg.user} ${cfg.dbpath}
+        '';
+
         serviceConfig = {
           ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}";
           User = cfg.user;

From c205c66fb5be2e02cf6a1f2958d7c6f093bd66d9 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 30 Aug 2019 15:57:10 +0100
Subject: [PATCH 428/794] firefox-devedition-bin: 69.0b10 -> 70.0b2

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 5d4ee39a4b2..a9ca0a5fe06 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,935 +1,935 @@
 {
-  version = "69.0b10";
+  version = "70.0b2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ach/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ach/firefox-70.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "9d036f8217a95ea3d601e10050ee15f75f6d3eea5f38f5a1ce0a773d92cca7418a863385555ec9112751016e4008672f8de79c17b7156775d7ba3eee2a4c19d9";
+      sha512 = "cf64b9cd170d5a1bf1765ed07df197a3d0c7411b5281c89a0d2adfb3d9c404ed9fd2c8c021fe93971b846d7ebfdcfdf08f3a5703e156d6dbab61619f53d6d415";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/af/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/af/firefox-70.0b2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "def33babd8a97fb1b9f9059a019d5c823e965f404baadc1daf3325a3f7437f0152585dd6ba13f67542eb7b1e7cb2f265986c7813c35e65cb79febba5636a6c5d";
+      sha512 = "e2815831dc99e0373541a56a38fa936a97d93a07a2dd7f789f5e4cc45860ce3c1b70bbbe709d35534364586af5b0dc626a4ba36dc8881244f98665a80ba57764";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/an/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/an/firefox-70.0b2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "b51086111c0a2a989c6123729028b41a834f25bff19836b486bfd935d52055a8c23bdb0e79eb8718d86a4b4781ed6fdd02b946d2dc5e0b86de9fc2166393f1e4";
+      sha512 = "d7cc4b7a1d7fabe186ae10a9bbd5d746415178dc3d17255e2278c1b5a9a7170403cdd153668b94220ea68be387b0c7b3365c8d460bfe53f7b381e7f3da12948e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ar/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ar/firefox-70.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "d3cc62cfa029a7112aa8b27257e2b1b7c3adb99d56d3d749b19009be92ada130353f6d5bd8383b78ddd179417779d2425ecfa2d778a4752f7a876f3fbef84c34";
+      sha512 = "8fb79f3636682c83dcf42b143892148fddb06eefca4c5eb72f5ed703b821dc2bfab7a167a58992d83202866dc07bfa09eee876cc567586791440afea676efbbe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ast/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ast/firefox-70.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "75ec692ad8b8d56e13b6b34a980c9f37034b188a675dd0c975e598277fa919587a90a3be11867bd63db1c83a12876d10e2eeb83e5666f10c256adad5b9f369f7";
+      sha512 = "468bcff942edfc8ba843f6f5a4b42aeb2b606186701d6a371565c4803664591037fe44bd026fca790ff8b8bb036619862ec51f04af63acfbf393fe8ac677907f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/az/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/az/firefox-70.0b2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "9f44dd00187942430c69898298e677dbfe8385a9e43d312681c7d487ae3353b0dd668a87945d41183bbdffd8bfe7331d1d752a594fa515372139385935134417";
+      sha512 = "983f8d78364c1479a252806f912d015e791e8073bc7848c0bebb28c7a39d6ab08bac2bd9e4a7f1c1cb68b8d2894eaa927541a78836717066491b450c0b34671c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/be/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/be/firefox-70.0b2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "faf91758f3cf17f8dbc570195adacbd93a57f46f0750eabceb6e66df16dbf459670254712b63146b89be67442ba828d5506a703cd51bf3d7c42708ba30bba3e4";
+      sha512 = "dd31f1d7d3f6fe10f9dba54475512016be4b26bf59ca0ce55932b23cbc29954bd80e95fb1e29f2ec695e8f16d0b0145ed0d160f1964fe40ffe079a3833ee8090";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bg/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bg/firefox-70.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "b712fdfa9643d00cf44129ec7d0f718ebb46e48fb568d70989b5c094f1a7c231247672620955f397b94e7de0aaa74893780155901cc1c4e26ba4ab9646b566e7";
+      sha512 = "d08edb6750464805ef379b18008d5f3a76a649ee4d6528b4ebd255ab89205756e2c9978bd9a27f56a607117186d434fa2df49ef4494bf5bd4f1f8e2eed10b30a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bn/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bn/firefox-70.0b2.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "9a41d3c3647f3c7c0f5d329edf70693f63835a5dfaf67df08d7937a2efdc89b4cae263e4447ea09e05453be4a3ca658a965f3aafe432cad86ce9ce754c4e5813";
+      sha512 = "a3c200e13d6b20a7fcdba2524501d936a183213f590213727facd9271867ca3d5ac0c59831b88e92a424b3b154bb9cfc66dfd8908ee28fe6a4ed15146944eb7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/br/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/br/firefox-70.0b2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "8c3ee20552f7c85723cb8489cea7f64821619a09deaffba94f42c1b29c55894e40720cb3997791c10baf27c99ea11976741c30286e417b207ec620a3dee4c771";
+      sha512 = "235ca44c123dc8034541637b8cf5b7d7d3e361300639033dcae361bfcedd41360a5761486c990e7328e479b3073b5f68f01bd38228170c352f993c0bee4757c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bs/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bs/firefox-70.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "348c1e68f57f2a09c134452aa110b39cd638d97bb0b8adaef7f57210c9d95e3a8a6732e72a437219e517799835c4d1d6332af54706239bc604f57e166d859898";
+      sha512 = "2b2202f8397edd25f871d0e9b7e2535be98559bcd84080b8418460f7f1e558cb779f1588e94d87e8e713639cb3bde3efa8de7baf2e2f36bf387d965bffb9552d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ca/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ca/firefox-70.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "4630f3edb4f435dd169335c67477ceb6e42f2d8161dd9559ff58525fc117f7cbf45da534de6e160bf824b3b4b41ded3d3dcac2782f2a208ab7d0e014b4ba40ed";
+      sha512 = "23b7af96430ff5202529e5bbfc5d359d8cb9419b54a8e7dff6b1c828ccd1cd3ca686ed062a29f7e8ee8201ae1a2bbce7032a0f3f0cfc63168fbf0b49c52a9391";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cak/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cak/firefox-70.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "2cae224ee70259a60c0868b83ba933eb43867ca0345bc0fea9693dc3ddcd9130d7325ba953d729778e7ed0eae334b200abd11dc1e903183514c11475e0a61269";
+      sha512 = "beda7fd930fbcf0985711917ea4b78a94042072a8cdd325079f3568bfcf2456efa0666efa4f869430cbfde34091b9d7d101edb94fde0a0c6942f61ee9c8a4fc1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cs/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cs/firefox-70.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "434ef8593e4771c00b772ef3be672fa82d1084431882a6b95011cdaaa04035d08bb1927ec0eafe51d44e7028e2038f798073c5287335300989866ee7f7347ed6";
+      sha512 = "1b47c85b7b5125ba416e18345c7247b85f29e4136d56333da14d8f2c3ebb7b9f81bd0332f6031b36e68e21d851f9390e171f75305bfbe0f46dd0b7c995e0b2aa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cy/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cy/firefox-70.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "e26e3a3e571efa96d03169f17bb7e0920b2ba160830440ed924b6b60c244d31297bfc72d810292e07b9abeee9cb4843f0c2369192b827362fd65bb3f9da4c577";
+      sha512 = "071d30f74d13311693dbf3b4c1a111d12e53aaeb8d6207f8628f7a45acfcf797a722a5196086fc7b6c12545a8a177868a5669542f0535a4223df155867ec6b30";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/da/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/da/firefox-70.0b2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "4cac02fcb2efbe5736e52232b2cc6225572f9fa2518129d501b7d86d782177b4581d9d0ccd5d90131a1e2d676dc43ce9d0841f036701cbc543d379a24ac11fbd";
+      sha512 = "3640a0a07c512e60e4119a683ac44cc596dc2a187d7f04a4b087540ca5deaba1c220403e398edf4c36247e92eef73de252d597ec082a7bc6e6c77e7ea799fef4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/de/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/de/firefox-70.0b2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "b8279a32bd29f70e9470707c9d8843a39c9c7e95c1b732944bdcdcb1fc383d33881ab40f2d00ea36bf01ab7501a77e754dbd2230187fbb2eb0b324cc155a4412";
+      sha512 = "58538f8a9a0d6e97d49c005f45dc1b1842c07a6923a556d98aa13b4c979502a329adaf7b1782522e02a770945ef3809dc68138e73736593fa5ed5d07a1c9e265";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/dsb/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/dsb/firefox-70.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "761e8e0c9414a8a72fac258d52729ad4dab8376e249218ec49ceb47311bd798346b57902671ec394f1ef2c15b641c47f9741e67c76f54684fe4639b609e1700f";
+      sha512 = "8a0ca47fdc85672c18bf883929eef9fa56b2b3b79e584c415c76f3005a55cca944700d27ca23b2ac2051c7c130b42b3551dcd1c05ec7a347ce6463ceecbb0748";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/el/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/el/firefox-70.0b2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "ed8d934d5c7c3bbc1126f04de045cd5f0ed9a529a8d4f207ff115c2e8dd4e152c801e5a4aa0b37fc10dd8fd1f1e363b78f21b4930d49e25649264b751c1260ea";
+      sha512 = "c29d7b350fcfc7b6b76b02ef8677a21800d786e709b5e1b886532f74c8c11696da0fbf2adf6b22fd8c5edb6ab312516a2535ce3185ca5334cff9d79974a4f5ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-CA/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-CA/firefox-70.0b2.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "60689489f53a863d55cfbef67499220efb00aee32ee6ea7054f41f14df43c1b787a04ea374e0ab950dba2110b2728b980fdc46f97136614ef8b97eee210eb58c";
+      sha512 = "d04571c4f4b4bfec7f8a0eb2ee2ed9e9f91c415609106a97ddde7122bddb8f8a25685e4bc6c2eed5ccbad2111bc3e9db6e3ee27c422cc1813a8bb1941cd04af1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-GB/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-GB/firefox-70.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "c3e10c0f0922e4bab3558cbb6be106278fa782b50a0fa5e38db6adf7ff60e88717af15437e48ea23b15762424d89a94361663dda8e02d6fdf9d6c19a5afc90a9";
+      sha512 = "c1f39142888d46884a51b892f232f6cb78309d65a6ba342a45d4bc6f3448ae90bbfd77d44f0e1611948a66a63bcb6d0f0e76f2c6f5fc3083d58b12b6df7cd2ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-US/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-US/firefox-70.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "135e4b561e311d6132164808272bd689b486b840d652ae0ea4ce9a7096472836fe798309d0feafc1ab8cfb32b2c72b396a63734b4795e591863a5c89bd49802c";
+      sha512 = "1b0eb7dd1995822cf30aa85749741c1bdea6cc98b4eaeb1d11fd94b56d2138a177428734169355257a165350cf21b72141386d6fcbca606e9d3bc11f292563de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/eo/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/eo/firefox-70.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "8991bccfb8cf10e0df6a2288968b334edd0b71a4030c0e008daf124b6e5256d73dbf5b5b376570852a0fa338570a9d286f24ef63dcf039842cd0fb1eb5901695";
+      sha512 = "e03f025948a463007708099a6e19abbd5a3e272eb03e053c6dc7ef156b1e4e83d68ae02bcce8f19fca1409e96e07f88a36537e08dcd73f1f289cd64a57b3aafa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-AR/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-AR/firefox-70.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "57a8275cf23e29a9a425ce23ef3bc787596df0dda95d5dbb2673bd658ad0bdcae3fa554cf51899d5a2719ebc218b70bda176c3467a01a7a4da7a60678f668101";
+      sha512 = "f48d98ebd744d4915ffb6f0cfaec981b8177b0f74297224555bfbfa7390dbec29eae93f4dd3ba51bd84dbeb71a4c60519414f2a4c3d75b7c96b59610e30e5f9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-CL/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-CL/firefox-70.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "2528855037d5a843895c639cb0d2b353784e59dc2103c4175e085f216d490ea037bf440bf4bbf926301143079a2885040c294c77b10f032135fe070b20e99371";
+      sha512 = "f593020ba37d0ce81a194772d1acc2f528ed826b009e034e17d3119e482b0df9e8dd518dd597687e566d30e2a736d89850e3cd2487d7c723e242a12f69962b45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-ES/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-ES/firefox-70.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "4c5c6cbd1fa3680489bf6324e975bcea43429f7b55be853d2523daa45adf1f22772d0427f9df005c7e3c22543830473df82d4da818aff2ff72c96902d0b72e5d";
+      sha512 = "081641bedfa1f4831641aa0029f8ec34db6f4965f9aff2c5344b779387dd887c2cb371908778d6cef6ccaa0448c98513b300244dab30f36f68776506f840b43c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-MX/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-MX/firefox-70.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "e2400bb17d7df8b0541de8c391b28d2b5e7ee9523dc73d90e9d10ec578b3acb58051c6bb510b18c076b7dad8a4b4a7ddb605db3af318022c369ea78cccf3c441";
+      sha512 = "fe58f3745c1b0009e065979cb6ca451f377d837b0a41062e0ab04d435cc935d931d6e8200521850ce3161aed6f9583a67df14d0cab5853e491b1a433909947d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/et/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/et/firefox-70.0b2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "ebb2bcc463312c187d2c5119c4e0e5580a78477be61b76a028a28791398311e0fde3ddcda039397c9d63f8658ceb7490b62fb6e69eeed34c204e60b6867b216d";
+      sha512 = "2d1bfa94424af6f6ae08e11c99e83749408e9be1ac7face25d392c0475df978666706fd694b76558d824d226a50fa5f1eb8da52fd4ff3a1bb615bc83986ecba0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/eu/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/eu/firefox-70.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "8c3796a5189f40324b2227750ea72b09397df750a154e1056a8bf9b7933a8ad6935a64be569641bd391fdaeb9d10cdd330c0ad031ea012e9a64848d8a034c650";
+      sha512 = "7a192de6d021fdbca6764906284b4490653705147c56b9709e83c7fc087916197c954ac1cc19cff3da78220d572492800ea5773d3e03cfac6ee75d5e6d8ae85b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fa/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fa/firefox-70.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "239371297c2524142842dd18b9de92c8b93b7fff82c045599d19effad81344703c65cf77e1db4c665de2b565cfe5ae7ec8a7589b68ab25b5ff0e6ea90b7c4cad";
+      sha512 = "427af8a45ae42e31ced616daf2d5e418e745bf43f87dd4858c983746dda1d52e1b909db542e9822c39019b13d1b47196c7041040f8c56e9f0712d7fbfba8b935";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ff/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ff/firefox-70.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "064babe379e9753394acfda8e1a9ccebbf1b980ceca6d0898e897b5ce91d06c74fe525c5c2ac34d9527c55acffac5f70a88ee5742ab363e3f0855d5d851bf56e";
+      sha512 = "8a0627bff20eec56a7fbf6be6131bc004c12fd3033ceebe365a1367dccaf773c7c4f8592ee9a313a01943ec962ec010932d3f0fea7a94576372bb8fb735c90bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fi/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fi/firefox-70.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "411501345e1f1f9bff9d03f2e97e756d750cce3fc753be5572016de12bf18c1b6be716f39b0db87ebaeed6bc300264eef9d1624d82fd289767ac32c2765cc44c";
+      sha512 = "b86da9c7cfb2edab970d91b098c5ae3da60f83a9b772033d8a8a0a4db27afe62f5db600a17a883561733f1939bb95342273b4c5c7e004870c4eabb08648b822c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fr/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fr/firefox-70.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "9bd4161f31256e12ece7d5cc28eb78dc0bf2249a6643d6d962524582b10a520ce3dbb578fbee803f9f2fc301bd57adebb7fd6f9d3f83fa7c7fbb30b7e16960f5";
+      sha512 = "54ad1fe9eaff331246817e2033adf54d5267e991ee016f96edc21b5c322a46103f72a5662df06da313a840aedd04f677340573e57b55a9a1fa611af3ead97e0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fy-NL/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fy-NL/firefox-70.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "d14d82ba14694de463c45aa32ab5782643233c12591a1c48732067a4366f22467e4c31d231164750722f2b6f6b61b2a8a2378e866b55de706ba83052cefeb24d";
+      sha512 = "c13363513a633def5c2fdfcdd0327b201f5d6d04d0dcd698f614799ac88424d19612eacfc6325b11808617a3cdc3f92e5903d84cdd56fa68212cb1b2babb9a03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ga-IE/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ga-IE/firefox-70.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "1fc14f670747b47d6b784e7a4f1875c90cf566009f084e5923af853f4c46686cdd0d66eebf410a4d9f024b260af57151d281014303ce93226b95c20bf41d1944";
+      sha512 = "23644670ee388362801cc4ca62fc6bf370d479821e0811ab493405ff3c8fce538ece89184c9d4f020c8a5089d3f7addd1d4fe298b55199dfe12f73408a988314";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gd/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gd/firefox-70.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "60bbe1d315958353d50dac327a358a3c1b52f5f93ea93262d640d91cf85207f47fc34fbf689c9efb60ff63b8cb8d7e991cd7edc8effe2277c8b70bf026d36608";
+      sha512 = "967d24fee05d35aaf27be6ebbd3d31112126ee04bb750d3f17a2bd6a1abeab5ec7ee43235a26de5f19e5979c6d295e74ffec9f1bbf6fa32564f50986487b0455";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gl/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gl/firefox-70.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "dc13fa5d442188edc445c0a32e0dfe96d6320cddf6369c6a70af52f77ea375d98b596655cea8df02c81c7db4a8fec9ea9e48cef7579665e7c4ef89eef9022dd5";
+      sha512 = "9976dfcfbf3d93df9c06a4328bc73ed5e1a3b922a8a616cd3c298d5955964ffda4e4fb96e85a23cb9c950602959e11d86f3d58840d475e5c6f5232992da13184";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gn/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gn/firefox-70.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "23c145e14f86300430479ab5253c854921672341b3ab0c5748bbfb1d7f4553a22f7e7c76ab3d48eb8110c9a69caa337cfb0c4cb66b53b3a267cb077375449897";
+      sha512 = "155eee867cf421717c5c6720c2926318dfd7e3900bd42bbadf6947d291c3afa7b6d81610d53052700f32338e9fd4dd66ffc240ceabd5e6c6b6a3d5a18462b923";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gu-IN/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gu-IN/firefox-70.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "8738fe7c58893724e6a2a5b46dd888823fa0e1621639341b36b120913f28626f9ecc71e7ae54d16704a411f9c58908ff4ac7f77c8c4622f4278969ac7fe665af";
+      sha512 = "82c58161e908a2dcbd10f8192aa9c89e220a5ef250d5b5037f483a415105946fad0527b0bb6ef3ea78b6b6a785064f116e17bcac7b2f45a1f0676e689f030677";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/he/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/he/firefox-70.0b2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "09fc26d62b294e76662e005980cf54bdef3f5d0b38ac83da3fad4b85bcc0bd614651249caa4a37bf681a7f1ff03470e79980216f24d396833fcefc808ceac4bc";
+      sha512 = "c6f8f8c144d6acdbf65a733627a7b977ae0b1aea7020356ad8e8e3d1cecc568c015d5e3a523df00bc94262b1ba7460f22de6d06421119407914c3e3856b91736";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hi-IN/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hi-IN/firefox-70.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a51273d8cd8f4ecc4d7e5140daec8d834dbfc76567a62d92ac5a469da733a6231fc6c91e5182bafade141366936080499c51f6fdf6d61f023292c0fdda186507";
+      sha512 = "3ab7baf8b0609aa76cc3e72daa5bb0aab1feb6e4957ab032cb0011b575ac4f5f41689466a6ea10717c14065c463c6469967848a22a76bf9e03e53e9b3aaef6b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hr/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hr/firefox-70.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "19947b47816f7172ce94fc1a91516520fad41fc09fb8d5c25828ceabadd8506a2d5dcc6f1e1f32c43c7afff48066bf5729ff9c831dd5f3dfe1e509a3874c4965";
+      sha512 = "50be7cb19abc57bb3d3810bed8786c1ba8f4aa3f4c2d4d6ec6347b1cd263c724c6f138d2f95e579010c3dd893b432dfac169f964e78585601211de2b4144c02d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hsb/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hsb/firefox-70.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "1eea8f2b9904f4dfebb08c718df271adf3bbc9b7eda5d0109e3cc5e34aae7688e1e81769b9bae51c8252b3d69aa52a9b740e242137675015973fe2310dd4b92a";
+      sha512 = "cdbf552caa9d85ca5cd2501a98c7270eefbc4ad31db3cfc8399dc5e2d7dd7344feb71b1fd7bc6023e74dd10963668f004c4c7a74f518cc849539d9f780081c52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hu/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hu/firefox-70.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "098bdd04332e0cf675e3cfacaace38a40920fa58660098e27483555ed5f55b06f9dc8e64b38a6bc6729d7e2ba39faff02a7f90cb0286470bbae26ea523ec5fe9";
+      sha512 = "731cbc3fa44e815fb9e437f863eb218accd37a009e136a653947a5571440dd839f025b724c160ef3076f87285f51503a1a9020f470076a71dd246caed8f66237";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hy-AM/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hy-AM/firefox-70.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "3228e47d2e168b9b93bb96631345a41a0130eba87ff03f8b57c0a71377f011b208037df5f03936e9d8543d994872bca26a78ed19f12a52c723063775f76d306b";
+      sha512 = "0be8245de7830aec18132d8a36d9eb48528070b09d87cfcd8dff78b0d26d79dbd2cecd94bf5088158253849c2690201e38766cf85719126d232932384c7dbff0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ia/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ia/firefox-70.0b2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "7fc1f0b3d8a4957d04080de201430af03db69a56082b8dfc07ff6992b10e0c357693aef3e6f1231eb3d3bf135218f6e77e79e000f329da7c8cf9b144108c1248";
+      sha512 = "09fea9073150d0b6464d0769317c94d397eefcbd1577b73bee9601fe3babe12b7533730383a56629c2470e39628f11f0d0fef36a41f3212865b2643ca2f00add";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/id/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/id/firefox-70.0b2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "740baef5685aec6ce47740e925f0f764dfaac1a736a634c119bf012bec24e7872238cd128d19f2f1d59e8452f54e95a9c10816748b4ddd8b7e469f8bf1568082";
+      sha512 = "94b0340e3cd930ba39520ad28198a108bff9ffe40e8e1de77bc783bcd211d7cb5017b2c894d212a7a024ceb69c681f76bf513a38a3cd40aa6f846afcff32b3a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/is/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/is/firefox-70.0b2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "10566dd3e42d4499dd82900e160933f0d66773576341ff7d39ab6d1bcef2188a291856d9f3854f87f2086df77b914f9c30893446f4ae0f580d07613ce6ec31cb";
+      sha512 = "68fb812f36082a9bcc41416a0ddc704c69ecd0e5d958d16c1171c7be27097342a57980692b1000fd13c1de893404fab0d150ce675e0bc4efa96e06748d392754";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/it/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/it/firefox-70.0b2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "67e67041f213108d6fc2fa6fc5144fa20c8de19237669949a0be8786885c054710a5971bb826127c75facf65fb5a5175a349d60e4fa7d0f3e016eb48f434068f";
+      sha512 = "e02f944ca83b869785b92a40a5e13f088275cffe26084f85f5d866ce5f9b0d0234e7a9fb5907e4f97663fb00091005ca73142d14f99465c3a8b1888aaa5784de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ja/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ja/firefox-70.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "24da0b3cb0f81b593563dc3eda3bf3559357d2f3f1b9019772850bc49f410ef4a12800e0a54edfc888c810083f43d74757359c82438498fe20853435bb7cc066";
+      sha512 = "83611da83e6cf95dbbb3dea3586ac3fc5ab9e770a75a55e3868543c9f43fe481f5e6775dd45eb1cbeda06bb60619fe7867af64c7c8c2efc862e7f23fdd0d0ac1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ka/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ka/firefox-70.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "9212744cec092fcf7440258f2d6c07f680b6b89bb73e804cca0323d4d86b4d1c7ad6bf2c24ae6cade056d9fd742fea5220847bd17203d319ef87d1d015af9179";
+      sha512 = "94683999f9bf4ccb13dcce3f993291e5568a3a4f107bccae6f8b95a2d05c8e68a62e9d24ba9c60264c17a027f1848e82cce6fd143994e69e2000688bc61df543";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kab/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kab/firefox-70.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "dc48121c91f66d5c33c7afeec4218861cd8dc0aef232a4940048724541269a22ecf21645f032a51289cb5f362dda8b8073084de152337cefe21c3e4c97d0744f";
+      sha512 = "fd1bdb8ff2df2e8c18ab7d13b1e07b128291b410607571426dce5054e8e6b221eadedce560c5e16d65ca2917910df02f74d6573323f7a26375f1ffcba080f22e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kk/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kk/firefox-70.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "c64ae21572eddf9b97b0fd3c97d0927229c54f42af3fb65bb3a8e579064937b76f4e3ac32ce3debe24537dfc5d6aaf3615f1aec7289e62a043b1aac7b2df653b";
+      sha512 = "3c53e12ccf2698778d579c09a26a522a038c4510d7af8fc9accbdbcb2c9013e12e243b88c03e7075ea76258abf2d234fe0ff7a06538f6d8e0f363ca3887617ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/km/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/km/firefox-70.0b2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "8348b595287e8b22ffaa78d50bda5550ae027659f91c83317f2307e180d8aca29b8e58ac0b39787e7abdbd66ca88cf44fd937a6eea2064fa8df9173ac9978898";
+      sha512 = "2d3bab56eed0ef36ee41b11071dc2ee0407c675421fb23fe095ac81ecc492813bac115d03b3e832c33b03fb2df89b37a6153a388b44e540d48af93234cd41888";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kn/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kn/firefox-70.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "f7a2d48278c9c2da883f889c89ab83778b2d9a43a32ce6186d7b7c5428a62138689cdc3182fd851da4b992b51902352f0e28c3cf7c9bd9c014712206f4c21c11";
+      sha512 = "b4dbb60f0aeaa203483a8c7c79afa9a9e8214b032507c0754b4320eabc40a39fc0a242709779faa38affc2e570dbfd70e1843d712c361ed9a3c52dca17b72eb9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ko/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ko/firefox-70.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "ef00c8295bb7598e0fd9a9023c4c404759e41436685c23ef0ae9c756bdd12e1cf34ae6cec4d5327807797128a3f54f105804445b11b03317ffa0e2495e262442";
+      sha512 = "9c3e9876dc6363282cb302a65c3cf82bb14fb022e3f125fdad2e554d70501ef2b275826c4dcf064119463ceb93e6f0b8dab8c273364d1331d6ba5244eb0119c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lij/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lij/firefox-70.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "a7927a14c82f8f095e36e5c1440e8e95bbd8906bb2945c0f8b6363b93290d9e3195c15a48d0a3e6ee9da44ff050c016e2ee7118f1e1f2c14bc234efa450fba4b";
+      sha512 = "689c0b271e7efd6c45de879d573cd5fed31d1ee2445849ac3442559f11d33a500fe70e861b54b288cb84ed42434071f9da79db2c1c8f7460ebd53445079439ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lt/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lt/firefox-70.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "0b382fe2188a0251cd0f45a4ca6b9e1e057249e01fbb2fbe76a34035fae4fd704f1eaeb75319acc75df1a94ece00d956b5886f07a0f5a21a5e00a6acdbd8f830";
+      sha512 = "92ba0cf69d128848f2fc4dd86171ed7e4eb56c6dcf868d3918c7fbf41bb76305839f410567bb1ee7bf4ff114b858127dfb0320f2672560cb38141c88b601070e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lv/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lv/firefox-70.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "68cc69b2e070219bbd23322480cf232bce9daac37afa9b7a8cd4d8f512d82ac170cc3926a0245218b6bce0994aacc54d8f3dcb9ea0a7941e9bc3b707787ad04b";
+      sha512 = "54587e5040c387431e94b4739a9e34020d7dce1777195122d513175b71ecdb44663c416fa648ed648cbf4f6279b7fcecbf819f6fc3a61155698f0dcff5f42212";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/mk/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/mk/firefox-70.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "91fe3a635b0cbc401d5293c04da69dc3a59aafa062be8376e559858dbe9aaca49ba3826fb7486e8f12ebc582bc96a83268ed480b95324e008c77270dcf813f18";
+      sha512 = "b7943903f7bd3783e5c3776d35125b19ed88e87f6449f25a5b26dead87407d0180cb21b67c89971d3e975d454098d22706c74a33d21c2888a90a0af9ef7b601a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/mr/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/mr/firefox-70.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "8315f540933ef132f30ef28c744fba49b30fc4152d2929a7ed673939da5dc1c4de490bccca83a33dda2ebcf27624ad1892e93756555ee2da8395039ce76a5d38";
+      sha512 = "07e742844231a1dc7a09a268501934c63caaa482ed7117d1a498c66b6f5c1d559e3b0d59cac06b9c3d358add59a13912af1dd11a6c2cf72d5cca97b68ecd1c32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ms/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ms/firefox-70.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "fa8272b4bc3d1a6a032c987331bafeee26b7f0881a75ba1b788171441a35e1ca95bf9dff46c529eb926dc867b524590ecb3262f2de04c0fcd8ecfad806955a6f";
+      sha512 = "c649789abaac00c55ed415bdbd9c28185c56795754324517f5044cd753aedc004482501537c67c42afa616ddb5890a4ec992379fa30a28b8a492a0e559a73f95";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/my/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/my/firefox-70.0b2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "b46e40abb59f4157800ebfa9e79a5aaf968fba405a77dc1c7360965d5d690139d8ce1f5735e6349a198c2cedb0a1fc90d3cdaa2d414e0800a7130de8c45753c8";
+      sha512 = "06049a7770f621a9a72b5e563b485b81caad533410db23558679100f7a422fa1cf2a85233cc1bfd5d5b9c1705f8299544b4cbb4f52de3c73cf33bbe64cf845bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nb-NO/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nb-NO/firefox-70.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "469a56fd2380f457bc84cb2fc96fa580ad0e7150042b6b9e0ebb27b29f315f34f8c2e2caf42284cc184531e392632eb52773be0d080f32281c540d81f3b63752";
+      sha512 = "5f80bdb4a310d46cf5b3b36567964f444c75c92e19b5ae5cab81847b2b601f04ee3d43a2325b8bd6d7ed3422f146e90612785b25f982bbf95a86057344ae35dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ne-NP/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ne-NP/firefox-70.0b2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "88540a7aaa06488b3252e898cf654fe1031921e27e98525dfb5f44f770d60b43b5fd5450e5321b27b31e73e663b14fe98716f25b7db5b4acceaa7bee55f4cf79";
+      sha512 = "f35496c71aa7efbab365e80050ef218fd4bad1e8c015bb97df65aa0e4f16613b531d40bbcf4739aa462077026259ea6f1d7ac71b10e51e04e75d120dcbab3ca1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nl/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nl/firefox-70.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "5fccf7ad91b99aefce329b515bbe5096141618a96469912fd32f621c98be17acfe579cf03137d96cdf8d8319c4ed3d4b28e8bbe1ec2f3251b8c004e19b14b1c9";
+      sha512 = "21327076b9196d799a40d28f1fea66f59944bbb0757fde66aba2b0f8b929a0d45a01bb0901c4b6eff4e0e5f7f033a44d2dac83c94494b7f95003c3dd620f1ce4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nn-NO/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nn-NO/firefox-70.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "7d9faba6bb18f19d9acab0c63bc4ffcbdf8eecdbe345943674ff2ac9545d24efae2cfeaeb34ddc8e6f24bdace18d6a6ad77d2ccda7518063ee1cea2e66382a8c";
+      sha512 = "dc444e5546d1985d0ee4bbe2394e9e51131b46b9e41dae54c1402a9b08aa7de4a7d73fb57bd677af151420e71073ac398d28f4ae324b4e6e3028f01fdb98bd76";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/oc/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/oc/firefox-70.0b2.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "fc14d0fa30457836c0b41950df190f931c6c011a569f9160083665deddb33b6947d92485ed1e2c3adbad6a9bf51480d64c108de79a39889a87059020d0748f51";
+      sha512 = "0c0fbf38f078c0fc4ae38112611f164808c7b9fbc4e3ef7d57e622e918f5c581915095d5bf7c92cc0ef9beb67cb04ba9b1ae1e011b7c8f91f23a79a326481931";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pa-IN/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pa-IN/firefox-70.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "641580dc6260a863ee948e2fe7a814e7aee991efe556ca60cc6ff0074ffab369ca9dda05d9c3028ee22d000bb7cf5264dc56cec844f917039a7e2193b2709142";
+      sha512 = "b9f07313118ddfd5147866045e047f9ae7cefa0116d86aaf7f5dbaa2a64bf14f7a56bb748e115945d04aeb1dc4572d54b3d122c1e775062ee1de366c710726d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pl/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pl/firefox-70.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "467b4c1f71cf5732834ec482f0ee1afb3d047b4a25c6a38928fd9199fed3598e94eb34ee3da7d552e3135a054d13423d94dabb430b19d00f73d0c99d6ea1df8a";
+      sha512 = "bd1e920304e1bb7bf6cf198c5537f1b106b1484b7ecf683e1424d208b736d2a3ab40c7e885a385611ba6f033a2ae4fb00cf6113810a20dd8808a34ceb11c7b38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pt-BR/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pt-BR/firefox-70.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "af6e8ea04434f992a88c8a2fde33274776841bba274b0249b21f3ada6d991fdeff53a5499e0c92ec54e4f1acbd52b5d8226af89cab7641062d73cddfa56602f5";
+      sha512 = "e1bb5ca89ea0b60cb2997b9dba3fdb25e90914899f38a51d4506cb9bbd3d61f33d32ec3a9d2d79857d339f107134a021e0253b6a54916b48b6aaa5ef4aa08638";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pt-PT/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pt-PT/firefox-70.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "238852418c739d91ee6213da7c3fb9be47ca2c2f1ef13e459ebd7219814c6052147a9b8c37aa2f09155a15c84f281c20a6f23b53acbcb20ccc92392347970816";
+      sha512 = "622bab9fe052fcfcdeb4d12b6b8773ed08e14dcf51fdecad24a638811a2f25c1a1efa13d7aa45dcdf06726eb366ee78c4abc7d22016303a9048df9af314c14bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/rm/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/rm/firefox-70.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "13f001cc46a461176557a14de16303976f6f6cb91f778d6c9f1bb6f4973f2ef939635c28c64eac24ab2318abc558dd8b7b1b71e3ce71d5422c13fa0508900c49";
+      sha512 = "b02769fd926eebc180eab8f3ab9aab7d2a8d78d81f51116ef156865c74b60ac76ec75656455557dcfda2323c3dbbb438f8979de64309851f5b77c01175fc4b24";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ro/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ro/firefox-70.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "2f454799772e92899a138a32702200c8a261e653fb0a9b588e312091e5acef92362eeeb18bc26ac62e6ca093f1ed07e7839010d07396754114a0b989d5aaec07";
+      sha512 = "572204e2a2a6d7535ce36ba9479f1fd634069a1fd9799eac6a3e5dcf02133859f4574ab7dc36018be88e53ab5a8bafb561e5994d013c0b9da7c9ea467183bb81";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ru/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ru/firefox-70.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "efe333e4abddf173a87bce8e3b82a5112a2d36f5ae690c5ad09ae668804ab3dc67a6ca3fc4d1fd49ad9591a482a5e617e4f897aa6ef59638920cd97e863d8a92";
+      sha512 = "42a99586fa8d07827a597c83fdfc746beea7504e800037efe0e82b65868dcb0e1ba6dd2aa401dbe64a30879d521215d180bb39906ad332d9e362405036da48ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/si/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/si/firefox-70.0b2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "245531ae683a796db5628becba71ba68e389d8d9646dd678a08327e41c66d2f1baf9ba223ac70d19eb110d56cb932238d1642ab129989067f4e9fe87b8d73f19";
+      sha512 = "288b629c23e7bd61b64b3f5947a93753ca780906b537d1f97892424c7ea9f890008370f5ce44e74062196558e9a088856236c98031996f5d9b40b454827fb1cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sk/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sk/firefox-70.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "633c280502541f20572aaff136e0e7a2f4ca2bd2bf8c286703688ebd1fcb4516933ad46761b9bf90da033b4085985ca96e3224e8fd30d6b22bc2d531ec9195e9";
+      sha512 = "47b295382b39a040171ad46268da5005173a1206a3ea26c7dd8138d287ded24740f031456dccd2fdd72266691aa2d893ffc93211ebff2759666a643e3e448915";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sl/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sl/firefox-70.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "0fcfb99cfc7be32f2ee53ec3d5d3cc436c6d423c3570e5d2564bd9e662d2e1b13339e1e63a702943b54de4374c756fcae5c6ffeefb5d63a962b5e16ce69d222b";
+      sha512 = "fec91027bc619c7a6d0092db4493e40ab31311191117e1cbb39bac33450c9f8705356405b6ee38b52201ba39e4da8141505759f891c7e6ae3d8d22f9ae29a629";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/son/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/son/firefox-70.0b2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "da0321adc6aab116cdfbe1a9e67bca1e4eead2612827c783225badeec0c25af867cad573b16d4c9e052c325e922c1cfdac506fe77e707a7e554bb2268380ad15";
+      sha512 = "8a1eff23ddf4391e77947519a5178724ba9393370669bc05764b971bdd930ca8ef9ede4cb0ba60c50daa2214d4212c6159f7379e16ec9a5c538ad8d7d39f0ff4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sq/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sq/firefox-70.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "d3f30a04a94669b0a4cc2f0067b6f15431de64a8e27d66f700274f498f4a19121fb3008a23e14c8e6949f9c261bcd4669a0afc613d4c7dc08b3075cbbb61dc79";
+      sha512 = "3811b809979c87996b8db041cef14b7987331067dffcedcedebf36b9b9569c70088a38a624361b25ea5dde2af6005fbbe5add558cde41d5cfed7687a2bd96847";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sr/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sr/firefox-70.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "3c85221edfabe9cfc95a8d73a7435e8a4273293a4ed79d925059f12f7cff87bcdbf6b48779377bbf828fe3cd2ec841c3e0720d69c6c97b5727c27b2d3a08d42c";
+      sha512 = "fbbc294a2f387e6ac44e4edc1a9b9a384d3677abdb6717e550f774d731037d0a7ce8036f25229efbacff75423e9a185423d2a39ac951c77ae62653097bc9ce26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sv-SE/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sv-SE/firefox-70.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "b88eb668b293a98f17956fcd48af915ac077c3f5c2fa0dad895fa4c05c577f0c56fae5ed2b4eba22518c979ba6af768ed92d8ddbd17e49a96388f36155388e98";
+      sha512 = "0fbe4d264e97ce88bda435f7c8da09e589407030945b51b68004b5df2c0994bbe294a87b7a18a2e03a8d1de05cccbe2f23ecc59dbd1945c28b80c75e0ba45c1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ta/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ta/firefox-70.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "b70452ca9eaaca80a4cba956037e67e236d1663a6a009193a4e78f80bc77f5d2fe77ee385ce6ec27d1356cddd59017741aaa9f78f6c25e2b706064b0e22aeeb0";
+      sha512 = "57b86a405d32d9ca991c995316d51fc6f9363dcdbba2d0d1d601f302afaf863911e035d30ad67751210b4e3c726b3734b62b63b7dab6cc2f69a172bd8c62493e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/te/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/te/firefox-70.0b2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "57e762c6ca3f3c9ea6c6b0088971ff8800203d38ca90bf65801a3d4f84f44e836d7454051e609f3b7bb4a851ba5c57a57d9781b81b872209bca2df3ee23283c4";
+      sha512 = "54ac916b2352b545ac8f5a9ccea2cc1ea5b3e267dadec7bcb06c3db7406f4dc5f7479a0f2c3954e9e19d093fed849df50b45c51d69753626149757633039a4b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/th/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/th/firefox-70.0b2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "4cd5b8a3b6d77f6e3653a4f9a1eaf36a93416f5c0e89c39c97863304227ff33363853d27174a90bc9d5e54c4b7d3c72b3adf2a09b2485655d1d24f7bab96f7a0";
+      sha512 = "95ea774a8266d51054e7af4db09503963641981c8db332c8119e61c3d6349234aae202cc3e9726449454440f10f8ead17e4d6c682f261410937f7355cb7668b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/tr/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/tr/firefox-70.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "1f697f15c169a0ed5595699a20d37a3d6034d4ea2df2aa02dda2dc73b3fc91c07d8c344bfdffac5a4a6c4a44f016c9246dae1169c4ff7fdacfdf9d5093a4e353";
+      sha512 = "44b70293b353fed9b8435de36178ef6ee3fea108ad4ee129a1631eb32714c06aa23d58064746cd62a0f407b1f0557da38bc749c3113f3ba1d1b5d049eaac126f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/uk/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/uk/firefox-70.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "cc6c67520fa96593cdad128612a291e8b6c78914ddeb7088036743173b99dd3dd94a4670ce9e38e265591e1da95845f448e22eb8f0074877863dbf748f9967dd";
+      sha512 = "ec6beef8f0b068b7c301a4a1a0c769b66ed5af08414d5306549b9b077592b06a2eafc175ecb097b9ab5033dad15344e52588506685222c14f73411a5fb9faeba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ur/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ur/firefox-70.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "e22efcb9c9b36059209d40f1bf34bd65307b1319cb6c51a12c99684847228bc8cc139ee0ba7888e87042ac2b5866717e661b4f4e2bbd30f46dad6f18ab5c7df8";
+      sha512 = "d1efd485f869b6555672d80057dfecdf7775cd45bde0711ad90dcdac8ffab4b46bf04e9350a0aa7629d9939c953f434e75b6aa458cc835e6cd06efcc7fa1bccf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/uz/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/uz/firefox-70.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "e27b755d4af110b3751de25925e95eda62037cdf8236db7587aa47aef099a055b5ddf1bf08f031ffa9c79142ecef49f2045751bb41c18d9fef9e0a2734440612";
+      sha512 = "b7cae3888e2bc4a7b31a0b7313b7476799b16055f7af8e4016083da8a71f40f523f9963d79f53bd6a96c1bffe2fe2d34d62518bdbd9ad137fe17f4c175fd0f06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/vi/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/vi/firefox-70.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "33617c205dfc61511df43de79c29ae8bae059e6d0d3bdc868a6965e98822efefa832d6f1ff514676f3531d4b5c89d8fac4da780b85151b05e2e05dd41ada3f1d";
+      sha512 = "aa4aa778e35e72122fd857c736c226d62e5f6ec73f1075500728e90f9c2ddaf9c0e6033d1785b4102918a6db32a744617552769c29cedde655e9a3f0b173a4e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/xh/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/xh/firefox-70.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "76ce282b86372019e4467d66ad1025ca6641cd8c5f4bce509def9aedcfc028b491f86cd5149a0496d08d55711578356c21ccdef786f910afe9b8ffa26c2c4c8c";
+      sha512 = "41619782aca727c09262de57a128fdc7936cd4b3ace84565cf687a006bd462a3218682c56693efbb233df221c66b2b545cd701b025d6b3a5308b132ff87b35a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/zh-CN/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/zh-CN/firefox-70.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "1ccf7de81d4dbd19a9499cdfb3f286f86dee4451c5bbc5ce0bfb85d184b351e45b0d9289b609d3eca60ea32a45cbaf2160664511443a6c0d13d144945606ef26";
+      sha512 = "befc922f6256bd8416758c4fcae972e939e645a752a97863ac0b432310605cbe46dea4c713d4ed86189a9f4094131fdbffec10b4d771b061335baeb180b75ea7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/zh-TW/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/zh-TW/firefox-70.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "f645642c10edc2d36bd97bbf1b950710d1b52770717be35fe58b081604a4dba55b5dc417f1553cc6574826ebe7bc3435f0904754f5551f98f93d61023ca2de01";
+      sha512 = "3bd89f88ca805e3b19edacb97efcbf50ffb2f4b3baf67c1d64d9c475922c6ca5ace13e07de292f95efc0f78bd1b0fe9e9e9198288c3d874263c7be6175291eb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ach/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ach/firefox-70.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "58b0df5500016a4c87a60233c8ef2d479937ec002b10ae53ee973b997c8911dcaa77470c8f0e6e3667cad5f2e4f11006a767040b0ffbc33d04b8a937087e9994";
+      sha512 = "800146462c9bdef3a5cc021995ec558ba02fa1b5310973286d1360327aaa9967430d1432775c44c21dfcde6b06d39f9b7b7568661734f70f1452e78071ee440b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/af/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/af/firefox-70.0b2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a9d47c62679e0c24a759812b6b194ae890e4cea6bbca683eb55f016a81eb05c207fef6f61f2ebc6c8f85cfb25d5f71f62b70502355435913094dfcadde81aba6";
+      sha512 = "61b65cbb84523e3cf98e59847d07ec5766b2db3d5fd27c4633add006d428aed40c77f100dd87ab222b29d95bfa4cd7e2f7fc8ebae2fb4712935f51546939dbac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/an/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/an/firefox-70.0b2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "7b8fb37c1b458c9d04d45b69e3dcd054b14cf6f9bb3faa4c9bb978033e8e7fb67724ed8dfe1bce39b4821d669f9289e7ec3367a826f67ff9be81cbe37267cdf7";
+      sha512 = "f9808793e9657622de595b529fb6341c13ded793177413ff5f829712f7054f42c98de5a5e153deb3f8b8f3b3fc8e80fc3737e1dc5ec577731744bd0e992d7be0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ar/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ar/firefox-70.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "5ab368033e7281d7bdfc7d27b95cc7d28e8c5528e75ecb49e0b68fbbc02d2e3ff15e5c6c3218e3dd339ab2ea1531e47ecb888f7e379881d953667ebe1de3a1e7";
+      sha512 = "9ab1dbce20235787d945f3ea6ada45ba174dbb9169f206c2aabeaa2fae8bba6f4cf55577c1985f59f62d2a302d97ad2e3d7b7baa68682e4ecf3b8978410b45ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ast/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ast/firefox-70.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "2df1a20c28fe5d114cc1e0b0d95723ddbe4f7da2d38e9ae7a1cb43fb7808968472e32157981c612341d8e9ecf590b8d068f6b84dc3bd2642228b9d659a29e367";
+      sha512 = "c5e4aedcdccddd1968564170d7f74deacec13e801bb19cb97ffeb7923924d66649b2bfcd0823d8e2b27b737bf5b0b558c57f931f1ff8b6928d2e2ad0c63d270c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/az/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/az/firefox-70.0b2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "fcee266e1263300751f9d3829a41381cffcc82316d419cc5ad739bc67e96826cbdf7324f4cd5cc16aeb0cc3496c5188383810e311f6454b0c4794cb20b4a0703";
+      sha512 = "d67fba709c62bd06288bfe80bee2e08f370824420b52b07bd0e8c6dccc350770f0710e22ce55f9ac4bf989aea74cc3db1ee026baa7fde967fdf14f8dd9694702";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/be/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/be/firefox-70.0b2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "06f63c9f406e1c0ce2bd6400c30304a664b8728900a52ce1e015682596bf7488501da8dd6a766d54150b81ac287f04a058f110863ac6483c89348ca49fdbde4c";
+      sha512 = "9fcf25f380bad5cea7c8fcceecd0734239bcf10d3081a22a24899103c96a388596135676a0769a8c2cdcce0ae7abc67e8a0b65621725de4201919d250bc28f02";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bg/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bg/firefox-70.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "ff644c16c203058c37d7baee9d787d4373b3e0a2bca1d25330b11dd6da9fcebee5a93d038c283637783d27a216d062a0db84c462f9d858b35bc2dd26c638d960";
+      sha512 = "a7a5818af9299a4b63098c102019134dcd74001a92a2d672d2c3c9e8dad6a58c28fdfd14ab10b96262ce34fca4947905f100a5d89df0e106df3c8b9a0a1796b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bn/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bn/firefox-70.0b2.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "54a33277a4b10d53cfc8f794ce1ecdf328f83ae99f0dfee6d47f9243c17d83351301e3138121f45928b9db54b2b9e63d0474533ae6644ca874b20405f4acac89";
+      sha512 = "60de18a8524a67dfb90ee9d272ec06e70b4393b3ed76acc7c86a545af561b323710add4a4d8a896982dd8bb48bf3e32496fe800abf50fed509d91f0e54a8d04a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/br/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/br/firefox-70.0b2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "9dc72a4327bd02cfcb328bba9731ee90fda96e22ba4c46615ebc3ca0abe19472261386ffaeb06070b1456103090276c1da544fbb4c3ba8cca29a5f296fe6414a";
+      sha512 = "61cca84ee862455860c3889480852df1ea62dfd9ef18209ca24fde83b3971ed7788811b4c6ad57a19d32525fa67ac82ece938700682385a4b99587959bc2af9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bs/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bs/firefox-70.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "34d0f109426869a9b6ead4d7509770f4b861590a028aa2228d4e4b508c72cb2be184a3734fc7e71b7fa0318e9b454a95bfb63314f0ee3c8af11339f1a3d15c62";
+      sha512 = "45fa72a908bd24e6e8f35fbb1337b394850eeabc7d52252007a93f1f2993d4e43fadd3254a41664ecd76da29ed3b72dbebd95bf0735c71f07d9d19f3e3f723b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ca/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ca/firefox-70.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "d4d442549316d417b1c013759b64d31b6fe1a55990b02357043528c5985c40dba1edd060cd58bca5d8233eb1a4a6b850bcd6cd297a81c9d6bed8f032538b9a94";
+      sha512 = "53f9de3f0720b489cb7ae59c2dd2b7c0cbc6bb7306e802253562fb508ce0ff1415cf5b76c0a3eb085e592562cc1d39817009ba1e668e4c68f4ee0c8b5947cfa0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cak/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cak/firefox-70.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c79a799abe3281b64e654f317de6956a1dedc4049b8c5f98aa41cd12d0d290018e7ab5faf411a777493b8e6e8d761637bad09db75edd0812cf8e57e49ebae4bb";
+      sha512 = "ccac21ab9baea681bb170309fa3c1e7762aa731e49b831a4a45bb5a1477bf2582e1ea9ec78c8c63838589fbfe74b3f8e31653caf7c13355cc92de959b0d6820d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cs/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cs/firefox-70.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "bcc5a60b5795207cae1ffa2359e7668fa6f09583ea8904a73ccffdb13cbffe312a6f0bee62356fe1533f25d10b592d8ca620942f8d265ab0450a7eb42ba95c17";
+      sha512 = "ac08d633f909edb3663d7e7cf5a27c1226d91a244786f941fc4fe771a7d5104183fa43782b8d838bbb50ee9342be081e28467b4dfaaae1c4b2a39233d5a9e31d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cy/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cy/firefox-70.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "221b4186252a507fce2398825039814173e55d767b1221835c0ced80fb19e4108006169009874c76176d7c39f25158cd9f554c7c08a18e1f2aca585c09054293";
+      sha512 = "176f3b9699e0b2b8c7f108add3a07b90664e7eb5170c9669cb5b67f2b0a6c0b2a6c47cfb2e34494467aa865f12c12c525fc967761878b92e067baff2d6e625ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/da/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/da/firefox-70.0b2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "947eae9a8a2e3761d5ee5d7d23d5edb2c5977417e0c812528116fe76216b7de6738978fbd561a0e78fa8e47877f880b63db5f92e4987814c69fd683f83b3dc82";
+      sha512 = "29b8ccdfd4f202f418ce2005e5edff4f69d3c3c337ee78069ee9c13b9fd3e90d29b28ad2801d8133119ae3048b6a09ac8105dc4fbaf1dd8f267fd15bb9ed31a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/de/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/de/firefox-70.0b2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "78e94aa258713c9d1d1c893d37b79062f6af8b7de49bd70857b77ed8a6eeccb8c6e452b9fcd35f726d504fafee49a7c45cd876ae7e4493bd1c11f13a737fd02b";
+      sha512 = "c041f802e2c5d57f013f018e192f2c62271ee15f53a7bdc9adbb447f5b3319e4da0c9743b0cf8ce4dfb03e94d0b81e0f8256b749c4eb3ea3a3b9833bbee28db2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/dsb/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/dsb/firefox-70.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "041797c6567cc399d88bd34846092aa1af2e40d380d9c286e423ea797160e63616bcc3bf611c28e3eb3cfa2136db9db749f32e72141361064a71130db69adc3f";
+      sha512 = "a6ed5dba712d1c5512f5e0e1caad7f0b0f7e2ccacd891bad54aee79cb749bb79610a46ebc75bb662352bb8419d8e0f047c0b0f8214f11edf8153708040188b5b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/el/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/el/firefox-70.0b2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "432d58b92a720d14b3df6cdaf685e471eef8b1f7b7ff7c9685304d99bb2382f4eb1eb0535105572d472e7887e880ab6cfe18baeb7f1660dcb59c432120dcf41e";
+      sha512 = "987c29ca1d3b65bef9b5464b2d2c945cb66a6be671ce09b421218c3fbc6aeea0de6e5f7c2105943ca41b7f56d7aea25f8bdf4289eeff4618a92cf45c4234ed05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-CA/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-CA/firefox-70.0b2.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "d7241e3dc44a5f66d7fa39eaf19fb0ba04f67ec1816cefe0dc2721e12df7d73b69d2fe1c7ebb24c2f5957ea3b575452ac6998bb9d9933d5ed39463d846b59d03";
+      sha512 = "7e85aee04f790b6efe29ca592c38cd2962636d7b8b5901e1779fe371b7a8546f700fab25ae5a53d170afe67c3ac64345954b358965010e65fe1a63ef803dcfd2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-GB/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-GB/firefox-70.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "5b12a9bf265009d1baaadc0707042a4290ba398544249d39ded6f213dbf8274207cc924fe5bd47f416b0923d35559a43724a31e8ab9b5fbb52f0c8749d6441e4";
+      sha512 = "a16b6b40a0c52c53b28113e5bc681b56846664899e5876d47b873816a8ee7cd309a1e49057b0bffbd923e5faa354f1f8ae4e01172ffb24062d7451fe361e8941";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-US/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-US/firefox-70.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "c12dc9983539a597b00115cf1350007f9441c90e281ebc3d0d91c00bf4b260678925f52e4a1409f02f8b56d43f30191bd0eaa1ef29c3000bc3ebf1f527a5f635";
+      sha512 = "de2716443b6dc3757fe58d42ef4fc526c1218601650ba7ccb0b0a9f77b7acb04a4e4af2c79b7587ab8d8e3515ca6602b563fb54ac5e102ca30952c39843c7d31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/eo/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/eo/firefox-70.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "9429af640db7a461a66e67d7b35239eed02ed9ec5b96718c4337fe3812f93a2039c5c5eb365fc7ca3e502368657f6a33f7318b6594cd3767d0fe72314c4eef8e";
+      sha512 = "bb0b25735ec9bc607661fed392c0dc841185f84b06410dc0c2b7a05245d62cdc4978285246d2b281b08507ae2de2b4fe561dc115d838a10e581e484cc12dffd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-AR/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-AR/firefox-70.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "92200fa63eb1f034b80a28e45d4223e6a27a7d4f2daf07d9e1966f76927e0e6dc0da996c7528bf2dd87189a2b061adb6e44a540b7af6598923e1fb47eefef7d8";
+      sha512 = "6161b532fb8412151cb007fe0fa679ff0f195206d71b4a07f8b312a28c0fa0041f32e960fc6f88f3c88e54a850a24d00dc370e8a3a16fcc5b420c0a9cfe2e674";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-CL/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-CL/firefox-70.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "094dd4ff8ba4c4f5205f43b73afade5a210ac01824c3c9f475cdbfec83bebfc6390b899ffd44c395f379c40baf9254943ed5d15b30676bb5216ae8f40c02aec5";
+      sha512 = "490f550d9091a70a9a693acd80f24cd644188a3ed0199781c5c04583ae2a66b623df8a5d1a5d3b1c7617a214aef09f99d306577db5bca1034ed1afdea8d909d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-ES/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-ES/firefox-70.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "500400ffc47aebf23b7bc816be356550242b8655b703ddb992c18ae032ac524dc94513a81a05e4a593fd70e753a25c567e4c8089c341e6dbf374897d89c210f5";
+      sha512 = "cb648224649c1f5a22c7b5eef4a4b4cb7381a76009cc1a4b0f2db7f1ca850f21ce3f5f4effe9e114f2ab55a0ca4a3f0180b5e7610cd895cbf1d8eff24a77ea82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-MX/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-MX/firefox-70.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "4d674f72fd150d30eb87bfd0bbd716ac93645dd69b0a8eeb5c57648077059436c6b071b4746a8b9104732e48ebbc8797c5981adfdc785500bceb99bb8b2a3190";
+      sha512 = "bb5c9f06d2b17507f9036192558029a6068bc4b62c1403e228284722fd1011ca002b5b7669320c3613fb8362433a13a05960945c56721a220fd8e45e2908367c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/et/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/et/firefox-70.0b2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "ad4e26c6f7800bea6eec1be23e5964ae880b87e1bcad875c4925916c4b901bf0b4be3643d69a1785bc0bfcb35affccf2394cc2805ab0f2f8022c5bae666b70c8";
+      sha512 = "642e8fb33bbffe1dbfec0caee8299051678c930b5b8382b7dbb27a139aa01edc737566b3b88444425296f29bedb30acf7e1e4bc39aabe37a4705271b0ddfa2e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/eu/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/eu/firefox-70.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "e8091097cfbf737c775e8448e42866bcb167305e4d186b17190f41f45b12554fdf959d55be029c29915f8b3277d8d41192b740a65c218de84707f931f4e55bd6";
+      sha512 = "b6856d8c07830809434528ade2e85da9577562e69e6753e0a3ba96e9e015642b77ee5cd913b017fe7ea96cd1eb985d8eed013c38e61078f37e155baf7d115711";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fa/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fa/firefox-70.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "b6ea01641fdaa57026f7ad6193cb026c68392952dd3cb7e33f14bfea5762e04eebe23eb042e8b05bdef7a1f6e8bdcd7daf181f621442273f0f6a10f4d74b69a0";
+      sha512 = "46f320dd9b746cfbdf6d41e6ed4fee3c36027a21bf69eec769dc656d4c4620ee702e4f6bd82a3121f14218a68948bcdc032a215bb0effe93d35b5f5e044152d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ff/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ff/firefox-70.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "293f1d5c58dd55c4a9af1deed28c3e89531df45b00e4ccf7add6e2e28b6eb34752e8eebe045392b1bfdc7a7287422ac8fb8f607822f13c28cbd7114b1a207941";
+      sha512 = "f32d17a087c4fa5ab1ac6b692709b067607b5a9efaf8d15fdc3d52f9bf02db3b3e460fb1350ee17f583a8b32e1823d91aa472451598dbc3eba2774b953b32195";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fi/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fi/firefox-70.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "5615e699341e9c49388e4db80d9628dc0bdb964a13885f5e5b070fef3c1a397145ad13b5c583305c52d6c1a5f466dfdd10fb97b05924c3220043da08b41121e5";
+      sha512 = "ed4ce81ee0446841d989ea575654463ea8186e2e1b71e771380f2cb0ce6b2858ac8903330623be00c57a2a50f639ae320e794681647292fb6ed060fdc850d50c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fr/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fr/firefox-70.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "3fb4b9aec3ee90cccd3f2fb34ff0665e68e7b55cb237e1760fbbec481748596f4c61c0e633cd1b5ef6993500f057fff74e983daa14343c820b9e3bed0cc90e2c";
+      sha512 = "0b199767300180ed093b32685373d1b702a2d09587df3a4d99fc9f0d6b82c41b4002e83fd26be00b24dab4c1c3d38552d46676a5df52a69474f623ee94d72657";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fy-NL/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fy-NL/firefox-70.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "47ab5c06277c1aff27a54e42e01501b6b33dd0452c9ed069d6cae1a19b551459b4988274ace92001a15409964a09beae84b49c356f9005416b2660a3c5b7275c";
+      sha512 = "8e714668d8ad01ee6dc9cd5e5f607f393ec09434e62d1d08a55f4312a52b31591e64064bbf0da28e2e47d0c571e895e9061197ceb36d1ab5899f09de549b86c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ga-IE/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ga-IE/firefox-70.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "0df94004a3443899ee641ba604174c996c03ff091b0e0738f5a61e5e30a2627e2d3ab468e7cd71065c6585f3eb450a9f0d6b9c82f997c8ae81aa9e891adb2dbf";
+      sha512 = "4156af0bb459848815ec4bef7b91f69328cc44d9b23f56911849098d4b30422f013ac74597dbfe6610df093439170b5566e87a290e33dcb6b32d5e2e95525622";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gd/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gd/firefox-70.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "2fa916963a8ee51ebe2e4e230efa2bdd36922008276ac6f67de09eea1c44b53070254e232b9713b4c1884e280727609c7e61d169219b8f56652964c7012e85bf";
+      sha512 = "c2d188a2f4a63f9cc106b2dcb64d3277aea07de0f4290fec560927d8ac577ae57c0f6f9dab998833a51924f1f4eb94cbce9312ac7bc69205a64fe766093c0847";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gl/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gl/firefox-70.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "c4eef282b8e1658ef582c3d3219e283d1c741a00dcc3b3fb6b29494c7d0098ff7574cc92716f798c98a6ce0cb7e8362ab0b48ec1160b62520a5bc5cdf582e99d";
+      sha512 = "c9427d99935fdfbf3b5ae3b0e9ab9f2b31b0a7b0d5b55b14effa1fd979d5f32b73016c939821f1db6eea286047334486b017b9000803e6ede4bcd4a564e89c10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gn/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gn/firefox-70.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "c6e913c6df1765846191e7979655b038d3a4b12e44812be36876380da49b646b1208119f299818fe4b4ee67f2999f3c5e442be40ec8343a2b6d6b3fcaa6edc05";
+      sha512 = "e039e1bf1f0250c1179b3bd185c1a612754f496d39e087059bc485af6a280c15cecab6e7869a63357c7b0dd713ef3efe5ceb6cc4c1f7334fc67560722e63b523";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gu-IN/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gu-IN/firefox-70.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "348e13f235c3c80b28717571916d2aebb7d0a6865d6d4577f651ed3061dd66bf02a43bdecbda879b69f78ccd9a8e2de8ac96f3abe49b87562fa6c6c398c21b2f";
+      sha512 = "9a8d9a076e521a8b5a4f1cb3c06538d9cfcfbfe32862b48301c202a212beeea2d888964d317bfffbb4e4b5a56ef06ff2acda22f0b129a2521d23a5234817fcec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/he/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/he/firefox-70.0b2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "d0100433eb4194c415249b1adf984b4f3dbd8a11e4785008086603fdf1a2e6dd8d319e76296d0e5d9f9fcc0033b67f12d062b7ee0f2170c9e74b1cc73d55bdf6";
+      sha512 = "763c4dc5241d3ec4337c17d4f7c7ef13667ad1a7ace2e71b65ead7fc4e771ffceb1eb1772c340ed8349cf401b1d9c4fa7f4e16031f5227e45a8e813e08437159";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hi-IN/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hi-IN/firefox-70.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "91807a5b65da4bd3d2c801431cdd5922617433068b85ac4f3c87de9e3b881239c9ffbcd6d426ee4f88a98c4fe706f2a03b105df4b124d9fffc029b158fc15105";
+      sha512 = "a6092b8f611976117489fb9a860a801aac9fd598394be0b42e88091760a7f05c10d04d4e90b228a801ce784a981f4770c78e544614a68c2d9a0e8ab13fb89ff4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hr/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hr/firefox-70.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "3e0d747dd6e79117799fbbdc585c73312c13a21b8ea7c0ae4872b66d4da670267dce1942b350ad00026e3258af9da362e81c59e791820d3341c49ebd0e3816b1";
+      sha512 = "ae2d26a2e98cc180699fa5f0a8fa1426525db4ccba99a57841fc8499e9595f0231de7802cfe347a81906d3abec3503b624ff224b1392ecaece17468ba12bad9c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hsb/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hsb/firefox-70.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "777ad7021020da8d302192f56e93de358af7deae7a60fe5e9f13a3b3d98779e99c4f23b8c3a801b0154f5ba35528f5800d93167de0fa3d397108df7f7ef23a58";
+      sha512 = "0524a4f4ba2ddd3143f9f95e07749aa5f8c37c8f31cc9030f220a99d1a8d270b61ebb63ee3118edc79712f3af3f1795ded34492144d0dcf1857f04cbb3cf3451";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hu/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hu/firefox-70.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "651b0a70264ef15320391311ce357e944fc1cc59a7b68875578dee031247ebf8566dd70c566c43f94773751b73e783f1cbdb3cfadd0f9d11c302bcfdcb014d0c";
+      sha512 = "64f4bd68c9a62965162bea7ca4bcf15369f9d3c69c0f6080d0bd660202f2a546f39835b8987e26da3752adc366164b451f842f2694305bf60a2b085749b13827";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hy-AM/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hy-AM/firefox-70.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "a3372d320797626169609e5e2d97a72f8a54cf7bdd106fd41eaf2d8e6ac8cf0615962b3cbea463aa412badb5ac02f7c1c04cf7aad546cac73caa2742e7d985af";
+      sha512 = "6d33a2bf17038e24c323bd53372974062fe5a11278eb535518637ee68712f4c2da93a3dd3378161f1e67efc51a06c746578af10f02c81fd25b747820e963b5f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ia/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ia/firefox-70.0b2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "3f3925da5a9d5525f4427155061cec77307139ea61eeb532bf475aad3bc47f30af07213d26500ac8a2287bb81d37ad2bd4490626afcfe8839f94287779212612";
+      sha512 = "0e4a78c9c03e7d87a934023cd0608426794f3e9818c7929b1e12bb300cc11d576334396c1125ceda555907363288726e286f6a376d6e301f386854ad3b437d35";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/id/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/id/firefox-70.0b2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "3a698899d82d3a10a7c6c4e2eb61706896c73182f16b1752404a422d2731ad272052618e87bea89455eb2ffa410e138614c2c6285c1089bbc830a0217a0c9cd8";
+      sha512 = "76b89937f37aedf1534b8e06601c9d59680426a55b3df3726318f438de1ec259c335876a1da31c6996e54c0d9efcc651e1504f764d4b426db2f0d97a1ca1e9ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/is/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/is/firefox-70.0b2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "d5cfdea22357a74ab7daead5a2e8b5aa16e454f0d63c569221bcdc71d8960f45780661cafff8c60499fe50dcc49d967600096e1d2f44bc1f7f649cd3f16df8d2";
+      sha512 = "17c164cc5a95f3e89e2bbddf58442da84dcfe784812163b68740dd1caa9ab823333c3188abf579601437217e0e9e58871424d1227b4ade6a0fc77e5798ef9099";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/it/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/it/firefox-70.0b2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "92da285bcd16df6a1f61f9ad7a57cc7eb867013421d61cee6a5eedf26e2a518a1988b53f6a217048eebbaa78551324a391f9c52e03d475d32eae513a4c9e2296";
+      sha512 = "ae37e92971d2f0c6ce322011e66c2857aa73518f1d4e8d26c3c2cf1d99bea8909ff2541146b6789096af5141cd927dc82f91ffb9f7eaa0fcf4276d4782e72a97";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ja/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ja/firefox-70.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "995903a57a7fc0f41c3737e570d61a1fcf226054d7c11be982d66ecad685aa9fa6ae6ffef93797aee387b3b442fc049f6329b5d88de86e7e809529ccf817947f";
+      sha512 = "32690138d8c3dc2be001579602269ab5e89b7509f6d289a4cd0fb50b90e7a9a61ea57af8b064f904833504f0d523f1bab0a03f456fb75c967cc87f3e8e331b9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ka/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ka/firefox-70.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "834ba5046a53091f3b24038069fc98f6d40350a401ac811a75ee6053e9bcffa97d8b3210eaaadb748b328b7679c80783bde5cdc1d6340e80b7240174a3b7c140";
+      sha512 = "6611137ec50a1a35b7ee3fa15a2066fd3231717ed6f7a4884c36306653226ee4211e8364e4872029d9b1967f69d10b799a4d58131d082f882e1b39e758132ebf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kab/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kab/firefox-70.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "75986a7f8dba13177b00a99f219fa1e5262015fb5688dceff96222ec1a2f6ae758aeeee620edc090acfa59a4870dd43ea181dde61a5a7e68e693e59af97d54b9";
+      sha512 = "f06c8fb18639967870bd581d2757ea66631f35b167688f4693198f6d70d1f61985946216410c401f0aa881e566df5a0f13d085e1ee880a35fb9ed21b0fefddea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kk/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kk/firefox-70.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "8cb2cfe5ba91af61096084aee42dd7f666605bdab54cd7304c6e839765e41e2cee627d34ed65b7162934b60eed448090e5c963813f87bc0805e79e4f92e99523";
+      sha512 = "b22bae385110057cd77440101e27234afd17dc74602bf05763975ebc68e0940b4501ff168613fb664b2087a2782fe44a52589ab9972cfa44f9097513460cada5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/km/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/km/firefox-70.0b2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "77d511c378a386c5567a47d4115fbc5c5b88dc03838a3de838c403f7b2d986b367e5cf43efd93749ac9635436f4ff1827ed3a59345a8897f332963f0cb12496f";
+      sha512 = "7c49611ba0dfaed7717f385925ccc621f5313496235a90c3851d26f11ec183541553979e6efe67f36faf7997d1e27a15e3d5646f33ed884fd66e6553c93d7db6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kn/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kn/firefox-70.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "51646a4e9ef0a644266a925705e4e5d2f4488697c076f9156862d258bdb4ed2eb6b105d5b9047dfaf574154d4fca750365f86f0693f312f68d8984812997badf";
+      sha512 = "c1fa863fa066a7832975963afbcf63aff6caf702ee8c58e2d54705e61b1863d71b81d7d0b9b8da7cf41d7c950a66820d8e1137a32ef91bb283ffad9b36b84388";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ko/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ko/firefox-70.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "d122b9dc0c0d5f4b7d62b3f188558e0db25549cfddef321f54b53c66e704ac895e9c67d3c8970de1f4ba3e7ffdd47bac5a4430000c289fb332c1e3f9d5893b66";
+      sha512 = "8d179e7660331ba4c90f666ad3792064cce4fc551144ae3a8d550f620765e43274ad18ca9eeef988c2a7ea612dcf82dfb65cf225f875b154a4d4a4c11e5d7a64";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lij/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lij/firefox-70.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "f1d45f8a8938599b0eab9aca11b1a917b8be86a224ed5e2c2b9bdc3ca0e4532958c6cd3468c17512b718135adb4284074fa2f4f32e851ddaaf72535cff60d58a";
+      sha512 = "e36bd824232bb3d7d7fb4779e3207cdd504d84861bd0b5b2ced6a29ecb9d16b10e2fb267162ca96452f52e8089a085021869eb107ad8ba5cfdb49f8e42e56648";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lt/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lt/firefox-70.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "c6d7dba3ea655c9c419b5960f7d6bd6c4816a55e835470c1c77ad820fa48fa58a25db12dd26393d0eecc6aa77ee022d27ad4ba42779922a451297a35a65a87fd";
+      sha512 = "4ec494f1fc2260d73aabd695a29441d12620a8118945974e8a0ca6f21a0e9e49bf8a6378d4409f26f05cef369c990e1432d0b11eec99b98399e994703ba286f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lv/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lv/firefox-70.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "c5f8b3946e256c9d22b735e65987073776a1b7bfbc80b198e9a026f42b2d6161ea244d748de9948849d9fe3b760b30bb92bab2c459c8d925565f41ef39e916e7";
+      sha512 = "3ffa772cecb4cea1c775b20b3ce505c2d84a9918c1422d85c5a2bde80c4b1432f223d828343af04c7c9518ae54bd7771e8144b66165aae1bdd140e068d0bda1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/mk/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/mk/firefox-70.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "e847e1aceea05139b2f1884298d59bea6a57dc3f33edca3d0175e9137de40d8e9347116951a9e5e9f8acfe43b458bcb8744a404093d1857d0b42f72ffaad90e3";
+      sha512 = "e8cf48b2e4a841c6101ab0759db844dce8865bcaf056dc0d2a5c43653bf86602dcdb337422a8149a4d4527f33ff79509d4c4a3fc221ca50c0f78fac80d7e45a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/mr/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/mr/firefox-70.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "92014b5413076602f711f3c71730ddd462b69bf67fffc104f2b18fd92189ae43a94c368fc4047c43366c3a15fca3cda9d8368631da51bd04f1c24727dec9ca63";
+      sha512 = "a6be024f8c41f106157845fec1d5d4a5f81456d76f174883e8bc3d2f1d8dae327b20de89539980fef316baabdaf2cdf058dc91c12bbad1fefa0f374d66ac3222";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ms/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ms/firefox-70.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "5c5decf31166b853e39b9a830ada9996778ad9331fb7ae21005968c1577daa156f852aab12e21da3cb5cddc55284b8cf0b439c205c0ddbe93b919de19567b7f4";
+      sha512 = "4beb0656f90497f480a171d762d3b85260f4f7388847260faa15bf7835bffb88a2d44657401b5d0680992864b1a4ee8acf6a6f56d3e9f41b6704808f775076ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/my/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/my/firefox-70.0b2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "60f910bc5a9cc7102bc6c9dfe8748e29d9590220acb5ef5c5b25e5c8b7186c6d17093df015df61296ba461c0a1f7dea139a94c4f920cd8cd8d770d0ee03d61ab";
+      sha512 = "98c47dd55ce49f4933a1fd67626a6edaaa20b4945ffa21195f19c9676f284081d32de83047dcd6d0e7737be94deae34fd306484f0ea80527bf0e3117cb67fd04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nb-NO/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nb-NO/firefox-70.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "3b7702091cffa06e91d5c82c0d18468d09c6df66ce2e0aa84180db7cefc627c1f2dcb9fe889351d265a5b4a0ff49cbffe957a22b7400c8300642e68462e317c5";
+      sha512 = "5d51f3e4dcdb82995c456e164bd4875e735029238ad47e7361c2af29c2c22ad43398279dad33356a858e054e268e846bdc72d8a82e869f12d2871dea8f6a75a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ne-NP/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ne-NP/firefox-70.0b2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "6c66a05a2cb9d3224beeedc821874634049258e107820f3b1881a1cefc8d084091a418bf6c46400d56fafd7022979f324dde5309e365e06c9ec806a5020ebc0a";
+      sha512 = "794aee0947e1a3b81534fee16e3d7efef9fe6d8eebd8ec18b8bb120b3a3cdfcb4929882d09e8ee15136f65d88c0d6c25cbf8570f86e8c0f337f86f12fb11580c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nl/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nl/firefox-70.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "6fb7a1357f73852706906386572c1a04237a041890f4bbc6ef5c1a865ba541d6af86eb6b055ada442251e3dd7d4ce30a79ebc50ebffa3850c2bbee44ba866a19";
+      sha512 = "e63f00aa526cdc8cb4eba86f4b920dc38e0a5f9eaef0a4103bf380f72b9fe2421aa4ee1417bca18da719ee01d57964c2edf21c4697121d70820686ad2f7379df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nn-NO/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nn-NO/firefox-70.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "cdf167ea3728623fa7d3d9cbc39df02ba32750bfb61ecc9dfc574e9126c7e4b00c9c8fc938a6368d4f501d2b381eaefff9fb3024d4bdaad6f853c924fdc1b2eb";
+      sha512 = "d9e30d8d820ef5b07f6814cb5e37e3918b321968229d33911afa815ea6e727f4d3b505a397b60f1c1e679dfb79f9e130de450c10f8946035153f535060b9d4cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/oc/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/oc/firefox-70.0b2.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "9e5180bcb7195b7064ea10046f1cd044e6d287ce732be1d6f4c0a3c5adb2a26b951d76e92866a667652616bb7853f5249618220bad09ea2d32b8aa71131d9371";
+      sha512 = "94004a03a0b07fb91a30677168d19ecfb29d5613483da62859cc68d9e392f94ecfd87f29b5f3c44cdfbb3fe067216fe4f6db997da2368aeb289fb7b1d83029a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pa-IN/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pa-IN/firefox-70.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "e0ad213505bad75ce2947b0bd501df174ef4516916bef43e083506721438e83f5a35139d5aa661569ec8d955eab87973995e29ac077c330af53e9647cffbd825";
+      sha512 = "5d4d9952600b81a93ed62314a536d91729ff6a423ae9359436e632c9d807b13ac19fd6b1d2034839450ed5ba5411b91afeb52d0cfd74ec84a1924b6036563b74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pl/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pl/firefox-70.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "9e84080936bbf5e7585edae2b3ccdd1d9a825ffcefea7d4399f892e9c2a18fab580928e74671e14dbde3ae0cfb0ad081f6ae3b9cd9ff1df3c778a8d0f399e11d";
+      sha512 = "6f3f628b38e06494d528c96071c0ba0738582da37f16a4a28eacbd17aa7574f1ef795c662ad09b8a15637bc25fb6b791e1bc54b3d530031c66450f5f7ba3ca76";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pt-BR/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pt-BR/firefox-70.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "b98aa88bf2c9207ab21708c7fb72be8256a0c89df32ed51202c9f24fe232d38285dcf7cb74017ce50e7eee22f091de494793eab15c36ae5724d393f49d70d78c";
+      sha512 = "e97eb866f17277db6303c58411fb5f4ef561884c0e5437dc09d3da63145107a8ba5862a8d965d4c5ba38f40930e82c440ae1a26b023f6a212ce177c77df72f4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pt-PT/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pt-PT/firefox-70.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "0afdbce1e0c0571a31fd5f90e40bd088a3df479ecb40c851750480e917fa60150d00a35a32083a846640c2c9ed5ee455e1a71ccf2ba226f0fd6899c2e22490b0";
+      sha512 = "81cd5a4c5b2a89079a45826f34ebd6564a929e1ba73dd07efa7d8a8b4958a36fa083377bd0e7b6b1e86a83a749f1117f3e7f2703961e668cced5cbdca8e95c10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/rm/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/rm/firefox-70.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "224c878a035a8c3a5fa6baa45964e676ee33bd5a52273f7da755a36f4d3191fb11eeed10acdfe8e5417eb2ce55fd524206cd8973a1874073d1b1c936a0490f5b";
+      sha512 = "2b78c41faea2f3f91be9c21de826e5e8a2533a76dc925458e2f75f085fbce71bda63dfbaedfe988f29ef9384a0ecbf4599174a210269c6adf3f875d227374385";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ro/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ro/firefox-70.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "3c07f89c0b52a0ab59d1820704fcd65c4d90cca95a4cac212b97697c6a25b918cc7cb2d86eabb4e58aa961e868c21ce5350aeee2ff2289b052fbaf9b1f1d461d";
+      sha512 = "d01b01df0d9e25635b85abec0e0ac081beee02a97bc50b1902b271aa4ae5cacb410d7b9644d76785d54622553eeb8f4ca4f85e40c7867c6f99840de570974a2c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ru/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ru/firefox-70.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "747f637a451e584e70414b11a5bbb65cf45a55c4491de0f0877efae6d348cffa3c4442235829474d1609d05749d3f785e17f6dea041a318dc504f795d312a88e";
+      sha512 = "36ac6ec95c9c1e3d5caf1315854324bd0cb41fd6e83dabd81d3af2189fcd111ea7ab8a384e5a07f4618c9046b8f59c3590c6bb8d1a12a2475d19d7d65940a26f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/si/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/si/firefox-70.0b2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "43a5d175b3759863ac557a69c6650bd3d7a1b2fe4747466a5e5d3b8eb5570c5b4d9ac18120ad5a79b768731409f1179fffbc5be9e6c171523ed5e0b71945eae2";
+      sha512 = "796878bd3a982443558d042c64520d6cd65c1eb247c6630e1c1073c75be3a2d3e3d4f164deb44336ff536c6a7a81650c0806de79cc3698d6215fb87ff2ca50e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sk/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sk/firefox-70.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "4c11c5e850d9dfbe8285973acdb85de064b9009df28b974dc482c8138472c8555c6e44718d770f561805a8dc4d600ec77cead4d217d76f412b1128db4dc3d31b";
+      sha512 = "48f3179f9ac81ef1c69a44540adf994874a91770eb1b2af51804a791c10540485a61af2b1fd337f7cec86682c5a3df24e8e030add48773459b8ba7caba6e88ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sl/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sl/firefox-70.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "b02dc1cbcd8307fd803d477a73c7196fcdf4cc7ce7b250892ed0cba61c2003c63454623a953a0186359e117b0ece427d977561f04d29757d2889236289fa7fe6";
+      sha512 = "5ca3ddfef139448e411bb226cd2abb3a8fc4100986a294bedc5bcc4a1906a6b0ab82f6e3d536dfa66e404bd5b7eed671e98cb22f1d082764cc5d3080fa0363f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/son/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/son/firefox-70.0b2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "aae03bccc5904c2b50d4bdc4bdbd0995ca8eeba67973bbd5ee5488606c2f0759b88334c500aa2b48edadb2c6ea27b16452db29a6647377de87a6f6d054acf202";
+      sha512 = "a14b7a55043d2aeec02d1f28f30038e0ffbc3f76df1c5abad04413673d5e6d7290feab39e0ff40bfc35bf993fc49311b0cca38735c367da233808910c2a864f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sq/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sq/firefox-70.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "2c9708666b8226ad9f2c107c3c9c8607942781544a6eb9a050915d5a55712fa5c9bb38a07581e9781c054a4799f4d677788cadaaa30dede88b508771da20cbeb";
+      sha512 = "ea1575fefd6ffccb7a6ab428663de5e80b48062e13d3424d05b5aa3b86972236839f6a0df7546b5ead27be0a40293f2e9d74472d2756d9fa86bad18d478993de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sr/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sr/firefox-70.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "b575acaaa5701c18fbb90cc71d6627eeae41a0ac1cf42327843e7c120cb51e7761b54669eda69577ed2c3c8c98ee9be66dba65e914283e50afb058f7b94c3487";
+      sha512 = "8c5ecc59a41613ac259e1f1515e6475fada7cb7c33650722ad9d36005b8aa173afaab254eec004be082bd74406c88aa4754dc3f4dd131b9761fc82778a7dc573";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sv-SE/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sv-SE/firefox-70.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "728c09e2feaaee2faebe8bd6a42ac78685c98c5d0065d14ea9d29df1afadb429f9d03519e9256e678f63c29d59f392805ea8843f7df8d25c3d42c557e91feca4";
+      sha512 = "f6446ff3add515a7fe46af9752206c05632cb95b5e65e19c331556a6e4e304f765f8cfc9cd90fec2892fe7302230a5b3b85c462a557e7074e255ecd94befbcd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ta/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ta/firefox-70.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "5415b52d2270d55c12254ae4cc61cadf0b743cda3ec80f36e8e5ced2bb0599abfa37725994f680165c3803889cc04f218dbd2b89f3011bc41a8f1fe204b1a821";
+      sha512 = "03302b3da44fa586df13d2f20faee5da5e82151550498d7c0e0fc70efca8a98db47443bdd0289fe90d602ca53c1e82c9f610cc8432fefe5c99878faacd0c9153";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/te/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/te/firefox-70.0b2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "6361e327a8d71977488d0b6e5d4dfcf9271dc4739b52e31a979bcc686b2a6f326065e88ebafba05e38e6628955690a934c02b510eb5ae0ea15371bc309ae43b3";
+      sha512 = "49b3921154e909685e8e52a892a2af322e650109fa6b17bcebd62908e71b5b30c0346905c2422124629d93e1cded40b6f81222ad4871057ac482c1df7ca3b53f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/th/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/th/firefox-70.0b2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "883fc0aabee67ca6098a4e860f58018bbdb511aeff8f1ffddf8c012357208dd2156ef0fbea7e92f2f0fc0da8d8a60d913ca638742c2b6511fbb4d943b59cb944";
+      sha512 = "497da9beff43403f2b09da713474dde509ea2a71145fc8006a852536e4ab71a83586d67d6b7238b3b0ed3d135db6bb2716716b959463b13d92935f2b1ee147ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/tr/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/tr/firefox-70.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "e5f302af1bb937aa0dc0283a97a61588a7ad72dd46f74c0514645edbe23a5c25032a585230709fffe34d3b7e739797e4a2a33c2b2115f4623ab2da9b7c5fda4e";
+      sha512 = "43762b9401ad7337e0ff00003a07d374271ab032a4609bf9abb1fc3a69ab578e45721395d06aa4fdf41e15a71bf503156632b5e3d6f94b5d6e62592c78a267a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/uk/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/uk/firefox-70.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "4590f2774f1b119bb76c23b65103a635c4c51541fd9ade6ae44d997892f21015c71d8d718697acff6525420d6b2d5352d2f3c4afd3f35841fd7b207260c1ac2b";
+      sha512 = "e10bbbf8a8f899f2a7b57bed9a846d6b490303c456027b034a750dce6b21416415eb0d9420629d008d901ab903e7c643fe7ad5bdf5aab511da9977d536d71ffe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ur/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ur/firefox-70.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "d559ce617dd2da4bf45eed7a61c79703064f29ca473993fd2df64f8e7006a6026c70e732db66fa33f78e550eaae88da2dd67cfefa85456d7e9e8a1d28e67b5be";
+      sha512 = "9155b7efa37b299ce74ed6faacafb354947430265a34fea9e101a9f0947a57a4a3b001bc7b583002ea08d3b7f33074926c4f6184b563fa5a1811b2b7a9b05fd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/uz/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/uz/firefox-70.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "1770b55e2f8a7119d5395587f9f7d7fdc10f8c3c55f954f62d08a1ec3fa66600cecbe94cc7cd04580c1ba568ce5e839bac52e8c8b3dc654937e91a8a573db358";
+      sha512 = "a3a3aeaa6cfa114e619ba9685dbf9d796015f26b9fbb4529f69d17f8c40c0771d58ff044cd4f97123096244f29b964f1756868e35b5dec3fb79f7b32b7a31ab2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/vi/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/vi/firefox-70.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "754513e26d09ceff0957a5d520097b600db660657feb1d8484ce046e90e60d37268474df79ebf5a450436b9f6574f0443fb7d647ff0f5b045055591488e4ab67";
+      sha512 = "167a38acc587a4479fcd15d1e47f34e0412e846a0689a119c1f382ef119bfab3035450326d086f6c8efd67a93300df234d53165609c47e94327b4415f40d88c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/xh/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/xh/firefox-70.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "2e2e353006a2ad5430a201e0b7ed793d439afc1f7f4114258065f58afaa351eaf2be32f3dce1401af350cdc5753fffc13fee856181e51b961d688049c348c3f1";
+      sha512 = "6a0ab1589a56d6563431d2e5f01e6c01a65be6865cb4b4d52a21b6438727d378ded049730374d3400603286104e4e05f246829b9a45513998db6c9c14597d6cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/zh-CN/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/zh-CN/firefox-70.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "7b86f1c8b7d81b90f7b72b3eec110257758da38f7f3bca50006a339de5ca1075e06762f07ba29b23a0718c6014ee30564329276098c9f8569487b4831f7b5809";
+      sha512 = "f3e20c68a34ba6aca4bffd07d0bc1e5676ef7f2d9b56aa175431825e90221255bfaa76e40a6fdacf812172317deadd3e3a29756331ccb09aba5804ae58d2ca8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/zh-TW/firefox-69.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/zh-TW/firefox-70.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "1f2a59adb5f3e243629f54ceb769e032eb2274990a7f5feb43a0c7f2df8344aea31fff8cb0ab9ea2e220f68548a7266ea052f8c02ef3fc8bbeb0b5917a1c853e";
+      sha512 = "dea1df5beec52f0d12e18907922bbd2f27b4a20c87874c199d04671f636fbfebfc1d64bf0c8935ae41c139d4beaf08e164aabe47da8be67d4855b1fb924aabfb";
     }
     ];
 }

From cb7d0d226ebbd9eb08230138f7ffb87e5229370c Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 30 Aug 2019 15:57:18 +0100
Subject: [PATCH 429/794] firefox-beta-bin: 69.0b14 -> 69.0b16

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 02087ae01ac..50b7153533d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,935 +1,935 @@
 {
-  version = "69.0b14";
+  version = "69.0b16";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ach/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ach/firefox-69.0b16.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "69f7a54d9e458d67fc554e282bd3d25a97e78e9e1aef70db3ca1ab63eec572da1746ffd405cd722243e12bede511b98fe5dd6d8fe70d39660c9e08cdde5d5704";
+      sha512 = "5fe26093cdffc6c3afde7438bbcde7fb24867e70b74c18ef287d5897e4470f2671fe30053bf7d9077d9494e9cc97a2dabb9938d4c99fcaf7981d8df7cea281fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/af/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/af/firefox-69.0b16.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "367200eb6731ecc4934f98abccdce40ddf4a73324162e8c76ac3903593f7eb8a73c9abc34d36ce7502be4f55e865a1cc39d629b9f026e25ce56af8d76edab915";
+      sha512 = "2a1ea5564ac0bb16dc716f29f4f3a63f8029ba314e353ad74bb437a70ade138b29f58df2fb8320efbf5c001232253aa4a16f48673bc4c6e5906ce3c4c912026a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/an/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/an/firefox-69.0b16.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "4d146e92193945daada5e3db6e3de0beb5b453bd237b07c036a8bf3dfa92894b74e0cf956e5eb5217cc1872794f7f40dc58f9b1fd21b2ff89c6122a580ef5422";
+      sha512 = "5fae2f3b33d7776f70a4244c6be02a47e81000a9de91fde1a3d73be2675e1ca67a2219f8aeacb70759cc779b985e4f0698c625c20f895e75e28ed9c764c8c3e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ar/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ar/firefox-69.0b16.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "ead64f65522c0775fe58dba27df1cdbc589dee666e2ffcd1ffa84b2285205afbe86f6d6b1b59b74eb6add2dd8332e2488165d6af21819269f2bdf394d0a32c89";
+      sha512 = "dd8eb0155a3d9489645c03c3240f5ca2c6ee0b0de7cd82e62aad1575e8868f3ec763985c4142078ef8ace86da81887bf7d1f95c2ec22d5bc73086e230898e7a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ast/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ast/firefox-69.0b16.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "c5e1faa329fe3c37eb4b2856280011d8750f0c5e1cd638b409277826d612421b35b14682e553bab41a856d8dbb9104edc32a08ee612830b2292c991860c0404d";
+      sha512 = "960fea994048e4c08389c7701541266e3631c4d70f604146189805f1ad606aab16ef9c2b28eedee82acbe0f42f69c96a90a041ba4cf95fec060b1d6c29a94bc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/az/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/az/firefox-69.0b16.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "dd48ea7a7334798dcd26a9d15ee101936d603fc0f3374f6e36653ffadd8bb623081e232d1aef682caa31ce2409cc508a51bdeb6388f43d47b946e74bd2022238";
+      sha512 = "8e7b6bb3fc5c6726115a0a20f61d1cad5e9a4e9e86e462e1ab6a454f5257af22ebf8dcdea3298fc1e9648fe630c36245f4c45ba4093d45e59741ceb882fc501b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/be/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/be/firefox-69.0b16.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "de23e64ae742d96ffefcbe3abe1a39f62dd1df291c023d71b361ceaa596e9972ffe07b24a10203497024b575b2223ea4bf695b6561717e879dcc03d7b6b8915a";
+      sha512 = "919a1f9007599ed0b325e0b218b18fc803c535f7eab76068cf4e94fe1ceb4543d090d7f341ba5f4d4de9aaaedc1b19d88ddbcb5c329ed5650d2ebc721f6aa49b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bg/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/bg/firefox-69.0b16.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "4e4dcc3e755b6b721ea005043310220f67e525e4c2339f7fcf12b078c2e611dac8b4fad6b734cf7207641b3823fa2d0d1f271e71103f8cff184d6669b1b1c883";
+      sha512 = "6746f4d0c2a73f99bc04c3b12bcf54e5eca7262ac6d54835a567a23a07fc91775db9e64d0c5accf045aabd5d4645a753413f934e6eac9dbcefaea30c944aadd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bn/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/bn/firefox-69.0b16.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "766f354fe5a168b902fa7c418e0f328f0e95ef0754db29740c6093bad202caad443cfe02e5c3841fe818b1f6b9b53e1b2ae84e29d72346260b5a07cf5ca24ea4";
+      sha512 = "ba88ff34405c92b907cc16e44dbd5d1db0b4bcf0fb75ca650739bf307a6e2270cfd69bba9ead6c260721857738165fbbcd4af44fbe8cb9d7402d97c32eb09532";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/br/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/br/firefox-69.0b16.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "c5457927947a378e3778cc01e706deaf02a01e6ca4406270d6e4f5973e0f00ea3bbd27aca09b65c0dcfa5b430c600ec1e0d71cce48a796575d9c469e44679d9e";
+      sha512 = "e7c78c11b3fd36d7c6ab55ac9571a53615a595dd5c5d66cd3dc6fb6d3fb42a1b29dcc86180f2028502f25869c951ad3caedf4590a61fe525616f18d560d6e775";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bs/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/bs/firefox-69.0b16.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "50605bd4bb4583fe7835f31e3f21186e6ce8738bdb55fc4a2832442cb4b21d5bdfcf3bae7905636e37c132db6c4561dcd93ce208a12b1a9c52d8d8248df2c4af";
+      sha512 = "36a677f1c449ad58e8750323cffdea3200c3953b9fc6bf920a0439229eb00164d4c1199286d1f0cc47eb31b3fe7acf9e78ebc3f4a3f49a443d1425afe717ab2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ca/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ca/firefox-69.0b16.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "baf2c5fc6e752a5d3f8b2e5a39a89f709e3203c53caef5bf3d649027bed2dfc5191b31998074f5ba7a437c8d8f2c911b5c6bb653ac1e6cf1d2594772431b0c68";
+      sha512 = "b78937e7ca4c7df19ed1c40a8b459d65176ca908333d7d19f30a377fddf836438cd750f2efeebb235c75c25f4a42a70e919c2c0061b865f7b90d71fe2ea119f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cak/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/cak/firefox-69.0b16.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "8117c621252a9a6ce9eabdaf7dae8ab9499a20c407b9d48bdc49b17fb72659889b038296f6af11e66a3dd5a9f6fcca9581396812753b7ea80a9299c1f558693a";
+      sha512 = "ac21c01a6528790fd31d56f0c637a0cee8b4cd0938ecd18200c48f8c982ee6a06a36ad779f9cb708d0b8191b7df4480d62dd75cd2a4bd0502cdd862aa8e95a08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cs/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/cs/firefox-69.0b16.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "7c9103c4938e57bfc7b47a9cd0c07e38775edc50a001fb24f91def01a8c3c7a3de1330173fd3842e8b0ec42d001d2cd5c9b4a4caf60613edaf331059d6cde524";
+      sha512 = "09cafbad6acc6db507d5589f4f89f3914cb80c826de9e55d8f02b42c29f6e46d24f49729efd8c67b5b575fc4dd240d8b32f0ed69992ac992b02c8f2639c2b613";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cy/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/cy/firefox-69.0b16.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "10ad0c39925c53381a5e8ccc6fdacb3939e2f32c17a6382f6279fea32bebb8a2a43f326e2467fcb48f4df1ea96c445cfcf0f413b436814da1074f6f5b353cf89";
+      sha512 = "18de3618d1b1fd350a8c826e57898f019e9c792e5f97521ab52ee940956e8e49a9191e361e0426412ca27e63c1e502f350c11a68574f2be37b29e43a9a63b25b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/da/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/da/firefox-69.0b16.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "8bc4c854a68db46280e0e9d561cf507ee5c334f3ba70d2834906face0540a47b77fc45d526024bd106c233f8e5245f3258279810a9fc2949e5e24d21fc17ef0d";
+      sha512 = "7fd40f49390d1ca844f31eaad74a419a28aab6f74cbad1f040e01ecc5b6691ff516a4d2c41c906e241aab54573580eee3b6b01531468cc3e35c4fa61f7b60931";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/de/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/de/firefox-69.0b16.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "d793e9da3997aaa0318d1b1c22586d31b65bb1eaa21049a86878fe32acbc75161f1a48f9307c3c73bed9d15808252e644622648c150f5cb52a1480a418921b90";
+      sha512 = "85347a3419e55984769031850ec30f757238801cf8483551ddba35abfd0e2638c75fa358ec09705d28dcc647fa47ad37c4f545522d5f8aa54067fbcc232a47c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/dsb/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/dsb/firefox-69.0b16.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "e9ab9d16d1eff15d049beb6b9293322b425e6da4fc1f1286c2bc785d7235b1d672df1f476a6949371af687ffa3af3b7cc214bb886a1147f96fca4b6821aabbdd";
+      sha512 = "a8f24207ea3b763a3295c1feb43c22f0e502561224a4d3d342cdd7321bd4e93fca83293834163d9a6160e0fc4c6aedb60b4f72e172e99eb98e6b8c0cfef665e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/el/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/el/firefox-69.0b16.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "31cc046a58bbbbc2bba80131bfb456019c1b38f6a5efec72d140743e5e1f61b0cf10094d61fbd9f76806ea03461365a27aaf3b15531004baee5b431a59e32539";
+      sha512 = "ca8a37134a897631e398448683e4805ea9fd10a30629c09f760b6b90b9e8fb6505adf3143031e88b7a189791f487aa0ed852c0a4911b93fdedb34cd0cec7b7b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-CA/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/en-CA/firefox-69.0b16.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "eb9b3b8278c589f1b693bae1f48d86a4611b377c3949d51d75f534f133d85436b277f5acee1bd419a3f24faca245abb5d4d9f9fbd95b2adf05c03af72f37cdc7";
+      sha512 = "b2c154bf92cf4ac6a4021b199e9e8438b59e4aeaa5ca7f72df41bdf64dcbdb196d384775b759b867a717e48e7a31f457cdec2c20e3c4dbd93d3c440ce277d396";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-GB/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/en-GB/firefox-69.0b16.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "03ba44f4957abf9e2c36ad394af34354c0674b8e20a7e75d40b516434b3428fc3ad1d42ded42bd0587f282637ab663175a217eedf41f444d7e2e77d9d08c0dec";
+      sha512 = "73c0b07840bf816f093c90b9103a25d2ff00cadcf13341ff228e09bf939c131db3ade9d3be472a4eec3ca5b4131245ea4c788171e6ee42beba7dc1c7881da0b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-US/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/en-US/firefox-69.0b16.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "e61379736128667d1b4e5271037b3dff8f2c6425678791ce2883345a672023665573177019001364324bb4b166989bcc475844ef30ea5a8703a949d3c08882e2";
+      sha512 = "c63d7358887ba0d8af897063c5431c2bd404fb9708e6b59d73c14dd8cfa1a2137af72eb01dfe25b9e6d92b84d5b966693cc89f5446ed3410f910e2df3f92b6cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eo/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/eo/firefox-69.0b16.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "081d2573b5674e28e7cd04f0e856909ce7b1d2d16ec61bdf99cc5e0fd8aa5abb3624e220d609bf7dbb0b9d2db6367d7c67a64ffc470700896ed7520a250d06af";
+      sha512 = "0e4a373bac78d80e2849c41c93196782ef41a74f91c6319da690916138a78c20c9d26d8c96e5efe67a835185c8df77354b3fed5a62500e791634eb2f15909031";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-AR/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-AR/firefox-69.0b16.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "12fb861ad3e36473e4384f8574d479b2beb4d036dde78478b391381afccc1fb1e7888e08d0de366acc8c537f141187a0075438cf53601fd0bb4356ad7a76484c";
+      sha512 = "ff07382bcc926272bc69c10aa7f35eee7806d94a18ddebfa3599451d002afdda739461aad90d8df094f56b9b8840cedef659757245d4fd1a8603ac25d2a3100b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-CL/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-CL/firefox-69.0b16.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "6adf0c82bf246e256db530a4abff51e6389ec5ef899abf406fdf78c2c81831bccdf88cf133e2b8fb5a4ce4d843b947703dcf7a5aa721a6bb4913b6d07d04dbca";
+      sha512 = "201f631a6682c9aa13c511a0d6da256e2f207362264f6e1ea060568a9e597216407ace99508ebe820a348859eb72c6df7581276eca5040b3ee2e99e048c67062";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-ES/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-ES/firefox-69.0b16.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "6b31621b8d8f0aa090839fb4db7c10618374551b04b66b1696fff7ece4de9cdc7da06243f2f6a0be931a201cd984b9c8a4ff4332d0ae8ad2a42e08fe0de0f709";
+      sha512 = "76573a05de730de4c6bc76dcf98a21764c78baec4eb0ead45adae2658e9173b33c97132d0a2e5c95807a60a22c9ab2e1dce09e5b73ae2dfd905ced82ba105333";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-MX/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-MX/firefox-69.0b16.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "e1efaa7059a8e7c4b9dabc5481ef9ad14235e310ee42a8f28cf3eedc1907484be9fec8fea7dfc76e11fd531fdaa4933b581425d826ac41e040a855a3d2bdbc6f";
+      sha512 = "b619f5a2392ffa0b36f48503e94adf9cf1719911258e1752507f274078d12f74257677f3e76493fd080a0be08ca94964dc55129a59e292b1e2573676dc59e5c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/et/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/et/firefox-69.0b16.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "f8683048d0b87c0dcb0d929298e7b6429540edcc9308a1fd8dd6c40e47a39011c9abd4fc495bfe9fa8702f68717cbb06611e6f023d43f84cda623e23b67d2331";
+      sha512 = "951288cf8a5745e433332798b87ceb54e35d408ca9f4e9d9fb288192de430eb45065fe88f0858f1a71e0cbeaf87c85c240a6d350bf8ce2f50c8ae548cff71f90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eu/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/eu/firefox-69.0b16.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "6ec1a27c6d786d3af512f03836f1b795df14dba63c935274fb601228af012eb6063c035d3cd5c9e7b24976be57f0d62e03f7f136bc322e667adf8612cca08b25";
+      sha512 = "78c856affa639c531d70e20b1de6f0eba59b33e403a1d24c3508fab03624b5c90db636d39b0c199f2fd0b5fab10fa3ecb2fced6cc3b1e8a06b9be11e8ec917b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fa/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fa/firefox-69.0b16.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "0ef5ceebf4c144ba6b6fe8c999f97b78f6bfc18667229a85ed2093fe3838d5b1f7213ecfd004af95cb18b2a6dedd8675d1365d6b9a09b2976a771d96b61954be";
+      sha512 = "a835fa37f804055dc117f694d85ae8b750c82f7ba92976def927f187ee91330a3d0616c0915917d1d0ec3c295f803c0bd2bdc9ecae0230f9a6642e42cab0e066";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ff/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ff/firefox-69.0b16.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "c17d2f95b4e1441e7f5efcf597c7c4ca362aeb837debd788933c52d6803bfc987bc8eb218391dd71a0581bfd386e625eaa2f4e3ac678f74a9ad3ec4f6ae34ca0";
+      sha512 = "ed3664cd4418ed5af133e00c30b3a9d23a82bb681c5d965fe00b4e2bf6ce4c777b00c352dca4cfcfcf5a895d7001dcc6de67b4ef0abb3967014c483437f9b1f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fi/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fi/firefox-69.0b16.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "ab77f83eb23cc32fc5bdc4bec4f5c5710d53d7e46df6004e6a4751f9ba111366ee96742862fa5b76b438fe693b06245874ea9ddb2fa3575b4966bb1ebb66bf12";
+      sha512 = "3edf6cc3dec21a48f914a754718a57cd495ed8bd9b807a9c4aae412a117ad1068abf0daf6cced6da74bd4887fe51746f1bb57dbc5858917ad17d8912cc9c4cb1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fr/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fr/firefox-69.0b16.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "1c78f9c50efbaa3336503c6810260fd9b8d7478fcafde0a54155fd177d22a8988e35edfb26ea9e3e0d6b37984ecf72a98b2928f14d39a7927b53c76df1d60bcd";
+      sha512 = "9f92a2dbaf834f13f0f0fe2cff0ac433c01b7e8155a381d21324fc1e7224f7d5c0a8374a7e5e43f679232f565958ef946e3cbdacd3e711e34ae97eb27176321d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fy-NL/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fy-NL/firefox-69.0b16.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "396d65f9647de3d46d6936143dd1173e91a2d023e82bd51d6b22fcd0a06d87e376f83c33ae983f3d192cdd34dda8f97b38a6a9b0a3c49dcc75db7ff913131172";
+      sha512 = "f98eb4bdb595db2f688c25644dacddb2049fe8f8b21e83f8cd7031cd23587713f1fa53f39a0b444f6ee979901806811c16599224c6a1a7d17cda84b544ee1848";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ga-IE/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ga-IE/firefox-69.0b16.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c66a6cda941dfefaafaaa6e674110e4825032d468dcd0f299ff9795a7ade24e89524badeb27d6ee9decae81ed63ae1c4df1ca0f9f8c7f1d35d50ac4cc36450b4";
+      sha512 = "eec73de53bce5c18ff0491d6f4018e3fb39471d3d63c6cf9527cff8f4b6b6e0a7e24e3b7fed58094409efee29df7dc35f2410ea05d5e916efa1d778926ab23f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gd/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gd/firefox-69.0b16.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "077423578f0acb3ab6dcafac6394a5a75110252532e7552e1c81976298fa50187cc9f93f43ff8745f2cf2e148f0a4ba3d206607396dec83021fb7c825295d02e";
+      sha512 = "1d10666f6c563dfa07f708b058fe867b9618974394a5eb4733926429a76bb6ea59e7ecf6a2a89740cf2f04692186bcfcafd2eb6775c5b59421bab0a92a24fe41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gl/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gl/firefox-69.0b16.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "52dbe9d4f88cf6d2d5710fecc95f0ea78519034ffc9d4f111cf96e99296ae77617a11735dcae3ebff552ba1fe741c11f4f767cb9710e4fea4d4ff961d42fbf99";
+      sha512 = "b56d98f5a1e558aa73ec385c03b18dc9bc615670dc5a539eaf6c925f4af3915362d2d072f29ae3bde3f9ba266a321d704c6bfcb959d47858a650ffe7fab5767a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gn/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gn/firefox-69.0b16.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "cb38005b6db3b58559baed9c427d19b36550bae82d6b6049c7c705df67ce736a772f868d4d770fcadf37e7a19cf2d02f221b2472ea9fafe26d00f3ddb0798079";
+      sha512 = "50a9d482efe2c22002419f4559d1b90fd5f368a23deddd78227b7d20b6a051870a997506a1de931ac8c45bd5d33ff9152f3a8ad41c735912b48dc0fe9c073360";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gu-IN/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gu-IN/firefox-69.0b16.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "776f81e4aa1c01d8bbbc7ff83f6c0eae549ca7b6b86aeb6b346280a7188704502c1f62790eaafda06defb73744930ab61aef97b9ddbe16581de2129da88c6eb5";
+      sha512 = "8ce423880bb405240a78773c3f81aa08bf42b39c68068d3cc604486a96b44e7509c577b2c8f2285cce62181b7f11565ea6910c8871b798d0b6856765b16e1899";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/he/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/he/firefox-69.0b16.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "fa0a8beb4edc5363d339502aa132f257a6a78c2c96a5c9cf43ebc5522e43ccb96940acfcef0c06b2e9e5325860f2b93a5cbc3d77553e8c7f7a39ed010b1b69cf";
+      sha512 = "6a0722861c63a414690e9eeb2456ee492a92b8b20f8fd9973c1580b2e3ef1bdb87bb7ca0d17603c429a76805076e2a7c4cf986d643e790b2b04c58b69aeb8758";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hi-IN/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hi-IN/firefox-69.0b16.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "114d157b3e2b4891544fd1c4496c8c2b2e697250c71210f0ad034c6eacf2b35157c18146ce843d2bd2927fb9e7f71f2854e8bda221d4af91b2d50df21747d0e0";
+      sha512 = "4e9ba72349a3e58ee2b584b5d3ed5f601a1af7714104139e7dfa997921e6b7954a5cb7b78b9b8b7bcb7eb09da990116f844dbd96cab901ca408c2fd49303c35d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hr/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hr/firefox-69.0b16.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "701470a4164010d28590f53008568b01017c4d0047d815f51b0fd1781c037f110c4fdec0820ef6ebda01efec1c0acddb7938ed40e946ee77ded662e760b2b61f";
+      sha512 = "f53f4177603c41008d06f16bf9e102855273f53856e57f79967f59af64bd38f745c4d71583db50917a45a7c3bd64940f69ecdb864dd957798c2ce5b65f5a75d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hsb/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hsb/firefox-69.0b16.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "625488b1e226d36b4995d81215128d647cb780062ab450a7df05c13edfa71ca5ded4d8d778876721228bb16c3545fcc069af692eb962d7a1028c0defe74a189e";
+      sha512 = "f6044e9f09cf4fb64dd9d3935332bec46ddd783f6335206a51e68a411be57169d4a6388224da462d65090cd2ebfee64946626fc41ac3d779f53391c1765fa290";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hu/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hu/firefox-69.0b16.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "5113917f0b5ac615fb68324acc6dc966a457262e40f49678c215184500cef1fdd300ddc18fd3bf62222f1fe2d00c916ac8dada8adf6060a2e2098cd96fc4607b";
+      sha512 = "0178b084718079f1e6117f723e2931275a28944deb5bff48c3fc9d2548ceec7a6f019253cb7fb014b04e6800bdc62eded02b1ad26efc2eaccbbd2d0ca359faa1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hy-AM/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hy-AM/firefox-69.0b16.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "70f989efad4fd4282a06e78a1a6cfc28159168428b24efd9d393f2ef7d02afc06eb3e52349797e9e5a8b6cacd13a2cf7e9bd0758dc203bcc7d0ba4a77a599b83";
+      sha512 = "0f069f14ab5895b1242b0b583e2a952c9a794e363973f68d119a791d5777048849dad23badeef6f155e1539b06468a4b7b0555e0e76f137edc523d09b6a51b36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ia/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ia/firefox-69.0b16.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "a8f01c33f945eb0377f2907811db68d912ea2e7a200e362c311a9ecb5b8c5621e05364a05fdc07a35a438d0ffd8e56f83341561823fffd0aae7d7e9794ea9079";
+      sha512 = "fa0beaf3088becebfc5e4f02b884a572fc86b5f89dafd8e79741fcddd331f1d667b1c2af81050b56121ff40a2c9077bc514df9ec2de4d165b536d5b17cf2fa29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/id/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/id/firefox-69.0b16.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "359744507ac8c7acaa18ef5b81b7979777e1e860ae443b93b8b510389e198a4482f02d10e86996ccf9879748613a5a26aaea9fb5affc7ed8477891dbfdd6006d";
+      sha512 = "10bb29fb1f4a588f8ccde4e087bba1c7b405c44a9a79acb16d189f704bc31ba24e33b1c89b1879deba4d5c5da0a5f94ef69a7987256af6fbb6d7571db85a1bb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/is/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/is/firefox-69.0b16.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "fa008324cb424c675bd5ed33eb886db661329254cd5809e3c1d51f4e530d034eabbdc607cc6fdcb3a332f5cf45078b0d49425c83e6985f9cc87b939c94391bf9";
+      sha512 = "48229cafe81da44259f0768f1494685afe072558dddac63c6321955d852ddd80a3b8729692dbb9c6b283a302e6d412d7c8d4f48888a0d5a1cae12dc1a025124a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/it/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/it/firefox-69.0b16.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "406e361c1ef650cafec63b213f67ca016e251c50455866ac112039abb85bfe62ef6c56e7ac103afd87c05535f42767e937f99a045d456249f87187b00948cd71";
+      sha512 = "1097ddf7dad776303b942bc80455c8902c0c0fe1667fab972754260da6fe45f383967b8bd2d51e845a66bc0728c7655050858722c1b3b8d2e8d0331c8f612cdd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ja/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ja/firefox-69.0b16.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d1c5d95ec4f8ca8e46dbe90e6c16d4e2da7b2c29664ee878be09c8aa46aa421f91c419cee4e8db0aff47c768df49ed316d789fb20c50a04390bc63bdc5e5cdb1";
+      sha512 = "ca0e8dd301c1e1f76acdfae325445b2ebf45a15be70febeb677d215edbff7df509db7a38409b5039aab1a76cc8cb235d597f5b87f02a96bf842ef6d2e11e6176";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ka/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ka/firefox-69.0b16.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "623aee24ae26658971a1bc83b80fc45e296c9c17a82abf6956ea6f019db37b110d9642144c7c3fd05ee681a9953f9d4889dedb82c6b421d975d13f4d7e0c61b8";
+      sha512 = "99a1ae878c93ddf52c96466bae92259a4e51791ae343574c09f99e5f1878a15d705c84323af6b2871ddbe14c3f4b7fa5cc7a45c27b10b6bdf5bc70ce3a315322";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kab/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/kab/firefox-69.0b16.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "0405b91ea64f7840632b2c7f633af1ff478cee3910ffa32b6e49a87e4d7eda3f96f27eafca2c249f8ecf40ebbb89a615227ea011cd6269a7699bdf68b213f877";
+      sha512 = "b2b6190978068d2d36baf58efff771dc48cbaa09e53da8d19ebedfec4da5ab6c9c1c212ab0a9fb6cf7a264565b1815bcd2a2e0283f912c9ae3ab5fc6dd0427be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kk/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/kk/firefox-69.0b16.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "b8d170de3d7224c17e72d6c598f7d53184c0ac7437b93b3770df504789e862e68bbf0ba73727fb0cf8c3cbd177fd100c8c0039454a7c32bc33b6a4e05e1257df";
+      sha512 = "3c56bffab7e32ba9e0a572df36c473e94a3ef7b84207f204b5fa4df1473e4f64fe11a0b7bf8dee4cc26db56e99cf21eeb17b598dc211a5d9f5b3ab3fc5d625b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/km/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/km/firefox-69.0b16.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "2d6d79109681322c73a9ca4b544e5764a0c6312d98dc46403a1d9f62285ea4fc2d88900a2a2c67f32ac61826d59f684ae4e0d9d3c09a5eca0938292e8acdf545";
+      sha512 = "6a33560d83232074445c0cb31949f0e8ed4ffb18ce9407f4f9b8f5bb9460e949eb5d302b7f58a4ebcee5d27de0bc588e7d047ff8a17aa3edadc0ab595a175362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kn/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/kn/firefox-69.0b16.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "9f143e23caa679ef6d7d5cd4abe3e078882bfab15cc18f1209b7a5b654208f5904a225eeb0be744de341954d076806679657546f2ad2560b5a7f8df1cca2d6ef";
+      sha512 = "d67b40cb99923acd769bb10d824903dc01379c9a5245f6d9fe0747b58525773b2724329c64760ec1c18726056bd1f7d74d9e292b3173555011bf7e66d6169828";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ko/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ko/firefox-69.0b16.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "c1dc9b159da316ffc61a64684dde56aba305a7a17fe8a6ae32520ba950096e62c8e265bcf98124c45ab39ebbd6f9edf7ef63e8760b0b434810e7ef67eb9b7586";
+      sha512 = "e932cf78de717646837ef432179a0b9cd41875b60ed5ec0c082f9b285c9899006844a61073689670449206a82c6a0bd72e076a51be1551ab3f757c6f0a060bb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lij/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/lij/firefox-69.0b16.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "7a9077eb4d267646bdd0890d785d6378e91ee4af4b41af1f90384af3ee1274441a78fe80e33de7eca3dd10f7ac4d1fa43d9720a931ff5036264f8c0371c4a401";
+      sha512 = "d52ee5886f86e511f947366caaf2769c4b3fca87254091c395077dab4b665b35de7b66cf90849958bbbdd61316d5df43014a8c9f9bc9006641a40aa2e8d79f98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lt/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/lt/firefox-69.0b16.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "a9fb3b19c7413da23783dbb79fb890293b9f9efaf0e50ed1f7b13aa0382dc971da247824450338564303473f735175131b3bcafbde8696b227671ffc6e2d1de2";
+      sha512 = "ea57e8db294d8b293a48d61257097caca093c9a2ed0b14b2d5c486de44b542cc546b751c2cca73ff6ae4945c210018a35ec61583f5b338628894117c04dbd135";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lv/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/lv/firefox-69.0b16.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "805556c78f01629f44dcd960d29292b1da81082fd110101e36ad8d41b4972207ee201938413c24b623d891d2632575862f42ad96271c18f13f4f50d12d8d06bc";
+      sha512 = "66054fe532331c73b0718791d83f389ad369fc77ecb0904c6fe3f97310ffb4d88e316d9dc618a07dfd4569b3c746ac882d8b353484c580af63c59f44e8257c11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mk/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/mk/firefox-69.0b16.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "ad3373da3f42c2d4960433da7bfc2717ca39c39a4f9e3c539ca72feddcbd24bb4138d0cbc790ad0c8d5fa64a652e5750b4c95e363e125d852548164062f590cf";
+      sha512 = "0f67149117eef961fad9355fe61353a3a2ee15f19e92a592d6fad69e46ac488c26f2b0269f6c229df51690bfead9e85c1ae0489230ba32fb27609900a9725f57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mr/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/mr/firefox-69.0b16.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "9e9b07ddf0647977cf93d8be02eff0fcfcda2914e8c9fcea418dc03ed3bd0adb1bb71dfa9147d222866d9b86c2b2fdc8827304fb4099da6024c205ff9a564f8a";
+      sha512 = "740667d86641c92ac299fd63700ad74dc4ec2fabb261bff9abfbb704e7181863556aec952b420f5883ab6a18e66d237d15636e2d9eb7bcfbece6227190b4b6fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ms/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ms/firefox-69.0b16.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "a56f7c3b8c713b08e1f5e19b290fc1f0dd108d285b83fa3489bacad6757d02970368f4cbcad6ad78ef53c587989a8f96b23146024e705158a9c3b309bf530041";
+      sha512 = "21ed058002c2c57c0e0e43658b12a7b257009814d13566d2d8a5164d0d3acb131a8c90f99b1e577b6d002f7e5019e296010e61b1df2c5d2e9443e8f55f20a4ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/my/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/my/firefox-69.0b16.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "5be85980189d689fb1f16136c7ef0d427efdcacdd966a00c67527014588e62c20397483116e1728682be5eb6aea445c1cd3d8290452f05a32023ba593ce0b536";
+      sha512 = "8273c4d0df0fda727465d5bd4b50aa09dda1c81b4e78e291479efcceadd87ad24f50e2dec1accc2783fd0bf2e30a2d9e775d44ba599384f0e8e4ad0b6fe08e25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nb-NO/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/nb-NO/firefox-69.0b16.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "008908a88d4c4edf535b3cfc009140da760e40de0b14377ab79320431229b0e9b27ad745aff2265fe7d689e1391b3af3467a70f4279b82033380e3b7d234a5d0";
+      sha512 = "492842b037b018bc07827902e76a117f9ee4620342af102f2753e0d898ec9b070412debc6f72dad2d899c3869c27d2d969bbd9a8cbfe4d0c10d85428d9c7f3e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ne-NP/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ne-NP/firefox-69.0b16.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "7d7bdde40155ec5409b43cc150c44b6687f7ae8bbec411a5b1c257a0dc630d58c6dab289772804f632fece1a3dde5d613f939ff153486a8a38052d3f1abf312a";
+      sha512 = "5e31871031f4745af8e050e18b1d2f2a16bfd18596358b189c7940a8ff11e999e44cf2e96b62404e481d0d8712f151a10290ec36e5903ab72e26986a03f93e12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nl/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/nl/firefox-69.0b16.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "467e487abb563fb8354c0f3a3661951acd40c851b4f570bb9483580a9004758304eb35842b7d75b3a21f0108914487c56416584f02abfe0ec7180ccf0e9af166";
+      sha512 = "8ca6f3842359e5a97445692747ffe0d65bead4222d0b2f90f86dc637a6e02a1cc75909ea03acb0c232185ad626cdcf2a5dafd27d578420385b7a4df353847323";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nn-NO/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/nn-NO/firefox-69.0b16.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "bd3ef206e3cc0f8674391940878f5b9bb9cffaa82013bd59d1bf924bfd20171df753ca51fc74f139c8bf4a977397ba8611cd90664de80b83a5eaf6ff3aec05e6";
+      sha512 = "a64d50c1625f4da5cde3aad78b04a4e3278ef3aabcb19cc9a9542e45f0c82f09a63fb464c0b2d842e107f22ad12226655617023afad112292ddc22d735a25d54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/oc/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/oc/firefox-69.0b16.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "5c955c03cb776dc6eb584d29197945ef22bc1be0074279947483750758b368a2a88f23b8412ac8e76ed209f37d35dd37f33726828bf33c8cb576cd5f7f51e7ad";
+      sha512 = "1b873b5a90c8130be2a782f8c0459f853d3fbd340d7500550fc7628282b1e575d92a1d0af263665f7fac7192c22910e8338b66abda828ffecddfec79dab62fe7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pa-IN/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pa-IN/firefox-69.0b16.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "48442fc58995e0f97ab255307dd6adf55b296316f19487f35635df4252547b3d3da3d76fce995918e9885a5fe79a68c0e711ec20dd22546f5dd5a4a531654009";
+      sha512 = "6aadc5b934136d99161d4f52df74653ebe0ba2d5fd1e2468c103b34862a331ea269c23956ad27c7883811a474b6f915f6076d9673ab4767e5a3b0ba44bd32ec0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pl/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pl/firefox-69.0b16.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "ab5f1d3e874d4cdacde0ef1978202fefb71ca602775ffc5d228729a6ea23c47b0efbaa3c554290b90030fd5145ad4d9a2a11b8e22973ec5923fc41edd86b666e";
+      sha512 = "b3caa21e7ebf3083be1ea13da68a83775a0713f6046994991328a293cef558abc523c43572ee98587c777aa779498cc5d7e671aac622142b4801386e2e1532b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-BR/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pt-BR/firefox-69.0b16.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "55f0f8539a4439c9e78ba794f9837f89cf9470cca827b036c69098c83a9cef91a1abe5dcc0b350358e707b274944a81600b90022e52884d3f2c7f7288b4a7d19";
+      sha512 = "f8b591901004a08c74a79cc4a9beb5139adaa2ba15261680c20c215ece1f1f115f0a71c4a2af2665c2c35bc3c5d3b5016159dfea5f603a981d5ccdc6b28c3b98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-PT/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pt-PT/firefox-69.0b16.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "23b9a79b6fdfae7a61a9efee4e0624a925bd234cad98c3309fe8ae389e4d01cdfd3c4f77cd2283f9649d87daba59c383d476d3f6d4768e580cf3905f5ef9a943";
+      sha512 = "ba910b1e9e77a938f4208679141b24bae1dea6bf83a2f3a2778aeac59da1e8ab22ffe9333188316e170bff75bfae57258f3ff53c08774d00ee060de2d6871f21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/rm/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/rm/firefox-69.0b16.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "b33e9e6a9d1fb694be1fb3990a790bf9fee990b1d45c8b3a318561c2417ba5fc0993349779b58aa2174f2fda9e610b0728a36c0d926a07f73275a5add8413f2b";
+      sha512 = "0272ede3149ece3f87192f8cdcfd74313fca17fee53c3c86dedfe702c8157257f29931c14168ac11095f0b0def077f267f222919cd7f4b5ce020797c36c3c603";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ro/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ro/firefox-69.0b16.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "0dc002bd4872ed8907c0794430b44476e21d732624626bdb8f9cfd3c81b4b63ccd21b11456f660f58a05ffc91881903c510222b093c316f1182376eb051f5989";
+      sha512 = "b58e3742fa43d52f737285c60e8b1237fea5158cd096450bb6187ee10471af0a77025fc526805c0ae8ddfceef7b7505dc637c8f72ab4188db31d0ffdf11ba606";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ru/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ru/firefox-69.0b16.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "b29a6e02fb86387d1209b8aee76be34e5ab9e1848084d8f722a55bbc4f61801dd0e694ea6d284574ccb89c65ec0c12f395a97f4232b39c28ab7b75e730a436c6";
+      sha512 = "f0086698a2deea24dd1510da377ed9094273a7867a920b0d05c6aa47d4f4c5042519d02c5977747df05a416a4bf94aad0a52a0b03869e693f621959a0f980a26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/si/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/si/firefox-69.0b16.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "a31294e1cb39c3949cdcf0b926edfd5f196e6e9a91e99c213d86129896c56b47e4f3a33b11c4b6b8d9d44a2b0fc767a87a67d9252cf1e3b4d2ae7f9716ccee4b";
+      sha512 = "4b0018c753aacadac60961b1e4a793b6a0f36d2f8844ada2515ad8081822cbb869ba23f7a69143af860ad060d86e7ad157a41609c1fff0cf481b45bc55a23c0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sk/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sk/firefox-69.0b16.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "f736359f8f3086d560b84070f35a2184b316c5f6ebccf9665232b031a220d3d638e85c67ede20c3ec5836ef12251f77f4df429842c824ebd6961d58a99ba3c22";
+      sha512 = "f19ddd306e48cf04bd70b008fbbd6827045d332839458126ea16393b04e6b76dc8397ade3bc28f5798ef24f27c9dafb578808f3ede8808609c24a8bc20935448";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sl/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sl/firefox-69.0b16.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "f5f0f3cfd91ca5a5201e3178a39d8ce0db3f01a36a4854dde16088c6b8423b5ff6e45793bc5221a02fe444a15d83078ab13ac48ae4b529144ac183aecfeb4811";
+      sha512 = "104f68ebf03ca5165ad9fd049beee70658156ae80b62e88e2342e845ddaf5603199d3ad66423a08766fac2ea2db07766e66b9e09b9e480af4cfb08e680d5dfae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/son/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/son/firefox-69.0b16.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "2ba05fbe3f440a9010f999bde29849976042f2874b6ccae408fea5e5057d812fd91879d5a288ccef6a4795101f854f74de794576706b90078e1f3c3887818592";
+      sha512 = "4ba381efa38f56c60a7c9afd625514c2b93cd89dfbd3e99968b89b8ae57bc8344f5686f6e7c87d8b21136d8f72e4c61af617152d534b749fe0ee731220b60716";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sq/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sq/firefox-69.0b16.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "cac976f53f72a5eb974ef97727a5d6ed38a5a4b8e61094f8e5d76968d6afadf0daa68c7d6b29a45df6dddef8cf26973e0ab1a65c29f906f7e404cf0b152c5e08";
+      sha512 = "8a3a3b1a8a48e8e681ae7765d8a0e9fce8f87f3e12f4af3fa4fce3dac0ef74524d4a14c1f802233362969237f893e02d22fd44d7e032ce2f45e69abf8a18c738";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sr/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sr/firefox-69.0b16.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "cb87cabbe1a9d5910354887b0a6eda4ee055b823a0ac35bc414d41f9fae636834344451e3a882c65cf581d21e875b400f5e3e054ab053ad1577fe48eed8dbfd6";
+      sha512 = "6ee469e7a091662d62250f17c7d45810f9db853571185364fd7e9f561dbe6e6582c13c5faad081769a8fd715fcb0230347cf88e642531a1d7e941072a2003990";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sv-SE/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sv-SE/firefox-69.0b16.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c4412a7488797482b3315a2872fed79ef033ef4fc32ea119e4a943999f5a892c430486a6e13236127c97af3c01f25724bd5ce6e84d4a9bce69d10b5ef84ffe7e";
+      sha512 = "5ba63456a302baf31a03f129fbbb820a1142a83b41a44829947ecb1878c1b7723035313844b7ac5e950440ba1feac7f14ca1473b1acc75f4899fb2abe259057a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ta/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ta/firefox-69.0b16.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "55729c9d755d83286dd88642cb130d75a827ecf98959cfc8e20f205e6c4c3ec31a03fe0a6f304662beae68677aacfaf8b993a4f79dac79c2b8157a3845bb022b";
+      sha512 = "b9f59f57c74ce57b80268a139bad81014494e9b2fd173be997c5aab61aaccf28f84d0eb1089c3abcf21fb62dff02b1b8e0176e0f4e3adaddbebc5452d9f9a07c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/te/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/te/firefox-69.0b16.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "2cd9b38b607b89b909216afc403e7394574e66abdafa327eed33edbac45eba850be22ff651b9581c53a7ab4735c29f1a4f2ee3fb3c220ef2f527f48d919b15fe";
+      sha512 = "84130d585c0b0e80007c9c1fec4011c44bd087576d1e351bb899893797d4ee8c9f856dbe4b9f8ad37a2aca98dc46c9eb81aef1cc236947b672f7c6a978f28bf3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/th/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/th/firefox-69.0b16.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "721711be47093f846b42d5bdae36ce083e05ad7edfbd75a32827189c4cab9da3af0b34551d55ebd67cecf8e04912c17f2a44b032f2a9a76e926a589381f3ebe3";
+      sha512 = "2a731a0294dd73b113983d70e4c5a779fdfd92a855e635655aec5e2316a32c97812dced18c04820c4332ffca63805af816df5e7a180d9c8108eb63f4339d8578";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/tr/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/tr/firefox-69.0b16.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "36c4b39480b95152795ebe744c6d1390f38540c3cdd19cfaccca40f3da446a5afb6c5b8dcd3bbc87b15bcfb5214870104724d645cc630c87373b78d89c7acf94";
+      sha512 = "5e1f639a0807cb403bab8157b3ccc0806d3704e27d2e682ab56bdbfbfa488b71d454dd983f4c9cd1754cd1173ff6e14f097cd2c8db5cc7075a63b94871dfe94c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uk/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/uk/firefox-69.0b16.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "4b388a81e67390ff461681587914ab944230361790f5b48676df5d402aad2a3ff28c808a2c8ecb655f2540c3d6cbab8188c2b154c0e173625b7be121968e853d";
+      sha512 = "33ec6d4c9ecfeaeaf5659b809faaaf60f24382f2c8918eb4bba81231c12f0c8049bbf766fa3a41a8947e6c745932b4e908f158f6a532c473cbea3c6a833e8d29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ur/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ur/firefox-69.0b16.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "43cb375b00bc335f5a5907796ffd84279799c8c907cf372968abb8a1e9c4ce4a4b9b199eb0384b548406a158216cb5e42efcc61836b5ece94fabe83d724bb26b";
+      sha512 = "2b06b2b145593f6c3cb74b16553aff15b8d453b3ddfe6a8ccaf2cbfa0beec3274a2b04b10373c5420dc67062c246d484f099ca3dbf1fa94ce0dd6ab6533dc066";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uz/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/uz/firefox-69.0b16.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "33c0922104c4f0d6e9a5860738bb5e5001ef24c047d617b86d16f9a8668092ca0c3bf88676c448947e4c07c3d80fead8714291cf9e947698765fbce65247a488";
+      sha512 = "86b5066b07f8b80dc86873f2f418a4526e386f65711199008538ae192d9af06cfbcca1132cc95007b44a9ae1afb5a76de7a2c4d971b59177e097b4266e075fdc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/vi/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/vi/firefox-69.0b16.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "d4fc27a2f69dcda6832bd0372c97381e3c47883b2f9abdb21b67b2c06f392cf2e2e8aaca8f0c5f67da87f8884b7be8d407b49a3caa04dd166165a8623f621cf7";
+      sha512 = "c474e765f85a145d4fd0c9410305e56fc8f32c6eb9c0ae139aef48e1b35ed4eda941c92d3030266d38738ea559088ba799db1c937a0fbe3867583beb4825a93c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/xh/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/xh/firefox-69.0b16.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c7d3c3975ccd4b2635f30aea2c2ef8e2c8197c52730fb60fc0a9adc5321a1f960565a442d73b68ab15367ff06f87ad09e463c8b9a0f871aca526716828795d1a";
+      sha512 = "2fd1fac92f3bd260949c0851849424fce5ff56989e7c9486ff11702c85514929c49952568ea45d0e2889e806f6ea1556748b475646c90647a92e50716b1250fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-CN/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/zh-CN/firefox-69.0b16.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "f6df2df60e020f07aa210e373d177a49204ac35912172a0885e9767eebf64f660d2288e3d9d3cdf574c22c4c0257c955faabc02721c34c59a113de94674d80fc";
+      sha512 = "b3d7786d3883a99ca1833905ab971aba5a4ed42fec451bd7d5664c329a4deb495afbf00975a7c9935bff42b42c828d830984d389a6b0b728586dec9017e37fe1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-TW/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/zh-TW/firefox-69.0b16.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "70d1cc8904f27509fc476b59a634eb7ac26cbf53c88069b104d00ddc3c596384d75bb5522bd38fa25f2aaebe2ade7453505622110a36f7f77f19062a846f01ec";
+      sha512 = "67d506a05c404911c3b937dfef3c696ae6d3739b3113ad288b46b9a995028d48ab7c7dfbfa7a735f453698dc1b58864aed7b718f3b81bf42d3e8114180743692";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ach/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ach/firefox-69.0b16.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "74550f32169f07e5d551ed20ddc3f24f731a18966f75f80d40187496af4bffd1b0742c6ca001fa263b236826f2dfc6edd21e724bb1e4c8c8260e5526e20d031d";
+      sha512 = "8115dc00b12319c89463a0c97c3117df8109d68372ce91287bc382238d0f0a6d2795d8540bef5ad5c5215f237bc1b23e4e9f11a63ec8aa32b80e0a501c27f534";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/af/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/af/firefox-69.0b16.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "2d305bfc2ad71d6c37a3de2e4427417c5ca67cd97eeecda91c8d5a84d72eb7f02c6d11a857af6af673caa5921abe8420b673c4ced79025eb5a639f466e0cc8d7";
+      sha512 = "1bc5809edf99dea1ecbd942e92879139056e1d5bc83512c84fd110b227c37f76997e1f2d00f4471f03cc00cecfe4e3e2e62af858641539c08c4685a6986baaf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/an/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/an/firefox-69.0b16.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "0a6319ac1017a9c022da4d8a3a619e9243668090e8266b4778e767a9313aaba5c1d2d5174f640c3103220b5e0dc40ec4040690767062d8e6819ac0b3573ac464";
+      sha512 = "7a1abe0ba440d50362ec550da3061df3d2e498f94587591cbed920c7348e2da6f8fbd087bd3fcda2462e18722db0b0c2ec129aee8562670af44ecb333b2a912a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ar/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ar/firefox-69.0b16.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "dee2b757f449dab23baa5ff16cdc123564650c48cc4492bddd36e7ef4f99608c2a4077fe7478d035275aa3ab2368b54e2e171ab689537081b09de0388cdd0922";
+      sha512 = "89adee7c9ce7e74ef7890f3b8ddabea3d6e06c90db695f3d19af64b7c6602f9d80cc2c2c6d2958ffe4909d734507074f658cf4f04701e5ddfa9a9a9d4062e21c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ast/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ast/firefox-69.0b16.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "1e92c8fb6965dfbc9dcfda7bdd44a8612487541930a0e758c0e8b8fd27e2a5984761a430420924adbffbc11f6523beb80a8995f1e6d0ab37cec9d130306f81f2";
+      sha512 = "e20bf6a66f67713cb3225b8f8109c4d44943102d2a37571c3489b02d88d5b677d2465e2bd51783e720e5f31b59ad51a1ba7ba0cde723e942059080e840c63253";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/az/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/az/firefox-69.0b16.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "e35e1e9a217a7a8da13297e7cc1d553b7a4698ddce0eef31bea85709c836f4ca5993cd4892bdcf0e61d6a37cf125a4b9b6a4df36cf19fd4f09ca63c802069bf1";
+      sha512 = "30a25fdb3280a740c11f9b3f53f871fcb294e83377fa1f6cfebdf939a73df583d8806470eb62d3174603a29eba599ea5c6d5dcb4106f4afed18a899dc30c1170";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/be/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/be/firefox-69.0b16.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "cf65d94565d2b25ef90353dc686cc4780eeefb29cde142a735d10e8511e4d9d1db74ce57d80da35d1ad9b9cb3b8cb060fad01ea95b46a86231063f4559cb50b3";
+      sha512 = "485be4d97719bb771e25ec80f84ee94b7ac5741baf4a08a06a02ca54fc915d7c2a54ead25a0abc9d40145cdb7c1a34ccf6a727eab710a29407ab5587f6a0e778";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bg/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/bg/firefox-69.0b16.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "09540c63919525169cfb3c2ef8d19115cabaa63b41b21de43e15335797761d1d452c80ebfce1768a88f3a0e135a222e30486708a8b2ef5c1327738f2d5bc8325";
+      sha512 = "14b2380a52cfce2dddc48a8c0cd52ed31d01f3c46728aa866e0d05360f9d078aa7f59ca7bcc33d0ca7beb60c81780d5def46e1b05786164a0123d95b80aa100c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bn/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/bn/firefox-69.0b16.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "47d497da9c178e675989b046acf7d35caa7a66090d8751090e86c5b9d9ddf6924767a586d43d33a7a093f1885f5477a8bc008e58eede27bd219e0acd6b00468e";
+      sha512 = "1ca9adfd64c8194fcb7014cf48a87e171d5fd667515a972259e9bbd5ae436470a64c2c03a7d672c411bb0644bd962e41f60dd5385a5c04aee1ff7a2f5b847eb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/br/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/br/firefox-69.0b16.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "bb313f01a39abb6687b71314755be566ec6944fbe0aeb5571321032ee814e4aecf57fbdae9847f4e72a8844813d086d7cdb2521a09578ad04a0f31891571d508";
+      sha512 = "e80b7a6ea23d381b416af92502b74de117eaf406f139705390b756c604b58fb874eab389da7d4adab4a14925b53dec66b768892a12324f2f57979ddf9b3fdff7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bs/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/bs/firefox-69.0b16.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "3b6a6e000d6887604696014e82c8668f4dd5e798287bc2e60cab98a0a51a4446854fc78a606615fd760f731c70cd10bade6e6f07fca17c5abc4e50d2c1cdb893";
+      sha512 = "72b3c206cbf559784bd2adccf3a24f85f840e26b4975b3b0a2796ebd5c1ecb2bb00ccf6c1cfd7fedca191fae33f6abbb71d742e00e74aefb7b4314c91c0bf0a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ca/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ca/firefox-69.0b16.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "ddde0c94dae1ef133d3312043271d7fc9d626900f5bbb473b7aa6c2ebb455d358736da2736271611f3e6b336f7c88a4e60d060101788bfc7ccccb9e2ff863259";
+      sha512 = "450f99474c8f86c5af4bdd210be09a6c05d9638aa9efdcabc8a0d636d7965033f4b885fe6a48d22fd50b6144fe461fb0f5aa7870fecbafa9f1b8cc769465099c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cak/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/cak/firefox-69.0b16.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "875439f58c7ccba85c6a59031d92344262de3fb27852fcc727b15ee0964d37eaedf6715dc5569cccd0f7d684e96052b84926c4b81c509fe456015eb67ff883d8";
+      sha512 = "dd9396d37038bef1a0dc8b052afce384c83c7aa9ab9992fe6eae879b6721b251bed5c12f7b1599de86658e16829bcee15b411ff8dd40bd8afda29ae5996bb041";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cs/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/cs/firefox-69.0b16.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "c93a27a66889e2e2ced6dcea0495d9295c179b2aa2afc706196b84a4c4537e0499875bd2b2ec152a38d2c5afb5d1d45224086c2cc2bfa56907c9f9aa883deea2";
+      sha512 = "bb722cbf74437cf3ac9f870fcdfdba191334c3f6970e1ab0b4d0da8257e60cce09d65177a4f81dbbf225e73b03a8616aef4289a27f25440e2526d96a501443b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cy/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/cy/firefox-69.0b16.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "66059d9f6e059bbebf42ab3d29fc9103de639e5b1fd7f4b8b0648b98d86a030d668bf35852bbe83ff27dc3d1ababe47a74f1e37a227a61da6b4c90b12543207a";
+      sha512 = "e6c0f84a810005f2081ef8cd88b94e689caf07c5aa08b4c2f9ca5d5cd071a8e37d1f572c82b262f3e26381a6097c54ab80bfc4a0d09924693937751c7a1d79d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/da/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/da/firefox-69.0b16.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "a3943bc573c65a0c90a88ea76882a4b43ded06aa33c1bf1d861d3d6ababfef3c75104c7614b740860cd682c4d0cf3fdeaf54a41ef206f117ae8197a73431d362";
+      sha512 = "d209f91aac27c9cc0a075cb51ed4f9d41aaa74a7407892ec45ab2ce8c09e77a725fa6e8287988cd53b0b681be785c04babe13e19e63c25351cc6cedd84156a24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/de/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/de/firefox-69.0b16.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "2635e6ab49e4545f562043cc56e56750a882943ee160b3f2bcc328ae53bbeda364746a3d97cec3d84086e90b554a98184d268b27efb9e51255a3778ce1f5abf0";
+      sha512 = "64b843eed8012fdb91fb6573e2e7e8900e3d3ce2c476a509e1171746261ddd1c15874d539e416d5c0607b34e19b01d56f2d497e4d09c595d29febdf3461094e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/dsb/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/dsb/firefox-69.0b16.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "aa44a98135e4e5b3f28ac37eed0103876a817c07b231830271c2dd44351ac43da9139a3adbbc8a6ebf0cd28c87e802db27632d87e7f5afb0209f4816f35273db";
+      sha512 = "27801c40f75cd6824af2f6e583b99396c07baaa66c1aed6bbd7382fa85b7969ebedb6877dc0a979775ae153c4274dcb970401cf5686bf681b3858009eb8059f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/el/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/el/firefox-69.0b16.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "6c86717c1ec09829567ade584c4f114d6bc92c9ba85a4583670a038b5616521a4578ad97b023673125fe85b9a99fc7c3999fb7e4b50fd75540386b6024d26c69";
+      sha512 = "7c4452fc29cd4a2c6516445fcca6c470f9f8ee81ffd600dae225eab8857ec43593f85b182b2e252cd04f3a6279a86dbad71ba0c2e0b723cd6d8c4a354b3cc582";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-CA/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/en-CA/firefox-69.0b16.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "90af2b18f403b7fd25bf5d920c3eaca638a6fd5c75dd57afdb0c9e1a20a8404cd652d2c69b63bcbf4365af88d1483f02b929d3b825899eb465c142775e4eeea6";
+      sha512 = "53e7855ab3575799e96569115cf5882233a31e4af1e15009b85593c7fc086e85b7bdf0148694789b816e8a469665f82cb5f1448aa4cdf160a5f8abc97f92253a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-GB/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/en-GB/firefox-69.0b16.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "4ff1dfe725977d16c23333b3f3c8ca035d4973fea2d7d1f49daaf75cf6597fa56690512636a19455e5fcda984a4ac887d4b987b45b811683cb65d40daee7b8a5";
+      sha512 = "db512b8a4a6a46021e2a24ce0ead90d8f56b9eff756b9b1a6c8cc1290a96eb51d763d96c0475c7636b9ee9a88adde7f3c81eb9366e3eab3448afc60e2a060108";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-US/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/en-US/firefox-69.0b16.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "851e15abeda5a7d9faf74950e97b2decd6ef989c04acf8d57833f9172f0793f9741d9f1212c2aec41f017c8ccd491a1dc973beddee39ac7660e63f2a24463911";
+      sha512 = "eb6ed30b684c016b947e3354da57b5886b29524b57f4bff4e071fab5d5ae978b94adf0572e74e9e31e15e493098aaba03344b632d0ff71145f90a8e5c7e367d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eo/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/eo/firefox-69.0b16.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "623247002b82238eb05f4bc7fa6182aa5f68121a87af6cb78315b4f144a17a50899905d915dba41b5dc2d372ff97ff8dfbf0ed2a0a216c85cd45f65206ad23d3";
+      sha512 = "b2b343ec5448978d9ecefbe1c73c94e8d578d875dffa09fa3739c396c3a09ddef4bebb7bf2f5c12b1bc39fdd3b8e89185c2a514422883d0e8856af854369a501";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-AR/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-AR/firefox-69.0b16.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "fe485782e38e7f0b74e96e2e06283b6ad30223ab1cdc3636fc15810b327ba564706d134ef00ab0a38d4f6d5639aa84a52cd46af4726e1fbfc9eb2ec19ce1862d";
+      sha512 = "fbcc4138161f11c0c61eadfef889a72aa691bc5b9db961a52cda092b638ad5d2313fb5934bcf2dd035f225971bfe1561acab549da61a7aa885191ca2c3112d7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-CL/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-CL/firefox-69.0b16.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "8520600de63e160c21f4edddefdf8f971c12456a5ffe967dd02ca00c7227b34f6b8acc569fa0c0d40c6f91bdfe97683444eb38cbda8d1cb1ba2b913c943038d4";
+      sha512 = "ff8908b2c09877a2c7cbb0842e826c51069234656efc9b7964c2432e3d61154596cd63864a3a6b331fec68ece3118e5cacf9014389806dff8897933d584c537a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-ES/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-ES/firefox-69.0b16.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "0e36857acf8231b9be9983aac35b2090ccd85dd2f8cd7b37021f2d62b37b17eca4e29afa8afdc000ff608bc535b3583720c4111c6bc87a67b5928e25d1912f9d";
+      sha512 = "1546d5d67b1b4c778d137b35189470c1aec01e617c2ea8b52bbd58c636b5e2a262db5a8f02bcfaa45ad1fef499d9c9e135eade38f3daaeab6c456e52458927e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-MX/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-MX/firefox-69.0b16.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "4611aa1bf2f9717093027cd38e60afecd855f9bd6f5b90e57ec64ba61c2d3cfa38e94688e5b7e02e6ca40a9ccd03ea9c25543b03be297ab76a89db3395fd7dca";
+      sha512 = "da8809ae2d281547be55b0d3db4c779758ecd5c2b8204f54f732708816fa1d653f593e9e0bb24136213f3d1e94dee6394e47326b74be2401ba59732ff4f8dff9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/et/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/et/firefox-69.0b16.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "94d4cbfcab4dc697462001946eb91733e7c9cad2d70d1d7070ed6d6e4cd83f364338a70f313c400ebd9f17bebc05d8297e27b5d662f0f940a66e63a97e549ee7";
+      sha512 = "7d9cdace25276f868e853d7b964d1fcd18b7109d4072db49984d5d00628c9910c99cf494304fc962245f8d551ca9f95a603dbb1cc48f655b724353e869237218";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eu/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/eu/firefox-69.0b16.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "e140a1bb452d2a970d540b764ba41bd70f4042f7f6f2d8bdc3407cd3d428e009815c3fffe4dafe3964dce45d860c7960d0818acc6fc8878e323b4fa1dbc340cd";
+      sha512 = "e3f8db0d5be3fbec65d27c3cd4f2272fc5dec401ca19a0fd5bcb7b48a196e81752d2b1c6b72bc94b3294ee09eed58b765790663185973ab34fb7816c38570ce5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fa/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fa/firefox-69.0b16.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "2ce77cb106e64e49b2605edd7f6ba19e7c0782356de0a38ee572e8b5f18020ff4e8235bd83749b578d67a40ac81b246a531e21ed24a944e562444344bb594121";
+      sha512 = "5be17588077f86e6766e1c257b73e8b81b2213f3f9079c01539578a6480fd07a90d4129af77f81418b4dca8278c44bdf997b3e0686ed1c2e8e4a5269644d21ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ff/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ff/firefox-69.0b16.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "a3b44ae73ff9bb7ace9ddc7d7886b4362eb2265fe0f8d5b2e34fb929dc367a6be29a46d750cd33b7d03cd321827dc261f1d88cca91fbb180ee1dc72398c1281e";
+      sha512 = "57f543f448b8a4abc99201eeae76b0574841a5c7815d7303844b5cdcb4a5668fa03483d9a2953f9a56bbe175f8f82e94b4aa58d77174e5ca26c8755c25cc6c63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fi/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fi/firefox-69.0b16.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "934f497203bde168237ba43d49400dc48c9082a24de8f74ce887cbbc1f35057a2419dc346b88f18ed7d78596ed220d4f65371fd2bc34a1ef005803109c7e77d4";
+      sha512 = "bfb0d7c4a4e4d0633879f79d8ad5a406e7e3d57f80ab1f1eed671ef85ff7065afa826769b868c90b8e90b87dc012016b419eb0a57de344ce51f49bbf61094931";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fr/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fr/firefox-69.0b16.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "778509904c83b8c00c0b71331c770cad677ee487079710d9244d1bcc5a2e2f6e397b30c1c8ffd7f787f8fbbe87f509105bd2978d26f60406b8904245f170d79c";
+      sha512 = "b944d8473f8c7a859b738d78140fc6b840ae7798a3a0e8c237bd81f411f87129528ddf68f33da6578547fa768fa1465625dbc4a94f265491722bd4f23a614ce7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fy-NL/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fy-NL/firefox-69.0b16.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "8cd82fc3c7a2558f5408d2e18d8fffc01dc1a0c69f52e61e7da185a9b7d24c79e29d68c7e61386b6910aeb8f91276fc1fe5c142ca526112b1e0ab206ec3757dd";
+      sha512 = "445018db73c97ffa87377bc78162cbe2f31dae2ffbf47ec9e0bb42001e5a15787fadf4ce2d4027693eaca4edbfcee72a7e3874594d3409384df62c91b118d388";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ga-IE/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ga-IE/firefox-69.0b16.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "4e0184a5d0f6a8213d250b2210076e4857d27224b2d6ca27375a8951417ffc74e8fb02b9b571a12f34f59911f0663ff21d1abb09836bc0f4a1fac3c6894bf82d";
+      sha512 = "2a6b8f3ecfacea21415daa0dfc8e3797b5c3567e7e7bb9ec933525d2a2e9e51dfd94fa81477878e2bca68f8127e32e387f43ac8ceb0c02622813baa5b17fcf08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gd/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gd/firefox-69.0b16.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "f67a284aba28000a070f06c1b075dbf3edb60b4704c62fe80df4714df51395644507ebb89506ab2cb65ccd8d1c16e896da0c4dbac7fd3251026f0e00bcabe014";
+      sha512 = "474d524fdab0d83bad98e0f05348d8db0f49c11f2e50e7b5221137359e268e37e662440961bb206cb2ee44aee9d07b4565bb8b27a696ae0df89ceff76309820b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gl/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gl/firefox-69.0b16.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "c07c74904f845e2b740f6eabd334fa1aa0d74012e86fbc17624d671c7e2cb3d78143a499aabadeecdf276c3c6d4f2934a54240ec7078619491eeb28c8c50be9f";
+      sha512 = "ba2dfaa33b47ce1106496783bde98b1ff7cdb0171262feb8890a6ada29a67c34165b8b7ab58aabb89029d0571a6ff8cc83b14c310270e0e7a725ffb9fd7dccc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gn/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gn/firefox-69.0b16.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "426ceb6386da90c30726ff5318613bb88875c1b109bbd73f46f6c436b61a18b76a8272807323abf925e1ebbc6531c7d82ce1af5dbaa9a2941a8007cf8dffd3f2";
+      sha512 = "e5f5bf7d20eccc3d860ae2b8c6aed372944f23ed6d7a41774141cf1d67ab40c8bb2cf7e8e5931d37b9951668f03c6ab1271bb57ca7ead9aac52045244fbce93e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gu-IN/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gu-IN/firefox-69.0b16.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "71217c32a6cf4fe5bdc922d09bc290537e58f26a75290bf23a5fc60be3e42b8b17d5b05dfc8ea4c547a149e795fc9449459d5f74efb4c7d9ab7068f5533c0bb2";
+      sha512 = "9ca06aafebb4ae5a65af94c7fd4dc30bb0fb37d6f50a8a8d0b5d3a92cdbfb7a6a5fc609f5f9d93c47cbfd811198e19ab554d47cb7a03db5a9848135660b17f43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/he/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/he/firefox-69.0b16.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "580b58ccefbc9f1d79027976dcb8b880c6608208322449146c99e1e6ceb18b0d9069891dccee5c37df48b8251984ad915228fdebd48d3770b54e47ee2433440b";
+      sha512 = "ff9331af69d497b9886b7fbfe3954c0149e170973c96d0bd23252e0d9f97964f88f60e8258785337c8143a5abddfaa4da5d1222b27c42e38686ec44c738521a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hi-IN/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hi-IN/firefox-69.0b16.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "52d0bf548b7cdf6db5bda320f8262d226adde14cab042458e591fa922e5c4cb66c7a10699ffd3a4e90b9be522c5dba77bb8bc787b4db73b6805a04b72d92f752";
+      sha512 = "d50d6887657b6dd61db4d53c0008e42850000d56a56b53532900cd6384c64d029a7a276386a5b46aa74b05c5597a4782f586b27cb01d34058c124c5bb58faec9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hr/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hr/firefox-69.0b16.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "8a24d6c60af65b624a3f577a984d237ac93582bc5630ec2fd7d3c39902ca73ea47ae34d41fe90dbdabf15872bfd679e029ec361ecb7d38c17be4441f3df298ff";
+      sha512 = "d5c5a069cc845544cdc905c9ed3083329b75e367c99accf1986a799a6f69f081565ed0c9e5bfcc6ea9e5c4b606262e60a62be6d4271267094c5aa701f090cdfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hsb/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hsb/firefox-69.0b16.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "085f6fe6b298047cd08c153c8fa9c3266c8fe69c0165647c863053e2b9836db9b5dd083c7fcedbb2100b22947a296da5b0894897eb801734430e153eddd168b2";
+      sha512 = "9b2b8198bfad4f9f1bd5808c2d696abb1473230afa20e42e216c6616821a98cdb6bea6b92efdc8280892e04a0c1b6a967adb9c69fdee9f9c1bfb4f6fd4d17da4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hu/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hu/firefox-69.0b16.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "06c2e59c69eabee03b5bf118d27fcc5b9ee3ca21e1596926c5e75200f47ee4b27c4bba5da0e3a67cf6acd7986dd066f2ca79089156559c2cb725023067dddbbd";
+      sha512 = "bb189556077d8490596acf9433146923ac6a68e26d804fd6946a0af1b247342f5140693d777b9dcda41972ad2ca6773b362381ffb9fecb58826c0353511065e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hy-AM/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hy-AM/firefox-69.0b16.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "94f95dc01d54875be32db75a8ba17202678aeb8f0dc471a356b73ff6cf2725d302dbb5bb41318b69e904d9a685e8b833bf0ad489818fdc4aec72617cf19e3221";
+      sha512 = "a295c182fb7bb80d21e551156e8e1d77327311274e22eca16f4640e833a4db21597e3e4b5f64e2d39dc40bca387497ea78e2fa198b760062a33b1cae86c6405a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ia/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ia/firefox-69.0b16.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "ad541cabe5f20fc90cccb932e4062d8088fd58b9bffdacf6da8c53cf9667d82363a8da70bb441881fd132bf0239adca681abad4ffc44808f4565eca9830ef387";
+      sha512 = "9a5f01f6164751f0ed8cd34e9d792fa889a5a7ea9eefcc3e8afba20ed419da984db0983126122c8cc7770f0b34bdf1c39695632f737aa83281b01f8f713b43df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/id/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/id/firefox-69.0b16.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "ccbba3cd4a34a2db26c81bd670b53e50279ee22b1e43203802112010024ab496077f2efab9f100f50dadfda7d35edad09cfee7e54997ee2034d84e8efa24dc3e";
+      sha512 = "3073f0b719b1b4d71eb07b9f1a62f51176377579cdd8cdb1c8ec0876fc820289db29cb13f049058d0efcb955c15a3c377c4496c458b4b3fe438dcbdaa9d6fc07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/is/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/is/firefox-69.0b16.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "11ef7c6e96d4fe5813bfa63a322b9a57f283e444a22be440ea14acc0d186314e57119642dae7d285122a17ede96eb8d37f8f879c22101f8a64ea5f0b97dd1a17";
+      sha512 = "15a8593945e4cafbbd4a1b274c652fb121cdbf567031f6919e84767df65eb4f4e42d411b4799b8e5299d6215dd3f1cfef5104c9197c1ff1feb68f89e0bcfa2b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/it/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/it/firefox-69.0b16.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "c568510a83c61f9472852f8c8fff0293bc7dff741f4ad8bdcb16caa5abdb2fc9cc0186ed13c95485775c8041e9ad0a4f6433fff933626f80eafea9ffa3fd3f61";
+      sha512 = "55c688602fb41d39cf4e33f96b57ff98d466623ca80281564ea6a4384b1985d29436f7288f56e969151d9873cece10422abf753b262b5ac6e283731397e53e91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ja/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ja/firefox-69.0b16.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f04b5d728d9e319c2f88db4c283daba74cc36b03221a61c92dbd3301f1a2a8d725dd72fc9fc95e984082eb128a519e002bb62c59f82e6a529afbb36289be5e23";
+      sha512 = "f350eca93c6110e8a258802be4ff1cb8b07e819f2fe3b24e912f296c4e18cafed279ad5ad8eb093f3bd7945b0c9cf5466d673e5b4ae342a3b2d0e418e5e6c86c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ka/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ka/firefox-69.0b16.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "9c47c3e57913fa009e92858363a7384f9e71a9b6826c64edaa2772984be43c32e45c73b7599d45ff51dcb11a42fb70963ab95615f730a2f11d792e0ee1c0417a";
+      sha512 = "ce392f476b5eb00620c2170cda585e4cf73416a5d564446e65e39e0deea538825f3d91e91e5624c353b163983efd0bf844baa9a52e3e308d9e232d83f9167d0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kab/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/kab/firefox-69.0b16.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "aa7e4e641d79568af30845813ae6aed59d59964b37be672b9a18a0006f152dce7fdace65a6d4ae2626f80becfa56b32f0b18cc826cde2d555816a27c76b175da";
+      sha512 = "ffab6510cd2b68b0b4b57ae1ec727e391a0330cf44c9c1f9fb8bd1385c8dc86f1de5dcc5712b0f0dfa5e25920eadd6561501579ee5d15ade22fce747ba88b988";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kk/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/kk/firefox-69.0b16.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "30817ac01333af478e9dc6be7db8e898705bc9020627b171de664e892ec13987f17e8e2a346cd94bf77bd9caae62cf8b37a1ee3714cdc034c648cdb424c72cac";
+      sha512 = "f9aa18138713b9b704c8d0d3fd8a5d2c5f802d3b23b7ad89d7f18eb885b9efeee53b94117bf7492a4fe83be19b5052d5ec6fd8f203d96f7988e5cb1eb524f496";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/km/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/km/firefox-69.0b16.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "f0c6fac7c89b677eb2407b199d61690a3ad59128b9d1a06575dfe289718e0d5677573cb0ff3da8e313d24798a9776c4387e57a60bae3ba916383cc02a57612e4";
+      sha512 = "1f0a4ba8942210a0ffbee2ec09f79d628638f58e26bc83d175d0b95ccb43636c976fba556720b39b42c37ac2fe67bd52c28f0a2f672706d967d09a26c3e446f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kn/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/kn/firefox-69.0b16.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "5ac4a09bf82678f3d8bd53c8bd44c1f6c0811a942a99321cfca1d553d68ead2abe8ed2f4af3c50e9ee88ac1ede35e201fa4fa2ec399016b122389a51f16cd5be";
+      sha512 = "c23fc4fc298f88f4aee69680156d95fc98fc311630586d5a2a964c8fb74f2b56483e0b4267b90b1a3f37815ecb379e6583e7c801e57a94236d35e0e68f68bcda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ko/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ko/firefox-69.0b16.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "dd1bdf3e30b3a43d196ec50870bc8f2abcacf703860dab5b21e9b50fad5dbf9ed7cf0bdedf0844a2d56e60f9fc461e397b48f12956e2d95ab6e941b760e6f5c8";
+      sha512 = "4dc91ea327d7c69b68bb065eae6ef812ca01c32dcc22048867e43130b15a15edeac505bbf859d96185f90fb3958c74fb0c3e8bbb58c4a0d7856837f864163d7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lij/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/lij/firefox-69.0b16.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "5c9feb27b7ccec9a6594cf027b7ce55df4e0becb5871444bc24328401e3a764d7dadfa3a56b654b18b2e10ab8a8e03c96021a33de5cdc66b0d7e3d6992a2fb5f";
+      sha512 = "3588c1b35428dde09cc0262d3730407ed4bcf821b28556f7b05fb60250eac006e12ef8a929327a80429bab195632f9f40771467e572dd6821c646338d3c7d862";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lt/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/lt/firefox-69.0b16.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "ebbda17ab983261c9a593a4368696026f4743a79c6cf70e89184390b4c1966d474b75bd751a52dabe06e303b8f223c524494a6cb753dcd547cc8c93ba911088e";
+      sha512 = "972bfbd93200dc87a6f9cb246b30f301c8db216dc9067bf40f42cbd73ee5795cbb276ade5ba44a6e3df2239d481ea305f4499fe88f42a0f7d0071f84dc2fc9f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lv/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/lv/firefox-69.0b16.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "059c241db15b20d4a5713b35fc7dec60d51253a0d3c9e9e1337defa2ec33e0a3e22b2be6346b6b7fa51e35fd48870a86c2315bedbc32669260195bdff3e5d9b3";
+      sha512 = "c7a0a65c0649059cf35b394b033b965b3d708531f6a8414d5fead08f2b5e5fd907c903c23e22e9bf5cdc78255e0215dfe34ce45ee96fc619fbca87fe086ed32b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mk/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/mk/firefox-69.0b16.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "170ace7a442581946c8ab52b63c935ad58cd3e6415c109c564faeec9333025fb9647f0f049a192386a2d980b7c3f9ceea62e1d56cc90e8c8a4aec568f58e4dbf";
+      sha512 = "677e6238580a561fa86dbe1ba8d293aec4d51ee96adea11871e169e1d6ed0c1de29a6a44c374c87aaf93b00178719f142b44821d3f2f866cd43308f7ddc95784";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mr/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/mr/firefox-69.0b16.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "91e4aa884b26041047ab3bc0c3eb5bb14a62776982f7e1edfc53f1732c5fba9bdb97b77e5f9603cfdd4bb2f67ca5f5959ea61eb4827c6075d30b502c9282cb3b";
+      sha512 = "1457c464363505e787367bad9b90e6396da7e5d0840618cbd02c1996985fc42af4279ad9f53b6f0014c9f0296f1912ca5bf7832794048e69cf5a7d5b89ffe811";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ms/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ms/firefox-69.0b16.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "2c236d61824b559def24a9f96ff15075d17220893ce5500bf1f997d582b89b8948eeb88683997ffb64dd57c2fdc01961d877de28be6110da7ff4bddb129540be";
+      sha512 = "54d0c0a9a17534891267a3dd89682a1ca24dfa42e13c0a68ca67ac800c210f77a1b504d2ea0e16293df31ac716dac2e646fddd6eb4a5996e6cfc9fb578391cf2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/my/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/my/firefox-69.0b16.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "909aee75dd8597d4c7d08cd28972c27fbe07aa774c93a6639d38ca152ea2d0a5330329a857b04100b67b35142689b3ab9f4376200b9d6efe8612a8dbaa19618b";
+      sha512 = "21a851362356c568d93a24e7038ff30c376d712d0ba52d9eb51ad325d43e6a36f3565b48385b54bd90f846d03b626e96e002264d10741005403ab6d30364feb1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nb-NO/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/nb-NO/firefox-69.0b16.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "a7b65f920dccfefb64e1d0a2425a8514e555089262f2d0d5300009c9d8b8ff343f387d0f3797819808a2d2b67c10ec026fd12f0306e23d8b31573a9ebbad726a";
+      sha512 = "d625f65dfe643608689b2d7858f06b3e1b06636249be516a76798bfa728827592a543e5e61279c7b8a5e8a0c07a17510232bccc98fa8fdac3f98806b94582db3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ne-NP/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ne-NP/firefox-69.0b16.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "10e0715ca360b3299312c6f8c86b4d89ccc0788611c44e20d90b0cadb20e00f2071377fb934383d6d76cff49d0fcaeb155b68328fb5bc96fb09479a192df1464";
+      sha512 = "5d85049a3d8f11b164d091cd7925d456e54db63fb93883e42306b1bde48c502e3ffab120c4f9d05de688086ab94470d4eed827f24689cb1872cdaeca6bef7233";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nl/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/nl/firefox-69.0b16.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "1e688394daf56bc6900d765ae4d01941d9cc02457b95965cc9624be7ad5a50a8b8cdc6212d7270c8253d539ecbe60a21648cf13f61bfade3dafcd8e6273509b7";
+      sha512 = "9716bbc5c5faa1ae284b7182f0473823d265993dc43c4ee59d6c6c17ada6cf7d898dda64cc7647ff65f46984aaf1658a5a3e2c50361d5a731ba6b82844d7b432";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nn-NO/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/nn-NO/firefox-69.0b16.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "8fcaadfa9e895a97403c60a09e27282b0907346d20c8dbcc8bc9343c0bbba03d3bdf6fc22e52271d5edb9e1df214844f17dc81d3aa74adbc2623fc34f034dcb5";
+      sha512 = "f227cb22ea4d15bdd4b20f2096f70d985cb3d9e174e464462c718a0bc6f533bc0c5bb098dacdb1a8ecc6fb07acd22f5dcd365e266208f75423677eb2bdf4ad65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/oc/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/oc/firefox-69.0b16.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "d2edc1fc3fb685ec8f46b58559edac3e6fa3eda0df5ef7bc95c4b4ed444bfdbff43257e5cebb50ef438c7638ac3cde6411e9d5b0a93bd22876c0a13965403a30";
+      sha512 = "0e116e00a58d1086093e321a188c2c060f9dce3374cb7152d753064e170eca302c0698cda110ed12a4e41b669c242e3865165bfafc4463d1ce583d0854e16075";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pa-IN/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pa-IN/firefox-69.0b16.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "535726a70b1d2e4562f4459df2873aff9b41ffc8e88bfe606465871e13ea4205431ce8846670b178e043e35b81ee8e71bcc896971dac2d8d538681ca8dd0db9a";
+      sha512 = "9966030d3fdb5da3e2f943078294615d64fb019ca67e8fb335693580bd100f6f10ad760b50f7d26c68098a3080e87359dcb1c22ab657c43c23fc2cef3738eb26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pl/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pl/firefox-69.0b16.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "1704e78bb2d0e9e8b50c078a52a01777f6df1fd4b2ed05a7226fe7f6eaaa38ae72a9ffd8780b0e6b9a51da40990de386e8acd518426ee89e61d16d6505e7befd";
+      sha512 = "ffb5a5cffab404ca1685f925580c47eba975d7a26af1ef31f05cf8f1e0ea72d130042f9b11e69427a2ab8b86fe47e279040af95a18869bad0465869c43a988bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-BR/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pt-BR/firefox-69.0b16.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "0cee5dc74c31ccd80b2cd81a83b909a77dc77c06f38af6290b7d6897d97e7aedf3036d03b1d42ef33dc3942566809388ca5b3e6d9b78a84793987db77fbb1fd3";
+      sha512 = "14956079e61152b99696ab29a92b57a3671519c4f58111999587ab796dd8e7d6805828e8d14a59bad28218c136f282ef052e56daf024ca3923ead95d7eab0af9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-PT/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pt-PT/firefox-69.0b16.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "b43c1fe0fcdfac892b73a3ef7c3ecfbdb5b646f9badb0dc5d64f9614ad35686e1eaa1e6ccc2cccf9c9a9bf25cd629e5bb893d13942a5dfba67368cf3ccf59c82";
+      sha512 = "cd5fef4336203fdfbd8af89a3cc17a01e88ddd4fd670c3b778b1fe228325dd35fc64ea6d0c85681cc1bbb51c588b53972c85746d9ac0c860b3143ec93a344361";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/rm/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/rm/firefox-69.0b16.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "370593dfc73e15ec56950c6fe788d579582451151e26896587258bbda65e623bcf28943413d80ba7bb629dc2230e4f42da0c26cd137f8fcbee79d85a8fb4c57a";
+      sha512 = "33d608066859460da6a50012fad5a76eb78bc4a3f8565dac1753b80b86755432340c6e9b5e13c319c24d89547fd32567ad99853ef7f954aebda9b15e2eddd064";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ro/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ro/firefox-69.0b16.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "6a415e17b0a3511da4bc97be2cbff5cb4307c4c63bdd2bf316b3469d6ea1abf365ac84608b169efe3e5ad8629a0430bac0898750b964672f83da0999c1c9b12e";
+      sha512 = "18bb7599738aff68f75dac1a6cd87e6a3a4a326ab64e9bf36f28d3e4890340c07e93b938d77ee4432548c5880b79862d9c472e283f638aa9e2d977ba8f54f686";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ru/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ru/firefox-69.0b16.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "b6a7c931874e0b41dbdfa7658b3ce1f7560d20acdc2ad1cb7fd3a51c05e6c7f392eb39c55faae6d723b23cf83ba5134bf9ae12463161fc9df0b04a311bb8f7cc";
+      sha512 = "c1a0c7b717740167f9906a2bec1d81dca2754c7a10f2139bee269bcad6b9d563f5ddd25d05bcc7a0621b910366853aa43663bc6d711fc1fc3b53e407dcbf9805";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/si/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/si/firefox-69.0b16.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "c2ccb292b6652320593dfb05af30be4a5fca09318981e255f15003bfb8911a6fc3c8bff420bdc13bbd1aea69b44e5809370ec100c4b6eb6ff54c71c85b3f52c5";
+      sha512 = "e807ae18343102df9030189f6e067062421a64f1fbfa9dd0d9e5590e727c049ae849dff2fb581a2f4de892fed21144a792535df188dd08c190c24dd1a58dfbe1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sk/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sk/firefox-69.0b16.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "8cecce76d5d8f6ed8d778fe2d2c733f1d81255696e78f7422c464df96275149246704175ae1c28566d223ca38da908d7974f0b055ab953cd3acc08c4e1c246a2";
+      sha512 = "35f1206c717f5475f4af6ac74bab0b691b21789457496c1226d6ace5d4d0f8f88e2c3467c6a01eae49c013b972e07f12b577be6543219b1a274340639799b2a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sl/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sl/firefox-69.0b16.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "0cfc0a94d8273926407ebc8addb69b76fc734215e6f0199c8b7e9e932ff89315f49f2695826446591a7e223d07b61da8ac2146f5589d58093096f70425ae15c9";
+      sha512 = "d665b46a8e6569e8e0e41411e647d3a27b172cbde22e3d9157a5610dfe559d6648adcd65418c45256d8fb9f56022ebf8d3eabadd9b8414f32565c421bd74e371";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/son/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/son/firefox-69.0b16.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "321034ab272f1bfd07bc4938912be05b0a14e81ba537cd232ce38e408d3c9dee6d93010c62c029be27d0322db7883cba6d418b35b0afba534eb32f4bf18e0273";
+      sha512 = "e0b22c18364e4394cf982f2cac370bff79c5440a949d5e69ef753bdcab05688b591f3d54e2721507c502f05a094436fcb219c8fa4be33462ffc7fd5090506944";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sq/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sq/firefox-69.0b16.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "3eb99ec8007060e049b1be8a70360d8839b90a48599866687b7ccefb46f736ecbcfb166936946feb4e959a941fc0534b6f843d8c62ef4f77b2cead7df32b892d";
+      sha512 = "75050296533af930bc1fa4602246b9d6db0aa48d1fce9a53212fc11041a331236fa88f70d8179c9961f09810d06df297d9dcfce791357e8c7db956c160019f67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sr/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sr/firefox-69.0b16.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "1645d31f9ae714a85bbc3433bfb97d910147d2b4c8e0b971a75d4bea5b8aeb2c500093e85beef9b28720a6c372db5edf68bd83be874cdf121add61fed3f098d1";
+      sha512 = "ceb21bac8b36872c7ec47053846e20376884678e7017632164026f0b6a8cc56416cfc4c693229964e287381739d5018836da20f8e5d636aa9607c80567a0c36a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sv-SE/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sv-SE/firefox-69.0b16.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "5a6c3329faf019a10d55a36cf893ce0d961c339c1a80ddec644266c164b774a6fb2bfdd371ceb50de758f12da5172c9bfc37aa6dda254c95b6fe01039c708191";
+      sha512 = "a92b5d28645dd601dd5f8d4892d210bdc284ca5ef6023f3e6660d6519fd8fdf1212e757f31048522009021f00716a1faa3da6e818b3f39ac4b96d68564aabe8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ta/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ta/firefox-69.0b16.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "98810df80bd496c8fab57530c56c7aaba0425bcff3debe07dfa4a647f63d6b7cb652fea19c5ec00c61536ea0e94fed6ea583aa411cd72919852f832dd02d6b61";
+      sha512 = "4935baa87058d2c2f87bc4e320d7fb1329c2380c93a72834783d5884e3e374a5b9f80b66fe1824b9d7003ba41b2f10648d8d257c34f71314de0ae9959233637e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/te/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/te/firefox-69.0b16.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "ad71ef457a0eb6324a23f7a2e4c6a0dfb6b07063e1ee5f2425a6dd6ab9feeac9f9240b9193d4bc8a70b715cb4f88322f39da577b645cc9359915ccaf91d1d19f";
+      sha512 = "5aef655c7d736d5c4cb91a6ba7c0fff7c9adee6dfd96b57f5c1f968d258fd7707a1b1ef0fabc049f2902085afd55455d016d9a786e94ef836e6a6379f33bb577";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/th/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/th/firefox-69.0b16.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "2e522f9c164049b6f8510065e2bd69394067b45f361ff127880dcaf1bb4bf893a8d4559222c39dae46b85e6b72abd0204e36296c119ac8c3442bebc8426a5276";
+      sha512 = "1bec6b20ae731e982a4be6aac81bbfad2d27add2fc1339401807fb41af36a27391499677355f0737a9230466e27f34bd5e97f4b3697decd56ffe854b932900a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/tr/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/tr/firefox-69.0b16.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "b6f684716068ad18aa626c05fb2ea331f33e0648c1d710f1037e3c5ad79d9f95748314d1f205fd1c3f3bda57c8512adc0bad55b56f355d9ba5f20469b00e2fb8";
+      sha512 = "ccb0537f3cc85331037070761e4b450bdb07215d024052d3b946b96deb89ae30333c3b90e25100bca6cc58efc2f0f5b864daf6b353dbe7655e71106b7d5c0784";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uk/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/uk/firefox-69.0b16.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "edeeea9cddcbb5505bef77b91a7f85ee909aa1fa803fe0e5a142a2207a0e8717a983bbf5636c3adf0798fd77e509bb90c759615810f19a59a2839e5336264d1f";
+      sha512 = "a3490dd08645d2bc21a0a7176b1e9ba2da47b4d2a5ef45472715dd6905eb1cb1956849fdd006a4d370c0e58744e126fb1902d4997c7280fff256885becb39877";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ur/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ur/firefox-69.0b16.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "36193d23c39331bbdae452acd06fa9db963366cb302ecbfc19724ab41fbba4d1ff3daa0f58cfafda95146792dbc1988878080ed104b8f77f1f81a53157728a93";
+      sha512 = "a021c72eb298bce45097ed0d2c9aa2ade86b06668bb0d22e1832b600ef15691680b9836598467ae40d20203bf07246ed85485d0f2b3d145452725544d62b033b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uz/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/uz/firefox-69.0b16.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "06ebb9c3c88d2332fcca2eb51f4a2995c9e181da9e84db1d8f57ce1c2ad4dd35a6b0ed3e7a61395bda7302bd6e7eacfb2114b51fb71e2e3dcefc9d3ef975036d";
+      sha512 = "ee54245bbc0845e680f5b02a2b217f2e253daa99e531fbf721a0f9dc03e68fe77371665bf2db7aad94748ad5c641bb93c7e3bf43f6e3f4e53b7ec91306d69f7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/vi/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/vi/firefox-69.0b16.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "944b716ccd4ba2ca23f1fe1ab8f5a6e16edee1d8f1ed3d2d785f061ec3317431f941b6aa811ed02f35d9862e44dd7b31a860e292509632258b45b6160a6bbd5e";
+      sha512 = "e14901e594346298a43cf9b7cf70be1cd26e6f19415fd11c09e5ac8eca7a43fb07d7b4f4e238f4b13e986e1a9e37f23d73e456990403f2983a9939b8bec455b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/xh/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/xh/firefox-69.0b16.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "f391a9ef0b66224e91bdc99a0a509211a56af3958f0b2d491d11ab024771bc91986b79b87733c86f8d045564d2546f68a8f2891bb13baacffa55d8f481a87421";
+      sha512 = "a256c23d0c478dec86c5a3413c7e64c61e7e4a519c5e1a343b457481543529354d588b07f1b0ea37450c2d3d317145796401c05988ed6d35f545612d6c5f87f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-CN/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/zh-CN/firefox-69.0b16.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "ec812067a347aa55d3555f156ce9dcce040ac7fa363dd3ff06dae9120e8186f521b08e4b02ce23e41adc5ee443dcf112264043efdadc328b43ba192d977f7d15";
+      sha512 = "a10aa5ef7b4fb6e4e3ac64a7d25c2d329eb42a0e5e0f680d786c9215d1f536a9daecbe5df31fb8484eed1471ccf89a596a5d2f97ae9875686b6f394f2a3c25ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-TW/firefox-69.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/zh-TW/firefox-69.0b16.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "a42ceb0523b083feda01262678344ae138bc5ff64c4713791a005191b5fe8378813501de11b25bf9c50019f0a07b9180fb34547ae4bebe98eb9964ab9312560b";
+      sha512 = "790725d0674be5ee347dbef3c2f0ac0d017cd972ae32dd318767535a4006432c5d56ef2e13a602f705fb177476ee120a5327dfa3625b6966a9fed8bb04f50c04";
     }
     ];
 }

From c930cf74a018697008138019cc8954218d1dd85b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 7 Aug 2019 23:04:01 +0100
Subject: [PATCH 430/794] emacsPackages.cedet: Mark as broken

---
 pkgs/applications/editors/emacs-modes/cedet/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix
index e350dc08e71..5fbe095c4f3 100644
--- a/pkgs/applications/editors/emacs-modes/cedet/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix
@@ -44,5 +44,8 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
 
     homepage = http://cedet.sourceforge.net/;
+
+    # Fails with `semantic-idle.el:42:1:Error: Invalid function: class-p`
+    broken = true;
   };
 }

From 81168273ff4d21f141a0d755a1b05eea34c65054 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 7 Aug 2019 23:12:11 +0100
Subject: [PATCH 431/794] emacsPackages.colorThemeSolarized: Mark as broken

---
 .../editors/emacs-modes/color-theme-solarized/default.nix      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
index 6b51f117ad8..fb3de6ea3d9 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -30,5 +30,8 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.samuelrivas ];
     license = licenses.mit;
     platforms = platforms.all;
+
+    # Fails with `solarized-definitions.el:786:1:Warning: the function `rotatef' is not known to`
+    broken = true;
   };
 }

From 7580e58dde95e5acbc84df9c8dbe640417a2d8be Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 7 Aug 2019 23:12:46 +0100
Subject: [PATCH 432/794] emacsPackages.emacsClangCompleteAsync: Mark as broken

---
 .../emacs-modes/emacs-clang-complete-async/default.nix       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
index 66ac9a3d77e..23a9b3b1920 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
@@ -26,5 +26,10 @@ clangStdenv.mkDerivation {
     homepage = https://github.com/Golevka/emacs-clang-complete-async;
     description = "An emacs plugin to complete C and C++ code using libclang";
     license = clangStdenv.lib.licenses.gpl3Plus;
+
+    # Fails with:
+    # ./src/completion.h:5:10: fatal error: 'clang-c/Index.h' file not found
+    # include <clang-c/Index.h>
+    broken = true;
   };
 }

From deda623918024c8f1aa33c98bf7f6295c3ca7ef4 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 7 Aug 2019 23:13:09 +0100
Subject: [PATCH 433/794] emacsPackages.hol_light_mode: Mark as broken

---
 pkgs/applications/editors/emacs-modes/hol_light/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
index c32669239f8..38457af120b 100644
--- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
@@ -22,5 +22,8 @@ stdenv.mkDerivation rec {
     license     = stdenv.lib.licenses.gpl2Plus;
     platforms   = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+
+    # Fails trying to fetch dependencies in build
+    # broken = true;
   };
 }

From 87e16d70746244187437fef72d11f4764738539c Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 7 Aug 2019 23:13:30 +0100
Subject: [PATCH 434/794] emacsPackages.prologMode: Mark as broken

---
 pkgs/applications/editors/emacs-modes/prolog/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix
index b01c526aa8e..337a1585b1b 100644
--- a/pkgs/applications/editors/emacs-modes/prolog/default.nix
+++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix
@@ -17,5 +17,8 @@ stdenv.mkDerivation {
     homepage = http://bruda.ca/emacs/prolog_mode_for_emacs/;
     description = "Prolog mode for Emacs";
     license = stdenv.lib.licenses.gpl2Plus;
+
+    # Has wrong sha256
+    broken = true;
   };
 }

From bd87895d7302f30724e8f97b8c238bdc7435d077 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 7 Aug 2019 23:27:27 +0100
Subject: [PATCH 435/794] emacsPackagesNg: Import old packages not available in
 any generated set

---
 .../editors/emacs-modes/manual-packages.nix    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix
index 7f75de74ed6..34b81cc8329 100644
--- a/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -142,4 +142,22 @@
 
   zeitgeist = callPackage ./zeitgeist { };
 
+  # From old emacsPackages (pre emacsPackagesNg)
+  cedet = callPackage ./cedet { };
+  cedille = callPackage ./cedille { cedille = pkgs.cedille; };
+  coffee = callPackage ./coffee { };
+  colorThemeSolarized = callPackage ./color-theme-solarized {
+    colorTheme = self.color-theme;
+  };
+  cua = callPackage ./cua { };
+  emacsClangCompleteAsync = callPackage ./emacs-clang-complete-async { };
+  emacsSessionManagement = callPackage ./session-management-for-emacs { };
+  hsc3Mode = callPackage ./hsc3 { };
+  hol_light_mode = callPackage ./hol_light { };
+  ido-ubiquitous = callPackage ./ido-ubiquitous { };
+  ocamlMode = callPackage ./ocaml { };
+  prologMode = callPackage ./prolog { };
+  rectMark = callPackage ./rect-mark { };
+  sunriseCommander = callPackage ./sunrise-commander { };
+
 }

From 41d1b8fa883724c2f14ee214b9373f9bed9b7cd0 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 7 Aug 2019 23:52:22 +0100
Subject: [PATCH 436/794] emacsPackages: Drop old emacsPackages (non-NG) sets

These have been deprecated for a long time now and has not seen much maintenance.
---
 doc/package-specific-user-notes.xml           |   4 +-
 nixos/doc/manual/release-notes/rl-1909.xml    |   9 +-
 nixos/modules/services/editors/emacs.xml      |  20 +--
 .../editors/emacs-modes/melpa-packages.nix    |   4 +-
 .../editors/emacs-modes/updater-emacs.nix     |   2 +-
 pkgs/build-support/emacs/wrapper.nix          |   4 +-
 pkgs/development/tools/cask/default.nix       |   6 +-
 pkgs/top-level/aliases.nix                    |   6 +-
 pkgs/top-level/all-packages.nix               | 163 +-----------------
 pkgs/top-level/release.nix                    |   2 +-
 10 files changed, 37 insertions(+), 183 deletions(-)

diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml
index 196c760251f..a176f4d1395 100644
--- a/doc/package-specific-user-notes.xml
+++ b/doc/package-specific-user-notes.xml
@@ -6,7 +6,7 @@
          answer some of the frequently asked questions
          related to Nixpkgs use.
 
-  Some useful information related to package use 
+  Some useful information related to package use
   can be found in <link linkend="chap-package-notes">package-specific development notes</link>.
 
  </para>
@@ -196,7 +196,7 @@ overrides = self: super: rec {
   haskell-mode = self.melpaPackages.haskell-mode;
   ...
 };
-((emacsPackagesNgGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [
+((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [
   # here both these package will use haskell-mode of our own choice
   ghc-mod
   dante
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 166be1f1c28..002bb371168 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -338,10 +338,17 @@
        For nginx, the dependencies are still automatically managed when <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs,
        instead of depending on the catch-all <literal>acme-certificates.target</literal>. This target unit was also removed from the codebase.
        This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal
-       ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at 
+       ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at
         <link xlink:href="https://github.com/NixOS/nixpkgs/issues/60180">NixOS/nixpkgs#60180</link>.
      </para>
    </listitem>
+   <listitem>
+     <para>
+       The old deprecated <literal>emacs</literal> package sets have been dropped.
+       What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
+     </para>
+   </listitem>
+
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index acd69f18376..8ced302bad1 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -9,6 +9,7 @@
       Damien Cassou @DamienCassou
       Thomas Tuegel @ttuegel
       Rodney Lorrimar @rvl
+      Adam Hoese @adisbladis
   -->
  <para>
   <link xlink:href="https://www.gnu.org/software/emacs/">Emacs</link> is an
@@ -130,15 +131,6 @@
     Emacs packages through nixpkgs.
    </para>
 
-   <note>
-    <para>
-     This documentation describes the new Emacs packages framework in NixOS
-     16.03 (<varname>emacsPackagesNg</varname>) which should not be confused
-     with the previous and deprecated framework
-     (<varname>emacs24Packages</varname>).
-    </para>
-   </note>
-
    <para>
     The first step to declare the list of packages you want in your Emacs
     installation is to create a dedicated derivation. This can be done in a
@@ -164,7 +156,7 @@ $ ./result/bin/emacs
 
 let
   myEmacs = pkgs.emacs; <co xml:id="ex-emacsNix-2" />
-  emacsWithPackages = (pkgs.emacsPackagesNgGen myEmacs).emacsWithPackages; <co xml:id="ex-emacsNix-3" />
+  emacsWithPackages = (pkgs.emacsPackagesGen myEmacs).emacsWithPackages; <co xml:id="ex-emacsNix-3" />
 in
   emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ <co xml:id="ex-emacsNix-4" />
     magit          # ; Integrate git &lt;C-x g&gt;
@@ -262,10 +254,10 @@ in
     <example xml:id="module-services-emacs-querying-packages">
      <title>Querying Emacs packages</title>
 <programlisting><![CDATA[
-nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.elpaPackages
-nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.melpaPackages
-nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.melpaStablePackages
-nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.orgPackages
+nix-env -f "<nixpkgs>" -qaP -A emacsPackages.elpaPackages
+nix-env -f "<nixpkgs>" -qaP -A emacsPackages.melpaPackages
+nix-env -f "<nixpkgs>" -qaP -A emacsPackages.melpaStablePackages
+nix-env -f "<nixpkgs>" -qaP -A emacsPackages.orgPackages
 ]]></programlisting>
     </example>
    </para>
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 1a647466abd..12cc2c571d8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -6,8 +6,8 @@ To update the list of packages from MELPA,
 
 1. Run ./update-melpa
 2. Check for evaluation errors:
-env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaStablePackages
-env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaPackages
+env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages
+env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages
 3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json`
 
 */
diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix
index c7e858078e6..518ee67e451 100644
--- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix
+++ b/pkgs/applications/editors/emacs-modes/updater-emacs.nix
@@ -1,7 +1,7 @@
 let
   pkgs = import ../../../.. {};
 
-  emacsEnv = (pkgs.emacsPackagesNgFor pkgs.emacs26).emacsWithPackages (epkgs: let
+  emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs26).emacsWithPackages (epkgs: let
 
     promise = epkgs.trivialBuild {
       pname = "promise";
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index dfdd5b60851..b242672df10 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -18,10 +18,10 @@ the correct version of Emacs.
 `emacsWithPackages` inherits the package set which contains it, so the
 correct way to override the provided package set is to override the
 set which contains `emacsWithPackages`. For example, to override
-`emacsPackagesNg.emacsWithPackages`,
+`emacsPackages.emacsWithPackages`,
 ```
 let customEmacsPackages =
-      emacsPackagesNg.overrideScope' (self: super: {
+      emacsPackages.overrideScope' (self: super: {
         # use a custom version of emacs
         emacs = ...;
         # use the unstable MELPA version of magit
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index e33761a67e0..0b6742fbf43 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, emacsPackagesNg }:
+{ stdenv, fetchurl, python, emacsPackages }:
 
 stdenv.mkDerivation rec {
   name = "cask-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   doCheck = true;
-  buildInputs = with emacsPackagesNg; [
+  buildInputs = with emacsPackages; [
     s f dash ansi ecukes servant ert-runner el-mock
     noflet ert-async shell-split-string git package-build
   ];
@@ -44,5 +44,5 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.flexw ];
   };
 
-  nativeBuildInputs = [ emacsPackagesNg.emacs python ];
+  nativeBuildInputs = [ emacsPackages.emacs python ];
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1a4169605a6..3b8818da5c9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -87,9 +87,11 @@ mapAliases ({
   double_conversion = double-conversion; # 2017-11-22
   docker_compose = docker-compose; # 2018-11-10
   dwarf_fortress = dwarf-fortress; # added 2016-01-23
-  emacsMelpa = emacs25PackagesNg; # for backward compatibility
+  emacsMelpa = emacs25Packages; # for backward compatibility
   emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
-  emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18
+  emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
+  emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
+  emacsPackagesNg = emacsPackages; # added 2019-08-07
   emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01
   enblendenfuse = enblend-enfuse; # 2015-09-30
   evolution_data_server = evolution-data-server; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index deac1550c0d..fc5a35320ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -377,7 +377,7 @@ in
 
   mkShell = callPackage ../build-support/mkshell { };
 
-  nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; };
+  nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackages) inherit-local; };
 
   nix-gitignore = callPackage ../build-support/nix-gitignore { };
 
@@ -7919,7 +7919,7 @@ in
     # package.  Wishing we could merge it into one irony package, to avoid this issue,
     # but its emacs-side expression is autogenerated, and we can't hook into it (other
     # than peek into its version).
-    inherit (emacsPackagesNg.melpaStablePackages) irony;
+    inherit (emacsPackages.melpaStablePackages) irony;
   };
 
   hugs = callPackage ../development/interpreters/hugs { };
@@ -17917,7 +17917,6 @@ in
 
   emacs = emacs26;
   emacsPackages = emacs26Packages;
-  emacsPackagesNg = emacs26PackagesNg;
 
   emacs26 = callPackage ../applications/editors/emacs {
     # use override to enable additional features
@@ -17962,153 +17961,7 @@ in
     stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
   };
 
-  emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec {
-    inherit emacs;
-
-    autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
-
-    bbdb = callPackage ../applications/editors/emacs-modes/bbdb { };
-
-    bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {};
-
-    cedet = callPackage ../applications/editors/emacs-modes/cedet { };
-
-    calfw = callPackage ../applications/editors/emacs-modes/calfw { };
-
-    cedille = callPackage ../applications/editors/emacs-modes/cedille { cedille = pkgs.cedille; };
-
-    coffee = callPackage ../applications/editors/emacs-modes/coffee { };
-
-    colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { };
-
-    colorThemeSolarized = callPackage ../applications/editors/emacs-modes/color-theme-solarized { };
-
-    cryptol = callPackage ../applications/editors/emacs-modes/cryptol { };
-
-    cua = callPackage ../applications/editors/emacs-modes/cua { };
-
-    d = callPackage ../applications/editors/emacs-modes/d { };
-
-    darcsum = callPackage ../applications/editors/emacs-modes/darcsum { };
-
-    # ecb = callPackage ../applications/editors/emacs-modes/ecb { };
-
-    emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { };
-
-    emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { };
-
-    emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { };
-
-    emms = callPackage ../applications/editors/emacs-modes/emms { };
-
-    ensime = callPackage ../applications/editors/emacs-modes/ensime { };
-
-    erlangMode = callPackage ../applications/editors/emacs-modes/erlang { };
-
-    ess = callPackage ../applications/editors/emacs-modes/ess { };
-
-    flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { };
-
-    gh = callPackage ../applications/editors/emacs-modes/gh { };
-
-    graphvizDot = callPackage ../applications/editors/emacs-modes/graphviz-dot { };
-
-    gist = callPackage ../applications/editors/emacs-modes/gist { };
-
-    haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
-
-    hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { };
-
-    hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { };
-
-    htmlize = callPackage ../applications/editors/emacs-modes/htmlize { };
-
-    ido-ubiquitous = callPackage ../applications/editors/emacs-modes/ido-ubiquitous { };
-
-    icicles = callPackage ../applications/editors/emacs-modes/icicles { };
-
-    idris = callPackage ../applications/editors/emacs-modes/idris { };
-
-    jabber = callPackage ../applications/editors/emacs-modes/jabber { };
-
-    jade = callPackage ../applications/editors/emacs-modes/jade { };
-
-    jdee = callPackage ../applications/editors/emacs-modes/jdee { };
-
-    js2 = callPackage ../applications/editors/emacs-modes/js2 { };
-
-    let-alist = callPackage ../applications/editors/emacs-modes/let-alist { };
-
-    logito = callPackage ../applications/editors/emacs-modes/logito { };
-
-    loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
-
-    markdownMode = callPackage ../applications/editors/emacs-modes/markdown-mode { };
-
-    maudeMode = callPackage ../applications/editors/emacs-modes/maude { };
-
-    metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { };
-
-    monky = callPackage ../applications/editors/emacs-modes/monky { };
-
-    notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; });
-
-    ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
-
-    offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {};
-
-    # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
-    # we want it to have higher precedence.
-    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
-
-    org2blog = callPackage ../applications/editors/emacs-modes/org2blog { };
-
-    pcache = callPackage ../applications/editors/emacs-modes/pcache { };
-
-    phpMode = callPackage ../applications/editors/emacs-modes/php { };
-
-    prologMode = callPackage ../applications/editors/emacs-modes/prolog { };
-
-    proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral/4.4.nix {
-      texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; };
-    };
-    proofgeneral_HEAD = callPackage ../applications/editors/emacs-modes/proofgeneral/HEAD.nix {
-      texinfo = texinfo4 ;
-      texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; };
-    };
-
-    quack = callPackage ../applications/editors/emacs-modes/quack { };
-
-    rainbowDelimiters = callPackage ../applications/editors/emacs-modes/rainbow-delimiters { };
-
-    rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { };
-
-    rudel = callPackage ../applications/editors/emacs-modes/rudel { };
-
-    s = callPackage ../applications/editors/emacs-modes/s { };
-
-    sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { };
-
-    scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };
-    scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { };
-
-    structuredHaskellMode = haskellPackages.structured-haskell-mode;
-
-    sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
-
-    tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { };
-
-    writeGood = callPackage ../applications/editors/emacs-modes/writegood { };
-
-    xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
-
-    cask = callPackage ../applications/editors/emacs-modes/cask { };
-  };
-
-  emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25 pkgs.emacs25Packages);
-  emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages);
-
-  emacsPackagesNgFor = emacs: import ./emacs-packages.nix {
+  emacsPackagesFor = emacs: import ./emacs-packages.nix {
     inherit lib newScope stdenv pkgs;
     inherit fetchFromGitHub fetchurl;
     inherit emacs texinfo makeWrapper runCommand writeText;
@@ -18133,12 +17986,12 @@ in
     };
   };
 
-  emacs25PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs25);
-  emacs26PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs26);
+  emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25);
+  emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26);
 
-  emacs25WithPackages = emacs25PackagesNg.emacsWithPackages;
-  emacs26WithPackages = emacs26PackagesNg.emacsWithPackages;
-  emacsWithPackages = emacsPackagesNg.emacsWithPackages;
+  emacs25WithPackages = emacs25Packages.emacsWithPackages;
+  emacs26WithPackages = emacs26Packages.emacsWithPackages;
+  emacsWithPackages = emacsPackages.emacsWithPackages;
 
   inherit (gnome3) empathy;
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3437f620c74..9ae5a9e1fbd 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -192,7 +192,7 @@ let
 
       # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66
 
-      #emacsPackagesNg = packagePlatforms pkgs.emacsPackagesNg;
+      #emacsPackages = packagePlatforms pkgs.emacsPackages;
       #rPackages = packagePlatforms pkgs.rPackages;
       ocamlPackages = { };
       perlPackages = { };

From cd6e9c06b365e27a4bd15c61437cddf69590f572 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:34 +0100
Subject: [PATCH 437/794] emacs-packages: Remove auto-complete from old emacs
 package infra

Use new auto-generated packages
---
 .../emacs-modes/auto-complete/default.nix     | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/auto-complete/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix
deleted file mode 100644
index 40f172316ef..00000000000
--- a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "auto-complete-1.3.1";
-
-  src = fetchurl {
-    url = "http://cx4a.org/pub/auto-complete/${name}.tar.bz2";
-    sha256 = "124qxfp0pcphwlmrasbfrci48brxnrzc38h4wcf2sn20x1mvcrlj";
-  };
-
-  buildInputs = [ emacs ];
-
-  preInstall = ''
-    install -d $out/share/emacs/site-lisp
-  '';
-
-  installFlags = "DIR=$(out)/share/emacs/site-lisp";
-
-  postInstall = ''
-    ln -s javascript-mode $out/share/emacs/site-lisp/ac-dict/js2-mode
-  '';
-
-  meta = {
-    description = "Auto-complete extension for Emacs";
-    homepage = http://cx4a.org/software/auto-complete/;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From d76160105b4fe0c75108db9170138619a282de24 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:35 +0100
Subject: [PATCH 438/794] emacs-packages: Remove bbdb from old emacs package
 infrastructure

---
 .../editors/emacs-modes/bbdb/3.nix            | 25 -------------
 .../editors/emacs-modes/bbdb/default.nix      | 35 -------------------
 .../emacs-modes/bbdb/install-infodir.patch    | 28 ---------------
 3 files changed, 88 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/bbdb/3.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/bbdb/default.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch

diff --git a/pkgs/applications/editors/emacs-modes/bbdb/3.nix b/pkgs/applications/editors/emacs-modes/bbdb/3.nix
deleted file mode 100644
index d20ab53bf7e..00000000000
--- a/pkgs/applications/editors/emacs-modes/bbdb/3.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "bbdb-3.1.2";
-
-  src = fetchurl {
-    url = "https://download.savannah.gnu.org/releases/bbdb/${name}.tar.gz";
-    sha256 = "1gs16bbpiiy01w9pyg12868r57kx1v3hnw04gmqsmpc40l1hyy05";
-  };
-
-  buildInputs = [ emacs ];
-
-  # Hack to disable documentation as there is no way to tell bbdb to
-  # NOT build pdfs. I really don't want to pull in TexLive here...
-  preConfigure = ''
-   substituteInPlace ./Makefile.in \
-     --replace "SUBDIRS = lisp doc tex" "SUBDIRS = lisp"
-  '';
-
-  meta = {
-    homepage = https://savannah.nongnu.org/projects/bbdb/;
-    description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs, version 3";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
deleted file mode 100644
index 689bcfc9adf..00000000000
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{stdenv, fetchurl, emacs, texinfo, ctags}:
-
-stdenv.mkDerivation rec {
-  name = "bbdb-2.36";
-
-  src = fetchurl {
-    # not using mirror:// because it produces a different file
-    url = "http://bbdb.sourceforge.net/${name}.tar.gz";
-    sha256 = "1rmw94l71ahfbynyy0bijfy488q9bl5ksl4zpvg7j9dbmgbh296r";
-  };
-
-  patches = [ ./install-infodir.patch ];
-
-  buildInputs = [emacs texinfo ctags];
-  configureFlags = [ "--with-package-dir=$$out/share/emacs/site-lisp" ];
-  preInstall = "mkdir -p $out/info";
-  installTargets = "install-pkg texinfo";
-  postInstall = ''
-    mv  $out/info $out/share/
-    mv "$out/share/emacs/site-lisp/lisp/bbdb/"* $out/share/emacs/site-lisp/
-    mv $out/share/emacs/site-lisp/etc/bbdb $out/share/
-    rm -rf $out/share/emacs/site-lisp/{lisp,etc}
-    mv bits $out/share/bbdb/
-    # Make optional modules from bbdb available for import, but symlink
-    # them into the site-lisp directory to make it obvious that they are
-    # not a genuine part of the distribution.
-    ln -s "$out/share/bbdb/bits/"*.el $out/share/emacs/site-lisp/
-  '';
-
-  meta = {
-    homepage = http://bbdb.sourceforge.net/;
-    description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch b/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch
deleted file mode 100644
index 31ae6b26698..00000000000
--- a/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- bbdb-2.35/texinfo/Makefile.in	2001-11-20 09:00:12.000000000 +0100
-+++ bbdb-2.35/texinfo/Makefile.in	2008-02-20 12:07:36.000000000 +0100
-@@ -27,22 +27,22 @@ all: info bbdb.dvi
- install-pkg: uninstall-pkg info
- 	@if test "x$(SYMLINKS)" = "xno" ; then                         \
-           for i in `ls bbdb.info* ` ; do                               \
--            $(INSTALL_DATA) $$i $(PACKAGEDIR)/info/ ;                  \
-+            $(INSTALL_DATA) $$i $(infodir)/ ;                  \
-           done ;                                                       \
-         else                                                           \
-           if test "x$(LINKPATH)" = "x" ; then                          \
-             for i in `ls bbdb.info* ` ; do                             \
--              $(LN_S) `pwd`/$$i $(PACKAGEDIR)/info/$$i ;               \
-+              $(LN_S) `pwd`/$$i $(infodir)/$$i ;               \
-             done ;                                                     \
-           else                                                         \
-             for i in `ls bbdb.info* ` ; do                             \
--              $(LN_S) $(LINKPATH)/texinfo/$$i $(PACKAGEDIR)/info/$$i ; \
-+              $(LN_S) $(LINKPATH)/texinfo/$$i $(infodir)/$$i ; \
-             done ;                                                     \
-           fi ;                                                         \
-         fi
- 
- uninstall-pkg:
--	-$(RM) $(PACKAGEDIR)/info/bbdb.info*
-+	-$(RM) $(infodir)/bbdb.info*
- 
- info: bbdb.info

From 588adcc20e7ba9788ceb8c5c27a68f76d136f60a Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:35 +0100
Subject: [PATCH 439/794] emacs-packages: Remove calfw from old emacs package
 infrastructure

---
 .../editors/emacs-modes/calfw/default.nix     | 34 -------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/calfw/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix
deleted file mode 100644
index b8c61bb97af..00000000000
--- a/pkgs/applications/editors/emacs-modes/calfw/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ fetchgit, stdenv, emacs }:
-
-# TODO: byte-compile in build phase - a buildEmacsPackage that does
-# that would be nice
-
-stdenv.mkDerivation rec {
-  name = "calfw-1.3-5-ga9b6615";
-
-  src = fetchgit {
-    url = "git://github.com/kiwanami/emacs-calfw.git";
-    rev = "a9b6615b6666bbebe78257c557fd9a2e3a325d8d";
-    sha256 = "524acc8fec7e64ebe0d370ddb1d96eee6a409d650b79011fa910c35225a7f393";
-  };
-
-  buildInputs = [ emacs ];
-
-  installPhase =
-    ''
-       mkdir -p "$out/share/doc/${name}"
-       cp -v readme.md "$out/share/doc/${name}"
-
-       mkdir -p "$out/share/emacs/site-lisp/"
-       cp *.el "$out/share/emacs/site-lisp/"
-    '';
-
-  meta = {
-    description = "A calendar framework for Emacs";
-
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = stdenv.lib.platforms.unix;
-  };
-}

From d3bc11da929c0126ea442abb115efb167b602b75 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:35 +0100
Subject: [PATCH 440/794] emacs-packages: Remove cask from old emacs package
 infrastructure

---
 .../editors/emacs-modes/cask/default.nix      | 54 -------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/cask/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix
deleted file mode 100644
index 34120db6aa7..00000000000
--- a/pkgs/applications/editors/emacs-modes/cask/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, python }:
-
-stdenv.mkDerivation rec {
-  version = "0.8.4";
-  name = "cask-${version}";
-
-  src = fetchFromGitHub {
-    owner = "cask";
-    repo = "cask";
-    rev = "v${version}";
-    sha256 = "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686";
-  };
-
-  buildInputs = [ emacs python ];
-
-  # byte-compiling emacs files automatically triggers cask's bootstrap
-  # mechanism, what we don't want.
-  dontBuild = true;
-
-  installPhase = ''
-    install -d "$out/share/emacs/site-lisp"
-    install cask*.el* "$out/share/emacs/site-lisp"
-
-    install -d "$out/bin"
-    install bin/cask "$out/bin"
-
-    # We also need to install cask's templates in order for 'cask
-    # init' to work properly.
-    install -d "$out/templates"
-    install templates/* "$out/templates"
-
-    # In order to work with cask's hard coded file paths (during bootstrap),
-    # we have to create these links.
-    ln -s "$out/share/emacs/site-lisp/"* "$out"
-
-    # This file disables cask's self-updating function.
-    touch "$out/.no-upgrade"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Project management tool for Emacs";
-    longDescription =
-      ''
-        Cask is a project management tool for Emacs that helps automate the
-        package development cycle; development, dependencies, testing,
-        building, packaging and more. Cask can also be used to manage
-        dependencies for your local Emacs configuration.
-      '';
-    homepage = https://github.com/cask/cask;
-    license = licenses.gpl3Plus;
-    platforms = platforms.all;
-    maintainers = [ ];
-  };
-}

From 6dc2d9645cac7b7e4fc0110615c13dc483aad5ff Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:35 +0100
Subject: [PATCH 441/794] emacs-packages: Remove color-theme from old emacs
 package infrastructure

---
 .../emacs-modes/color-theme/default.nix       | 26 -----------------
 .../emacs-modes/color-theme/fix-build.patch   | 19 -------------
 .../emacs-modes/color-theme/gnus-bug.diff     | 28 -------------------
 3 files changed, 73 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/color-theme/default.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch
 delete mode 100644 pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff

diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix
deleted file mode 100644
index 407b9e58f0b..00000000000
--- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-stdenv.mkDerivation rec {
-  name = "color-theme-6.6.0";
-
-  src = fetchurl {
-    url = "mirror://savannah/color-theme/${name}.tar.gz";
-    sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn";
-  };
-
-  # patches from http://aur.archlinux.org/packages.php?ID=54883
-  patches = [ ./fix-build.patch ./gnus-bug.diff ];
-
-  buildInputs = [ emacs ];
-
-  installFlags = [ "ELISPDIR=$(out)/share/emacs/site-lisp" ];
-  installTargets = "install-bin";
-
-  meta = {
-    description = "Emacs-lisp mode for skinning your Emacs";
-    homepage = https://www.nongnu.org/color-theme;
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch b/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch
deleted file mode 100644
index cfc237c8cdc..00000000000
--- a/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Makefile	2009-05-15 18:22:49.000000000 +0200
-+++ b/Makefile	2009-05-16 08:59:36.000000000 +0200
-@@ -15,6 +15,7 @@
- TARGET	= $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
- MANUAL  = color-theme
- MISC	= AUTHORS COPYING ChangeLog Makefile.defs Makefile $(AUTOLOADFILE).in
-+LOADPATH = "$(shell pwd)" "$(shell pwd)/themes"
- #AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \
- #ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \
- #ChangeLog.2001 servers.pl color-theme-auto.in color-theme.texi
-@@ -47,7 +48,7 @@
- 
- %.elc: %.el
- 	@$(EMACS) $(OPTIONCOMPILE) \
--	--eval '(setq load-path (cons "." load-path))' \
-+	--eval '(setq load-path (append load-path (list $(LOADPATH))))' \
- 	-f batch-byte-compile $<
- 
- %.info: %.texi
diff --git a/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff b/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff
deleted file mode 100644
index 9d227df562e..00000000000
--- a/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur color-theme-6.6.0.orig/color-theme.el color-theme-6.6.0.new/color-theme.el
---- color-theme-6.6.0.orig/color-theme.el	2011-11-18 01:17:29.000000000 +0100
-+++ color-theme-6.6.0.new/color-theme.el	2011-11-18 01:24:07.000000000 +0100
-@@ -73,9 +73,10 @@
-   "Non-nil if running XEmacs.")
- 
- ;; Add this since it appears to miss in emacs-2x
--(or (fboundp 'replace-in-string)
--    (defun replace-in-string (target old new)
--      (replace-regexp-in-string old new  target)))
-+(if (fboundp 'replace-in-string)
-+    (defalias 'color-theme-replace-in-string 'replace-in-string)
-+  (defsubst color-theme-replace-in-string (target old new &optional literal)
-+    (replace-regexp-in-string old new target nil literal)))
- 
- ;; face-attr-construct has a problem in Emacs 20.7 and older when
- ;; dealing with inverse-video faces.  Here is a short test to check
-@@ -1626,8 +1627,8 @@
-        (add-to-list 'color-themes
-                     (list ',n
-                           (upcase-initials
--                           (replace-in-string
--                            (replace-in-string 
-+                           (color-theme-replace-in-string
-+                            (color-theme-replace-in-string 
-                              (symbol-name ',n) "^color-theme-" "") "-" " "))
-                           ,author))
-        (defun ,n ()

From 743b468cdd5bcd005fd402c69e1e908204c1e54a Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:36 +0100
Subject: [PATCH 442/794] emacs-packages: Remove cryptol from old emacs package
 infrastructure

---
 .../editors/emacs-modes/cryptol/default.nix   | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/cryptol/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/cryptol/default.nix b/pkgs/applications/editors/emacs-modes/cryptol/default.nix
deleted file mode 100644
index 5b408ad7999..00000000000
--- a/pkgs/applications/editors/emacs-modes/cryptol/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
-  name    = "cryptol-mode-${version}";
-  version = "0.1.0";
-
-  src = fetchurl {
-    url    = "https://github.com/thoughtpolice/cryptol-mode/archive/v${version}.tar.gz";
-    sha256 = "1qyrqvfgpg1nyk1clv7v94r3amm02613hrak5732xzn6iak81cc0";
-  };
-
-  buildInputs = [ emacs ];
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Emacs major mode for Cryptol";
-    homepage    = "https://thoughtpolice/cryptol-mode";
-    license     = stdenv.lib.licenses.gpl3Plus;
-    platforms   = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
-  };
-}

From c6c316eb2f112a0d3a2a4205a594f1d7b2a8f04b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:36 +0100
Subject: [PATCH 443/794] emacs-packages: Remove d from old emacs package
 infrastructure

---
 .../editors/emacs-modes/d/default.nix         | 32 -------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/d/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/d/default.nix b/pkgs/applications/editors/emacs-modes/d/default.nix
deleted file mode 100644
index 28736acded2..00000000000
--- a/pkgs/applications/editors/emacs-modes/d/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-# Note: Don't have a version, using date as fallback.
-let version = "20150111";
-
-in stdenv.mkDerivation {
-  name = "emacs-d-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz";
-    sha256 = "0vb0za51lc6qf1qgqisap4vzk36caa5k17zajjn034rhjsqfw0w7";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs -L . --batch -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Major mode for editing D code";
-    homepage = https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.all;
-  };
-
-}

From 9ff83498eec17fb1f7ca7e6a17825e2a3df10951 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:36 +0100
Subject: [PATCH 444/794] emacs-packages: Remove darcsum from old emacs package
 infrastructure

---
 .../editors/emacs-modes/darcsum/darcs_context |  7 ----
 .../editors/emacs-modes/darcsum/default.nix   | 34 -------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/darcsum/darcs_context
 delete mode 100644 pkgs/applications/editors/emacs-modes/darcsum/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/darcsum/darcs_context b/pkgs/applications/editors/emacs-modes/darcsum/darcs_context
deleted file mode 100644
index 7e9de1ed80b..00000000000
--- a/pkgs/applications/editors/emacs-modes/darcsum/darcs_context
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Context:
-
-[TAG 1.3
-Simon Michael <simon@joyful.com>**20131103203640
- Ignore-this: d12bac373e4aa0e5ffe6c390e1dfe269
-] 
diff --git a/pkgs/applications/editors/emacs-modes/darcsum/default.nix b/pkgs/applications/editors/emacs-modes/darcsum/default.nix
deleted file mode 100644
index 0a1c2c77b2a..00000000000
--- a/pkgs/applications/editors/emacs-modes/darcsum/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# To automatically load darcsum when needed, add the following to your emacs init file:
-#
-#   (autoload 'darcsum-changes "darcsum" nil t)
-#   (autoload 'darcsum-whatsnew "darcsum" nil t)
-#   (autoload 'darcsum-view "darcsum" nil t)
-#
-# (These lines were copied from 50darcsum.el in the darcsum repository.)
-
-
-{ fetchdarcs, stdenv }:
-
-stdenv.mkDerivation {
-  name = "darcsum-1.3";
-
-  src = fetchdarcs {
-    url = http://hub.darcs.net/simon/darcsum;
-    context = ./darcs_context;
-    sha256 = "18dyk2apmnjapd604a5njfqwjri1mc7lgjaajy9phicpibgdrwzh";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    install -d "$out/share/emacs/site-lisp"
-    install darcsum.el "$out/share/emacs/site-lisp"
-  '';
-
-  meta = {
-    description = "A pcl-cvs like interface for managing darcs patches";
-    homepage = http://hub.darcs.net/simon/darcsum;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.falsifian ];
-  };
-}

From d12e80ca4a07d914ff3a258e1fd1bf5d1821aade Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:36 +0100
Subject: [PATCH 445/794] emacs-packages: Remove ecb from old emacs package
 infrastructure

---
 .../editors/emacs-modes/ecb/default.nix       | 48 -------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/ecb/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/pkgs/applications/editors/emacs-modes/ecb/default.nix
deleted file mode 100644
index 807bb91f850..00000000000
--- a/pkgs/applications/editors/emacs-modes/ecb/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ fetchurl, stdenv, emacs, cedet, jdee, texinfo }:
-
-stdenv.mkDerivation rec {
-  name = "ecb-2.40";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/ecb/${name}.tar.gz";
-    sha256 = "0gp56ixfgnyk2j1fps4mk1yv1vpz81kivb3gq9f56jw4kdlhjrjs";
-  };
-
-  buildInputs = [ emacs ];
-  propagatedBuildInputs = [ cedet jdee ];
-  propagatedUserEnvPkgs = propagatedBuildInputs;
-
-  patchPhase = ''
-    sed -i "Makefile" \
-        -e 's|CEDET[[:blank:]]*=.*$|CEDET = ${cedet}/share/emacs/site-lisp|g ;
-            s|INSTALLINFO[[:blank:]]*=.*$|INSTALLINFO = ${texinfo}/bin/install-info|g ;
-            s|MAKEINFO[[:blank:]]*=.*$|MAKEINFO = ${texinfo}/bin/makeinfo|g ;
-            s|common/cedet.el|cedet.el|g'
-  '';
-
-  installPhase = ''
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp -rv *.el *.elc ecb-images "$out/share/emacs/site-lisp"
-
-    mkdir -p "$out/share/info"
-    cp -v info-help/*.info* "$out/share/info"
-  '';
-
-  meta = {
-    description = "ECB, the Emacs Code browser";
-
-    longDescription = ''
-      ECB stands for "Emacs Code Browser".  While Emacs already has
-      good editing support for many modes, its browsing support is
-      somewhat lacking.  That's where ECB comes in: it displays a
-      number of informational windows that allow for easy source code
-      navigation and overview.
-    '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    homepage = http://ecb.sourceforge.net/;
-
-    maintainers = [ ];
-  };
-}

From ff92c81d905617560c74d43a0711e756f1dd1f71 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:36 +0100
Subject: [PATCH 446/794] emacs-packages: Remove emacs-w3m from old emacs
 package infrastructure

---
 .../editors/emacs-modes/emacs-w3m/default.nix | 61 -------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
deleted file mode 100644
index 8e1d7092e6a..00000000000
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoreconfHook }:
-
-let date = "2013-03-21"; in
-stdenv.mkDerivation rec {
-  name = "emacs-w3m-cvs${date}";
-
-  # Get the source from CVS because the previous release (1.4.4) is old and
-  # doesn't work with GNU Emacs 23.
-  src = fetchcvs {
-    inherit date;
-    cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
-    module = "emacs-w3m";
-    sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ emacs w3m texinfo ];
-
-  # XXX: Should we do the same for xpdf/evince, gv, gs, etc.?
-  patchPhase = ''
-    sed -i "w3m.el" \
-        -e 's|defcustom w3m-command nil|defcustom w3m-command "${w3m}/bin/w3m"|g ;
-            s|(w3m-which-command "display")|"${imagemagick.out}/bin/display"|g'
-
-    sed -i "w3m-image.el" \
-        -e 's|(w3m-which-command "convert")|"${imagemagick.out}/bin/convert"|g ;
-            s|(w3m-which-command "identify")|"${imagemagick.out}/bin/identify"|g'
-  '';
-
-  configureFlags = [
-    "--with-lispdir=$(out)/share/emacs/site-lisp"
-    "--with-icondir=$(out)/share/emacs/site-lisp/images/w3m"
-  ];
-
-  postInstall = ''
-    cd "$out/share/emacs/site-lisp"
-    for i in ChangeLog*
-    do
-      mv -v "$i" "w3m-$i"
-    done
-  '';
-
-  meta = {
-    description = "Emacs-w3m, a simple Emacs interface to the w3m web browser";
-
-    longDescription = ''
-      Emacs/W3 used to be known as the most popular WEB browser on Emacs, but
-      it worked so slowly that we wanted a simple and speedy alternative.
-
-      w3m is a pager with WWW capability, developed by Akinori ITO. Although
-      it is a pager, it can be used as a text-mode WWW browser. Then we
-      developed a simple Emacs interface to w3m.
-    '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    homepage = http://emacs-w3m.namazu.org/;
-
-    maintainers = [ ];
-  };
-}

From ffd0fb4c8e38d5e724c982834e02e48bf2687c74 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:37 +0100
Subject: [PATCH 447/794] emacs-packages: Remove emms from old emacs package
 infrastructure

---
 .../editors/emacs-modes/emms/default.nix      | 73 -------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/emms/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix
deleted file mode 100644
index f966989b5a3..00000000000
--- a/pkgs/applications/editors/emacs-modes/emms/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ stdenv, fetchurl, emacs, texinfo
-, mpg321, vorbis-tools, taglib, mp3info, alsaUtils }:
-
-# XXX: EMMS also supports Xine, MPlayer, Jack, etc.
-
-stdenv.mkDerivation rec {
-  name = "emms-3.0";
-
-  src = fetchurl {
-    # These guys don't use ftp.gnu.org...
-    url = "https://www.gnu.org/software/emms/download/${name}.tar.gz";
-    sha256 = "151mfx97x15lfpd1qc2sqbvhwhvg46axgh15qyqmdy42vh906xav";
-  };
-
-  buildInputs = [ emacs texinfo ];
-
-  configurePhase = ''
-    sed -i "Makefile" -e "s|PREFIX *=.*\$|PREFIX = $out|g ;
-                          s|/usr/sbin/install-info|install-info|g ;
-                          s|/usr/include/taglib|${taglib}/include/taglib|g ;
-                          s|/usr/lib|${taglib}/lib|g ;
-                          s|^all:\(.*\)\$|all:\1 emms-print-metadata|g"
-    mkdir -p "$out/share/man/man1"
-
-    sed -i "emms-player-mpg321-remote.el" \
-        -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g'
-    sed -i "emms-player-simple.el" \
-        -e 's|"ogg123"|"${vorbis-tools}/bin/ogg123"|g'
-    sed -i "emms-info-ogginfo.el" \
-        -e 's|emms-info-ogginfo-program-name[[:blank:]]\+"ogginfo"|emms-info-ogginfo-program-name "${vorbis-tools}/bin/ogginfo"|g'
-    sed -i "emms-info-libtag.el" \
-        -e "s|\"emms-print-metadata\"|\"$out/bin/emms-print-metadata\"|g"
-    sed -i "emms-volume-amixer.el" \
-        -e 's|"amixer"|"${alsaUtils}/bin/amixer"|g'
-
-    # Use the libtag info back-end for MP3s since we're building it.
-    sed -i "emms-setup.el" \
-        -e 's|emms-info-mp3info|emms-info-libtag|g'
-
-    # But use mp3info for the tag editor.
-    sed -i "emms-info-mp3info.el" \
-        -e 's|emms-info-mp3info-program-name[[:blank:]]\+"mp3info"|emms-info-mp3info-program-name "${mp3info}/bin/mp3info"|g'
-    sed -i "emms-tag-editor.el" \
-        -e 's|"mp3info"|"${mp3info}/bin/mp3info"|g'
-  '';
-
-  postInstall = ''
-    mkdir -p "$out/bin" && cp emms-print-metadata "$out/bin"
-  '';
-
-  meta = {
-    description = "GNU EMMS, The Emacs Multimedia System";
-
-    longDescription = ''
-      EMMS is the Emacs Multimedia System.  It tries to be a clean and
-      small application to play multimedia files from Emacs using
-      external players.  Many of it's ideas are derived from
-      MpthreePlayer, but it tries to be more general and cleaner.
-
-      The fact that EMMS is based on external players makes it
-      powerful, because it supports all formats that those players
-      support, with no effort from your side.
-    '';
-
-    homepage = https://www.gnu.org/software/emms/;
-
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
-    broken = true;
-  };
-}

From 65938fa496c69d1adcd0a01e20323eb1cc47aff7 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:37 +0100
Subject: [PATCH 448/794] emacs-packages: Remove ensime from old emacs package
 infrastructure

---
 .../editors/emacs-modes/ensime/default.nix    | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/ensime/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/ensime/default.nix b/pkgs/applications/editors/emacs-modes/ensime/default.nix
deleted file mode 100644
index d776103a662..00000000000
--- a/pkgs/applications/editors/emacs-modes/ensime/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, emacs, unzip, autoComplete, dash, s, scalaMode2, sbtMode }:
-
-stdenv.mkDerivation {
-  name = "emacs-ensime-2014-09-04";
-
-  src = fetchurl {
-    url = "https://github.com/ensime/ensime-emacs/archive/d3820a3f362975f6e14b817988ec07bfef2b4dad.zip";
-    sha256 = "0gwr0r92z2hh2x8g0hpxaar2vvfk1b91cp6v04gaasw0fvl5i7g5";
-  };
-
-  buildInputs = [ emacs unzip ];
-  propagatedUserEnvPkgs = [ autoComplete dash s scalaMode2 sbtMode ];
-
-  buildPhase = ''
-    emacs -L . -L ${autoComplete}/share/emacs/site-lisp --batch -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-  '';
-}

From a6f38b3d76e04f7d5425ba762556790b449c4f5b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:37 +0100
Subject: [PATCH 449/794] emacs-packages: Remove erlang from old emacs package
 infrastructure

---
 .../editors/emacs-modes/erlang/default.nix    | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/erlang/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix
deleted file mode 100644
index 463d7fc7e15..00000000000
--- a/pkgs/applications/editors/emacs-modes/erlang/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, erlang }:
-
-stdenv.mkDerivation {
-
-  name = "erlang-mode-${erlang.version}";
-
-  buildInputs = [ ];
-
-  inherit erlang;
-
-  buildCommand = ''
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp "$erlang/lib/erlang/lib/tools"*/emacs/*.el $out/share/emacs/site-lisp/
-  '';
-
-  # emacs highlighting */
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/erlang/otp;
-    description = "Erlang mode for Emacs";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.samuelrivas ];
-  };
-}

From 6ac327abe7aa655a74c676867f5de053cae522fb Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:37 +0100
Subject: [PATCH 450/794] emacs-packages: Remove ess from old emacs package
 infrastructure

---
 .../editors/emacs-modes/ess/default.nix       | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/ess/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/ess/default.nix b/pkgs/applications/editors/emacs-modes/ess/default.nix
deleted file mode 100644
index ce335a5d482..00000000000
--- a/pkgs/applications/editors/emacs-modes/ess/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, emacs, texinfo }:
-
-stdenv.mkDerivation rec {
-  name = "ess-14.09";
-
-  src = fetchurl {
-    url = "http://ess.r-project.org/downloads/ess/${name}.tgz";
-    sha256 = "0wa507jfmq3k7x0vigd2yzb4j2190ix4wnnpv7ql4bjy0vfvmwdn";
-  };
-
-  buildInputs = [ emacs texinfo ];
-
-  configurePhase = "makeFlags=PREFIX=$out";
-
-  meta = {
-    description = "Emacs Speaks Statistics";
-    homepage = http://ess.r-project.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    hydraPlatforms = stdenv.lib.platforms.linux;
-  };
-}

From c9ff69ec3d5e8836a3c6414adc9d5d6fa3368c02 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:38 +0100
Subject: [PATCH 451/794] emacs-packages: Remove flymake-cursor from old emacs
 package infrastructure

---
 .../emacs-modes/flymake-cursor/default.nix    | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
deleted file mode 100644
index eae338d241d..00000000000
--- a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "flymake-cursor-0.1.5";
-
-  src = fetchurl {
-    url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el";
-    sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr";
-  };
-
-  phases = [ "buildPhase" "installPhase"];
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    cp $src flymake-cursor.el
-    emacs --batch -f batch-byte-compile flymake-cursor.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install flymake-cursor.el flymake-cursor.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Displays flymake error msg in minibuffer after delay";
-    homepage = http://www.emacswiki.org/emacs/flymake-cursor.el;
-    license = stdenv.lib.licenses.publicDomain;
-  };
-}

From f42f46f682bad24e8762b69f8a89f8a2089bbe13 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:38 +0100
Subject: [PATCH 452/794] emacs-packages: Remove gh from old emacs package
 infrastructure

---
 .../editors/emacs-modes/gh/default.nix        | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/gh/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/gh/default.nix b/pkgs/applications/editors/emacs-modes/gh/default.nix
deleted file mode 100644
index aa59eace2ae..00000000000
--- a/pkgs/applications/editors/emacs-modes/gh/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchgit, emacs, pcache, logito }:
-
-stdenv.mkDerivation rec {
-  name = "gh-0.5.3";
-
-  src = fetchgit {
-    url = "https://github.com/sigma/gh.el.git";
-    rev = "ef03b63d063ec22f03af449aa955c98dfad7f80e";
-    sha256 = "1pciq16vl5l4kvj08q4ib1jzk2bb2y1makcsyaw8k9jblqviw756";
-  };
-
-  buildInputs = [ emacs ];
-  propagatedUserEnvPkgs = [ pcache logito ];
-
-  patchPhase = ''
-    sed -i Makefile \
-      -e "s|^ *EFLAGS *=|& -L ${pcache}/share/emacs/site-lisp -L ${logito}/share/emacs/site-lisp --eval '(setq user-emacs-directory \"./\")'|" \
-      -e "s|/usr/local|$out|" \
-      -e "s|/site-lisp/\$(PKGNAME)|/site-lisp|"
-  '';
-
-  buildPhase = "make lisp";
-
-  meta = {
-    description = "A (very early) GitHub client library for Emacs";
-    homepage = https://github.com/sigma/gh.el;
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From cec46692f62c8c4f5aebe8ec5c026be31734eacb Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:38 +0100
Subject: [PATCH 453/794] emacs-packages: Remove gist from old emacs package
 infrastructure

---
 .../editors/emacs-modes/gist/default.nix      | 36 -------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/gist/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/gist/default.nix b/pkgs/applications/editors/emacs-modes/gist/default.nix
deleted file mode 100644
index 08471247f08..00000000000
--- a/pkgs/applications/editors/emacs-modes/gist/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchgit, emacs, gh, pcache, logito }:
-
-stdenv.mkDerivation rec {
-  name = "gist-1.0";
-
-  src = fetchgit {
-    url = "https://github.com/sigma/gist.el.git";
-    rev = "bbb457e4eaaf5f96cfaaa4f63021e3e542bfbfed";
-    sha256 = "469f9df52076d0c6038183cff4b9415bca98de66c08814a60b69729b44bdf294";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs -L ${gh}/share/emacs/site-lisp \
-          -L ${pcache}/share/emacs/site-lisp \
-          -L ${logito}/share/emacs/site-lisp \
-          --eval '(setq user-emacs-directory "./")' \
-          --batch -f batch-byte-compile gist.el
-  '';
-
-  propagatedUserEnvPkgs = [ gh pcache logito ];
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install gist.el gist.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Emacs integration for gist.github.com";
-    homepage = https://github.com/sigma/gist.el;
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From f6350284d21c17a2a48518c2c4159e3a32705d76 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:38 +0100
Subject: [PATCH 454/794] emacs-packages: Remove graphviz-dot from old emacs
 package infrastructure

---
 .../emacs-modes/graphviz-dot/default.nix      | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
deleted file mode 100644
index a08f138bed9..00000000000
--- a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "graphviz-dot-mode-0.3.3";
-
-  src = fetchurl {
-    url = "http://www.graphviz.org/Misc/graphviz-dot-mode.el";
-    sha256 = "6465c18cfaa519a063cf664207613f70b0a17ac5eabcfaa949b3c4c289842953";
-  };
-
-  buildInputs = [ emacs ];
-
-  dontUnpack = true;
-
-  installPhase = ''
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp -v ${src} "$out/share/emacs/site-lisp/graphviz-dot-mode.el"
-    emacs -batch --eval '(setq load-path (cons "." load-path))' -f batch-byte-compile "$out/share/emacs/site-lisp/graphviz-dot-mode.el"
-  '';
-
-  meta = {
-    homepage = http://www.graphviz.org/;
-    description = "An emacs mode for the DOT Language, used by graphviz";
-  };
-}

From 84a09cad680d2f1c73398ccafa1ed275807de6bf Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:38 +0100
Subject: [PATCH 455/794] emacs-packages: Remove haskell from old emacs package
 infrastructure

---
 .../editors/emacs-modes/haskell/default.nix   | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/haskell/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
deleted file mode 100644
index 6b10766bedb..00000000000
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, texinfo }:
-
-# Use "emacsMelpa.haskell-mode" instead.
-
-let
-  version = "13.14-169-g0d3569d";      # git describe --tags
-in
-stdenv.mkDerivation {
-  name = "haskell-mode-${version}";
-
-  src = fetchFromGitHub {
-    owner = "haskell";
-    repo = "haskell-mode";
-    rev = "v${version}";
-    sha256 = "0v5iy9wy05hf44wy7qs0c9q0v34m4k6wrqg4kyvji61568k1yx3k";
-  };
-
-  buildInputs = [ emacs texinfo ];
-
-  makeFlags = "VERSION=v${version} GIT_VERSION=v${version}";
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp
-    cp *.el *.elc *.hs $out/share/emacs/site-lisp/
-    mkdir -p $out/share/info
-    cp -v *.info* $out/share/info/
-  '';
-
-  # The test suite must run *after* copying the generated files to $out
-  # because "make check" implies "make clean".
-  doInstallCheck = true;
-  installCheckTarget = "check";
-
-  meta = {
-    homepage = https://github.com/haskell/haskell-mode;
-    description = "Haskell mode for Emacs";
-
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.peti ];
-    broken = true;  # no longer compiles and this package is obsolete anyway
-  };
-}

From 6b2f177737305a03095685a0615055b7c4b61083 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:39 +0100
Subject: [PATCH 456/794] emacs-packages: Remove htmlize from old emacs package
 infrastructure

---
 .../editors/emacs-modes/htmlize/default.nix   | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/htmlize/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
deleted file mode 100644
index c16f449c3a2..00000000000
--- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation {
-  name = "htmlize-1.47";
-
-  src = fetchFromGitHub {
-    owner = "emacsmirror";
-    repo = "htmlize";
-    rev = "release/1.47";
-    name = "htmlize-1.47-src";
-    sha256 = "1vkqxgirc82vc44g7xhhr041arf93yirjin3h144kjyfkgkplnkp";
-  };
-
-  installPhase = ''
-     mkdir -p $out/share/emacs/site-lisp
-     cp htmlize.el $out/share/emacs/site-lisp/
-  '';
-
-  meta = {
-    description = "Convert buffer text and decorations to HTML";
-  };
-}

From 26af6f335bdeb92bf25f75ad7d6e5678501f4dfc Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:39 +0100
Subject: [PATCH 457/794] emacs-packages: Remove idris from old emacs package
 infrastructure

---
 .../editors/emacs-modes/idris/default.nix     | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/idris/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix
deleted file mode 100644
index 2e168b3abf7..00000000000
--- a/pkgs/applications/editors/emacs-modes/idris/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  pname = "idris-mode";
-  version = "0.9.18";
-
-  src = fetchurl {
-    url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz";
-    sha256 = "06rw5lrxqqnw0kni3x9jm73x352d1vb683d41v8x3yzqfa2sxmwg";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs -L . --batch -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Emacs major mode for Idris";
-    homepage = https://github.com/idris-hackers/idris-mode;
-    license = stdenv.lib.licenses.gpl3;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From f4c2f9794d2bef809a2d961580902c126390e2b0 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:39 +0100
Subject: [PATCH 458/794] emacs-packages: Remove jabber from old emacs package
 infrastructure

---
 .../editors/emacs-modes/jabber/default.nix    | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/jabber/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix
deleted file mode 100644
index c0ddbc88cf2..00000000000
--- a/pkgs/applications/editors/emacs-modes/jabber/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-stdenv.mkDerivation rec {
-  pname  = "emacs-jabber";
-  version = "0.8.0";
-  name = "${pname}-${version}";
-  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26";
-  };
-  buildInputs = [ emacs ];
-  meta = with stdenv.lib; {
-    description = "A Jabber client for Emacs";
-    longDescription = ''
-      jabber.el is a Jabber client for Emacs. It may seem strange to have a
-      chat client in an editor, but consider that chatting is, after all, just
-      a special case of text editing.
-    '';
-    homepage = http://emacs-jabber.sourceforge.net/;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ astsmtl ];
-    platforms = platforms.linux;
-  };
-}

From 438131a1a46c9bfe43919b7a8c081d0cdfd50c18 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:39 +0100
Subject: [PATCH 459/794] emacs-packages: Remove jade from old emacs package
 infrastructure

---
 .../editors/emacs-modes/jade/default.nix      | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/jade/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/jade/default.nix b/pkgs/applications/editors/emacs-modes/jade/default.nix
deleted file mode 100644
index 925fa54c735..00000000000
--- a/pkgs/applications/editors/emacs-modes/jade/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation {
-  name = "jade-mode-0-20120802";
-
-  src = fetchgit {
-    url = "https://github.com/brianc/jade-mode.git";
-    rev = "275ab149edb0f6bcfae6ac17ba456f3351191604";
-    sha256 = "3cd2bebcd66e59d60b8e5e538e65a8ffdfc9a53b86443090a284e8329d7cb09b";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs --batch -L . -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp
-    cp *.el *.elc $out/share/emacs/site-lisp/
-  '';
-
-  meta = {
-    description = "Emacs major mode for jade and stylus";
-    homepage = https://github.com/brianc/jade-mode;
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From 0e7598677c599daafcb4854c025870afdfbca596 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:40 +0100
Subject: [PATCH 460/794] emacs-packages: Remove jdee from old emacs package
 infrastructure

---
 .../emacs-modes/jdee/build-properties.patch   |  12 --
 .../emacs-modes/jdee/cedet-paths.patch        |  18 ---
 .../editors/emacs-modes/jdee/default.nix      |  99 -----------------
 .../emacs-modes/jdee/elib-avltree.patch       | 105 ------------------
 .../emacs-modes/jdee/java-directory.patch     |  82 --------------
 5 files changed, 316 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/jdee/build-properties.patch
 delete mode 100644 pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch
 delete mode 100644 pkgs/applications/editors/emacs-modes/jdee/default.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch
 delete mode 100644 pkgs/applications/editors/emacs-modes/jdee/java-directory.patch

diff --git a/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch b/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch
deleted file mode 100644
index d0a733b912e..00000000000
--- a/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Make sure `build.properties' is honored.
-
---- jde/build.xml
-+++ jde/build.xml
-@@ -14,6 +14,7 @@
-   <property name="project.version" value="2.4.0"/>
-   <property name="config.dir" location="./config"/>
- 
-+  <property file="build.properties"/>
- 
-   <!-- everything depends on this initialization target -->
-   <target name="init">
diff --git a/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch b/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch
deleted file mode 100644
index 8c866e2d1db..00000000000
--- a/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-JDE insists on seeing CEDET's source tree layout, with various
-sub-directories (`common', `eieio', etc.).  However, the installed CEDET
-is flat, with everything under ${cedet}/share/emacs/site-lisp.
-
---- jde/config/build.el	(revision 90)
-+++ jde/config/build.el	(working copy)
-@@ -50,10 +50,5 @@ PATHS are sub directories under CEDET-DI
- (jde-make-autoloads-and-compile (expand-file-name "@{build.lisp.dir}")
- 				"@{src.lisp.dir}"
- 				"@{cedet.dir}"
--				'("common"
--				  "eieio"
--				  "semantic"
--				  "semantic/bovine"
--				  "speedbar"
--				  )
-+				'(".")
- 				"@{build.lisp.autoload.libname}")
diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix
deleted file mode 100644
index 306fe66823c..00000000000
--- a/pkgs/applications/editors/emacs-modes/jdee/default.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{ fetchsvn, stdenv, emacs, cedet, ant }:
-
-let
-  revision = "137";
-in
-  stdenv.mkDerivation rec {
-    name = "jdee-svn${revision}";
-
-    # Last release is too old, so use SVN.
-    # See http://www.emacswiki.org/emacs/JavaDevelopmentEnvironment .
-    src = fetchsvn {
-      url = "https://jdee.svn.sourceforge.net/svnroot/jdee/trunk/jdee";
-      rev = revision;
-      sha256 = "1z1y957glbqm7z3dhah9h4jysw3173pq1gpx5agfwcw614n516xz";
-    };
-
-    patchFlags = "-p1 --ignore-whitespace";
-
-    patches = [
-      ./build-properties.patch
-      ./cedet-paths.patch ./elib-avltree.patch
-      ./java-directory.patch
-    ];
-
-    configurePhase = ''
-      mkdir -p "dist"
-      cat > build.properties <<EOF
-        dist.lisp.dir = dist/share/emacs/site-lisp
-        dist.java.lib.dir = dist/share/java
-        dist.jar.jde.file = dist/share/java/jde.jar
-        dist.java.src.dir = dist/src/${name}/java
-        dist.doc.dir  dist/doc/${name}
-        prefix.dir = $out
-        cedet.dir = ${cedet}/share/emacs/site-lisp
-        elib.dir = /nowhere
-        build.bin.emacs = ${emacs}/bin/emacs
-      EOF
-
-      # Substitute variables, à la Autoconf.
-      for i in "lisp/"*.el
-      do
-        sed -i "$i" -e "s|@out@|$out|g ;
-                        s|@javadir@|$out/share/java|g ;
-                        s|@datadir@|$out/share/${name}|g"
-      done
-    '';
-
-    buildPhase = "ant dist";
-
-    installPhase = ''
-      ant install
-
-      mkdir -p "$out/share/${name}"
-      cp -rv java/bsh-commands "$out/share/${name}"
-
-      # Move everything that's not a JAR to $datadir.  This includes
-      # `sun_checks.xml', license files, etc.
-      cd "$out/share/java"
-      for i in *
-      do
-        if echo $i | grep -qv '\.jar''$'
-        then
-            mv -v "$i" "$out/share/${name}"
-        fi
-      done
-    '';
-
-    buildInputs = [ emacs ant ];
-    propagatedBuildInputs = [ cedet ];
-    propagatedUserEnvPkgs = propagatedBuildInputs; # FIXME: Not honored
-
-    meta = {
-      description = "JDEE, a Java development environment for Emacs";
-
-      longDescription = ''
-        The JDEE is a software package that interfaces Emacs to
-        command-line Java development tools (for example, JavaSoft's
-        JDK).  JDEE features include:
-
-        * JDEE menu with compile, run, debug, build, browse, project,
-          and help commands
-        * syntax coloring
-        * auto indentation
-        * compile error to source links
-        * source-level debugging
-        * source code browsing
-        * make file support
-        * automatic code generation
-        * Java source interpreter (Pat Neimeyer's BeanShell)
-      '';
-
-      license = stdenv.lib.licenses.gpl2Plus;
-
-      maintainers = [ ];
-      platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
-
-      broken = true;
-    };
-  }
diff --git a/pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch b/pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch
deleted file mode 100644
index db891b1655e..00000000000
--- a/pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-JDEE refers to the `avltree' module from GNU Elib, but GNU Elib
-no longer exists (see http://www.gnu.org/software/elib/).  This
-patch updates the module names to what's current in Emacs.
-
---- jde/config/build.el
-+++ jde/config/build.el
-@@ -33,11 +33,10 @@ compile.
- CEDET-DIR is the cedet lisp code base directory (see PATHS).
- 
- PATHS are sub directories under CEDET-DIR we use to compile."
--  (dolist (path (list dir lisp-src-dir elib-dir cedet-dir))
-+  (dolist (path (list dir lisp-src-dir cedet-dir))
-     (if (not (file-directory-p path))
- 	(error "Doesn't exist or not a directory: %s" path)))
-   (let ((autoload-buf (jde-make-autoloads dir autoload-libname)))
--    (add-to-list 'load-path elib-dir t)
-     (dolist (path paths)
-       (add-to-list 'load-path (expand-file-name path cedet-dir) t))
-     (add-to-list 'load-path lisp-src-dir t)
-
---- jde/lisp/jde-parse.el	(revision 90)
-+++ jde/lisp/jde-parse.el	(working copy)
-@@ -24,7 +24,7 @@
- 
- (require 'semantic-sb)
- (require 'semantic-ctxt)
--(require 'avltree)
-+(require 'avl-tree)
- (require 'thingatpt)
- (require 'eieio)
- (require 'jde-imenu)                    ; All the imenu stuff is here now!
-@@ -869,7 +869,8 @@ in a method; otherwise, nil."
- 
- (defclass jde-avl-tree ()
-   ((tree        :initarg tree
--	        :type list
-+		;; FIXME: Emacs 23 `avl-tree' objects are not lists.
-+	        ;;:type list
- 	        :documentation
- 	        "The tree")
-    (compare-fcn :initarg compare-fcn
-@@ -887,51 +887,51 @@ in a method; otherwise, nil."
- 
-   (assert (typep  (oref this compare-fcn)  'function))
- 
--  (oset this  tree (avltree-create (oref this compare-fcn))))
-+  (oset this  tree (avl-tree-create (oref this compare-fcn))))
- 
- (defmethod jde-avl-tree-add ((this jde-avl-tree) item)
-   "Inserts ITEM in this tree."
--  (avltree-enter (oref this tree) item))
-+  (avl-tree-enter (oref this tree) item))
- 
- (defmethod jde-avl-tree-delete ((this jde-avl-tree) item)
-   "Deletes ITEM from THIS tree."
--  (avltree-delete (oref this tree) item))
-+  (avl-tree-delete (oref this tree) item))
- 
- (defmethod jde-avl-tree-is-empty ((this jde-avl-tree))
-   "Return t if THIS tree is empty, otherwise return nil."
--  (avltree-empty (oref this tree)))
-+  (avl-tree-empty (oref this tree)))
- 
- (defmethod jde-avl-tree-find ((this jde-avl-tree) item)
-   "Return the element in THIS tree that matches item."
--  (avltree-member (oref this tree) item))
-+  (avl-tree-member (oref this tree) item))
- 
- (defmethod jde-avl-tree-map ((this jde-avl-tree) map-function)
-   "Applies MAP-FUNCTION to all elements of THIS tree."
--  (avltree-map map-function (oref this tree)))
-+  (avl-tree-map map-function (oref this tree)))
- 
- (defmethod jde-avl-tree-first ((this jde-avl-tree))
-   "Return the first item in THIS tree."
--  (avltree-first (oref this tree)))
-+  (avl-tree-first (oref this tree)))
-   
- (defmethod jde-avl-tree-last ((this jde-avl-tree))
-   "Return the last item in THIS tree."
--  (avltree-last (oref this tree)))
-+  (avl-tree-last (oref this tree)))
- 
- (defmethod jde-avl-tree-copy ((this jde-avl-tree))
-   "Return a copy of THIS tree."
--  (avltree-copy (oref this tree)))
-+  (avl-tree-copy (oref this tree)))
- 
- (defmethod jde-avl-tree-flatten ((this jde-avl-tree))
-   "Return a sorted list containing all elements of THIS tree."
--  (avltree-flatten (oref this tree)))
-+  (avl-tree-flatten (oref this tree)))
- 
- (defmethod jde-avl-tree-size ((this jde-avl-tree))
-   "Return the number of elements in THIS tree."
--  (avltree-size (oref this tree)))
-+  (avl-tree-size (oref this tree)))
- 
- (defmethod jde-avl-tree-clear ((this jde-avl-tree))
-   "Delete all elements of THIS tree."
--  (avltree-clear (oref this tree)))
-+  (avl-tree-clear (oref this tree)))
- 
- (defclass jde-parse-method-map (jde-avl-tree) 
-   ()
diff --git a/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch b/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch
deleted file mode 100644
index ec03749daa6..00000000000
--- a/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Tell the elisp code about the right Java directory.
-
---- jde/lisp/jde.el	(revision 90)
-+++ jde/lisp/jde.el	(working copy)
-@@ -2448,17 +2448,14 @@ environment variable."
- (defmethod initialize-instance ((this jde-bsh) &rest fields)
-   "Constructor for the JDEE BeanShell instance."
-   (call-next-method)
--  (let* ((jde-java-directory
--          (concat
--           (jde-find-jde-data-directory)
--           "java/")))
--
--    (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
--    (oset this checkstyle-jar  (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))
--    (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory))
-+  (let ((jde-java-directory "@out@/share/java"))
-+
-+    (oset this bsh-cmd-dir "@datadir@/bsh-commands")
-+    (oset this checkstyle-jar  (expand-file-name "checkstyle-all.jar" jde-java-directory))
-+    (oset this regexp-jar (expand-file-name "jakarta-regexp.jar" jde-java-directory))
-     (oset this jde-classes-dir (expand-file-name "classes" jde-java-directory))
--    (oset this jde-jar (expand-file-name "lib/jde.jar" jde-java-directory))
--    (oset this jar  (expand-file-name "lib/bsh.jar" jde-java-directory))
-+    (oset this jde-jar (expand-file-name "jde.jar" jde-java-directory))
-+    (oset this jar  (expand-file-name "bsh.jar" jde-java-directory))
-     (oset-default 'jde-bsh the-bsh this)))
- 
- (defmethod bsh-create-buffer ((this jde-bsh))
-
---- jde/lisp/jde-checkstyle.el	(revision 90)
-+++ jde/lisp/jde-checkstyle.el	(working copy)
-@@ -316,10 +316,7 @@ string describing how the compilation fi
- 	 (vm-path (oref (jde-run-get-vm) :path))
- 	 (source-file 
- 	  (concat (file-name-nondirectory buffer-file-name)))
--	 (jde-java-directory
--	  (concat
--	   (jde-find-jde-data-directory)
--	   "java/"))
-+	 (jde-java-directory "@out@/share/java")
- 	 (args (append
- 		(unless jde-checkstyle-expanded-properties-file
- 		  (jde-checkstyle-get-property-args this))
-@@ -328,12 +325,12 @@ string describing how the compilation fi
- 		      (if jde-checkstyle-classpath
- 			  (jde-build-classpath jde-checkstyle-classpath)
- 			(jde-normalize-path
--			 (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))))
-+			 (expand-file-name "checkstyle-all.jar" jde-java-directory))))
- 		(list jde-checkstyle-class)		
- 		(list "-c" 
- 		      (if jde-checkstyle-style
- 			  (jde-normalize-path jde-checkstyle-style)
--			(concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml")))
-+			"@datadir@/sun_checks.xml"))
- 		(if jde-checkstyle-expanded-properties-file
-                     (list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file)))
- 		(if jde-checkstyle-module-package-names-file
-
---- jde/lisp/jde-dbs.el	(revision 90)
-+++ jde/lisp/jde-dbs.el	(working copy)
-@@ -899,9 +899,7 @@ for the breakpoint."
- 		  (jde-normalize-path 'jde-run-working-directory)
- 		source-directory))	     
-              (vm (oref (jde-run-get-vm) :path))
--	     (jde-java-directory
--	      (expand-file-name "java"
--	       (jde-find-jde-data-directory)))
-+	     (jde-java-directory "@out@/share/java")
- 	     (vm-args 
- 		(let (args)
- 		  (setq args 
-@@ -912,7 +910,7 @@ for the breakpoint."
- 			  (jde-build-classpath
- 			       (list
- 				 (expand-file-name 
--				  (if jde-bug-debug "classes" "lib/jde.jar")
-+				  (if jde-bug-debug "classes" "jde.jar")
- 				  jde-java-directory)
- 				 (if (jde-bug-vm-includes-jpda-p)
-                                    (jde-get-tools-jar)

From c6e0fe1b9dc3d1e996fc4e62faf3258eea3ac3f9 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:40 +0100
Subject: [PATCH 461/794] emacs-packages: Remove js2 from old emacs package
 infrastructure

---
 .../editors/emacs-modes/js2/default.nix       | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/js2/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix
deleted file mode 100644
index bc94828ec51..00000000000
--- a/pkgs/applications/editors/emacs-modes/js2/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation {
-  name = "js2-mode-0-20141118";
-
-  src = fetchgit {
-    url = "git://github.com/mooz/js2-mode.git";
-    rev = "3abcd90ddc2f446ddf0fb874dd79ba870c26ad2d";
-    sha256 = "0sh9ax2w0ydhjjn4vnwbgy3926p7ad6h6nmsnm0a3zlldj9a4vwn";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs --batch -f batch-byte-compile js2-mode.el
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp
-    cp js2-mode.el js2-mode.elc $out/share/emacs/site-lisp/
-  '';
-}

From b25416192340401d65344b3264215de6c7984d79 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:40 +0100
Subject: [PATCH 462/794] emacs-packages: Remove let-alist from old emacs
 package infrastructure

---
 .../editors/emacs-modes/let-alist/default.nix | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/let-alist/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/let-alist/default.nix b/pkgs/applications/editors/emacs-modes/let-alist/default.nix
deleted file mode 100644
index f6fee846f92..00000000000
--- a/pkgs/applications/editors/emacs-modes/let-alist/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "let-alist-1.0.3";
-
-  src = fetchurl {
-    url = "https://elpa.gnu.org/packages/let-alist-1.0.3.el";
-    sha256 = "12n1cmjc7hzyy0jmsdxqz1hqzg4ri4nvvi0p9mw1d6v44xzfm0mx";
-  };
-
-  buildInputs = [ emacs ];
-
-  unpackPhase = "cp -v ${src} let-alist.el";
-  buildPhase = "emacs --batch -f batch-byte-compile let-alist.el";
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp
-    mv -v *.el *.elc $out/share/emacs/site-lisp/
-  '';
-
-  meta = {
-    homepage = https://elpa.gnu.org/packages/let-alist.html;
-    description = "Easily let-bind values of an assoc-list by their names";
-    license = stdenv.lib.licenses.gpl3Plus;
-  };
-}

From 7c3726ae9577a9f5d7f2f0b63295eb6f5845a4a1 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:40 +0100
Subject: [PATCH 463/794] emacs-packages: Remove logito from old emacs package
 infrastructure

---
 .../editors/emacs-modes/logito/default.nix    | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/logito/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/logito/default.nix b/pkgs/applications/editors/emacs-modes/logito/default.nix
deleted file mode 100644
index c324e395fa9..00000000000
--- a/pkgs/applications/editors/emacs-modes/logito/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "logito-0.1";
-
-  src = fetchgit {
-    url = "https://github.com/sigma/logito.git";
-    rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052";
-    sha256 = "b9a7433417eafc5bc158f63dddf559b2044368eb3061f0264169de319c68fe4a";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs --batch -f batch-byte-compile logito.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install logito.el logito.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Tiny logging framework for Emacs";
-    homepage = https://github.com/sigma/logito;
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From fb4ba957da5fa175ec700479b1ff7ce8b8d70a69 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:40 +0100
Subject: [PATCH 464/794] emacs-packages: Remove lorem-ipsum from old emacs
 package infrastructure

---
 .../emacs-modes/lorem-ipsum/default.nix       | 32 -------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix
deleted file mode 100644
index b75c51d3bd7..00000000000
--- a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "lorem-ipsum-0.1";
-
-  src = fetchurl {
-    url = "http://www.emacswiki.org/emacs/download/lorem-ipsum.el";
-    sha256 = "122d0z3xqfaikgk34l7bh989mfxddin2ljinysp2lqw8djfi7jsl";
-  };
-
-  phases = [ "buildPhase" "installPhase"];
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    cp $src lorem-ipsum.el
-    emacs --batch -f batch-byte-compile lorem-ipsum.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install lorem-ipsum.el lorem-ipsum.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Insert dummy pseudo Latin text for Emacs";
-    homepage = http://www.emacswiki.org/emacs/LoremIpsum;
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From ed3d9288a16c87e13b2a9ba03a87eec926504e91 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:41 +0100
Subject: [PATCH 465/794] emacs-packages: Remove markdown-mode from old emacs
 package infrastructure

---
 .../emacs-modes/markdown-mode/default.nix     | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/markdown-mode/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
deleted file mode 100644
index 7176b289b8b..00000000000
--- a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs }:
-
-let
-  version = "2.0-82-gfe30ef7";
-in
-stdenv.mkDerivation {
-  name = "markdown-mode-${version}";
-
-  src = fetchFromGitHub {
-    owner  = "defunkt";
-    repo   = "markdown-mode";
-    rev    = "v${version}";
-    sha256 = "14a6r05j0g2ppq2q4kd14qyxwr6yv5jwndavbwzkmp6qhmm9k8nz";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs -L . --batch -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-  '';
-
-  meta.license = stdenv.lib.licenses.gpl3Plus;
-}

From ea726bf658080a673da4e5d060146b02ad06ba64 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:41 +0100
Subject: [PATCH 466/794] emacs-packages: Remove maude from old emacs package
 infrastructure

---
 .../editors/emacs-modes/maude/default.nix     | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/maude/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/pkgs/applications/editors/emacs-modes/maude/default.nix
deleted file mode 100644
index 9b737a938a1..00000000000
--- a/pkgs/applications/editors/emacs-modes/maude/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-stdenv.mkDerivation {
-  name = "maude-mode-0.2";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/maude-mode/maude-mode-0.2.tar.gz";
-    sha256 = "19jdd7la0bxxxnnq4ryckf63jykg0r3v92z126x6djaigi3xn1yx";
-  };
-
-  buildInputs = [emacs];
-  configureFlags = [ "--with-lispdir=$$out/share/emacs/site-lisp" ];
-
-  meta = {
-    description = "Emacs mode for the programming language Maude";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.peti ];
-  };
-}

From 07e7cf853ac2c986888e0892bb4c09a7557644c0 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:41 +0100
Subject: [PATCH 467/794] emacs-packages: Remove metaweblog from old emacs
 package infrastructure

---
 .../emacs-modes/metaweblog/default.nix        | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/metaweblog/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix
deleted file mode 100644
index a5633cdfaba..00000000000
--- a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchgit, emacs, xmlRpc }:
-
-stdenv.mkDerivation rec {
-  name = "metaweblog-0.1";
-
-  src = fetchgit {
-    url = https://github.com/punchagan/metaweblog.git;
-    rev = "ceda65048afaa4c7596c7f50ced998c59ef41167";
-    sha256 = "a4c10bb1b4be574e560f87d5f07da4e24e5fffe9ecc83e6d4f9325f3a7eb1e2f";
-  };
-
-  buildInputs = [ emacs ];
-  propagatedUserEnvPkgs = [ xmlRpc ];
-
-  buildPhase = ''
-    emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el* $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "An emacs library to access metaweblog based weblogs";
-    homepage = https://github.com/punchagan/metaweblog;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From 1c00ad630ec055921b7207ed1baeb63929f67bcb Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:41 +0100
Subject: [PATCH 468/794] emacs-packages: Remove monky from old emacs package
 infrastructure

---
 .../editors/emacs-modes/monky/default.nix     | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/monky/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/monky/default.nix b/pkgs/applications/editors/emacs-modes/monky/default.nix
deleted file mode 100644
index 8e35a4e2b57..00000000000
--- a/pkgs/applications/editors/emacs-modes/monky/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, emacs, unzip }:
-
-stdenv.mkDerivation {
-  name = "emacs-monky-20150404";
-
-  src = fetchurl {
-    url = "https://github.com/ananthakumaran/monky/archive/48c0200910739b6521f26f6423b2bfb8c38b4482.zip";
-    sha256 = "0yp3pzddx7yki9n3qrriqa5p442qyrdivvlc4xbl024vzjyzddrj";
-  };
-
-  buildInputs = [ emacs unzip ];
-
-  buildPhase = "emacs -L . --batch -f batch-byte-compile *.el";
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-  '';
-}

From 3386f5488f512d94096d65a576f26310f52a5276 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:42 +0100
Subject: [PATCH 469/794] emacs-packages: Remove offlineimap from old emacs
 package infrastructure

---
 .../emacs-modes/offlineimap/default.nix       | 29 -------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/offlineimap/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/offlineimap/default.nix b/pkgs/applications/editors/emacs-modes/offlineimap/default.nix
deleted file mode 100644
index e03b1a42ab1..00000000000
--- a/pkgs/applications/editors/emacs-modes/offlineimap/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation rec {
-  rev = "646482203aacdf847d57d0a96263fddcfc33fb61";
-  name = "emacs-offlineimap-${rev}";
-
-  src = fetchgit {
-    inherit rev;
-    url = "git://git.naquadah.org/offlineimap-el.git";
-    sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b";
-  };
-
-  buildInputs = [ emacs ];
-
-  installPhase = ''
-    substituteInPlace offlineimap.el --replace "Machine.MachineUI" "machineui"
-    emacs --batch -f batch-byte-compile offlineimap.el
-    install -d $out/share/emacs/site-lisp
-    install offlineimap.el offlineimap.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "OfflineIMAP support for Emacs";
-    homepage = "http://julien.danjou.info/projects/emacs-packages#offlineimap";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ ];
-    broken = true;
-  };
-}

From 5cdc278b4c71d82df240799083ee5b6281262bc3 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:42 +0100
Subject: [PATCH 470/794] emacs-packages: Remove org from old emacs package
 infrastructure

---
 .../editors/emacs-modes/org/default.nix       | 51 -------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/org/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
deleted file mode 100644
index a8250ead7b4..00000000000
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ fetchurl, stdenv, emacs, texinfo, texlive }:
-
-stdenv.mkDerivation rec {
-  name = "org-8.3.3";
-
-  src = fetchurl {
-    url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "1vhymmd41v7an457xdjhk5zfc4q1x7z64b25rs1ccam5p550cq65";
-  };
-
-  buildInputs = [ emacs ];
-  nativeBuildInputs = [ (texlive.combine {
-    inherit (texlive) scheme-small cm-super;
-  }) texinfo ];
-
-  configurePhase =
-    '' sed -i mk/default.mk \
-           -e "s|^prefix\t=.*$|prefix=$out/share|g"
-    '';
-
-  postBuild =
-    '' make doc
-    '';
-
-  installPhase =
-    '' make install install-info
-
-       mkdir -p "$out/share/doc/${name}"
-       cp -v doc/org*.{html,pdf,txt} "$out/share/doc/${name}"
-
-       mkdir -p "$out/share/org"
-       cp -R contrib "$out/share/org/contrib"
-    '';
-
-  meta = {
-    description = "Org-Mode, an Emacs mode for notes, project planning, and authoring";
-
-    longDescription =
-      '' Org-mode is for keeping notes, maintaining ToDo lists, doing project
-         planning, and authoring with a fast and effective plain-text system.
-
-         This package contains a version of Org-mode typically more recent
-         than that found in GNU Emacs.
-      '';
-
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ pSub ];
-    platforms = stdenv.lib.platforms.unix;
-  };
-}

From 1349476a9a4d7ca12466348a19bc49ac29ffec32 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:42 +0100
Subject: [PATCH 471/794] emacs-packages: Remove org2blog from old emacs
 package infrastructure

---
 .../editors/emacs-modes/org2blog/default.nix  | 34 -------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/org2blog/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/pkgs/applications/editors/emacs-modes/org2blog/default.nix
deleted file mode 100644
index 5c1aec7e02b..00000000000
--- a/pkgs/applications/editors/emacs-modes/org2blog/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, emacs, org, xmlRpc, metaweblog }:
-
-stdenv.mkDerivation rec {
-  name = "org2blog-0.8.1";
-
-  src = fetchgit {
-    url = https://github.com/punchagan/org2blog.git;
-    rev = "5f573ff3e4007c16517a5fe28c4f5d8dde3f8a77";
-    sha256 = "e83c08ceece92bb507be70046db4a7fa87a4af34ad3f84a727e0bd6a1dd99a33";
-  };
-
-  buildInputs = [ emacs ];
-  propagatedUserEnvPkgs = [ org xmlRpc metaweblog ];
-
-  buildPhase = ''
-    emacs -L . -L ${org}/share/emacs/site-lisp/org \
-               -L ${xmlRpc}/share/emacs/site-lisp \
-               -L ${metaweblog}/share/emacs/site-lisp \
-               --batch -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el* $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Publish directly from Emacs’ org-mode to WordPress blogs";
-    homepage = https://github.com/punchagan/org2blog;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From af4faf11dabbddbf6baa925c64124f4e32f0707d Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:42 +0100
Subject: [PATCH 472/794] emacs-packages: Remove pcache from old emacs package
 infrastructure

---
 .../editors/emacs-modes/pcache/default.nix    | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/pcache/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/pcache/default.nix b/pkgs/applications/editors/emacs-modes/pcache/default.nix
deleted file mode 100644
index f4dcf03dee8..00000000000
--- a/pkgs/applications/editors/emacs-modes/pcache/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "pcache-0.2.3";
-
-  src = fetchgit {
-    url = "https://github.com/sigma/pcache.git";
-    rev = "fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6";
-    sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs --batch -f batch-byte-compile pcache.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install pcache.el pcache.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Persistent caching for Emacs";
-    homepage = https://github.com/sigma/pcache.el;
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From 61d42be5b081a8727ca461a8a047a3de60b7594d Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:42 +0100
Subject: [PATCH 473/794] emacs-packages: Remove php from old emacs package
 infrastructure

---
 pkgs/applications/editors/emacs-modes/php/builder.sh |  7 -------
 .../applications/editors/emacs-modes/php/default.nix | 12 ------------
 2 files changed, 19 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/php/builder.sh
 delete mode 100644 pkgs/applications/editors/emacs-modes/php/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/php/builder.sh b/pkgs/applications/editors/emacs-modes/php/builder.sh
deleted file mode 100644
index 85c44848057..00000000000
--- a/pkgs/applications/editors/emacs-modes/php/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/share/emacs/site-lisp
-cd $out/share/emacs/site-lisp
-tar xvfz $src
-mv php-mode-*/* .
-rmdir php-mode-*
diff --git a/pkgs/applications/editors/emacs-modes/php/default.nix b/pkgs/applications/editors/emacs-modes/php/default.nix
deleted file mode 100644
index 2b3cf7b2971..00000000000
--- a/pkgs/applications/editors/emacs-modes/php/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "php-mode-1.5.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/php-mode/${name}.tar.gz";
-    sha256 = "1bffgg4rpiggxqc1hvjcby24sfyzj5728zg7r6f4v6a126a7kcfq";
-  };
-
-  builder = ./builder.sh;
-}

From 99677ec06b91020baf3ea2d76b38d79932ee657a Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:43 +0100
Subject: [PATCH 474/794] emacs-packages: Remove proofgeneral from old emacs
 package infrastructure

---
 .../editors/emacs-modes/proofgeneral/4.4.nix  | 47 ------------------
 .../editors/emacs-modes/proofgeneral/HEAD.nix | 49 -------------------
 .../editors/emacs-modes/proofgeneral/pg.patch | 16 ------
 3 files changed, 112 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch

diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix
deleted file mode 100644
index 0f7ac1d1dc8..00000000000
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, which, automake, enableDoc ? false }:
-
-stdenv.mkDerivation rec {
-  name = "ProofGeneral-${version}";
-  version = "4.4";
-
-  src = fetchFromGitHub {
-    owner = "ProofGeneral";
-    repo = "PG";
-    rev = "v${version}";
-    sha256 = "0bdfk91wf71z80mdfnl8hpinripndcjgdkz854zil6521r84nqk8";
-  };
-
-  buildInputs = [ emacs which ] ++ stdenv.lib.optionals enableDoc [ texinfo texLive ];
-
-  prePatch =
-    '' sed -i "Makefile" \
-           -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
-               s|/sbin/install-info|install-info|g"
-
-       sed -i "bin/proofgeneral" -e's/which/type -p/g'
-
-       chmod +x bin/proofgeneral
-
-       # @image{ProofGeneral-image} fails, so remove it.
-       sed -i '91d' doc/PG-adapting.texi
-       sed -i '96d' doc/ProofGeneral.texi
-    '' + stdenv.lib.optionalString enableDoc
-    # Copy `texinfo.tex' in the right place so that `texi2pdf' works.
-    '' cp -v "${automake}/share/"automake-*/texinfo.tex doc
-    '';
-
-  patches = [ ./pg.patch ];
-
-  installTargets = [ "install" ] ++ stdenv.lib.optional enableDoc "install-doc";
-
-  meta = {
-    description = "Proof General, an Emacs front-end for proof assistants";
-    longDescription = ''
-      Proof General is a generic front-end for proof assistants (also known as
-      interactive theorem provers), based on the customizable text editor Emacs.
-    '';
-    homepage = http://proofgeneral.inf.ed.ac.uk;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;  # arbitrary choice
-  };
-}
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
deleted file mode 100644
index de72b24f87a..00000000000
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
-
-stdenv.mkDerivation (rec {
-  name = "ProofGeneral-unstable-${version}";
-  version = "2018-01-30";
-
-  src = fetchFromGitHub {
-    owner = "ProofGeneral";
-    repo = "PG";
-    rev = "945cada601c5729edd16fcc989a3969c8b34d20a";
-    sha256 = "1zjmbhq6c8g8b93nnsvr5pxx6mlcndb0fz152b2h80vfh9663cn8";
-  };
-
-  buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive;
-
-  prePatch =
-    '' sed -i "Makefile" \
-           -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
-               s|/sbin/install-info|install-info|g"
-
-       # @image{ProofGeneral} fails, so remove it.
-       sed -i '94d' doc/PG-adapting.texi
-       sed -i '96d' doc/ProofGeneral.texi
-    '';
-
-  preBuild = ''
-    make clean;
-  '';
-
-  installPhase =
-    if enableDoc
-    then
-    # Copy `texinfo.tex' in the right place so that `texi2pdf' works.
-    '' cp -v "${automake}/share/"automake-*/texinfo.tex doc
-       make install install-doc
-    ''
-    else "make install";
-
-  meta = {
-    description = "Proof General, an Emacs front-end for proof assistants";
-    longDescription = ''
-      Proof General is a generic front-end for proof assistants (also known as
-      interactive theorem provers), based on the customizable text editor Emacs.
-    '';
-    homepage = http://proofgeneral.inf.ed.ac.uk;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;  # arbitrary choice
-  };
-})
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
deleted file mode 100644
index 704e4b6c8c7..00000000000
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r c7d8bfff4c0a bin/proofgeneral
---- a/bin/proofgeneral	Sat Sep 27 02:25:15 2014 +0100
-+++ b/bin/proofgeneral	Sat Sep 27 02:28:16 2014 +0100
-@@ -73,11 +73,7 @@
- 
- # Try to find Proof General directory
- if [ -z "$PGHOME" ] || [ ! -d "$PGHOME" ]; then
--    # default relative to this script, otherwise PGHOMEDEFAULT
--    MYDIR="`readlink --canonicalize "$0" | sed -ne 's,/bin/proofgeneral$,,p'`"
--    if [ -d "$MYDIR/generic" ]; then
--	PGHOME="$MYDIR"
--    elif [ -d "$PGHOMEDEFAULT" ]; then
-+    if [ -d "$PGHOMEDEFAULT" ]; then
- 	PGHOME="$PGHOMEDEFAULT"
-     else
- 	echo "Cannot find the Proof General lisp files: Set PGHOME or use --pghome."

From 5413061d52367815130741257cb8b28c04651ad1 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:43 +0100
Subject: [PATCH 475/794] emacs-packages: Remove quack from old emacs package
 infrastructure

---
 .../editors/emacs-modes/quack/default.nix     | 32 -------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/quack/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix
deleted file mode 100644
index 94cb3104ecc..00000000000
--- a/pkgs/applications/editors/emacs-modes/quack/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ fetchurl, stdenv, emacs }:
-
-stdenv.mkDerivation {
-  name = "quack-0.39";
-
-  src = fetchurl {
-    # XXX: Upstream URL is not versioned, which might eventually break this.
-    url = "http://www.neilvandyke.org/quack/quack.el";
-    sha256 = "1q5bsllxkibiddwp32306flqm8s3caffnpbqz5ka260avllp4jj5";
-  };
-
-  buildInputs = [ emacs ];
-
-  dontUnpack = true;
-  dontConfigure = true;
-  installPhase = "true";
-
-  buildPhase = ''
-    emacsDir="$out/share/emacs/site-lisp"
-
-    mkdir -p "$emacsDir"
-    cp -v "$src" "$emacsDir/quack.el"
-    emacs --batch -f batch-byte-compile "$emacsDir/quack.el"
-  '';
-
-  meta = {
-    description = "Enhanced Emacs support for editing and running Scheme code";
-    homepage = http://www.neilvandyke.org/quack/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ ];
-  };
-}

From 3e81a52ffb3e1cbd401de6f91754fd52b7d08a41 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:43 +0100
Subject: [PATCH 476/794] emacs-packages: Remove rainbow-delimiters from old
 emacs package infrastructure

---
 .../rainbow-delimiters/default.nix            | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
deleted file mode 100644
index 2b4223cdc1f..00000000000
--- a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-let version = "1.3.13";
-
-in stdenv.mkDerivation {
-  name = "emacs-rainbow-delimiters-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz";
-    sha256 = "075j3nsk4jm0rs5671n28c1wksrfbvpl9a4f89kzcd7sk1h6ncvl";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs -L . --batch -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-  '';
-}

From e7f24e0143a355791af8c471e7de54533a33d661 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:43 +0100
Subject: [PATCH 477/794] emacs-packages: Remove rudel from old emacs package
 infrastructure

---
 .../editors/emacs-modes/rudel/default.nix     | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/rudel/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix
deleted file mode 100644
index 0031ffee4d4..00000000000
--- a/pkgs/applications/editors/emacs-modes/rudel/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{stdenv, fetchurl}:
-
-let
-    version = "0.2-4";
-in
-stdenv.mkDerivation
-{
-  name = "rudel-${version}";
-  src = fetchurl
-  {
-    url = "mirror://sourceforge/rudel/rudel-${version}.tar.gz";
-    sha256 = "68247bfb702d929877f6d098932e8b0ca45c573a3510187e1ccc43e5ea194f25";
-  };
-
-  installPhase = ''
-    for n in . obby zeroconf jupiter; do
-      mkdir -p "$out/share/emacs/site-lisp/$n";
-      cp $n/*.el "$out/share/emacs/site-lisp/$n/";
-    done
-    install -D -m444 doc/card.pdf "$out/share/doc/rudel/card.pdf"
-  '';
-
-  meta = {
-    homepage = http://rudel.sourceforge.net/;
-    description = "A collaborative editing environment for GNU Emacs";
-    license = "GPL";
-  };
-}

From 7385a605f0422d84f49f0a21456c8c102a8e9d81 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:44 +0100
Subject: [PATCH 478/794] emacs-packages: Remove s from old emacs package
 infrastructure

---
 .../editors/emacs-modes/s/default.nix         | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/s/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/s/default.nix b/pkgs/applications/editors/emacs-modes/s/default.nix
deleted file mode 100644
index b818348939e..00000000000
--- a/pkgs/applications/editors/emacs-modes/s/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-let version = "1.9.0";
-
-in stdenv.mkDerivation {
-  name = "emacs-s-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/magnars/s.el/archive/${version}.tar.gz";
-    sha256 = "1gah2k577gvnmxlpw7zrz0jr571vghzhdv2hbgchlgah07czd091";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs -L . --batch -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-  '';
-}

From 63819cdbe79d817c8c579da2a04cb5ee98ff23c3 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:44 +0100
Subject: [PATCH 479/794] emacs-packages: Remove sbt-mode from old emacs
 package infrastructure

---
 .../editors/emacs-modes/sbt-mode/default.nix  | 24 -------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/sbt-mode/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
deleted file mode 100644
index 835cf8081af..00000000000
--- a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, emacs, unzip }:
-
-stdenv.mkDerivation {
-
-  name = "sbt-mode-2014-06-05";
-
-  src = fetchurl {
-    url = "https://github.com/hvesalai/sbt-mode/archive/676f22d9658989de401d299ed0250db9b911574d.zip";
-    sha256 = "0b8qrr3yp48ggl757d3a6bz633mbf4zxqpcwsh47b1ckiwa3nb2h";
-  };
-
-  buildInputs = [ unzip emacs ];
-
-  installPhase = ''
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp -v *.el *.elc "$out/share/emacs/site-lisp/"
-  '';
-
-  meta = {
-    homepage = https://github.com/hvesalai/scala-mode2;
-    description = "An Emacs mode for editing Scala code";
-    license = "permissive";
-  };
-}

From af26fea60e41f4045036cbbe8593796ee45832d6 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:44 +0100
Subject: [PATCH 480/794] emacs-packages: Remove scala-mode from old emacs
 package infrastructure

---
 .../editors/emacs-modes/scala-mode/v1.nix     | 30 -------------------
 .../editors/emacs-modes/scala-mode/v2.nix     | 24 ---------------
 2 files changed, 54 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/scala-mode/v1.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/scala-mode/v2.nix

diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix
deleted file mode 100644
index 7867226ff80..00000000000
--- a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ fetchsvn, stdenv, emacs }:
-
-let revision = "17339"; in
-stdenv.mkDerivation rec {
-  name = "scala-mode-r${revision}";
-
-  src = fetchsvn {
-    url = "http://lampsvn.epfl.ch/svn-repos/scala/scala-tool-support/trunk/src/emacs";
-    rev = revision;
-    sha256 = "05g3xk2mxkqwdnyvxklnrdyhppkvhfs2fd21blhzbhf474cgqlyh";
-  };
-
-  buildInputs = [ emacs ];
-
-  installPhase =
-    '' mkdir -p "$out/share/emacs/site-lisp"
-       cp -v *.el *.elc "$out/share/emacs/site-lisp"
-    '';
-
-  meta = {
-    description = "An Emacs mode for editing Scala code";
-
-    homepage = https://www.scala-lang.org/node/354;
-
-    # non-copyleft, BSD-style
-    license = "permissive";
-
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
deleted file mode 100644
index 0a44deb8ced..00000000000
--- a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, emacs, unzip }:
-
-stdenv.mkDerivation {
-
-  name = "scala-mode2-2014-07-01";
-
-  src = fetchurl {
-    url = "https://github.com/hvesalai/scala-mode2/archive/c154f1623f4696d26e1c88d19170e67bf6825837.zip";
-    sha256 = "0im2ajb1iagjldh52j8wz4yby68rs3h7shrdf1pqy5ds7s4fa8cc";
-  };
-
-  buildInputs = [ unzip emacs ];
-
-  installPhase = ''
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp -v *.el *.elc "$out/share/emacs/site-lisp/"
-  '';
-
-  meta = {
-    homepage = https://github.com/hvesalai/scala-mode2;
-    description = "An Emacs mode for editing Scala code";
-    license = "permissive";
-  };
-}

From 8a6932bc3d4fcf9e3c929373068a4fc831a4e1a2 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:44 +0100
Subject: [PATCH 481/794] emacs-packages: Remove tuareg from old emacs package
 infrastructure

---
 .../editors/emacs-modes/tuareg/default.nix    | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/tuareg/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix
deleted file mode 100644
index be03938f8a5..00000000000
--- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchzip, emacs }:
-
-# this package installs the emacs-mode which
-# resides in the ocaml compiler sources.
-
-let version = "2.0.9";
-
-in stdenv.mkDerivation {
-  name = "tuareg-mode-${version}";
-  src = fetchzip {
-    url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz";
-    sha256 = "13rh5ddwvwwz5jf0n3wagc5m9zq4cbaylnsknzjalryyvipwfyh3";
-  }; 
-
-  buildInputs = [ emacs ];
-
-  installPhase = ''
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp *.el *.elc  "$out/share/emacs/site-lisp"
-  '';
-
-  meta = {
-    homepage =  https://github.com/ocaml/tuareg;
-    description = "OCaml mode package for Emacs";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.gpl2Plus;
-  };
-}

From 38edd7b05a9f173094436162c76c3c931bdc4c4d Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:44 +0100
Subject: [PATCH 482/794] emacs-packages: Remove writegood from old emacs
 package infrastructure

---
 .../editors/emacs-modes/writegood/default.nix | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/writegood/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix
deleted file mode 100644
index 6d0631a4cb8..00000000000
--- a/pkgs/applications/editors/emacs-modes/writegood/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-let version = "2.0.2";
-
-in stdenv.mkDerivation {
-  name = "writegood-mode-${version}";
-  src = fetchurl {
-    url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz";
-    sha256 = "1ilbqj24vzpfh9n1wph7idj0914ga290jkpv9kr1pff3a0v5hf6k";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs -L . --batch -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Emacs minor mode that aids in finding common writing problems";
-    homepage = https://github.com/bnbeckwith/writegood-mode;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.pSub ];
-    license = stdenv.lib.licenses.gpl3;
-  };
-}

From 53d805245aabb2d52825aff2e1460701dc693596 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 18 Aug 2019 17:02:45 +0100
Subject: [PATCH 483/794] emacs-packages: Remove xml-rpc from old emacs package
 infrastructure

---
 .../editors/emacs-modes/xml-rpc/default.nix   | 32 -------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/xml-rpc/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
deleted file mode 100644
index 661430516b7..00000000000
--- a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-stdenv.mkDerivation rec {
-  name = "xml-rpc-1.6.8";
-
-  src = fetchurl {
-    url = https://launchpadlibrarian.net/40270196/xml-rpc.el;
-    sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b";
-  };
-
-  phases = [ "buildPhase" "installPhase"];
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    cp $src xml-rpc.el
-    emacs --batch -f batch-byte-compile xml-rpc.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install xml-rpc.el* $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Elisp implementation of clientside XML-RPC";
-    homepage = https://launchpad.net/xml-rpc-el;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From b3d6dd59a6c38d749e14d3cac489cb7e58abbb01 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 30 Aug 2019 16:32:52 +0100
Subject: [PATCH 484/794] emacs-packages: Add backwards compatible aliases

I want to add that I'm personally not a fan of this and I think we
should eventually drop these aliases to closely match the eco-system
rather than relying on some ad-hoc names created years ago.
---
 .../editors/emacs-modes/manual-packages.nix   | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix
index 34b81cc8329..92c9f96ed70 100644
--- a/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -152,12 +152,47 @@
   cua = callPackage ./cua { };
   emacsClangCompleteAsync = callPackage ./emacs-clang-complete-async { };
   emacsSessionManagement = callPackage ./session-management-for-emacs { };
-  hsc3Mode = callPackage ./hsc3 { };
+  hsc3-mode = callPackage ./hsc3 { };
   hol_light_mode = callPackage ./hol_light { };
   ido-ubiquitous = callPackage ./ido-ubiquitous { };
-  ocamlMode = callPackage ./ocaml { };
-  prologMode = callPackage ./prolog { };
+  ocaml-mode = callPackage ./ocaml { };
+  prolog-mode = callPackage ./prolog { };
   rectMark = callPackage ./rect-mark { };
   sunriseCommander = callPackage ./sunrise-commander { };
 
+  # Legacy aliases, these try to mostly map to melpa stable because it's
+  # closer to the old outdated package infra.
+  #
+  # Ideally this should be dropped some time during/after 20.03
+  bbdb3 = self.melpaStablePackages.bbdb;
+  ocamlMode = self.ocaml-mode;
+  jade = self.jade-mode;
+  # scalaMode2 = null;  # No clear mapping as of now
+  flymakeCursor = self.melpaStablePackages.flymake-cursor;
+  cryptol = self.melpaStablePackages.cryptol-mode;
+  maudeMode = self.maude-mode;
+  phpMode = self.melpaStablePackages.php-mode;
+  idris = self.melpaStablePackages.idris-mode;
+  rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters;
+  colorTheme = self.color-theme;
+  sbtMode = self.melpaStablePackages.sbt-mode;
+  markdownMode = self.melpaStablePackages.markdown-mode;
+  scalaMode1 = self.melpaStablePackages.scala-mode;
+  prologMode = self.prolog-mode;
+  hsc3Mode = self.hsc3-mode;
+  graphvizDot = self.melpaStablePackages.graphviz-dot-mode;
+  proofgeneral_HEAD = self.proof-general;
+  proofgeneral = self.melpaStablePackages.proof-general;
+  haskellMode = self.melpaStablePackages.haskell-mode;
+  writeGood = self.melpaStablePackages.writegood-mode;
+  erlangMode = self.melpaStablePackages.erlang;
+  d = self.melpaStablePackages.d-mode;
+  autoComplete = self.melpaStablePackages.auto-complete;
+  tuaregMode = self.melpaStablePackages.tuareg;
+  structuredHaskellMode = self.melpaStablePackages.shm;
+  xmlRpc = self.melpaStablePackages.xml-rpc;
+  emacsw3m = self.w3m;
+  loremIpsum = self.lorem-ipsum;
+  js2 = self.melpaStablePackages.js2-mode;
+
 }

From a66012b3ec81295779ecbaa2d0223d5e09f0b749 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 30 Aug 2019 17:49:37 +0200
Subject: [PATCH 485/794] gitRepo: 1.13.4 -> 1.13.5

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

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 2c427bb1824..bda811353f6 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "git-repo-${version}";
-  version = "1.13.4";
+  pname = "git-repo";
+  version = "1.13.5";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "0p55mx1ry0r3bb8nja09cfpiv1jjxf98r41vrqba1b5hm8hbzfhj";
+    sha256 = "0p9qzgdp88jzzl2zc6c263iww3phcqkyn02yvavhdgii926gi34q";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 6b87772ca4a0b7d8448365b4f1c1a08a904fb3e8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2019 17:55:59 +0200
Subject: [PATCH 486/794] nixos/mailman: don't reserve a static uid in the
 system

Any system uid will do, so we let the system allocate
one for us. The 'mailman' group is gone entirely since
we don't need it. Users who wish to run the 'mailman'
administration utility can do so via 'sudo':

    $ sudo -u mailman mailman info

Also, simplify the syntax of our user.users entry to
rely on an attribute set rather than a list.
---
 nixos/modules/misc/ids.nix              |  4 ++--
 nixos/modules/services/mail/mailman.nix | 14 ++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index efd8544d6a2..ac6af1ce8b7 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -340,7 +340,7 @@
       cockroachdb = 313;
       zoneminder = 314;
       paperless = 315;
-      mailman = 316;
+      #mailman = 316;  # removed 2019-08-30
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -641,7 +641,7 @@
       cockroachdb = 313;
       zoneminder = 314;
       paperless = 315;
-      mailman = 316;
+      #mailman = 316;  # removed 2019-08-30
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
index cae59cb52cc..f4d635139fa 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@@ -76,16 +76,7 @@ in {
       }
     ];
 
-    users.users = singleton {
-      name = "mailman";
-      group = "mailman";
-      uid = config.ids.uids.mailman;
-    };
-
-    users.groups = singleton {
-      name = "mailman";
-      gid = config.ids.gids.mailman;
-    };
+    users.users.mailman = { description = "GNU Mailman"; isSystemUser = true; };
 
     environment = {
       systemPackages = [ mailmanExe ];
@@ -105,10 +96,9 @@ in {
         ExecStart = "${mailmanExe}/bin/mailman start";
         ExecStop = "${mailmanExe}/bin/mailman stop";
         User = "mailman";
-        Group = "mailman";
         Type = "forking";
         StateDirectory = "mailman";
-        StateDirectoryMode = "0750";
+        StateDirectoryMode = "0700";
         RuntimeDirectory = "mailman";
         PIDFile = "/run/mailman/master.pid";
       };

From afd448a9fad78fc96a98489d3c49b63ca7b4f454 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2019 15:44:01 +0200
Subject: [PATCH 487/794] nixos/redis: disable transparent huge pages (TLP)
 before starting Redis

---
 nixos/modules/services/databases/redis.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index 3f2857100f5..37cc179023a 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -40,7 +40,12 @@ in
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = "Whether to enable the Redis server.";
+        description = ''
+          Whether to enable the Redis server. Note that the NixOS module for
+          Redis disables kernel support for Transparent Huge Pages (THP),
+          because this features causes major performance problems for Redis,
+          e.g. (https://redis.io/topics/latency).
+        '';
       };
 
       package = mkOption {
@@ -224,6 +229,16 @@ in
 
     environment.systemPackages = [ cfg.package ];
 
+    systemd.services.disable-transparent-huge-pages = {
+      enable = config.services.redis.enable;
+      description = "Disable Transparent Huge Pages (required by Redis)";
+      after = [ "sysinit.target" "local-fs.target" ];
+      before = [ "redis.service" ];
+      wantedBy = [ "redis.service" ];
+      script = "echo never >/sys/kernel/mm/transparent_hugepage/enabled";
+      serviceConfig.Type = "oneshot";
+    };
+
     systemd.services.redis =
       { description = "Redis Server";
 

From 67fbc4d060a22e94c16a14ba6ba3bb4588a0b715 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 30 Aug 2019 12:13:57 -0400
Subject: [PATCH 488/794] plank: 0.11.4 -> 0.11.89

---
 pkgs/applications/misc/plank/default.nix | 42 +++++++++++++++++++-----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
index d5a071fcb54..10c8a03fa0a 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/pkgs/applications/misc/plank/default.nix
@@ -1,21 +1,43 @@
-{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
-, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
-, bamf, gdk-pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee
-, wrapGAppsHook, autoreconfHook, pantheon }:
+{ stdenv
+, fetchurl
+, vala
+, atk
+, cairo
+, glib
+, gnome3
+, gtk3
+, libwnck3
+, libX11
+, libXfixes
+, libXi
+, pango
+, gettext
+, pkgconfig
+, libxml2
+, bamf
+, gdk-pixbuf
+, libdbusmenu-gtk3
+, file
+, gnome-menus
+, libgee
+, wrapGAppsHook
+, autoreconfHook
+, pantheon
+}:
 
 stdenv.mkDerivation rec {
   pname = "plank";
-  version = "0.11.4";
+  version = "0.11.89";
 
   src = fetchurl {
     url = "https://launchpad.net/${pname}/1.0/${version}/+download/${pname}-${version}.tar.xz";
-    sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8";
+    sha256 = "17cxlmy7n13jp1v8i4abxyx9hylzb39andhz3mk41ggzmrpa8qm6";
   };
 
   nativeBuildInputs = [
     autoreconfHook
+    gettext
     gnome3.gnome-common
-    intltool
     libxml2 # xmllint
     pkgconfig
     vala
@@ -47,7 +69,9 @@ stdenv.mkDerivation rec {
   ];
 
   # Make plank's application launcher hidden in Pantheon
-  patches = [ ./hide-in-pantheon.patch ];
+  patches = [
+    ./hide-in-pantheon.patch
+  ];
 
   postPatch = ''
     substituteInPlace ./configure \
@@ -56,7 +80,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Elegant, simple, clean dock";
-    homepage = https://launchpad.net/plank;
+    homepage = "https://launchpad.net/plank";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers;

From 9292bc58c6a601f3618077583398a807d30b6a75 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 30 Aug 2019 17:59:22 +0200
Subject: [PATCH 489/794] androidStudioPackages.{dev,canary}: 3.6.0.8 ->
 3.6.0.9

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 4b9e2f40950..9f7997860c6 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -14,9 +14,9 @@ let
   };
   betaVersion = stableVersion;
   latestVersion = { # canary & dev
-    version = "3.6.0.8"; # "Android Studio 3.6 Canary 8"
-    build = "192.5825043";
-    sha256Hash = "1nh8p880pz3x7hlwa3inkr9qkd95amkg0sv4f0m7bb70k9v5mnvv";
+    version = "3.6.0.9"; # "Android Studio 3.6 Canary 9"
+    build = "192.5830636";
+    sha256Hash = "0c9zmxf2scsf9pygcbabzngl7cdyjgpir5pggjaj535ni0nsrr7p";
   };
 in rec {
   # Attributes are named by their corresponding release channels

From d9f95c1b1ea184a20b99b30dfb6d1a6390937e1d Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Wed, 28 Aug 2019 20:56:43 -0400
Subject: [PATCH 490/794] maintainers: add roelvandijk to maintainers

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fb7db98fa3a..9659c0d1ecd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5397,6 +5397,12 @@
     githubId = 852967;
     name = "Russell O'Connor";
   };
+  roelvandijk = {
+    email = "roel@lambdacube.nl";
+    github = "roelvandijk";
+    githubId = 710906;
+    name = "Roel van Dijk";
+  };
   romildo = {
     email = "malaquias@gmail.com";
     github = "romildo";

From d20d6034bd1a50c97d19030d2625dd12d72a3287 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 30 Aug 2019 17:21:16 +0100
Subject: [PATCH 491/794] CODEOWNERS: Add myself as owner for emacs

---
 .github/CODEOWNERS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1b3acbf6f7a..58834f4597e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -145,3 +145,8 @@
 /nixos/modules/services/mail/postfix.nix    @peti
 /nixos/modules/services/networking/bind.nix @peti
 /nixos/modules/services/mail/rspamd.nix     @peti
+
+# Emacs
+/pkgs/applications/editors/emacs-modes @adisbladis
+/pkgs/applications/editors/emacs       @adisbladis
+/pkgs/top-level/emacs-packages.nix     @adisbladis

From 260314e9d74e2c57452f3279fad9461f72f90f33 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 30 Aug 2019 09:32:30 -0700
Subject: [PATCH 492/794] filezilla: 3.43.0 -> 3.44.2

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

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 530671e6173..91002e6f75e 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "filezilla";
-  version = "3.43.0";
+  version = "3.44.2";
 
   src = fetchurl {
     url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
-    sha256 = "13i505y34b6lg7knzznf8812d9nwpnbf3hidpq58cbv8c31m5rkg";
+    sha256 = "1dny16ybzml6py1y8vprylqq1xc08221w5xcwcmygkjrb0820kax";
   };
 
   configureFlags = [

From eedf3dc6e28ddc6b8315ea8a4b5dd0d46b09f3a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2019 18:42:28 +0200
Subject: [PATCH 493/794] nixos/mailman: decouple the mailman module from the
 postfix module

https://github.com/NixOS/nixpkgs/pull/67708#discussion_r319579987 suggested
that simply appending the necessary maps to the appropriate attributes in
services.postfix.config gets the job done; we don't special support in the
postfix module to accomplish that.
---
 nixos/modules/services/mail/mailman.nix | 11 ++++++++---
 nixos/modules/services/mail/postfix.nix | 11 +++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
index f4d635139fa..11dd5cb48db 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@@ -83,9 +83,14 @@ in {
       etc."mailman.cfg".text = mailmanCfg;
     };
 
-    services.postfix.config = {
-      # Mailman uses recipient delimiters, so we don't need special handling.
-      owner_request_special = "no";
+    services.postfix = {
+      relayDomains = [ "hash:/var/lib/mailman/data/postfix_domains" ];
+      config = {
+        transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];
+        local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];
+        # Mailman uses recipient delimiters, so we don't need special handling.
+        owner_request_special = "no";
+      };
     };
 
     systemd.services.mailman = {
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index bcf90778346..2b08ab1e6aa 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -11,10 +11,9 @@ let
 
   haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != ""
                       || cfg.extraAliases != "";
-  haveTransport = cfg.transport != "" || config.services.mailman.enable;
+  haveTransport = cfg.transport != "";
   haveVirtual = cfg.virtual != "";
-  haveLocalRecipients = cfg.localRecipients != null || config.services.mailman.enable;
-  haveRelayDomains = cfg.relayDomains != null || config.services.mailman.enable;
+  haveLocalRecipients = cfg.localRecipients != null;
 
   clientAccess =
     optional (cfg.dnsBlacklistOverrides != "")
@@ -753,12 +752,12 @@ in
       // optionalAttrs (cfg.domain != "") { mydomain = cfg.domain; }
       // optionalAttrs (cfg.origin != "") { myorigin =  cfg.origin; }
       // optionalAttrs (cfg.destination != null) { mydestination = cfg.destination; }
-      // optionalAttrs haveRelayDomains { relay_domains = optionals (cfg.relayDomains != null) cfg.relayDomains ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_domains"; }
+      // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; }
       // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; }
       // optionalAttrs haveAliases { alias_maps = [ "${cfg.aliasMapType}:/etc/postfix/aliases" ]; }
-      // optionalAttrs haveTransport { transport_maps = [ "hash:/etc/postfix/transport" ] ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_lmtp"; }
+      // optionalAttrs haveTransport { transport_maps = [ "hash:/etc/postfix/transport" ]; }
       // optionalAttrs haveVirtual { virtual_alias_maps = [ "${cfg.virtualMapType}:/etc/postfix/virtual" ]; }
-      // optionalAttrs haveLocalRecipients { local_recipient_maps = [ "hash:/etc/postfix/local_recipients" ] ++ optional haveAliases "$alias_maps" ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_lmtp"; }
+      // optionalAttrs haveLocalRecipients { local_recipient_maps = [ "hash:/etc/postfix/local_recipients" ] ++ optional haveAliases "$alias_maps"; }
       // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; }
       // optionalAttrs cfg.useSrs {
         sender_canonical_maps = [ "tcp:127.0.0.1:10001" ];

From c11fd45c244b24897e8e111b07c7cbce911255f1 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 24 Aug 2019 12:00:18 +0300
Subject: [PATCH 494/794] uq: init at 2018-05-27

---
 pkgs/misc/uq/default.nix        | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100755 pkgs/misc/uq/default.nix

diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix
new file mode 100755
index 00000000000..9dcfae41ea8
--- /dev/null
+++ b/pkgs/misc/uq/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "uq";
+  version = "unstable-2018-05-27";
+
+  src = fetchFromGitHub {
+    owner = "lostutils";
+    repo = "uq";
+    rev = "118bc2f3b1cf292afdffbc1cb4415d150b323165";
+    sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb";
+  };
+
+  cargoSha256 = "1s22v2wz5h3l5l447zl54bhdk6avkk2ycrbbpxcx1442lllbss4w";
+
+  meta = with lib; {
+    description = "A simple, user-friendly alternative to sort | uniq";
+    homepage = "https://github.com/lostutils/uq";
+    license = licenses.mit;
+    maintainers = with maintainers; [ doronbehar ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c71abe5e309..6b192e0431f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6654,6 +6654,8 @@ in
 
   upx = callPackage ../tools/compression/upx { };
 
+  uq = callPackage ../misc/uq { };
+
   uqmi = callPackage ../tools/networking/uqmi { };
 
   uriparser = callPackage ../development/libraries/uriparser {};

From 93a27dbe9f4c3689e4b62089be1a7d5e7eb6a8aa Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Fri, 30 Aug 2019 13:50:50 +0200
Subject: [PATCH 495/794] usbtop: init at 1.0

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

diff --git a/pkgs/os-specific/linux/usbtop/default.nix b/pkgs/os-specific/linux/usbtop/default.nix
new file mode 100644
index 00000000000..0ff8fcf0ddf
--- /dev/null
+++ b/pkgs/os-specific/linux/usbtop/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub
+, cmake
+, libpcap, boost }:
+
+stdenv.mkDerivation rec {
+  pname = "usbtop";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "aguinet";
+    repo = pname;
+    rev = "release-${version}";
+    sha256 = "0qbad0aq6j4jrh90l6a0akk71wdzhyzmy6q8wl138axyj2bp9kss";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libpcap boost ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/aguinet/usbtop";
+    description = "A top utility that shows an estimated instantaneous bandwidth on USB buses and devices";
+    maintainers = with maintainers; [ etu ];
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c3af89bc8d..14318795a7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16494,6 +16494,8 @@ in
     withGui = false;
   };
 
+  usbtop = callPackage ../os-specific/linux/usbtop { };
+
   usbutils = callPackage ../os-specific/linux/usbutils { };
 
   usermount = callPackage ../os-specific/linux/usermount { };

From aacf9235d842ef52daf43ee7ac36be9ca9fbe226 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Fri, 30 Aug 2019 13:51:10 +0200
Subject: [PATCH 496/794] nixos/usbtop: Add module to install usbtop and to
 enable kernel module

---
 nixos/modules/module-list.nix     |  1 +
 nixos/modules/programs/usbtop.nix | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 nixos/modules/programs/usbtop.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 75df6c8d453..fc03d05b07d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -152,6 +152,7 @@
   ./programs/tmux.nix
   ./programs/tsm-client.nix
   ./programs/udevil.nix
+  ./programs/usbtop.nix
   ./programs/venus.nix
   ./programs/vim.nix
   ./programs/wavemon.nix
diff --git a/nixos/modules/programs/usbtop.nix b/nixos/modules/programs/usbtop.nix
new file mode 100644
index 00000000000..c1b6ee38caa
--- /dev/null
+++ b/nixos/modules/programs/usbtop.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.usbtop;
+in {
+  options = {
+    programs.usbtop.enable = mkEnableOption "usbtop and required kernel module";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      usbtop
+    ];
+
+    boot.kernelModules = [
+      "usbmon"
+    ];
+  };
+}

From 3cd8f4300c1b3e5402c7431fbed504ff0f9d6d1c Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Mon, 22 Jul 2019 23:39:35 +0200
Subject: [PATCH 497/794] perlPackages.ConfigSimple: init at 4.59

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6180f6372e2..442df5ec715 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2879,6 +2879,18 @@ let
     };
   };
 
+  ConfigSimple = buildPerlPackage {
+    pname = "Config-Simple";
+    version = "4.59";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.59.tar.gz;
+      sha256 = "0m0hg29baarw5ds768q9r4rxb27im8kj4fazyf9gjqw4mmssjy6b";
+    };
+    meta = {
+      description = "Simple configuration file class";
+    };
+  };
+
   ConfigStd = buildPerlModule {
     pname = "Config-Std";
     version = "0.903";

From 1eb8f58130ff2524b7a7caa245db81ae309e53f7 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Mon, 5 Aug 2019 18:22:31 +0200
Subject: [PATCH 498/794] x2goserver: init at 4.1.0.3

---
 .../networking/remote/x2goserver/default.nix  | 93 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 95 insertions(+)
 create mode 100644 pkgs/applications/networking/remote/x2goserver/default.nix

diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/applications/networking/remote/x2goserver/default.nix
new file mode 100644
index 00000000000..f69d2326217
--- /dev/null
+++ b/pkgs/applications/networking/remote/x2goserver/default.nix
@@ -0,0 +1,93 @@
+{ stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs
+, utillinux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg
+, nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash
+}:
+
+let
+  pname = "x2goserver";
+  version = "4.1.0.3";
+
+  src = fetchurl {
+    url = "http://code.x2go.org/releases/source/x2goserver/${pname}-${version}.tar.gz";
+    sha256 = "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7";
+  };
+
+  x2go-perl = perlPackages.buildPerlPackage rec {
+    pname = "X2Go";
+    inherit version src;
+    makeFlags = [ "-f" "Makefile.perl" ];
+    patchPhase = ''
+      substituteInPlace X2Go/Config.pm --replace '/etc/x2go' '/var/lib/x2go/conf'
+      substituteInPlace X2Go/Server/DB.pm \
+        --replace '$x2go_lib_path/libx2go-server-db-sqlite3-wrapper' \
+                  '/run/wrappers/bin/x2gosqliteWrapper'
+      substituteInPlace X2Go/Server/DB/SQLite3.pm --replace "user='x2gouser'" "user='x2go'"
+    '';
+  };
+
+  perlEnv = perl.withPackages (p: with p; [
+    x2go-perl DBI DBDSQLite FileBaseDir TryTiny CaptureTiny ConfigSimple Switch
+  ]);
+
+  binaryDeps = [
+    perlEnv which nx-libs utillinux coreutils glibc.bin gawk gnused gnugrep
+    findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs
+    xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil
+    xorg.xkbcomp xorg.setxkbmap
+  ];
+in
+stdenv.mkDerivation rec {
+  inherit pname version src;
+
+  buildInputs = [ perlEnv bash ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  prePatch = ''
+    patchShebangs .
+    sed -i '/Makefile.PL\|Makefile.perl/d' Makefile
+    for i in */Makefile; do
+      substituteInPlace "$i" --replace "-o root -g root " ""
+    done
+    substituteInPlace libx2go-server-db-perl/Makefile --replace "chmod 2755" "chmod 755"
+    for i in x2goserver/sbin/x2godbadmin x2goserver/bin/x2go*
+    do
+      substituteInPlace $i --replace '/etc/x2go' '/var/lib/x2go/conf'
+    done
+    substituteInPlace x2goserver/sbin/x2gocleansessions \
+      --replace '/var/run/x2goserver.pid' '/var/run/x2go/x2goserver.pid'
+    substituteInPlace x2goserver/sbin/x2godbadmin --replace 'user="x2gouser"' 'user="x2go"'
+    substituteInPlace x2goserver-xsession/etc/Xsession \
+      --replace "SSH_AGENT /bin/bash -c" "SSH_AGENT ${bash}/bin/bash -c" \
+      --replace "[ -f /etc/redhat-release ]" "[ -d /etc/nix ] || [ -f /etc/redhat-release ]"
+  '';
+
+  makeFlags = [ "PREFIX=/" "NXLIBDIR=${nx-libs}/lib/nx" ];
+
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  postInstall = ''
+    mv $out/etc/x2go/x2goserver.conf{,.example}
+    mv $out/etc/x2go/x2goagent.options{,.example}
+    ln -sf ${nx-libs}/bin/nxagent $out/bin/x2goagent
+    for i in $out/sbin/x2go* $(find $out/bin -type f) \
+      $(ls $out/lib/x2go/x2go* | grep -v x2gocheckport)
+    do
+      wrapProgram $i --prefix PATH : ${lib.makeBinPath binaryDeps}:$out
+    done
+    # We're patching @INC of the setgid wrapper, because we can't mix
+    # the perl wrapper (for PERL5LIB) with security.wrappers (for setgid)
+    sed -ie "s,.\+bin/perl,#!${perl}/bin/perl -I ${perlEnv}/lib/perl5/site_perl," \
+      $out/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Remote desktop application, server component";
+    homepage = "http://x2go.org/";
+    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.averelld ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9eeb1084144..3f944f38c66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21331,6 +21331,8 @@ in
 
   x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
 
+  x2goserver = callPackage ../applications/networking/remote/x2goserver { };
+
   x2vnc = callPackage ../tools/X11/x2vnc { };
 
   x32edit = callPackage ../applications/audio/midas/x32edit.nix {};

From ebce65658f17f675757adca077903f54a56c8982 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 30 Aug 2019 19:29:59 +0200
Subject: [PATCH 499/794] nix: Reduce closure size by 48 MiB

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 58662f4c045..fb6fd2513ba 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -64,7 +64,12 @@ common =
         # https://github.com/NixOS/nixpkgs/issues/45462
         if is20 then ''
           mkdir -p $out/lib
-          cp ${boost}/lib/libboost_context* $out/lib
+          cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib
+          rm -f $out/lib/*.a
+          ${lib.optionalString stdenv.isLinux ''
+            chmod u+w $out/lib/*.so.*
+            patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
+          ''}
         '' else ''
           configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp")
         '';

From b2cc915003eb1d49bb2add1231d21fa573daa7fb Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sat, 31 Aug 2019 01:41:43 +0800
Subject: [PATCH 500/794] parity: Update buildInputs and nativeBuildInputs

Move cmake and pkgconfig from buildInputs to nativeBuildInputs
Remove unneeded perl from buildInputs
---
 pkgs/applications/blockchains/parity/parity.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/blockchains/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix
index 79831f3304d..fbc43cd3402 100644
--- a/pkgs/applications/blockchains/parity/parity.nix
+++ b/pkgs/applications/blockchains/parity/parity.nix
@@ -7,11 +7,10 @@
 , fetchFromGitHub
 , rustPlatform
 
-, pkgconfig
-, openssl
-, systemd
 , cmake
-, perl
+, openssl
+, pkgconfig
+, systemd
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -26,10 +25,9 @@ rustPlatform.buildRustPackage rec {
     inherit sha256;
   };
 
-  buildInputs = [
-    pkgconfig cmake perl
-    systemd.lib systemd.dev openssl openssl.dev
-  ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ openssl systemd ];
 
   cargoBuildFlags = [ "--features final" ];
 

From 6eee9a44b59623b794f3beaf1da34dc210e82b39 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sat, 31 Aug 2019 01:44:59 +0800
Subject: [PATCH 501/794] parity: 2.5.6 -> 2.5.7

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

diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix
index 873f83190fd..9b5a72077d5 100644
--- a/pkgs/applications/blockchains/parity/default.nix
+++ b/pkgs/applications/blockchains/parity/default.nix
@@ -1,6 +1,6 @@
 let
-  version     = "2.5.6";
-  sha256      = "1qkrqkkgjvm27babd6bidhf1n6vdp8rac1zy5kf61nfzplxzr2dy";
+  version     = "2.5.7";
+  sha256      = "0aprs71cbf98dsvjz0kydngkvdg5x7dijji8j6xadgvsarl1ljnj";
   cargoSha256 = "0aa0nkv3jr7cdzswbxghxxv0y65a59jgs1682ch8vrasi0x17m1x";
 in
   import ./parity.nix { inherit version sha256 cargoSha256; }

From bfe498f81b4765803bdc3ac324594b389da6a60a Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sat, 31 Aug 2019 01:45:23 +0800
Subject: [PATCH 502/794] parity-beta: 2.6.1 -> 2.6.2

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

diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix
index 4b6a88fd410..a936691bd79 100644
--- a/pkgs/applications/blockchains/parity/beta.nix
+++ b/pkgs/applications/blockchains/parity/beta.nix
@@ -1,6 +1,6 @@
 let
-  version     = "2.6.1";
-  sha256      = "0yvscs2ivy08zla3jhirxhwwaqsn9j5ml4sqbgx6h5rh19c941vh";
-  cargoSha256 = "1s3c44cggajrmc504klf4cyb1s4l5ny48yihs9c3fc0n8d064017";
+  version     = "2.6.2";
+  sha256      = "1j4249m5k3bi7di0wq6fm64zv3nlpgmg4hr5hnn94fyc09nz9n1r";
+  cargoSha256 = "18zd91n04wck3gd8szj4vxn3jq0bzq0h3rg0wcs6nzacbzhcx2sw";
 in
   import ./parity.nix { inherit version sha256 cargoSha256; }

From f0d23b63432d7093f55ce2f49c89d60b6cfc455f Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Mon, 5 Aug 2019 18:26:14 +0200
Subject: [PATCH 503/794] x2goserver: add module

---
 nixos/modules/module-list.nix         |   1 +
 nixos/modules/programs/x2goserver.nix | 148 ++++++++++++++++++++++++++
 2 files changed, 149 insertions(+)
 create mode 100644 nixos/modules/programs/x2goserver.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 22fd5d7609d..b439602566f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -158,6 +158,7 @@
   ./programs/way-cooler.nix
   ./programs/waybar.nix
   ./programs/wireshark.nix
+  ./programs/x2goserver.nix
   ./programs/xfs_quota.nix
   ./programs/xonsh.nix
   ./programs/xss-lock.nix
diff --git a/nixos/modules/programs/x2goserver.nix b/nixos/modules/programs/x2goserver.nix
new file mode 100644
index 00000000000..d9e7b6e4a5c
--- /dev/null
+++ b/nixos/modules/programs/x2goserver.nix
@@ -0,0 +1,148 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.x2goserver;
+
+  defaults = {
+    superenicer = { "enable" = cfg.superenicer.enable; };
+  };
+  confText = generators.toINI {} (recursiveUpdate defaults cfg.settings);
+  x2goServerConf = pkgs.writeText "x2goserver.conf" confText;
+
+  x2goAgentOptions = pkgs.writeText "x2goagent.options" ''
+    X2GO_NXOPTIONS=""
+    X2GO_NXAGENT_DEFAULT_OPTIONS="${concatStringsSep " " cfg.nxagentDefaultOptions}"
+  '';
+
+in {
+  options.programs.x2goserver = {
+    enable = mkEnableOption "x2goserver" // {
+      description = ''
+        Enables the x2goserver module.
+        NOTE: This will create a good amount of symlinks in `/usr/local/bin`
+      '';
+    };
+
+    superenicer = {
+      enable = mkEnableOption "superenicer" // {
+        description = ''
+          Enables the SupeReNicer code in x2gocleansessions, this will renice
+          suspended sessions to nice level 19 and renice them to level 0 if the
+          session becomes marked as running again
+        '';
+      };
+    };
+
+    nxagentDefaultOptions = mkOption {
+      type = types.listOf types.str;
+      default = [ "-extension GLX" "-nolisten tcp" ];
+      example = [ "-extension GLX" "-nolisten tcp" ];
+      description = ''
+        List of default nx agent options.
+      '';
+    };
+
+    settings = mkOption {
+      type = types.attrsOf types.attrs;
+      default = {};
+      description = ''
+        x2goserver.conf ini configuration as nix attributes. See
+        `x2goserver.conf(5)` for details
+      '';
+      example = literalExample ''
+        superenicer = {
+          "enable" = "yes";
+          "idle-nice-level" = 19;
+        };
+        telekinesis = { "enable" = "no"; };
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.x2goserver ];
+
+    users.groups.x2go = {};
+    users.users.x2go = {
+      home = "/var/lib/x2go/db";
+      group = "x2go";
+    };
+
+    security.wrappers.x2gosqliteWrapper = {
+      source = "${pkgs.x2goserver}/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl";
+      owner = "x2go";
+      group = "x2go";
+      setgid = true;
+    };
+    security.wrappers.x2goprintWrapper = {
+      source = "${pkgs.x2goserver}/bin/x2goprint";
+      owner = "x2go";
+      group = "x2go";
+      setgid = true;
+    };
+
+    systemd.tmpfiles.rules = with pkgs; [
+      "d /var/lib/x2go/ - x2go x2go - -"
+      "d /var/lib/x2go/db - x2go x2go - -"
+      "d /var/lib/x2go/conf - x2go x2go - -"
+      "d /run/x2go 0755 x2go x2go - -"
+    ] ++
+    # x2goclient sends SSH commands with preset PATH set to
+    # "/usr/local/bin;/usr/bin;/bin". Since we cannot filter arbitrary ssh
+    # commands, we have to make the following executables available.
+    map (f: "L+ /usr/local/bin/${f} - - - - ${x2goserver}/bin/${f}") [
+      "x2goagent" "x2gobasepath" "x2gocleansessions" "x2gocmdexitmessage"
+      "x2godbadmin" "x2gofeature" "x2gofeaturelist" "x2gofm" "x2gogetapps"
+      "x2gogetservers" "x2golistdesktops" "x2golistmounts" "x2golistsessions"
+      "x2golistsessions_root" "x2golistshadowsessions" "x2gomountdirs"
+      "x2gopath" "x2goprint" "x2goresume-desktopsharing" "x2goresume-session"
+      "x2goruncommand" "x2goserver-run-extensions" "x2gosessionlimit"
+      "x2gosetkeyboard" "x2goshowblocks" "x2gostartagent"
+      "x2gosuspend-desktopsharing" "x2gosuspend-session"
+      "x2goterminate-desktopsharing" "x2goterminate-session"
+      "x2goumount-session" "x2goversion"
+    ] ++ [
+      "L+ /usr/local/bin/awk - - - - ${gawk}/bin/awk"
+      "L+ /usr/local/bin/chmod - - - - ${coreutils}/bin/chmod"
+      "L+ /usr/local/bin/cp - - - - ${coreutils}/bin/cp"
+      "L+ /usr/local/bin/sed - - - - ${gnused}/bin/sed"
+      "L+ /usr/local/bin/setsid - - - - ${utillinux}/bin/setsid"
+      "L+ /usr/local/bin/xrandr - - - - ${xorg.xrandr}/bin/xrandr"
+      "L+ /usr/local/bin/xmodmap - - - - ${xorg.xmodmap}/bin/xmodmap"
+    ];
+
+    systemd.services.x2goserver = {
+      description = "X2Go Server Daemon";
+      wantedBy = [ "multi-user.target" ];
+      unitConfig.Documentation = "man:x2goserver.conf(5)";
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "${pkgs.x2goserver}/bin/x2gocleansessions";
+        PIDFile = "/run/x2go/x2goserver.pid";
+        User = "x2go";
+        Group = "x2go";
+        RuntimeDirectory = "x2go";
+        StateDirectory = "x2go";
+      };
+      preStart = ''
+        if [ ! -e /var/lib/x2go/setup_ran ]
+        then
+          mkdir -p /var/lib/x2go/conf
+          cp -r ${pkgs.x2goserver}/etc/x2go/* /var/lib/x2go/conf/
+          ln -sf ${x2goServerConf} /var/lib/x2go/conf/x2goserver.conf
+          ln -sf ${x2goAgentOptions} /var/lib/x2go/conf/x2goagent.options
+          ${pkgs.x2goserver}/bin/x2godbadmin --createdb
+          touch /var/lib/x2go/setup_ran
+        fi
+      '';
+    };
+
+    # https://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=276
+    security.sudo.extraConfig = ''
+      Defaults  env_keep+=QT_GRAPHICSSYSTEM
+    '';
+  };
+}

From 4388f7709a8770f99c9f103354b8054da4d2652d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 30 Aug 2019 20:00:16 +0200
Subject: [PATCH 504/794] nixFlakes: 2.3pre20190829_ebc4dae ->
 2.3pre20190830_04np4n6

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index fb6fd2513ba..574f95f82bb 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -200,12 +200,12 @@ in rec {
 
   nixFlakes = lib.lowPrio (callPackage common rec {
     name = "nix-2.3${suffix}";
-    suffix = "pre20190829_ebc4dae";
+    suffix = "pre20190830_04np4n6";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "ebc4dae51761cb54c1db28cf4d328d3f2f55b758";
-      hash = "sha256-yfp56L7lu0DIhskzxooF/26T9d4ufl5/k5LlXMI0PSM=";
+      rev = "aa82f8b2d2a2c42f0d713e8404b668cef1a4b108";
+      hash = "sha256-09ZHwpxf9pRDacCSGTHYx+fnKYgxKx8G37Jqb4wl1xI=";
     };
     fromGit = true;
 

From e594088ae872801cff534cc20f8e30582b96c79f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 30 Aug 2019 11:02:47 -0700
Subject: [PATCH 505/794] exempi: 2.4.5 -> 2.5.1

---
 pkgs/development/libraries/exempi/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index 3bc5270f053..22c812ba4c2 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -1,24 +1,14 @@
 { stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }:
 
 stdenv.mkDerivation rec {
-  name = "exempi-2.4.5";
+  pname = "exempi";
+  version = "2.5.1";
 
   src = fetchurl {
-    url = "https://libopenraw.freedesktop.org/download/${name}.tar.bz2";
+    url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2";
     sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0";
   };
 
-  patches = [
-    # CVE-2018-12648
-    # https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
-    # remove with exempi > 2.4.5
-    (fetchpatch {
-      name = "CVE-2018-12648.patch";
-      url = https://gitlab.freedesktop.org/libopenraw/exempi/commit/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch;
-      sha256 = "1nh8irk5p26868875wq5n8g92xp4crfb8fdd8gyna76ldyzqqx9q";
-    })
-  ];
-
   configureFlags = [
     "--with-boost=${boost.dev}"
   ];

From 7e29ce8a774ecf7831820feb3c82e69bf67c1fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 30 Aug 2019 20:59:44 +0200
Subject: [PATCH 506/794] maturin: 0.6.1 -> 0.7.0

pyo3-pack has been renamed to maturin version 0.7.0. Other larger
changes are:

- Mixed rust/python layout
- Added PEP 517 support
- Support settings all applicable fields from the python core
  metadata specification in Cargo.toml
---
 .../tools/rust/{pyo3-pack => maturin}/default.nix    | 12 ++++++------
 pkgs/top-level/aliases.nix                           |  1 +
 pkgs/top-level/all-packages.nix                      |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename pkgs/development/tools/rust/{pyo3-pack => maturin}/default.nix (72%)

diff --git a/pkgs/development/tools/rust/pyo3-pack/default.nix b/pkgs/development/tools/rust/maturin/default.nix
similarity index 72%
rename from pkgs/development/tools/rust/pyo3-pack/default.nix
rename to pkgs/development/tools/rust/maturin/default.nix
index a17d50262a0..4b07129ae0e 100644
--- a/pkgs/development/tools/rust/pyo3-pack/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -4,17 +4,17 @@
 let
   inherit (darwin.apple_sdk.frameworks) Security;
 in rustPlatform.buildRustPackage rec {
-  name = "pyo3-pack-${version}";
-  version = "0.6.1";
+  name = "maturin-${version}";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "PyO3";
-    repo = "pyo3-pack";
+    repo = "maturin";
     rev = "v${version}";
-    sha256 = "0zk0jhr7lnl9z6c8pbk7si3wa8b1kqzj3wrslc1n5fjla7xx8fzn";
+    sha256 = "1qscn8ycyg9ldkp1v5178mlw8r5ak2p12x52c0w4hgij7y1q5s39";
   };
 
-  cargoSha256 = "13gycipxc17baxg8nvjzkw96i1pxgncx7qjcrm9aab7p9vi2vrih";
+  cargoSha256 = "0fk9dgwkgkkmxxd8ydl0vp14jhzi65pkz36v5h3nkp4cb4n4cvdj";
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -27,7 +27,7 @@ in rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "Build and publish crates with pyo3 bindings as python packages";
-    homepage = https://github.com/PyO3/pyo3-pack;
+    homepage = https://github.com/PyO3/maturin;
     license = licenses.mit;
     maintainers = [ maintainers.danieldk ];
     platforms = platforms.all;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1a4169605a6..f51ba3fbaf1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -285,6 +285,7 @@ mapAliases ({
   ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream.";
   processing3 = processing; # added 2019-08-16
   procps-ng = procps; # added 2018-06-08
+  pyo3-pack = maturin;
   pulseaudioLight = pulseaudio; # added 2018-04-25
   qca-qt5 = libsForQt5.qca-qt5;  # added 2015-12-19
   qt_gstreamer = qt-gstreamer;  # added 2017-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c3af89bc8d..256b2f28e11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8355,7 +8355,7 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { };
+  maturin = callPackage ../development/tools/rust/maturin { };
   rainicorn = callPackage ../development/tools/rust/rainicorn { };
   inherit (rustPackages) rls;
   rustfmt = rustPackages.rustfmt;

From 722940fcdcfeb99787377a15be55d2e0b34c4822 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Fri, 30 Aug 2019 19:25:55 +0000
Subject: [PATCH 507/794] nixos/release-notes: fix indentation

---
 nixos/doc/manual/release-notes/rl-1909.xml | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 002bb371168..a211a8dfb86 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -564,27 +564,27 @@
       <option>boot.kernel.sysctl."kernel.core_pattern"</option> to <literal>"core"</literal>.
     </para>
    </listitem>
-  <listitem>
-   <para>
-    <literal>systemd.packages</literal> option now also supports generators and
-    shutdown scripts. Old <literal>systemd.generator-packages</literal> option has
-    been removed.
-   </para>
-  </listitem>
-  <listitem>
-   <para>
-    The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer.
-    Use <literal>rspamd</literal> in proxy mode instead.
-   </para>
-  </listitem>
-  <listitem>
-   <para>
-     systemd cgroup accounting via the
-     <link linkend="opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link>
-     option is now enabled by default. It now also enables the more recent Block IO and IP accounting
-     features.
-   </para>
-  </listitem>
+   <listitem>
+    <para>
+     <literal>systemd.packages</literal> option now also supports generators and
+     shutdown scripts. Old <literal>systemd.generator-packages</literal> option has
+     been removed.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer.
+     Use <literal>rspamd</literal> in proxy mode instead.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+      systemd cgroup accounting via the
+      <link linkend="opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link>
+      option is now enabled by default. It now also enables the more recent Block IO and IP accounting
+      features.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>

From 027b117feee14e0c89c88e16a336307ffc742de2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 28 Aug 2019 09:47:17 +0200
Subject: [PATCH 508/794] pigeon: init at 20160310

---
 pkgs/development/tools/pigeon/default.nix | 22 ++++++++
 pkgs/development/tools/pigeon/deps.nix    | 66 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  3 ++
 3 files changed, 91 insertions(+)
 create mode 100644 pkgs/development/tools/pigeon/default.nix
 create mode 100644 pkgs/development/tools/pigeon/deps.nix

diff --git a/pkgs/development/tools/pigeon/default.nix b/pkgs/development/tools/pigeon/default.nix
new file mode 100644
index 00000000000..ae543533059
--- /dev/null
+++ b/pkgs/development/tools/pigeon/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+buildGoPackage {
+  pname = "pigeon";
+  version = "20190810-f3db42a662";
+
+  goPackagePath = "github.com/mna/pigeon";
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "mna";
+    repo = "pigeon";
+    rev = "f3db42a662eded7550fc7cd11605d05311dfa30f";
+    sha256 = "1n0zqidwbqqfslrirpbqw14ylgiry6ggcp9ll4h8rf1chqwk6dhv";
+  };
+
+  meta = {
+    homepage = "https://github.com/mna/pigeon";
+    description = "A PEG parser generator for Go";
+    maintainers = with lib.maintainers; [ zimbatm ];
+    license = with lib.licenses; [ bsd3 ];
+  };
+}
diff --git a/pkgs/development/tools/pigeon/deps.nix b/pkgs/development/tools/pigeon/deps.nix
new file mode 100644
index 00000000000..d836dc43c7c
--- /dev/null
+++ b/pkgs/development/tools/pigeon/deps.nix
@@ -0,0 +1,66 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "c2843e01d9a2";
+      sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "3b0461eec859";
+      sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "112230192c58";
+      sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "d0b11bdaac8a";
+      sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "v0.3.0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "b29f5f60c37a";
+      sha256 = "118rvb59hc1fykbmif4008rbxw1p0dblc8dxkq96yaapd6p0vbpn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/xerrors";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/xerrors";
+      rev = "a985d3407aa7";
+      sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d290cb592e1..a8e9b52550b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24888,4 +24888,7 @@ in
   uhubctl = callPackage ../tools/misc/uhubctl {};
 
   kodelife = callPackage ../applications/graphics/kodelife {};
+
+  pigeon = callPackage ../development/tools/pigeon {};
+
 }

From 792bb4f7f6952204eaa1d5341e5743bdb159ef96 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 28 Aug 2019 10:07:11 +0200
Subject: [PATCH 509/794] verifpal: init at 0.2

---
 pkgs/tools/security/verifpal/default.nix | 38 ++++++++++++++++++++++++
 pkgs/tools/security/verifpal/deps.nix    | 12 ++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/tools/security/verifpal/default.nix
 create mode 100644 pkgs/tools/security/verifpal/deps.nix

diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix
new file mode 100644
index 00000000000..3b72cf3bd53
--- /dev/null
+++ b/pkgs/tools/security/verifpal/default.nix
@@ -0,0 +1,38 @@
+{ lib, fetchFromGitHub, buildGoPackage, pigeon }:
+buildGoPackage rec {
+  pname = "verifpal";
+  version = "0.2";
+
+  goPackagePath = "github.com/SymbolicSoft/verifpal";
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "SymbolicSoft";
+    repo = pname;
+    rev = version;
+    sha256 = "08a0xvgg94k6vq91ylvgi97kpkjbw0rw172v2dzwl2rfpzkigk1r";
+  };
+
+  postPatch = ''
+    sed -e 's|/bin/echo |echo |g' -i Makefile
+  '';
+
+  buildInputs = [ pigeon ];
+
+  buildPhase = ''
+    make -C go/src/$goPackagePath parser linux
+  '';
+
+  installPhase = ''
+    mkdir -p $bin/bin
+    cp go/src/$goPackagePath/build/bin/linux/verifpal $bin/bin/
+  '';
+
+  meta = {
+    homepage = "https://verifpal.com/";
+    description = "Cryptographic protocol analysis for students and engineers";
+    maintainers = with lib.maintainers; [ zimbatm ];
+    license = with lib.licenses; [ gpl3 ];
+    platforms = ["x86_64-linux"];
+  };
+}
diff --git a/pkgs/tools/security/verifpal/deps.nix b/pkgs/tools/security/verifpal/deps.nix
new file mode 100644
index 00000000000..aaa4269416a
--- /dev/null
+++ b/pkgs/tools/security/verifpal/deps.nix
@@ -0,0 +1,12 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+  {
+    goPackagePath = "github.com/logrusorgru/aurora";
+    fetch = {
+      type = "git";
+      url = "https://github.com/logrusorgru/aurora";
+      rev = "94edacc10f9b";
+      sha256 = "0bhwy3rrd8mwb8xjwf44nj6vmxaj5hdvayvszr1rskkmz08l5v01";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8e9b52550b..f986c32c717 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24891,4 +24891,6 @@ in
 
   pigeon = callPackage ../development/tools/pigeon {};
 
+  verifpal = callPackage ../tools/security/verifpal {};
+
 }

From 3c6d4d7e06b5145f067b68af66e804a1029b3dde Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 30 Aug 2019 22:52:31 +0200
Subject: [PATCH 510/794] gitRepo: 1.13.5 -> 1.13.5.1

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

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index bda811353f6..b26548ebe99 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "1.13.5";
+  version = "1.13.5.1";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "0p9qzgdp88jzzl2zc6c263iww3phcqkyn02yvavhdgii926gi34q";
+    sha256 = "13rp0fq76a6qlw60pnipkgfng25i0ygyk66y30jv7hy8ip4aa92n";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 71846dfceb1a90bf9d2eea655763856c46c7e8ea Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 30 Aug 2019 22:11:24 +0100
Subject: [PATCH 511/794] emacs-packages: Add update script that fetches from
 overlay

---
 .../editors/emacs-modes/update-from-overlay       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 pkgs/applications/editors/emacs-modes/update-from-overlay

diff --git a/pkgs/applications/editors/emacs-modes/update-from-overlay b/pkgs/applications/editors/emacs-modes/update-from-overlay
new file mode 100755
index 00000000000..26d2482e7ae
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/update-from-overlay
@@ -0,0 +1,15 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p curl nix
+set -euxo pipefail
+
+# This script piggybacks on the automatic code generation done by the nix-community emacs overlay
+# You can use this to avoid running lengthy code generation jobs locally
+
+curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix
+nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages --show-trace
+git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "elpa-packages: $(date --iso)" -- elpa-generated.nix
+
+curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json
+env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages
+env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages
+git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "melpa-packages: $(date --iso)" -- recipes-archive-melpa.json

From 347a0c25f370f3383072229d95de4fa970939bf3 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 30 Aug 2019 22:13:01 +0100
Subject: [PATCH 512/794] elpa-packages: 2019-08-30

---
 .../editors/emacs-modes/elpa-generated.nix    | 54 +++++--------------
 1 file changed, 12 insertions(+), 42 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 31e87df6d85..7737034973a 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -621,21 +621,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, ivy, lib }:
-      elpaBuild {
-        pname = "counsel-ebdb";
-        ename = "counsel-ebdb";
-        version = "1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/counsel-ebdb-1.el";
-          sha256 = "0p919gq871rxlrn6lpjbwws7h6i2gc9vgcxzj8bzgz8xk5hq9mis";
-        };
-        packageRequires = [ ebdb ivy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/counsel-ebdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
     crisp = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "crisp";
@@ -1252,10 +1237,10 @@
       elpaBuild {
         pname = "frog-menu";
         ename = "frog-menu";
-        version = "0.2.9";
+        version = "0.2.10";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/frog-menu-0.2.9.el";
-          sha256 = "1gjhypsafpqybcbwi49qi1g419hcq9qv4p940ybspydg9gqk3gmp";
+          url = "https://elpa.gnu.org/packages/frog-menu-0.2.10.el";
+          sha256 = "050qikvgh9v7kgvhznjsfrpyhs7iq1x63bryqdkrwlf668yhzi1m";
         };
         packageRequires = [ avy emacs posframe ];
         meta = {
@@ -1470,21 +1455,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, helm, lib }:
-      elpaBuild {
-        pname = "helm-ebdb";
-        ename = "helm-ebdb";
-        version = "1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/helm-ebdb-1.el";
-          sha256 = "17gpna0hywxnhfwc9zsm2r35mskyfi416qqmmdba26r4zmpb9r63";
-        };
-        packageRequires = [ ebdb helm ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/helm-ebdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
     highlight-escape-sequences = callPackage ({ elpaBuild
                                               , fetchurl
                                               , lib }:
@@ -2415,10 +2385,10 @@
       elpaBuild {
         pname = "phps-mode";
         ename = "phps-mode";
-        version = "0.2.4";
+        version = "0.2.8";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/phps-mode-0.2.4.tar";
-          sha256 = "0n6gj22w0llns3kx5hd69imhlrnlxx74zvhz7qikfx60669c5n20";
+          url = "https://elpa.gnu.org/packages/phps-mode-0.2.8.tar";
+          sha256 = "16sdqh93d2i9dxjibbhx4afakn150qc6xy2ifd83kx85c67y95kl";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3181,10 +3151,10 @@
       elpaBuild {
         pname = "tramp";
         ename = "tramp";
-        version = "2.4.2.1";
+        version = "2.4.2.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-2.4.2.1.tar";
-          sha256 = "139y05b2m715zryxqw7k438cc137mziz2k5nbzrrahddfz0i3cf9";
+          url = "https://elpa.gnu.org/packages/tramp-2.4.2.2.tar";
+          sha256 = "0bjfnxxyn8xgw10ybnjrza2gfwqifa3q7rh0bp6pidlhg45718p8";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3575,10 +3545,10 @@
       elpaBuild {
         pname = "wisitoken-grammar-mode";
         ename = "wisitoken-grammar-mode";
-        version = "1.0.2";
+        version = "1.0.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.0.2.tar";
-          sha256 = "09rpjl3z6xzap0lbrjs9hf2nspwc5avvx75ah3aimgvizrf2kyp0";
+          url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.0.3.tar";
+          sha256 = "1vljnhi35vix30xch9mziczg56ss1r615yn2pgdcw8wa8sm14crw";
         };
         packageRequires = [ emacs mmm-mode wisi ];
         meta = {

From 52be1a3de07163b8c418f9b89a9d89aef38ae629 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 30 Aug 2019 22:13:16 +0100
Subject: [PATCH 513/794] melpa-packages: 2019-08-30

---
 .../emacs-modes/recipes-archive-melpa.json    | 2976 ++++++++++-------
 1 file changed, 1826 insertions(+), 1150 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index 00bcb16b31b..def54a99e68 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -31,11 +31,11 @@
   "url": "https://git.sr.ht/~zge/nullpointer-emacs",
   "unstable": {
    "version": [
-    20190801,
-    902
+    20190819,
+    1232
    ],
-   "commit": "129585c4096e78f46b741c7729915f666bfee501",
-   "sha256": "0jplfnp4cn5vgj99g0ks0g9k2ij8yz1h24c6ghbz0hxd5bh5g889"
+   "commit": "9d195764bfd1f2da7dc50ed73e70f3e5ac8610f5",
+   "sha256": "1x99ifgsxb3xn18hihral1qc6c30w824blqjhr9kpx4shh42g9f5"
   },
   "stable": {
    "version": [
@@ -961,22 +961,22 @@
     "auto-complete",
     "yasnippet"
    ],
-   "commit": "19b34b56ebc0eaabf9b1f4a8ac6819bde9855d2b",
-   "sha256": "02j0dwzbvi744ybdqwx8dan1ahl2yar7cw20n619vbmxn0r6pml2"
+   "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
+   "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
   },
   "stable": {
    "version": [
     2,
-    1,
-    1
+    2,
+    2
    ],
    "deps": [
     "ac-php-core",
     "auto-complete",
     "yasnippet"
    ],
-   "commit": "710aca14d2d5035f338b8e76ed042d3bc7524e95",
-   "sha256": "01hrsxq1m9rxmsn1xfmj8k8w19gf9xj4hqy0aqrqs0cx2f74rxrw"
+   "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
+   "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
   }
  },
  {
@@ -987,8 +987,8 @@
   "repo": "xcwen/ac-php",
   "unstable": {
    "version": [
-    20190601,
-    622
+    20190816,
+    548
    ],
    "deps": [
     "dash",
@@ -998,14 +998,14 @@
     "s",
     "xcscope"
    ],
-   "commit": "19b34b56ebc0eaabf9b1f4a8ac6819bde9855d2b",
-   "sha256": "02j0dwzbvi744ybdqwx8dan1ahl2yar7cw20n619vbmxn0r6pml2"
+   "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
+   "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
   },
   "stable": {
    "version": [
     2,
-    1,
-    1
+    2,
+    2
    ],
    "deps": [
     "dash",
@@ -1015,8 +1015,8 @@
     "s",
     "xcscope"
    ],
-   "commit": "710aca14d2d5035f338b8e76ed042d3bc7524e95",
-   "sha256": "01hrsxq1m9rxmsn1xfmj8k8w19gf9xj4hqy0aqrqs0cx2f74rxrw"
+   "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
+   "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
   }
  },
  {
@@ -1065,8 +1065,8 @@
     "auto-complete",
     "rtags"
    ],
-   "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2",
-   "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w"
+   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
+   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
   },
   "stable": {
    "version": [
@@ -1812,14 +1812,14 @@
   "repo": "Malabarba/aggressive-indent-mode",
   "unstable": {
    "version": [
-    20190218,
-    2331
+    20190828,
+    1828
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "3803f24020ef0a656dc5345713c4964073aec9a8",
-   "sha256": "0dbg4lmzq0r7pvqx0wqxdcnmqz76nk9sdbwg276cmflqj9m0q7z1"
+   "commit": "c28246ba09d53e32cd9d8cafb1830f50387d9985",
+   "sha256": "19qklr4wqy55cb2133qlnrhf9yggsf096l14glw4jwpvx3cn61dd"
   },
   "stable": {
    "version": [
@@ -2136,16 +2136,16 @@
   "repo": "jwiegley/alert",
   "unstable": {
    "version": [
-    20190607,
-    1635
+    20190816,
+    2205
    ],
    "deps": [
     "cl-lib",
     "gntp",
     "log4e"
    ],
-   "commit": "ee1326aa8f1a0146ea10dc6f91d0a72584fa8b18",
-   "sha256": "1h7b606wcmasqxcfbgxfq1m06zns9yi1vi3smp1qgj5rpkrlhxz0"
+   "commit": "95a735e6947b0d09dbf9b9a944a21e5f5c1e6ee1",
+   "sha256": "0dqk6jnmfqhxcy4hd9a09632c9gfl7hg4vksp6p0k6wrz9yx6qsf"
   },
   "stable": {
    "version": [
@@ -2854,10 +2854,10 @@
  },
  {
   "ename": "ansible-doc",
-  "commit": "1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9",
-  "sha256": "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w",
+  "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0",
+  "sha256": "1gn334v5k1i3wsh1i53vnjj2y7kv4vba9yiwgiwz0pn7wd26wk5s",
   "fetcher": "github",
-  "repo": "lunaryorn/ansible-doc.el",
+  "repo": "emacsorphanage/ansible-doc",
   "unstable": {
    "version": [
     20160924,
@@ -3325,11 +3325,11 @@
   "repo": "ukaszg/aria2",
   "unstable": {
    "version": [
-    20141107,
-    2317
+    20190816,
+    25
    ],
-   "commit": "7a944c5100812269369225af7aa9580fedab175f",
-   "sha256": "1pwnx6k7b35xhwqvzd3rl6rf5ydvbrrdmbadns8w0iyz2yafdxji"
+   "commit": "90aeb73bedba63ac9efb9cad8e7444feb8b40261",
+   "sha256": "0hsmjmgbsvdim1vxzh0qh41f9vmpsh8rlsy2h508ydw82rpc2q6f"
   }
  },
  {
@@ -3764,11 +3764,11 @@
   "repo": "DamienCassou/auth-password-store",
   "unstable": {
    "version": [
-    20190812,
-    936
+    20190813,
+    1026
    ],
-   "commit": "2039468bb800d676ff02a76c8fabda168696b564",
-   "sha256": "07q7hjk40rz0cji1ygmybkwn6pm86m8fzkisdv920qpi6i2jhgvz"
+   "commit": "847a1f54ed48856b4dfaaa184583ef2c84173edf",
+   "sha256": "0g48z5w6n3c54zqfpx65dfyl9jqbl15idvbb1hhw2pd9f9r8fykk"
   },
   "stable": {
    "version": [
@@ -4382,14 +4382,14 @@
   "repo": "ncaq/auto-sudoedit",
   "unstable": {
    "version": [
-    20190809,
-    735
+    20190821,
+    209
    ],
    "deps": [
     "f"
    ],
-   "commit": "4d7aeeeff339683a5d4eed05de357058a11f2e02",
-   "sha256": "10zbillf66bnhni08x159w4nrd08x8zsagam3c7c7555p1ccf5rk"
+   "commit": "b589d7c8653204fe07b3355a51d5b622ac6a647a",
+   "sha256": "10ini7q91gbkvmk6j7fcybgdv5jrhfpk6dfwyl2vcb1nlkxfbnzc"
   }
  },
  {
@@ -4583,8 +4583,8 @@
     20190331,
     2230
    ],
-   "commit": "ef0c6b84d92eecd05aa5cd4a35b73652f21b311a",
-   "sha256": "0wh0fwl2mimb48g2sf2nhmr3xxwvgkgr3566187x3kw8zxgh1nv7"
+   "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949",
+   "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq"
   }
  },
  {
@@ -4690,14 +4690,14 @@
   "repo": "abo-abo/avy",
   "unstable": {
    "version": [
-    20190630,
-    1538
+    20190828,
+    951
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "66886e265cf41c6061dc70440eb5b61fad8f48e0",
-   "sha256": "101qbj6cx3358r1hr0jj8y1bsz24ci5qbc8k4lcw35llcsdvaivw"
+   "commit": "034de4c0e900717ebcb6e19a973cf66beea54420",
+   "sha256": "0ssvnbvmdvjqpdswn68lwv2xi8mdfx8iyvs38mqc45f4502ahbjx"
   },
   "stable": {
    "version": [
@@ -4961,11 +4961,11 @@
   "repo": "mschuldt/backlight.el",
   "unstable": {
    "version": [
-    20180629,
-    2159
+    20190821,
+    1808
    ],
-   "commit": "096e632bf100d318754d6c961c90ebb0ef29dce5",
-   "sha256": "0w9ng4rhsawcf96mnpy71h50j4mankmvjnfknxlmwiwlmx4sp0f1"
+   "commit": "5a7a9b70f368fc77bac2c9c2d10dee4ad9f03987",
+   "sha256": "0sbmvyf6y73c0rw5yi6rgri29qidr1hpwqlgdass9rrzdnq5i3zg"
   }
  },
  {
@@ -5081,6 +5081,21 @@
    "sha256": "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j"
   }
  },
+ {
+  "ename": "baidu-translate",
+  "commit": "c9cdf13f64a1de8c57dcb90229da0f62a8e14e7a",
+  "sha256": "0m8pqnp57bmk41wij5a0dcilg09p992q5413llfac41b6biqf2yd",
+  "fetcher": "github",
+  "repo": "liShiZhensPi/baidu-translate",
+  "unstable": {
+   "version": [
+    20190817,
+    1318
+   ],
+   "commit": "b04a74d09ff5e3fbefd1b39b2abe79a9e272321a",
+   "sha256": "0qja8xw2sk2wn7w6qa5zj2i0j5c8a7cnldrag99ip2b5m02f1z4l"
+  }
+ },
  {
   "ename": "bang",
   "commit": "d9830cce42339243091f4463490954a8a955c65f",
@@ -5089,20 +5104,20 @@
   "url": "https://git.sr.ht/~zge/bang",
   "unstable": {
    "version": [
-    20190727,
-    2122
+    20190819,
+    1339
    ],
-   "commit": "55f3e2a7fc240bf7754dc3de47514095c76f89be",
-   "sha256": "1mcyvwzbbghz3k9ww0iml55awkkndk57bdvl6apcljwgjqd6rkrb"
+   "commit": "87b5ad3c81ccf0f2435e3c26ad7f9a1d6191ddb9",
+   "sha256": "10cybpw6wks2p21g1cz9rr6chvhv1s7jasrnzbcgpg8vkzb3dj48"
   },
   "stable": {
    "version": [
+    1,
     0,
-    2,
-    0
+    1
    ],
-   "commit": "253d4bc87ec6beb12e5c6f5569a354907adb8679",
-   "sha256": "0gjzzqj46fc2ifzrp33cy4q0wbqdjmwmnc6mq042n1imdg5s0hg3"
+   "commit": "87b5ad3c81ccf0f2435e3c26ad7f9a1d6191ddb9",
+   "sha256": "10cybpw6wks2p21g1cz9rr6chvhv1s7jasrnzbcgpg8vkzb3dj48"
   }
  },
  {
@@ -5204,11 +5219,11 @@
   "repo": "szermatt/emacs-bash-completion",
   "unstable": {
    "version": [
-    20190516,
-    1854
+    20190820,
+    1804
    ],
-   "commit": "61592a1ce11efdff1d18bb7675c651a8f914c10d",
-   "sha256": "09chkvcwy12h24wlb92hjyanrsfc1nc735h8bpi0ffy1i8lxmlfm"
+   "commit": "504dd26b1de326ec03d2c45f2d2db1ad59481adf",
+   "sha256": "041zrjlc0n3l1r8gyd78i14jkl2mf3pfsk37malmsllf3067ambz"
   },
   "stable": {
    "version": [
@@ -5495,26 +5510,26 @@
   "repo": "unhammer/bbdb2erc",
   "unstable": {
    "version": [
-    20170221,
-    1354
+    20190822,
+    907
    ],
    "deps": [
     "bbdb"
    ],
-   "commit": "15db2bd29df0f6ee32c499fdeffb960b6a7f97a0",
-   "sha256": "0jlm6qffhh84vy5wmkxmsm5i4dp87cfh7zr5kvrw72zyww986kn4"
+   "commit": "40b89e961762af3e7ade3a1844a9fbcd4084ac65",
+   "sha256": "1faa32ya515rkx5pwz6bsav0ffyajq8vq8d3vzn9j81d9in2rh5j"
   },
   "stable": {
    "version": [
     0,
     1,
-    3
+    5
    ],
    "deps": [
     "bbdb"
    ],
-   "commit": "f39a36351e1e6f1105c9e32970e7502b77b0dbcd",
-   "sha256": "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs"
+   "commit": "40b89e961762af3e7ade3a1844a9fbcd4084ac65",
+   "sha256": "1faa32ya515rkx5pwz6bsav0ffyajq8vq8d3vzn9j81d9in2rh5j"
   }
  },
  {
@@ -5932,8 +5947,8 @@
     "a",
     "pdf-tools"
    ],
-   "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb",
-   "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z"
+   "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3",
+   "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y"
   }
  },
  {
@@ -6680,29 +6695,29 @@
   "repo": "jyp/boon",
   "unstable": {
    "version": [
-    20190802,
-    959
+    20190828,
+    655
    ],
    "deps": [
     "dash",
     "expand-region",
     "multiple-cursors"
    ],
-   "commit": "a1df9a6d8d01ead25583ec086de71e3d5840eba9",
-   "sha256": "0ak04sh49zkgz66hbgwvjmdxnxs4zsx1aw5yx79r0fd5rpxscxfi"
+   "commit": "623174d015d4ba867e4decf0fcd439b51262f0a9",
+   "sha256": "19qm2i4pba9kbaw70cdchvmv9jgs2vxnlrz9jqpcn864z3k887iw"
   },
   "stable": {
    "version": [
     1,
-    0
+    1
    ],
    "deps": [
     "dash",
     "expand-region",
     "multiple-cursors"
    ],
-   "commit": "d9f0545708bbbbe3df23b2b91cdd2824beb0df56",
-   "sha256": "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8"
+   "commit": "270ae67b3136ac355d2aed5b4690ae28edaf7c29",
+   "sha256": "1ss9bjs34q41pa0g0nbdzd8fwpjcbd2239rdlx5aykfv9v0b8j77"
   }
  },
  {
@@ -7160,15 +7175,15 @@
   "repo": "plandes/buffer-manage",
   "unstable": {
    "version": [
-    20190622,
-    317
+    20190815,
+    502
    ],
    "deps": [
     "choice-program",
     "dash"
    ],
-   "commit": "e6b896aca7f62a6587b593c500b31624d4414eca",
-   "sha256": "10mkss1dmnx1qzgra4xf1jl7gjv61rjdrszkcwwnhf65wa2pjhbk"
+   "commit": "47852b908a0d9a059e9f8cd7797229ecf6259b8c",
+   "sha256": "1zxlw2kkkfa0pgxzk7qcjxy77g0r3grnnv4sa6zjhmh9kh7jgf75"
   },
   "stable": {
    "version": [
@@ -7580,11 +7595,11 @@
   "repo": "jorgenschaefer/emacs-buttercup",
   "unstable": {
    "version": [
-    20181202,
-    1607
+    20190828,
+    2027
    ],
-   "commit": "810fa6fb8dab06610dbf2b5ccbc64b4d0ecc7485",
-   "sha256": "0dckgcyzsav6ld78bcyrrygy1cz1jvqgav6vy8f6klpmk3r8xrl1"
+   "commit": "9d172a74373916f571f6fe3292bdc66cd3f28779",
+   "sha256": "10xm856x58zgki2d9gr4rqqlkd3f8pl24z657qa7d3lkzs2av9a2"
   },
   "stable": {
    "version": [
@@ -8026,8 +8041,8 @@
   "repo": "beacoder/call-graph",
   "unstable": {
    "version": [
-    20190709,
-    444
+    20190828,
+    2340
    ],
    "deps": [
     "anaconda-mode",
@@ -8036,8 +8051,8 @@
     "ivy",
     "tree-mode"
    ],
-   "commit": "ef4845e7bd8ae577f9b919b6a74380493bca5de8",
-   "sha256": "1sypqnlwsv5gmrvcfz7dgfc81b24672njjw2va3yycvpv68pbii7"
+   "commit": "8ccb0323651155e3407ee5649b1a0355fd70ffe2",
+   "sha256": "0xflaqv88saq6i2wdggrwh06i9svp7v5070rmd860wg1pwi0qm81"
   },
   "stable": {
    "version": [
@@ -8137,30 +8152,30 @@
   "repo": "kisaragi-hiu/cangjie.el",
   "unstable": {
    "version": [
-    20190322,
-    1134
+    20190829,
+    1530
    ],
    "deps": [
     "dash",
     "f",
     "s"
    ],
-   "commit": "f4dcb691e3bda6971cb89b07f368dd285179a8ff",
-   "sha256": "0hvwaj1g1szyhjvyxhwflq45bbcvvgv391wa7qkwlxmrvvfhp9k2"
+   "commit": "b34a28dd06bd95a16b655f1917227925975314bc",
+   "sha256": "0xz62fivll6yv1x94f7f5m07zg7383llyz6wa1n5q1ysix2p20j1"
   },
   "stable": {
    "version": [
     0,
     7,
-    2
+    4
    ],
    "deps": [
     "dash",
     "f",
     "s"
    ],
-   "commit": "f4dcb691e3bda6971cb89b07f368dd285179a8ff",
-   "sha256": "0hvwaj1g1szyhjvyxhwflq45bbcvvgv391wa7qkwlxmrvvfhp9k2"
+   "commit": "b34a28dd06bd95a16b655f1917227925975314bc",
+   "sha256": "0xz62fivll6yv1x94f7f5m07zg7383llyz6wa1n5q1ysix2p20j1"
   }
  },
  {
@@ -8204,15 +8219,15 @@
   "repo": "kwrooijen/cargo.el",
   "unstable": {
    "version": [
-    20190729,
-    708
+    20190816,
+    1046
    ],
    "deps": [
     "markdown-mode",
     "rust-mode"
    ],
-   "commit": "626fd89986eab229e2fe36b38ac60697ed7a805b",
-   "sha256": "0aa57v2gxmj67i7dlqhg934nj023ldfn32pzjs2hnqnq3w3srnfv"
+   "commit": "f70b060c97f0df6ec6487968dfdfae8ec97a080f",
+   "sha256": "1qaz6m34j4khw27nkb8yfcy1iprcldbl7jjwzsljw1i2yfc1xqj0"
   },
   "stable": {
    "version": [
@@ -8803,8 +8818,8 @@
     20171115,
     2108
    ],
-   "commit": "2a473e3acb297086c988a84972ab37f77fabaaa9",
-   "sha256": "0piak5l66al28xg9m7ypv83l12q3v9fcndvnnarqvpmh5db1alp1"
+   "commit": "35d777b0fd54b574b42cf61c202bf077ed986e8f",
+   "sha256": "1p63w0i71vsysdp05mh05pvbpmhdvbjmiv3zgfdsim9k55lbn5pz"
   },
   "stable": {
    "version": [
@@ -9335,14 +9350,14 @@
   "repo": "SavchenkoValeriy/emacs-chocolate-theme",
   "unstable": {
    "version": [
-    20190811,
-    1414
+    20190818,
+    756
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "7b005d9ef522ccde84fc9488fa6ea3cc429f9c48",
-   "sha256": "176f7gcpzzsr74cspcm0f44bxpb8a4244zzljlqfpksfg8qpf23d"
+   "commit": "7de46341adcc7a5eaafcddc0d3a9d63274f5e9c7",
+   "sha256": "0s61lx5vhx01xzzqxy0blz6jxvljb8qjj3567nz17pwwdfcskc5v"
   }
  },
  {
@@ -9353,14 +9368,11 @@
   "repo": "plandes/choice-program",
   "unstable": {
    "version": [
-    20190721,
-    1854
+    20190817,
+    2153
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "215e8ab6acc47f240b12bd11ab387da7f5de885d",
-   "sha256": "14sp47l7j7sv3bsrnwzqz6mzn3wwv4s75r5my6vjh39pn0qshfh1"
+   "commit": "583242445e7890a12bb674b43244bf27c84d91f6",
+   "sha256": "08pbh4z3xbpk62a2m6shdpw2g44158di8pb9rjszfcpd5m6m2lf2"
   },
   "stable": {
    "version": [
@@ -9445,8 +9457,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20190811,
-    1423
+    20190829,
+    613
    ],
    "deps": [
     "clojure-mode",
@@ -9457,8 +9469,8 @@
     "sesman",
     "spinner"
    ],
-   "commit": "31f83dfadbf0d180a6273f8b19429e12bc23ef3a",
-   "sha256": "0bwjg4fgn9l9xjk4q7mkn56nlvygfjg5hzfdy3hy2k6a2w4s9ka0"
+   "commit": "f350c7431330ca7cd2f01a1fddefbb637d3e3493",
+   "sha256": "0zvk6kcs1v6gfv7d48inqqa7hwn5aghhkmycn0wdiarkcdhagjmi"
   },
   "stable": {
    "version": [
@@ -9534,15 +9546,15 @@
   "repo": "clojure-emacs/cider-hydra",
   "unstable": {
    "version": [
-    20181015,
-    727
+    20190816,
+    1121
    ],
    "deps": [
     "cider",
     "hydra"
    ],
-   "commit": "5956c3909cd9beae11f64973e4f0d830cea7860d",
-   "sha256": "1hnari85c4y5sc8cdv2idkg2qv058crz54xdidnphr1wgw5zhvpk"
+   "commit": "c3b8a15d72dddfbc390ab6a454bd7e4c765a2c95",
+   "sha256": "0qrxja9bxx07m1ij8ly36sib901a6qhczgxsp4ap4wszy63lx93r"
   },
   "stable": {
    "version": [
@@ -9803,8 +9815,8 @@
     20181130,
     230
    ],
-   "commit": "e205b96f944a4f312fd523804cbbaf00027a3c8b",
-   "sha256": "03xmpgpd4zw9x4shkz9aa744ifnwfblnq369qsp3r1awjacksrg3"
+   "commit": "f215866d7d7c52e84220cd541f40608a5b85abf0",
+   "sha256": "1k8x48cayanwajz81h5kfysqvnf58wrb9j4f9rbaqzg2nrnqw5sm"
   },
   "stable": {
    "version": [
@@ -9833,6 +9845,24 @@
    "sha256": "0w6pd47pfs8jna076xjz0xz1f7bxdgvyglpllkm62fifiy2n994l"
   }
  },
+ {
+  "ename": "clang-format+",
+  "commit": "9ee8e3de203fb3259202bf847f020259a7f07a74",
+  "sha256": "0r9n962q0nq8x3r4vyrdfmw74wsvxw7lxizvklxcsm421qpnzyfa",
+  "fetcher": "github",
+  "repo": "SavchenkoValeriy/emacs-clang-format-plus",
+  "unstable": {
+   "version": [
+    20190824,
+    2216
+   ],
+   "deps": [
+    "clang-format"
+   ],
+   "commit": "ddd4bfe1a13c2fd494ce339a320a51124c1d2f68",
+   "sha256": "0y97f86qnpcscwj41icb4i6j40qhvpkyhg529hwibpf6f53j7ckl"
+  }
+ },
  {
   "ename": "clean-aindent-mode",
   "commit": "ee9dac7c10e652f026643620418dfea9237a0d23",
@@ -10388,11 +10418,11 @@
   "repo": "vallyscode/cloud-theme",
   "unstable": {
    "version": [
-    20190811,
-    1842
+    20190826,
+    2117
    ],
-   "commit": "195ef1d55cf0e9aa25a257c93f1cff5ecf807374",
-   "sha256": "011f7x1qdjpz9vz76nd743fzlk2lp696286x2q3gmdhrmg7h3csc"
+   "commit": "9422a25a1d7e73176b0c8b81cf4be1f722d6304a",
+   "sha256": "085kj8wzm21fdli0ycdj117306pc9j0a6r17w9kzy7ckzax54zc6"
   }
  },
  {
@@ -10526,8 +10556,8 @@
     20190710,
     1319
    ],
-   "commit": "7d194f7d8331a127e0b2b921dc6bc0abfe21a0f5",
-   "sha256": "0gqpm4cgcx176kamgx8p3vxxf9r41ckxy20gdw153fqbba2prsip"
+   "commit": "c0d21d763b13e280ccf7a387ba690650db014646",
+   "sha256": "072m458y9sazjmp7z0i1c3wppnwqry1lb2crf6k0v9fk3l78zknz"
   },
   "stable": {
    "version": [
@@ -11021,11 +11051,11 @@
   "repo": "purcell/color-theme-sanityinc-tomorrow",
   "unstable": {
    "version": [
-    20190809,
-    1314
+    20190826,
+    1340
    ],
-   "commit": "025cda606860800fe32a81e25e81e18e2d841069",
-   "sha256": "0c6ibf29gxnm53q1xsrnfcl8r93apqpcljgj4m9knzswizxb2mqs"
+   "commit": "2ef60a4de1d0973e53e97cc08db4c0a510a2669f",
+   "sha256": "1f0829zipvckcgnl5kv9msdpya8q67p72rlkg0hb6z5ik095n2yq"
   },
   "stable": {
    "version": [
@@ -11407,11 +11437,11 @@
   "repo": "company-mode/company-mode",
   "unstable": {
    "version": [
-    20190430,
-    1852
+    20190821,
+    658
    ],
-   "commit": "ad6ff0eecca99dc5ac8b6a8a6174df7d2ad88ae7",
-   "sha256": "0cps5sl9iij1wrpcnhi7xqv58cqsrswhc8r7hj1c00w8288z978w"
+   "commit": "1120b56bd1154a17e4c0b950cbdba4c85be28e2a",
+   "sha256": "0pi6n1ggxb2i8x8f2wf1il8wcm6rd6ilvgbbh7ni95by1c987vbp"
   },
   "stable": {
    "version": [
@@ -11601,14 +11631,14 @@
   "repo": "randomphrase/company-c-headers",
   "unstable": {
    "version": [
-    20180814,
-    1730
+    20190825,
+    1631
    ],
    "deps": [
     "company"
    ],
-   "commit": "41331192b3961c8e3a51540678e1d11eaa346f03",
-   "sha256": "1hl14pv8splirzr9riak8m48ngxy1c6wa2q6ds6aq849zx9dafqh"
+   "commit": "5e676ab0c2f287c868b1e3931afd4c78895910cd",
+   "sha256": "18zyzhjnlbwblgqgr876ynrc7k736lg5s6bgxmxph7gymdz4fb4h"
   }
  },
  {
@@ -11924,6 +11954,25 @@
    "sha256": "09zaaqi8587n1fv5pxnrdmdll319s8f66xkc41p51gcs2p7qa5w1"
   }
  },
+ {
+  "ename": "company-fuzzy",
+  "commit": "3c3957d27d4208db45e7545f86ad1c25f53ec532",
+  "sha256": "0yxr0j3zdsf8xfy2mk4ybnjfv6g861772dshbd6v4p3q0pbhhhg6",
+  "fetcher": "github",
+  "repo": "elpa-host/company-fuzzy",
+  "unstable": {
+   "version": [
+    20190812,
+    204
+   ],
+   "deps": [
+    "company",
+    "s"
+   ],
+   "commit": "a97f55b60f427e536e637898d12792154d134aab",
+   "sha256": "1iw1vk1pgdacvfh17n45kk98rxml3f6kxnijmpp7fzz4q07yiv7w"
+  }
+ },
  {
   "ename": "company-ghc",
   "commit": "28f6a983444f796c81df7e5ee94d74c480b21298",
@@ -12373,22 +12422,22 @@
     "cl-lib",
     "company"
    ],
-   "commit": "19b34b56ebc0eaabf9b1f4a8ac6819bde9855d2b",
-   "sha256": "02j0dwzbvi744ybdqwx8dan1ahl2yar7cw20n619vbmxn0r6pml2"
+   "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
+   "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
   },
   "stable": {
    "version": [
     2,
-    1,
-    1
+    2,
+    2
    ],
    "deps": [
     "ac-php-core",
     "cl-lib",
     "company"
    ],
-   "commit": "710aca14d2d5035f338b8e76ed042d3bc7524e95",
-   "sha256": "01hrsxq1m9rxmsn1xfmj8k8w19gf9xj4hqy0aqrqs0cx2f74rxrw"
+   "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
+   "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
   }
  },
  {
@@ -12399,15 +12448,15 @@
   "repo": "emacs-php/phpactor.el",
   "unstable": {
    "version": [
-    20190812,
-    1454
+    20190823,
+    1219
    ],
    "deps": [
     "company",
     "phpactor"
    ],
-   "commit": "01ced487c673e027332ecb99c444f819b05ab40b",
-   "sha256": "0ish3kvzn1j1arg6n1mglzsb46sc7hr7gqgnw2084kj56y5q6rjp"
+   "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4",
+   "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn"
   },
   "stable": {
    "version": [
@@ -12647,15 +12696,15 @@
   "repo": "Andersbakken/rtags",
   "unstable": {
    "version": [
-    20180730,
-    338
+    20190821,
+    449
    ],
    "deps": [
     "company",
     "rtags"
    ],
-   "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2",
-   "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w"
+   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
+   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
   },
   "stable": {
    "version": [
@@ -12829,8 +12878,8 @@
   "repo": "TommyX12/company-tabnine",
   "unstable": {
    "version": [
-    20190811,
-    2013
+    20190829,
+    1801
    ],
    "deps": [
     "cl-lib",
@@ -12839,8 +12888,8 @@
     "s",
     "unicode-escape"
    ],
-   "commit": "df5e5fbfdb2ac174c031b75576a059429c6fb3a3",
-   "sha256": "0vxj9dm7h082i4jj8h8nh164jgdyxqr2fdavn2biwxijmdykp63p"
+   "commit": "2cbfea20d342d1a259b27b99185c2d822aba3094",
+   "sha256": "06vndicjzm19hk5kb7sxs3ljf559wfnvql1hlpfqlhhgjhgsw17c"
   }
  },
  {
@@ -13584,14 +13633,14 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20190809,
-    1548
+    20190830,
+    1557
    ],
    "deps": [
     "swiper"
    ],
-   "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e",
-   "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll"
+   "commit": "79333e9edfee38ec3b367c33711a68bdf7783259",
+   "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z"
   },
   "stable": {
    "version": [
@@ -13683,16 +13732,16 @@
   "repo": "nathankot/counsel-dash",
   "unstable": {
    "version": [
-    20190510,
-    708
+    20190823,
+    1334
    ],
    "deps": [
     "cl-lib",
     "counsel",
     "dash-docs"
    ],
-   "commit": "5856b8766956428c183a2df911a05f845d014041",
-   "sha256": "1x0y6w5ivicckllznvljad42hgmbnilkrx9bz7rs4clr1baxzvyh"
+   "commit": "24d370be9e94e90d045c49967e19484b9903fce9",
+   "sha256": "18gp7hhgng271c7bh06k9p24zqic0f64j5cicivljmyk9c3nh7an"
   },
   "stable": {
    "version": [
@@ -13725,8 +13774,8 @@
     "counsel",
     "ivy"
    ],
-   "commit": "fda1f77eb8548c4451894886ef5e99815dfc1bf8",
-   "sha256": "0rmdl93kgyydwa96yclds9vwly41bpk8v18cbqc1x266w6v77dr9"
+   "commit": "d7fcec59c4ba919b93018d4d61da0c154233c66b",
+   "sha256": "1pawczhhb7im1q314wsba9fwcks04kddg1vv8mcpiad237mf5dx4"
   },
   "stable": {
    "version": [
@@ -13874,15 +13923,15 @@
   "repo": "ericdanan/counsel-projectile",
   "unstable": {
    "version": [
-    20190724,
-    1903
+    20190817,
+    102
    ],
    "deps": [
     "counsel",
     "projectile"
    ],
-   "commit": "90d3792ab90559a9de6ad419dbfb2435a36a224d",
-   "sha256": "0m1rcmk9qnwr5zlsw8wzyvs3an1jqy5nvlm7lcsvzfkvzpn52ad0"
+   "commit": "fda7f0bad93a471fddf5fa01d6fdee5684e7f880",
+   "sha256": "097ksmy85lf9zfi6v2xz9bxl54l0il6v0ybj1305qg6g8xampbdw"
   },
   "stable": {
    "version": [
@@ -13934,6 +13983,25 @@
    "sha256": "0b5hykw3n96f0m50176hk639sbzdykhnp52xlp8g6l7p807x27w9"
   }
  },
+ {
+  "ename": "counsel-test",
+  "commit": "5b21ac3eaacfff27ca4def04f6cf7b4888b7fcf4",
+  "sha256": "0604kmj0ydfps2si0wvgjw41x2ds7dmsd53x50219f65d4w44nqr",
+  "fetcher": "github",
+  "repo": "xmagpie/counsel-test",
+  "unstable": {
+   "version": [
+    20190819,
+    1920
+   ],
+   "deps": [
+    "ivy",
+    "s"
+   ],
+   "commit": "7fc4e5d0d65c53edbcb4c25917bcf7faaea36ec7",
+   "sha256": "1xlcn99iizfv3wi701r6q176wicvpdsrz9k1jbyr65r6aw8am8fl"
+  }
+ },
  {
   "ename": "counsel-tramp",
   "commit": "e1822b735b6bd533f658bd64ddccda29e19e9a5e",
@@ -14396,11 +14464,11 @@
   "repo": "emacs-pe/crontab-mode",
   "unstable": {
    "version": [
-    20190304,
-    1423
+    20190827,
+    1300
    ],
-   "commit": "090ed61e919df6391df45a7645a0d8d5b0dae1cb",
-   "sha256": "1yz9vvh2x6s2y02n1z8aqgb40bxgs2s2mxmy1vmp2piffq81d09y"
+   "commit": "9acbb426c6bfb832e1e83f10fe01a8829452eb7e",
+   "sha256": "04wyngg5n5dr4ninfljl3n0gqx0pik5jbj6ny79bchrnxlh22f3k"
   }
  },
  {
@@ -15063,8 +15131,8 @@
     20190111,
     2150
    ],
-   "commit": "8cf109c0f19ad8c36b8a5368d138912495963387",
-   "sha256": "07wmv5hgi7db1cx6xrjsa8r337frm3cx38l1jglr9kf5qkw917q1"
+   "commit": "00c1dc96af0e44741dc777f96a2eb5769f572bb3",
+   "sha256": "0hkh3844kaawhqh90cqpskh9ifm6cs6i3d2bwkbrrjrkyig9qp38"
   },
   "stable": {
    "version": [
@@ -15099,20 +15167,20 @@
   "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode",
   "unstable": {
    "version": [
-    20181205,
-    607
+    20190826,
+    2244
    ],
-   "commit": "b5d936dfd4c1d0b68a0d911aadd4ba25df7af0e4",
-   "sha256": "0915kb9jcaixgindhj85fmykkhvj31ckp1yg6746fznwdgfrlifv"
+   "commit": "f3843276e235c6b633ba5367f78d74fe7c04e244",
+   "sha256": "066kjyvginjp2cqmdi8ybrr558074m8wqd0jrwsicn4dps3njvcn"
   },
   "stable": {
    "version": [
     2,
     0,
-    9
+    10
    ],
-   "commit": "98af62e67026fee1dda9155e1a463917fc83802e",
-   "sha256": "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj"
+   "commit": "b5d936dfd4c1d0b68a0d911aadd4ba25df7af0e4",
+   "sha256": "0915kb9jcaixgindhj85fmykkhvj31ckp1yg6746fznwdgfrlifv"
   }
  },
  {
@@ -15230,8 +15298,8 @@
   "repo": "jyp/dante",
   "unstable": {
    "version": [
-    20190629,
-    652
+    20190826,
+    1656
    ],
    "deps": [
     "company",
@@ -15242,8 +15310,8 @@
     "lcr",
     "s"
    ],
-   "commit": "8090286a5dd498de281ce1b1c14a47b9913198c8",
-   "sha256": "0yq03jk34if8qzxxbxvgszw0rly0l3k13rkc2msq0hx5j98z0yrj"
+   "commit": "a25ae9e5b5425cffdd88d498777e90ea8655fa37",
+   "sha256": "1ziw3snbs2z2cg8a3jbyjd48qkgrkzs4bh8lrbs0h2c87nzldvhd"
   },
   "stable": {
    "version": [
@@ -15271,8 +15339,8 @@
   "repo": "emacs-lsp/dap-mode",
   "unstable": {
    "version": [
-    20190810,
-    1131
+    20190823,
+    1240
    ],
    "deps": [
     "bui",
@@ -15283,8 +15351,8 @@
     "s",
     "tree-mode"
    ],
-   "commit": "f01c7d2a32ce04d6643771a6e4d38fd1fb3bfbe6",
-   "sha256": "1nv7h16wy60rhylbc5zd79i4mf5gy76j7h6qgq0jql607pqkrjxr"
+   "commit": "368a0ac922d03b6ad0d2d782823ef30b3072866a",
+   "sha256": "0zml4kskwz01myki3acbfrfqzgwyw1bsvppijmfi4d24jk04lydk"
   },
   "stable": {
    "version": [
@@ -15470,11 +15538,11 @@
   "repo": "bradyt/dart-mode",
   "unstable": {
    "version": [
-    20190808,
-    2226
+    20190827,
+    2102
    ],
-   "commit": "9b65aae8c79132275733ee4324948446c88a6b93",
-   "sha256": "0149axzm52f2j80qpcafb6db2knzrmp43ln0zcx4dj1qsrmq5mbj"
+   "commit": "04fcd649f19d49390079fbf2920a10bf37f6a634",
+   "sha256": "1rpdrq8w8vishjpakxvj20dgnnp2qksi1nrd0qllllb5sjyih56d"
   },
   "stable": {
    "version": [
@@ -15492,6 +15560,42 @@
    "sha256": "1qmdlwjmmqyyb65sqvfpygifai5m0llc815vp0jqwp8ldd8ls172"
   }
  },
+ {
+  "ename": "dart-server",
+  "commit": "e798e4fbe5a1d1dbe08c9bfc5c54d32cfe4bde62",
+  "sha256": "1w7qxd78cnxycg34hxlcw8yda2ixkl683k7mxm20wfqyg5f46bxm",
+  "fetcher": "github",
+  "repo": "bradyt/dart-server",
+  "unstable": {
+   "version": [
+    20190817,
+    1254
+   ],
+   "deps": [
+    "cl-lib",
+    "dash",
+    "flycheck",
+    "s"
+   ],
+   "commit": "aba838e8ee2f30309f366e8a91c17616549003ce",
+   "sha256": "0lwss1s1n2kfy0i8nwwfmz5fnw137zkhjs6zv81piniad6hrmn1l"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "cl-lib",
+    "dash",
+    "flycheck",
+    "s"
+   ],
+   "commit": "bbc66eb981d17046ab98584c950baf963ac5da61",
+   "sha256": "18my32ni61z9dbr8cfkx0cjk4pqhdcmmz3l1hh57vzysscdxldh5"
+  }
+ },
  {
   "ename": "dash",
   "commit": "57eed8767c3e98614259c408dc0b5c54d3473883",
@@ -15500,11 +15604,11 @@
   "repo": "magnars/dash.el",
   "unstable": {
    "version": [
-    20190424,
-    1804
+    20190814,
+    2006
    ],
-   "commit": "77f3bf40c9c85386a50f2dab3dc950513f6f88bd",
-   "sha256": "1h1v12f94i4a4kbcqi3njlf60p8n0601pp3vyahg0k06ms2aj46i"
+   "commit": "11907f4592ff1813536366d54245d3ecf6b99198",
+   "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr"
   },
   "stable": {
    "version": [
@@ -15579,8 +15683,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "77f3bf40c9c85386a50f2dab3dc950513f6f88bd",
-   "sha256": "1h1v12f94i4a4kbcqi3njlf60p8n0601pp3vyahg0k06ms2aj46i"
+   "commit": "11907f4592ff1813536366d54245d3ecf6b99198",
+   "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr"
   },
   "stable": {
    "version": [
@@ -15897,15 +16001,15 @@
   "repo": "conao3/ddskk-posframe.el",
   "unstable": {
    "version": [
-    20190623,
-    1529
+    20190816,
+    1855
    ],
    "deps": [
     "ddskk",
     "posframe"
    ],
-   "commit": "3505204b7bb96872312055bdc8ee5fb419b247e3",
-   "sha256": "0gn0vfi2pi0wykl2p3cjck89aprw659fgfwn3jm4dc8baqidip4c"
+   "commit": "f062a2a2a0fb3746ba01a7f56d051adf4cf4c7d8",
+   "sha256": "1lkvbix25p5jlhz5164vnyfldq1fk7m10w6q7q4rm2plnmxfbv1y"
   },
   "stable": {
    "version": [
@@ -15964,8 +16068,8 @@
     20181020,
     1513
    ],
-   "commit": "a499822afc2154ca83edf6a605ed22c5a932fa12",
-   "sha256": "0bfgh6v0q93lfd0q628r11jd45cys89z4874a19w61cb0mfpvks0"
+   "commit": "8ff1f5d73d5d56bee65e45e9d8ac4e75aa8b8e4c",
+   "sha256": "0hqxl0gi9csp2zfc65s01c3i6himh38fia46cn68i3hh5d6kb6qx"
   },
   "stable": {
    "version": [
@@ -16281,11 +16385,11 @@
   "repo": "howardabrams/demo-it",
   "unstable": {
    "version": [
-    20180404,
-    332
+    20190828,
+    26
    ],
-   "commit": "2760d2eed88ef854ce489a5f77627aa641af12bf",
-   "sha256": "1acfpkdwx8pvfhsqa7dp1n4q3cz5vks7b4gj5nc9rgvlmkv10j5c"
+   "commit": "9cfa5c3f92a0dca7eebb1f1a2011643c9b009d26",
+   "sha256": "1fcmrhm6h0j7jjw6kijrcacv628fy80ssxn6h5bilwmw0r4c7wm6"
   }
  },
  {
@@ -17707,8 +17811,8 @@
     20181225,
     2206
    ],
-   "commit": "74f520e8e8064d5e3f4cb33149f840fe59839c38",
-   "sha256": "1rj4qw34rzc085d1sra0hnc01dkj1xaxd1xyds45mxh41407zzfl"
+   "commit": "689ea9f3d702529a5b5ac2493e28eefca65c7abb",
+   "sha256": "0na9kkx2rjakgxq416cr2wjdggzf4ycki7jj7ywpra966zldf84s"
   },
   "stable": {
    "version": [
@@ -18324,8 +18428,8 @@
   "repo": "Silex/docker.el",
   "unstable": {
    "version": [
-    20190812,
-    1155
+    20190813,
+    1431
    ],
    "deps": [
     "dash",
@@ -18335,8 +18439,8 @@
     "s",
     "tablist"
    ],
-   "commit": "55635cb15b1dc3945174de04f4bab22129e675e8",
-   "sha256": "0wv36b7w5cya6yr0phvg8ws3kc138ya1b4vimjf6chzhx3r6mhy7"
+   "commit": "fe74a499ce3246fb9a7d72e6931864b94ce5261d",
+   "sha256": "1prxz9fy9ca6lrv3qff408igxc1hic2laz528ba9mzyr5bc9qsq0"
   },
   "stable": {
    "version": [
@@ -18599,16 +18703,16 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20190812,
-    1448
+    20190830,
+    1605
    ],
    "deps": [
     "all-the-icons",
     "dash",
     "shrink-path"
    ],
-   "commit": "a6145d435ae380dbbff4d148e3c200b89a60d010",
-   "sha256": "0mny8zz3l4bqgbshmfgrf5y7zn0jkgawfgzn189bw68x87i8fwp3"
+   "commit": "b433d87f428061cc7477b444b7dc9101e575095d",
+   "sha256": "0k0kdr7alxwz0zf14zz92zhacza8izzc38117x4zcixx3yrsspnx"
   },
   "stable": {
    "version": [
@@ -18633,14 +18737,14 @@
   "repo": "hlissner/emacs-doom-themes",
   "unstable": {
    "version": [
-    20190812,
-    2115
+    20190821,
+    2117
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ae18b84e01496c4ebd572cad00a89516af089a94",
-   "sha256": "0zcsk2z5z0hh9plbig4ba1ywzbdy0mar1jfm0c5mi46vl0vb29i7"
+   "commit": "470dd52ec4761a0b2c1f2c0309233e1fba04e598",
+   "sha256": "1wj9f7rxr2330fqgwsaqhz5mp1247a1x3a7zr6jdnr6h819ji74p"
   },
   "stable": {
    "version": [
@@ -18816,14 +18920,14 @@
   "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git",
   "unstable": {
    "version": [
-    20181022,
-    8
+    20190824,
+    2314
    ],
    "deps": [
     "debian-el"
    ],
-   "commit": "a80f8ac5d81720cce90cf3bc5fbb45d50b1953d7",
-   "sha256": "0358c6gvyb85zr5r79ar3q46c83gz39rawyhgcg1h1hqxgj6a2lx"
+   "commit": "aafb047e03c642e6ae4740a7fbc0a789e0ec1291",
+   "sha256": "1sfan4pil51jrc0b6fxf5vjyrif0dx1xmx92yhgwap684kpsarv4"
   },
   "stable": {
    "version": [
@@ -19252,17 +19356,17 @@
     20190808,
     345
    ],
-   "commit": "0f9863467c7a2dbacc41e62adc858765474c4ff0",
-   "sha256": "0ddhg3qbs4z6wkc680m5vmp2q6wdjs863h375rl1k114z4qdwn4z"
+   "commit": "823a3c66d11b30333f511c03348bd4714e736f46",
+   "sha256": "1fdca3rk599xfq02cihk30p29v4ng3hn3dvdzq5l90kfigpanaz9"
   },
   "stable": {
    "version": [
     1,
     11,
-    1
+    3
    ],
-   "commit": "2f40f29f8eab3f7ae044f1c522f3e34036a16d9d",
-   "sha256": "1ax0lf7h191l772s0pr2xyy1kxpzjalm44ck265jihiga07dk0m5"
+   "commit": "1fb491280dbe7e3bc7c00bb75ca837edc538333b",
+   "sha256": "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr"
   }
  },
  {
@@ -20020,8 +20124,8 @@
   "repo": "ecukes/ecukes",
   "unstable": {
    "version": [
-    20190731,
-    1558
+    20190822,
+    2127
    ],
    "deps": [
     "ansi",
@@ -20031,8 +20135,8 @@
     "f",
     "s"
    ],
-   "commit": "73f1b07dace22eff692568b9d29f9755d4138f30",
-   "sha256": "0w6ja73a3gnpnf58v3dmk04sb22gnwxdsn3wpvp5hlhsvkxrar6j"
+   "commit": "d835ce619a8f0057a133c08060af4b026e1c9359",
+   "sha256": "1iqrb6lmvmsfk1g6hcc304b091nv3x7f5pv7zpn87kvvw7xw6lqg"
   },
   "stable": {
    "version": [
@@ -20617,6 +20721,30 @@
    "sha256": "1a1apa48n24yisd2zw5k4lfkngx3016x6y11qi80hg75vrnmg7f1"
   }
  },
+ {
+  "ename": "edwina",
+  "commit": "050188e81b045bdadf722db552a42864121d9b81",
+  "sha256": "1581cwgfnrlcmbmrnfj57w9hb9jx9sinz6zw6zy2yk7g1r9vgbzl",
+  "fetcher": "github",
+  "repo": "ajgrf/edwina",
+  "unstable": {
+   "version": [
+    20190821,
+    1850
+   ],
+   "commit": "8d6f7ce117c622e19576888fbff9145615683815",
+   "sha256": "12rvmr8r85k9hfgbz2qwp0ryvy4qdarr82hq16ilppq5vlkiar02"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    0
+   ],
+   "commit": "cc0a039a400e8ef07b0d96d2169f1407e0af107a",
+   "sha256": "0l8w5f4bkqzb8pglvh516q91s6lvc1s1lfilxc9h881vl3934y7l"
+  }
+ },
  {
   "ename": "efire",
   "commit": "4150455d424326667390f72f6edd22b274d9fa01",
@@ -20729,17 +20857,17 @@
     20190714,
     236
    ],
-   "commit": "ba135b498cfa92e60634c4318fa0073bd60ba230",
-   "sha256": "1fxnvrqxdyqr7d88fdvr8hiwfrc3nrxddg6zpbqjw2jc3ijmzq0p"
+   "commit": "9fbaf81114ffd3550801457257c983a077a7e17e",
+   "sha256": "0iz9hcx9s5l7c0y73ik6l7whjymgc0q4vfdr73y85cmnwfyi7fk5"
   },
   "stable": {
    "version": [
     3,
     9,
-    0
+    1
    ],
-   "commit": "6ddf45cb589c6a191df21f8debb3a6b8d0fa41ee",
-   "sha256": "1krkba41vczhghz31dww1dw41r1l2h3di5564pqhs6c00shmds01"
+   "commit": "9fbaf81114ffd3550801457257c983a077a7e17e",
+   "sha256": "0iz9hcx9s5l7c0y73ik6l7whjymgc0q4vfdr73y85cmnwfyi7fk5"
   }
  },
  {
@@ -20750,15 +20878,15 @@
   "repo": "joaotavora/eglot",
   "unstable": {
    "version": [
-    20190812,
-    2013
+    20190819,
+    9
    ],
    "deps": [
     "flymake",
     "jsonrpc"
    ],
-   "commit": "6a7ce6634fcf79853a6bd89cf1c81bad2ac25540",
-   "sha256": "0qxkpn4mx2xjp98gwps0wric7c8c2g1ixdjy4jypya6alyc5b28x"
+   "commit": "7a70c977fdb6a16182d375993edd528653a2cb5d",
+   "sha256": "0s48k733nyk21h22c98ckch0kcki3snn1dw5ymqx2n9gl0w18gkh"
   },
   "stable": {
    "version": [
@@ -20843,8 +20971,8 @@
   "repo": "millejoh/emacs-ipython-notebook",
   "unstable": {
    "version": [
-    20190812,
-    1512
+    20190813,
+    2156
    ],
    "deps": [
     "auto-complete",
@@ -20857,8 +20985,8 @@
     "skewer-mode",
     "websocket"
    ],
-   "commit": "52f304d038019f3eed6e1afbccc31878e161183a",
-   "sha256": "0wds8xddp4v1i4rimzp5gva2v5wvhx4hdjhxl6m7lih95vlpnq6v"
+   "commit": "a2872eff6c18a0706c531e9316c792a9fb99826f",
+   "sha256": "0i182ic59wnhqmik15qsqjsqza5fn67qw18i5gvvj7dsn3v05vac"
   },
   "stable": {
    "version": [
@@ -20931,8 +21059,8 @@
   "repo": "kostafey/ejc-sql",
   "unstable": {
    "version": [
-    20190812,
-    2255
+    20190828,
+    919
    ],
    "deps": [
     "auto-complete",
@@ -20941,8 +21069,8 @@
     "direx",
     "spinner"
    ],
-   "commit": "524a00d23c60c4718e39f4b963086fcc497afc25",
-   "sha256": "0qw12rk3cw1f2i0s2fm5630w5dnn6z0f1fxif1lrkky4yjp9ybxi"
+   "commit": "5a2b3580e362841f51d262eeeeaa396fcceb4fe9",
+   "sha256": "1xgppkabl2lwfqrgylab25v4pqfkhfxy780hlmsys1yha2r1167l"
   },
   "stable": {
    "version": [
@@ -21383,15 +21511,16 @@
   "repo": "DamienCassou/elcouch",
   "unstable": {
    "version": [
-    20180809,
-    936
+    20190820,
+    1641
    ],
    "deps": [
     "json-mode",
-    "libelcouch"
+    "libelcouch",
+    "navigel"
    ],
-   "commit": "ae9b6261c5167d538914bfdbc4d34a36e50b5bc2",
-   "sha256": "0z9ypk2f0q38cxq6fb53kbi0flq7bi09yhzs5mkd65kxgcsicl43"
+   "commit": "8e1b7ddec91ae863c3951776a0fcbfead8ca7a80",
+   "sha256": "07psfjynphzpm5jgajf31cigs5jyj8qnq491xrk88jvxm63sq55c"
   },
   "stable": {
    "version": [
@@ -21596,20 +21725,20 @@
   "repo": "skeeto/elfeed",
   "unstable": {
    "version": [
-    20190809,
-    1358
+    20190824,
+    1213
    ],
-   "commit": "87433438e10d851d57d76bea4403cbde936647e9",
-   "sha256": "1spyrvq0zsfnhckci5kprkzy6yh4vx2fafx43dih92ccsi513hw5"
+   "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c",
+   "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2"
   },
   "stable": {
    "version": [
     3,
-    1,
+    2,
     0
    ],
-   "commit": "3d1c6ecbe585f9fe6ca5a97a3fc352d68f303f9e",
-   "sha256": "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i"
+   "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c",
+   "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2"
   }
  },
  {
@@ -21697,28 +21826,28 @@
   "repo": "skeeto/elfeed",
   "unstable": {
    "version": [
-    20180829,
-    1716
+    20190824,
+    1213
    ],
    "deps": [
     "elfeed",
     "simple-httpd"
    ],
-   "commit": "87433438e10d851d57d76bea4403cbde936647e9",
-   "sha256": "1spyrvq0zsfnhckci5kprkzy6yh4vx2fafx43dih92ccsi513hw5"
+   "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c",
+   "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2"
   },
   "stable": {
    "version": [
     3,
-    1,
+    2,
     0
    ],
    "deps": [
     "elfeed",
     "simple-httpd"
    ],
-   "commit": "3d1c6ecbe585f9fe6ca5a97a3fc352d68f303f9e",
-   "sha256": "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i"
+   "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c",
+   "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2"
   }
  },
  {
@@ -21807,20 +21936,20 @@
   "repo": "xuchunyang/elisp-demos",
   "unstable": {
    "version": [
-    20190720,
-    1301
+    20190816,
+    421
    ],
-   "commit": "8a517e8457c42735538c38555c6ac799f33855ef",
-   "sha256": "1wrq69sqkzkmlfrjci7wiwlfsnpwmc100hhg9a419w121kljsabc"
+   "commit": "628ade09bf24331003f7f69a3ebfa57da09288c0",
+   "sha256": "0lybadq66bl4snkwph9i1y0qxln29wyfjn222ii3nfwany28cj66"
   },
   "stable": {
    "version": [
     2019,
-    7,
-    20
+    8,
+    16
    ],
-   "commit": "8a517e8457c42735538c38555c6ac799f33855ef",
-   "sha256": "1wrq69sqkzkmlfrjci7wiwlfsnpwmc100hhg9a419w121kljsabc"
+   "commit": "628ade09bf24331003f7f69a3ebfa57da09288c0",
+   "sha256": "0lybadq66bl4snkwph9i1y0qxln29wyfjn222ii3nfwany28cj66"
   }
  },
  {
@@ -21954,8 +22083,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "34938422929800839e2f935aca890cd4a229ca99",
-   "sha256": "00v8iqlf6pk8a0656s14jd0gv5msqy6q2af15q21f2nl4j0gl9qj"
+   "commit": "be36d66b4781eab7218bff419f3ec79573bbd15c",
+   "sha256": "0q0nisc0k4dl67n8c1068g32z8a642dawmq1h9licad71c42s95p"
   },
   "stable": {
    "version": [
@@ -22037,15 +22166,15 @@
   "repo": "walseb/ellocate",
   "unstable": {
    "version": [
-    20190811,
-    1123
+    20190819,
+    211
    ],
    "deps": [
     "f",
     "s"
    ],
-   "commit": "10845fc5722d833f20944ecc5586b429974e383b",
-   "sha256": "01wy71gdkiwglbndc96jx3hm0w6pia18cr76810hffrfkbsywgd8"
+   "commit": "f5b222777d063d8ba3c851dcd9a132d6f74fbe08",
+   "sha256": "18cxqsxsgks7s31gmx9azsv26wdb979d24ypy44rhrwc5r4yk292"
   }
  },
  {
@@ -22056,8 +22185,8 @@
   "repo": "jcollard/elm-mode",
   "unstable": {
    "version": [
-    20190222,
-    2125
+    20190815,
+    555
    ],
    "deps": [
     "dash",
@@ -22067,8 +22196,8 @@
     "s",
     "seq"
    ],
-   "commit": "b59b66a5369816c3a6d47b3702b9007431b7b4cf",
-   "sha256": "13y4xhf4czir4fdl36lk9zhn6292x0lbxhdywpq55fy9ivz4pk6q"
+   "commit": "834fb5037424c47155518ed27537ef7ad6addcc5",
+   "sha256": "1jqp9n28xgxbp1xfqw1vpv9h5q41xirxcfj9257p2gvk1lg1w7jr"
   },
   "stable": {
    "version": [
@@ -22126,28 +22255,28 @@
   "repo": "Silex/elmacro",
   "unstable": {
    "version": [
-    20180628,
-    1411
+    20190823,
+    1308
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "89b9b0feabafd01fee48111d67131c4c9b5fed9a",
-   "sha256": "06wkzafh6vbcjf0m3sl253mgcq32p8cdv7vsfmyx51baa36938ha"
+   "commit": "5bf9ba6009226b95e5ba0f50489ccced475753e3",
+   "sha256": "1x4wnsshf9h10mp51x92vs5rxw5had4gmw6zz4f53czx1ymcv16a"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    1
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "9ed19a362b63d9c7436a78feb91bc694194cfefe",
-   "sha256": "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9"
+   "commit": "5bf9ba6009226b95e5ba0f50489ccced475753e3",
+   "sha256": "1x4wnsshf9h10mp51x92vs5rxw5had4gmw6zz4f53czx1ymcv16a"
   }
  },
  {
@@ -22338,20 +22467,20 @@
   "repo": "tgvaughan/elpher",
   "unstable": {
    "version": [
-    20190710,
-    755
+    20190816,
+    1414
    ],
-   "commit": "f0b76ab6fa09b0e29ff68ff72a7d5c73dcca6adb",
-   "sha256": "0aryai4m2ngffgwbr3dvi27jqcdnzj48w7f54wh5lr703wjmqpig"
+   "commit": "40ec805063c480dfdc01c8328be12f7c8f823c9c",
+   "sha256": "0g36b7pil5vihwx2v55ga82k9l31wl3w0ba0s3af27wh058zz7bq"
   },
   "stable": {
    "version": [
     1,
     4,
-    6
+    7
    ],
-   "commit": "0e8eb2e0c919a07aa5db733d02e7669ccfb4276d",
-   "sha256": "07xansmhn4l0b9ghzf56vyx8cqg0q01aq3pz5ikx2i19v5f0rc66"
+   "commit": "e5471b9460610b3c3af3842c6ac009bcbf70ecac",
+   "sha256": "1sf91x2spk7nkpnn7ss2vkjfzvxw83z3pw7nyvra45gvq11vmy3c"
   }
  },
  {
@@ -22454,8 +22583,8 @@
   "repo": "emacs-elsa/Elsa",
   "unstable": {
    "version": [
-    20190331,
-    1558
+    20190825,
+    1513
    ],
    "deps": [
     "cl-lib",
@@ -22463,8 +22592,8 @@
     "f",
     "trinary"
    ],
-   "commit": "eb88fb357e14777cf4ae71054791d1482aaeef29",
-   "sha256": "0lh30zm5k7x7sq6yyzf91f5ajp71bi0nqqb0f6ns25bjpc6vz45l"
+   "commit": "fa12fcfa37f399b56c8b45323e03c3328ae4fde3",
+   "sha256": "0aphgjzxm4qhpp5rc72mx7d6n7mfm1ah7gn5064j7kzdi630msjn"
   }
  },
  {
@@ -23155,14 +23284,14 @@
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
    "version": [
-    20190620,
-    1526
+    20190827,
+    1610
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "e70459caaadeb715116abb45ddf5e98921d46c14",
-   "sha256": "1b5krxc55ac5jsvbsikczh1shl5jgra58b306lhhsidmbmlisyx6"
+   "commit": "f209b44c76f4a8532783909384ae7492b8d9b6e7",
+   "sha256": "1m68vpsbkcmnlj35h31qikifvah8b9gazwk5yv4wafabpg3bdav2"
   },
   "stable": {
    "version": [
@@ -24472,8 +24601,8 @@
     20190404,
     928
    ],
-   "commit": "65449e9e54fd765abdbe546590e4da044f36c2a4",
-   "sha256": "0yj4vfpz6vjxsraiab45c4lw313yd7c88sa10fsr974h0wfp9rnv"
+   "commit": "a56c1dc1fb996040ab192b0c96dc32e5ebf47a06",
+   "sha256": "1dm7l2kizbg3d878b16hca5qyfaf2yvskhwlc3h2kldchw4xgrby"
   },
   "stable": {
    "version": [
@@ -25069,14 +25198,14 @@
   "repo": "xuchunyang/eshell-z",
   "unstable": {
    "version": [
-    20170117,
-    438
+    20190823,
+    2341
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "c9334cbc1552234df3437f35d98e32f4d18446b8",
-   "sha256": "1zja4hb2lj4m5w4j9mpc7xyqgg2ivpslllffjsg8x1w8xsxpj8fh"
+   "commit": "ee30761bd368df5f2e55c744ccc44089c7a46b6d",
+   "sha256": "0ywwvm1xx0p2iqzqmbb908147l8zlyf7gqsz0mgrzj0amqx1rhg2"
   },
   "stable": {
    "version": [
@@ -25273,14 +25402,14 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20190809,
-    1459
+    20190814,
+    1054
    ],
    "deps": [
     "julia-mode"
    ],
-   "commit": "d625e9ccdb612812b90fe427563db4b910da7159",
-   "sha256": "0fnfcxlngc7rwnkhs1fwir1ax7hi9qhl7zlalbl5m7yfly84dl4p"
+   "commit": "5b12e56a52144b2393858236e56e1c5ea828b753",
+   "sha256": "0gcz8r7mdjmrcrisqr1w4pmnyj4m76fc1qg773y2b1majkdv7rbj"
   },
   "stable": {
    "version": [
@@ -25913,15 +26042,15 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20190807,
-    214
+    20190828,
+    2159
    ],
    "deps": [
     "cl-lib",
     "evil"
    ],
-   "commit": "d226a50061a5033846ae819472e3c86fb54cc5f1",
-   "sha256": "155ajm7h9wpjg9ca60a4ib5fyp1sk4i54m5825595n43laqyd5p9"
+   "commit": "da75a170ea5485b7c0083624ca4e6cacc6aaa028",
+   "sha256": "1s4sr8lfdd2k11588gzylwbwmyigs29jfmvv9h0mjmixhaz85z1w"
   },
   "stable": {
    "version": [
@@ -26759,6 +26888,24 @@
    "sha256": "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7"
   }
  },
+ {
+  "ename": "evil-owl",
+  "commit": "306209c3e3669b962dfd0abf649865164ed8bba3",
+  "sha256": "1629ca2n3i6nk1vsxfn9rnzdy40kmiy18hqa4dw9v56jb9p47xh5",
+  "fetcher": "github",
+  "repo": "mamapanda/evil-owl",
+  "unstable": {
+   "version": [
+    20190828,
+    435
+   ],
+   "deps": [
+    "evil"
+   ],
+   "commit": "24c5f43df375194386344e69bc720ea3986c9510",
+   "sha256": "0bqzch14whlmrcasakah3psrzswvkzd7mmi8hx5s64kfp29wbdhi"
+  }
+ },
  {
   "ename": "evil-paredit",
   "commit": "88db86e1351410bcff6f3ed80681946afcec9959",
@@ -26934,14 +27081,26 @@
   "repo": "porras/evil-ruby-text-objects",
   "unstable": {
    "version": [
-    20190729,
-    1653
+    20190821,
+    1527
    ],
    "deps": [
     "evil"
    ],
-   "commit": "781f134d9484481b0b4ad32f9cfe90dc00219902",
-   "sha256": "00ybb6y5lnfsk44cy6dks46n2cl1ms4010vfqqrji64i19wd1riq"
+   "commit": "0ddc4c256a0c778fa65d75b707f20df874e5b5fa",
+   "sha256": "1ppwcyfy5dssswfzd16i1rx14si5r80mdvrnfwaf9jr3c2ws23lg"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "evil"
+   ],
+   "commit": "93cfc5ae3da0ffb19319e301734c51ecb43506b5",
+   "sha256": "0jizvchrisrdc7bl6xfc59axyjz1dmr6hi36jyv1bdwyayj2ifqi"
   }
  },
  {
@@ -27363,14 +27522,14 @@
   "repo": "mamapanda/evil-traces",
   "unstable": {
    "version": [
-    20190810,
-    2054
+    20190818,
+    2331
    ],
    "deps": [
     "evil"
    ],
-   "commit": "b1c64532ad754591c472e0615a10c9a9f8ad3df0",
-   "sha256": "0d7ijy067rb6wf1hzyyrk1nqh891b95fs0f39lbgawc0hkqk9bzw"
+   "commit": "4eec121e2abc0dd8f32b3d7cbdbf676302c4904a",
+   "sha256": "0hqrw3jda7qci0f3xqc35x0dhc2hrkd8fddwvlgicdj628wsm7ng"
   }
  },
  {
@@ -27572,11 +27731,11 @@
   "repo": "jjzmajic/ewal",
   "unstable": {
    "version": [
-    20190807,
-    240
+    20190828,
+    1542
    ],
-   "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8",
-   "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka"
+   "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5",
+   "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd"
   }
  },
  {
@@ -27587,14 +27746,14 @@
   "repo": "jjzmajic/ewal",
   "unstable": {
    "version": [
-    20190807,
-    240
+    20190825,
+    335
    ],
    "deps": [
     "ewal"
    ],
-   "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8",
-   "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka"
+   "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5",
+   "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd"
   }
  },
  {
@@ -27605,15 +27764,15 @@
   "repo": "jjzmajic/ewal",
   "unstable": {
    "version": [
-    20190720,
-    829
+    20190828,
+    1542
    ],
    "deps": [
     "ewal",
     "spacemacs-theme"
    ],
-   "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8",
-   "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka"
+   "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5",
+   "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd"
   }
  },
  {
@@ -28017,6 +28176,36 @@
    "sha256": "1h8h7v1cwbqbdk168vqz8ndb4zgxlkx28dyy0b315vib226vkxq6"
   }
  },
+ {
+  "ename": "exwm-mff",
+  "commit": "78f94ec4d5f83020003cbdb7b954213dfb0f242b",
+  "sha256": "10qjdhdkvyavjl43cyq9czvfbx8s0riiby0fss6v0snxdhg4qysd",
+  "fetcher": "github",
+  "repo": "ieure/exwm-mff",
+  "unstable": {
+   "version": [
+    20190810,
+    1744
+   ],
+   "deps": [
+    "exwm"
+   ],
+   "commit": "a6a4b3dda01cbcf411fc2824981eaa9e85199a52",
+   "sha256": "1f4yr4q5dayxmyvrdxbbviks6l02amqhgfa97k7cz9rwscsavg6c"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    6
+   ],
+   "deps": [
+    "exwm"
+   ],
+   "commit": "74a05bb1cc9444bb57d7a5361a15ec38deb4295a",
+   "sha256": "128j1xqg1k2z0lp7ivnszx8aai8y0zg182n1fhwc3iryrz52fn5q"
+  }
+ },
  {
   "ename": "exwm-surf",
   "commit": "4fc27fae2b58c7af87dadba9217cc05f8ab4890c",
@@ -28085,26 +28274,26 @@
   "repo": "wasamasa/eyebrowse",
   "unstable": {
    "version": [
-    20190322,
-    933
+    20190827,
+    1828
    ],
    "deps": [
     "dash"
    ],
-   "commit": "52e160997a1c4b1d463e8b9cc2ba3e27408c2a89",
-   "sha256": "0y2n08ykfc3hga5m969syysa2r4h3d2i1xfi0jjhpw3h7qrisbw8"
+   "commit": "d75e37a048718d6981c366c431b93ccbe884f356",
+   "sha256": "08k6dcz2pzgv0n4rfpq0gmpzs9319h5jk5xznmh2s8y42imvp5l7"
   },
   "stable": {
    "version": [
     0,
     7,
-    7
+    8
    ],
    "deps": [
     "dash"
    ],
-   "commit": "7294ed5fbf5f38407b599a10a335b8c4ec15a8d5",
-   "sha256": "1lhpf88042mg9q328w2d328ka9pild4ppdynbn3rsib9zgxp8waq"
+   "commit": "d75e37a048718d6981c366c431b93ccbe884f356",
+   "sha256": "08k6dcz2pzgv0n4rfpq0gmpzs9319h5jk5xznmh2s8y42imvp5l7"
   }
  },
  {
@@ -28271,6 +28460,36 @@
    "sha256": "0nq36h6kwyi2sv1fklm42spfkllm6jlz0alh2qlpgy4ixq5sp2pv"
   }
  },
+ {
+  "ename": "face-shift",
+  "commit": "e55d2d30525602726c3c63025f5fce671efac416",
+  "sha256": "1y0m6yv64q76x6i2r5npn97c2axsy2k7b3m58zxh8p7c5lpwjdpa",
+  "fetcher": "git",
+  "url": "https://git.sr.ht/~zge/face-shift",
+  "unstable": {
+   "version": [
+    20190818,
+    1551
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "8dd6fb5f6277d3a594654aeb3e6a7b7b5581656a",
+   "sha256": "003k8i18s782zf1g0c9wi8p9lyk0viz76dah8hd3y622hmx8sdlb"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    1
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "347e9a1c801c80be546fbf3be808f8245fb049d8",
+   "sha256": "0lkrbbhgv2a101rsf78ik27ni66spml3z9ljsajwjwhv3hvky0rq"
+  }
+ },
  {
   "ename": "faceup",
   "commit": "a10bf2928b93c3908e89ca8ad9649bb468ebca05",
@@ -28321,11 +28540,11 @@
   "repo": "WJCFerguson/emacs-faff-theme",
   "unstable": {
    "version": [
-    20190711,
-    1511
+    20190821,
+    1918
    ],
-   "commit": "49710f7bf8bebf6cd82e67f0ca3a718cff3b504d",
-   "sha256": "0ba1ayc1ccs1ygr66zpihm4wmnrhbvb48rrhha6lidyvmbxrxsa6"
+   "commit": "c88ed079add4e2c39401dda9fdeef96ea4ddb13c",
+   "sha256": "1a0ff8xmkkhiwj5809vrxfaj4mkdcvwyw8m656l6iidijskqnmh6"
   },
   "stable": {
    "version": [
@@ -28373,10 +28592,10 @@
  },
  {
   "ename": "fancy-battery",
-  "commit": "eae3af4145c534992d1c1ee5bb6420651c7c5d82",
-  "sha256": "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii",
+  "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0",
+  "sha256": "09qlkij9lbkaq46yb1860nkfiqpcn0h67zmm9lyz28475686759j",
   "fetcher": "github",
-  "repo": "lunaryorn/fancy-battery.el",
+  "repo": "emacsorphanage/fancy-battery",
   "unstable": {
    "version": [
     20150101,
@@ -28650,11 +28869,11 @@
   "repo": "tautologyclub/feebleline",
   "unstable": {
    "version": [
-    20190711,
-    713
+    20190822,
+    1401
    ],
-   "commit": "fe971abb6e0142513a8c6e453e9d3b2eac6a3f08",
-   "sha256": "0zisc4sf2fi0fspfzkvs8crlrvzrzrc72b379p5ngv53hmdmvkhy"
+   "commit": "b2f2db25cac77817bf0c49ea2cea6383556faea0",
+   "sha256": "0f2nynx9sib29qi3zkfkgxlcfrwz607pgg6qvvk4nnads033p1yn"
   }
  },
  {
@@ -29576,15 +29795,15 @@
   "repo": "Fuco1/flow-js2-mode",
   "unstable": {
    "version": [
-    20190627,
-    1240
+    20190814,
+    1402
    ],
    "deps": [
     "flow-minor-mode",
     "js2-mode"
    ],
-   "commit": "c7a300d7fbe5d14b55deed11e31175ea3237c85d",
-   "sha256": "0x00472q6vz9i1zc9wplqcjis0xdn7a58jbggzvns9fbnva5b7pl"
+   "commit": "bfb23b73d47ea9902bcdc13b48511b23d704fd22",
+   "sha256": "1pz2mhavs0jbfq8qswzvz3fz7nw7glcysybjyng9i0463vr8cwc9"
   }
  },
  {
@@ -29796,8 +30015,8 @@
   "repo": "flycheck/flycheck",
   "unstable": {
    "version": [
-    20190807,
-    813
+    20190828,
+    1147
    ],
    "deps": [
     "dash",
@@ -29805,8 +30024,8 @@
     "pkg-info",
     "seq"
    ],
-   "commit": "37c1f9d65c4a16c58aff9f2fa210ccf070a97c86",
-   "sha256": "1yqrb7r6ykjzmflk3259xpasmz2xgxxazvvhhjcy36krhwwj825x"
+   "commit": "ea176a4f6bfebd70b71a8a5e2988b49e1a58fe52",
+   "sha256": "0ys9cvhbxxq51sipk6ay13jcahgcbv869bxlhivdpjj7gmhzj5db"
   },
   "stable": {
    "version": [
@@ -30109,8 +30328,8 @@
     "flycheck",
     "let-alist"
    ],
-   "commit": "1dc8fdd691bcf950e95a0f00b71b53854923543e",
-   "sha256": "12abxdr75rjf9qas3q0wk220l3413cmddj45habz2ml9a9f7i41y"
+   "commit": "4c5d0c723bd564d632a4b93046679ed19d0e49d9",
+   "sha256": "17g5z02gjpyb5nwgwwcc0lxzd4l2jg0q2bndbxscsf5iw41p0irq"
   },
   "stable": {
    "version": [
@@ -30662,25 +30881,25 @@
   "url": "https://git.deparis.io/flycheck-grammalecte/",
   "unstable": {
    "version": [
-    20190801,
-    1813
+    20190817,
+    935
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "0ca2659c18f1e7e4963afbff8dcb9e5fef238f3b",
-   "sha256": "056hs0abyisqh9wsnykj1y05rw8qn8n6j1wgijy2k97yvg3rq7x3"
+   "commit": "d1ca6d9d4d64aa343598018134506930434ac5e0",
+   "sha256": "0s7kbs764nhq4nlfbbilz5clvadcyz5bi0ksrbm9kczhagisxnjv"
   },
   "stable": {
    "version": [
     0,
-    8
+    9
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "8ba9d41dad0c9c96760614ce7594ceb823f560de",
-   "sha256": "1l2n3vi7krd61bgwj7dg7qpkccimwfx3m0946fmxgrp0k6q41fn0"
+   "commit": "d1ca6d9d4d64aa343598018134506930434ac5e0",
+   "sha256": "0s7kbs764nhq4nlfbbilz5clvadcyz5bi0ksrbm9kczhagisxnjv"
   }
  },
  {
@@ -30735,8 +30954,8 @@
     "dash",
     "flycheck"
    ],
-   "commit": "eab1fc184854341a56154623a131cab6ff0ce18c",
-   "sha256": "0prmrix9a95zr39ybajp7fha03wknxyhrf1kfxsms1brxsc8bqim"
+   "commit": "8248ebaf8376ee5e37ff47c814a291550a7bdcf2",
+   "sha256": "1al9kyj7n0cjc4s1m41389bzvvrckg28598v506zd5hqvaiynsp0"
   },
   "stable": {
    "version": [
@@ -30968,8 +31187,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "8d7f52a4c7f80ca396ef0fc6c7d8e9f005778dfc",
-   "sha256": "0m5zhyzrh4lx7vzwdgdwcfkipdvi3y8kavhckbd7vd9zwx539ij1"
+   "commit": "0fdb067ebbcc8bc1a3f9d2109e341049516b71da",
+   "sha256": "1p7sns041iqsnmmhkcx2651plz3wrb2nr3s78w2pd7kagx5hwksb"
   },
   "stable": {
    "version": [
@@ -31247,8 +31466,8 @@
     "flycheck",
     "package-lint"
    ],
-   "commit": "6d99248b45eea1e5236062f38e524230efdb1a84",
-   "sha256": "00wyi2adiv9cb3x8bid2fhg3cjqlkc7z70i18vldbpmrpppjg4x5"
+   "commit": "31fe5d9731f30d076f14392401b3b101c9ca2260",
+   "sha256": "1j2jk11cag1scy4cid89lcvjspanhpamazqggksaaadg9b71ay04"
   },
   "stable": {
    "version": [
@@ -31582,8 +31801,8 @@
     "flycheck",
     "rtags"
    ],
-   "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2",
-   "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w"
+   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
+   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
   },
   "stable": {
    "version": [
@@ -32176,11 +32395,11 @@
   "repo": "orzechowskid/flymake-eslint",
   "unstable": {
    "version": [
-    20190720,
-    1501
+    20190828,
+    128
    ],
-   "commit": "5624f61c782c91710014620ebbaadab44a7e2b1f",
-   "sha256": "113hbdsgp950safyry3a2bpml3h2jjhypmfyjjyj3fibiigx9fmi"
+   "commit": "86268e1faf904bc8844dea313fe1bdaf02398ae9",
+   "sha256": "1xsj29z0qmijdb97cpy11dmqw8536amdz76664yzzn5gzin12fw7"
   },
   "stable": {
    "version": [
@@ -33376,11 +33595,11 @@
   "repo": "cadadr/elisp",
   "unstable": {
    "version": [
-    20190124,
-    1828
+    20190829,
+    1514
    ],
-   "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb",
-   "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z"
+   "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3",
+   "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y"
   }
  },
  {
@@ -33457,8 +33676,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20190809,
-    1808
+    20190820,
+    826
    ],
    "deps": [
     "closql",
@@ -33470,8 +33689,8 @@
     "markdown-mode",
     "transient"
    ],
-   "commit": "a60bd64056ec910fdbd1400dd8f583b8eec6145b",
-   "sha256": "1dhpsnb82mxpv3krf3apsbcirlcizw3g9gac9sfn0fad20qjwpgj"
+   "commit": "6c43971a78a08954c20992cb6b0e98a7e7295908",
+   "sha256": "1hlk6jmn4w7bq0x7syrxmk2gz4dn7iswi73dixcfkv3m97qiqxd1"
   },
   "stable": {
    "version": [
@@ -33526,14 +33745,14 @@
   "repo": "lassik/emacs-format-all-the-code",
   "unstable": {
    "version": [
-    20190721,
-    1032
+    20190830,
+    1152
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "dbed2d1ea8ee9a86d6e5e5f2aab4e73aaa88e918",
-   "sha256": "1v12b067dca73qy4s3ladhrqdkhfiih1d1hkbgxh0x9q0yhci871"
+   "commit": "15e9837a9e2d74bbb12fbaf1dcb400d0153754ba",
+   "sha256": "0bpz3i20vkd22y16cb7cllikj0sd91km2697wmix5wjsc370nimh"
   }
  },
  {
@@ -34018,8 +34237,8 @@
   "repo": "FStarLang/fstar-mode.el",
   "unstable": {
    "version": [
-    20190626,
-    1238
+    20190815,
+    1357
    ],
    "deps": [
     "company",
@@ -34029,8 +34248,8 @@
     "quick-peek",
     "yasnippet"
    ],
-   "commit": "ddb653cb3d6ba6568ffaf531ca57c9ea3e7498f5",
-   "sha256": "0mr48y24p81srv2m4glif1d7iy6i7jpx98lbv9577xry22d3vvhb"
+   "commit": "5af6fea23d1631f3f6653f804f17cd1b7358ca6b",
+   "sha256": "1wpr8hsvf923k7fwadl6j47k50vvfhzvpgrpj91j8208g8br87l8"
   },
   "stable": {
    "version": [
@@ -34060,8 +34279,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "2f2cb869f19e1ab10931a2228ad02b2cfbf8fc0e",
-   "sha256": "1pg1i85cx1zk10k333qzmc8i9dmry7nz6h57p13ysa7pnyi6d521"
+   "commit": "e6eb7be61c35d4a7b7d5eeb528b582639c57f08f",
+   "sha256": "10ndvjwg4c77qkh0a2ab7vdkz8z6fyk5ji7ra68cq75g7gclli77"
   },
   "stable": {
    "version": [
@@ -34224,6 +34443,30 @@
    "sha256": "1i6hhpdz5pyv07jr3wikrajnw270fm27nmrji2rz31z8b20nn4z0"
   }
  },
+ {
+  "ename": "fuz",
+  "commit": "aed40e85cf9a9906ca7a9fe34469083d21254e42",
+  "sha256": "0bpm2p5i8zyjsbn4d7i7rghwbap9mw4f5a5q47r6nxnr0fciarz5",
+  "fetcher": "github",
+  "repo": "cireu/fuz.el",
+  "unstable": {
+   "version": [
+    20190810,
+    507
+   ],
+   "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90",
+   "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs"
+  },
+  "stable": {
+   "version": [
+    1,
+    3,
+    0
+   ],
+   "commit": "90ca9207a9c1decda24a552b94ff41169ecccb14",
+   "sha256": "0v1advw2yr8b4jwd713fijd1kx4yc5xzz5ck2qfdxy5ixi1b39nm"
+  }
+ },
  {
   "ename": "fuzzy",
   "commit": "9e0197df173fbd7ec1e7e35c47476fcf2aaa483f",
@@ -34573,11 +34816,11 @@
   "repo": "jaor/geiser",
   "unstable": {
    "version": [
-    20190806,
-    149
+    20190826,
+    1736
    ],
-   "commit": "8f801fbf01586e33bcf0060bd1d3172d4afb48cf",
-   "sha256": "0cxd8zjgzkxjsgv1wfb6afc75brvs6hal7if31cj5ip7z38qzksx"
+   "commit": "d7bcfde6303b420ca76d9364c6e8f2c6827112e6",
+   "sha256": "01n3vxczv02vj9h7w1syq62qpnaw44wryk17ssk72ihg3zrrri6v"
   },
   "stable": {
    "version": [
@@ -34602,8 +34845,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "1907358fed4ad1ee61fb2a2e1a353b27822a3edd",
-   "sha256": "1v3645sgpr5i7alh08ik2dmlc3bl6idpfgdgf8763l7x8r41wa55"
+   "commit": "f032c3a77079487d0ea563b17ee3e5b2fb084611",
+   "sha256": "0lgh5z17ag5wvvnqwagvam29cp1n1vd50amn6df02xln80bsbllx"
   }
  },
  {
@@ -35255,8 +35498,8 @@
     "dash",
     "with-editor"
    ],
-   "commit": "75d0810d131e2e61ae3c683797a10a2caca96073",
-   "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq"
+   "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021",
+   "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc"
   },
   "stable": {
    "version": [
@@ -35526,20 +35769,20 @@
   "repo": "sshaw/git-link",
   "unstable": {
    "version": [
-    20190309,
-    2326
+    20190829,
+    145
    ],
-   "commit": "1dbabfed4c5c3c5ac6ffa9035a9c3d4c6cc7f885",
-   "sha256": "1b115d5rsb9m8lqjplg3qp0bxfc5cij5fgp0j21zspqwqvj7h0hq"
+   "commit": "267bd81c228bdab434172dbef896f3f3b82713fa",
+   "sha256": "04xa6lp8wkjb6zs096bf4sz124grcjj15xv1h009bmn2j95rggj6"
   },
   "stable": {
    "version": [
     0,
     7,
-    3
+    5
    ],
-   "commit": "1dbabfed4c5c3c5ac6ffa9035a9c3d4c6cc7f885",
-   "sha256": "1b115d5rsb9m8lqjplg3qp0bxfc5cij5fgp0j21zspqwqvj7h0hq"
+   "commit": "267bd81c228bdab434172dbef896f3f3b82713fa",
+   "sha256": "04xa6lp8wkjb6zs096bf4sz124grcjj15xv1h009bmn2j95rggj6"
   }
  },
  {
@@ -35865,8 +36108,8 @@
     20190701,
     630
    ],
-   "commit": "6a05025663789e6daab80a5dd47c3efbe607795f",
-   "sha256": "1mkdsg1pzwgyyxdlizwcspppvh6kb7z1s55bszxwrfasnpqk30jl"
+   "commit": "e3a410dd1113bdff382a745465ea48d9b1fe860b",
+   "sha256": "1yq9bsy2qry49q1asdxnfyhahsp499b37l2yabwhpbxjlb7mmnp6"
   }
  },
  {
@@ -35950,16 +36193,16 @@
   "repo": "charignon/github-review",
   "unstable": {
    "version": [
-    20190803,
-    1701
+    20190830,
+    1639
    ],
    "deps": [
     "dash",
     "ghub",
     "s"
    ],
-   "commit": "20b2e47f54587a39dbd8db9ec5ca33d5970dbcc1",
-   "sha256": "1slnggvsjzsqvdvm4nxnxba93hfjnz676bagmw79g7z6iswwz4sg"
+   "commit": "a13a3b4f1b6114a32af843971a145ab880f51232",
+   "sha256": "0injfpxzgfhmqalba845j5l5cdcxxqz43knhxwinf36g52nfabl0"
   }
  },
  {
@@ -36110,26 +36353,26 @@
   "repo": "joewreschnig/gitlab-ci-mode",
   "unstable": {
    "version": [
-    20190425,
-    2058
+    20190824,
+    1528
    ],
    "deps": [
     "yaml-mode"
    ],
-   "commit": "dac4e5125c78aa3ae12d2e35a66196d709676236",
-   "sha256": "1jkp9mnbiccqnha9zs646znqyqvy5jjb81kah7ghbkzdqqk2avm0"
+   "commit": "2651e831aed84ee2512245952fac94901b086549",
+   "sha256": "16fb4r3vq8xkzl911v7gaky95w1agfxjlpaxpjmidwx48rbcar59"
   },
   "stable": {
    "version": [
-    20190425,
-    11,
-    10
+    20190824,
+    12,
+    2
    ],
    "deps": [
     "yaml-mode"
    ],
-   "commit": "dac4e5125c78aa3ae12d2e35a66196d709676236",
-   "sha256": "1jkp9mnbiccqnha9zs646znqyqvy5jjb81kah7ghbkzdqqk2avm0"
+   "commit": "2651e831aed84ee2512245952fac94901b086549",
+   "sha256": "16fb4r3vq8xkzl911v7gaky95w1agfxjlpaxpjmidwx48rbcar59"
   }
  },
  {
@@ -36940,8 +37183,8 @@
     "cl-lib",
     "go-mode"
    ],
-   "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e",
-   "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5"
+   "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb",
+   "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q"
   },
   "stable": {
    "version": [
@@ -37033,11 +37276,11 @@
   "repo": "dominikh/go-mode.el",
   "unstable": {
    "version": [
-    20190808,
-    2249
+    20190819,
+    2109
    ],
-   "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e",
-   "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5"
+   "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb",
+   "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q"
   },
   "stable": {
    "version": [
@@ -37141,8 +37384,8 @@
    "deps": [
     "go-mode"
    ],
-   "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e",
-   "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5"
+   "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb",
+   "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q"
   },
   "stable": {
    "version": [
@@ -37434,8 +37677,8 @@
     20180130,
     1736
    ],
-   "commit": "5beae3f4dacad9b0b86a8a4ab308459475feda0e",
-   "sha256": "0f1x1vjzlr0i41b7nqziw7yiawfw8sb1ssqwii7a5nfgzsv19z7w"
+   "commit": "dceb47fb3ea99ad7cc4308fa2c9ecb0d012639e1",
+   "sha256": "184llmywxm3fi20lpyni3vx4wxg2z8aag8ahirka2ipnykl1z9id"
   }
  },
  {
@@ -37808,8 +38051,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "7b40d3e162becb69c99f2b71a26e1966adb34384",
-   "sha256": "16yqh892rfpg6mbzqxc8isxh3z3s9h14n6chm1h2qxsa82wqrrk2"
+   "commit": "3e2022d00278b8d47ea40793d299365c5d7b53a1",
+   "sha256": "1gmfsqn46lb4anqzb0s8yr21kzg5k2arw1daz056vcspq4fy3ix1"
   },
   "stable": {
    "version": [
@@ -38414,6 +38657,30 @@
    "sha256": "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2"
   }
  },
+ {
+  "ename": "grip-mode",
+  "commit": "de97f1c15b3ab53ca5e314b679c289705302bb64",
+  "sha256": "162ss93hbkxv5zd0vid6xh77ln7bsx2ngzr7h1y4dmcg36npmy5d",
+  "fetcher": "github",
+  "repo": "seagle0128/grip-mode",
+  "unstable": {
+   "version": [
+    20190820,
+    1726
+   ],
+   "commit": "e3f5143d34ec47ee3c01a21e1d7c5dbf744bfe1a",
+   "sha256": "09ikf88nl7mig525m4432f8bjff4rdgiw3a5vjnmilmsx85n6gpd"
+  },
+  "stable": {
+   "version": [
+    2,
+    0,
+    0
+   ],
+   "commit": "7777b694751c0da754712b964052617de1740e42",
+   "sha256": "1kbyr3rfdbclpvxbbv66rirj7bn507izafjssvkwgjrrd6vfhdv2"
+  }
+ },
  {
   "ename": "grizzl",
   "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
@@ -38972,20 +39239,20 @@
   "repo": "marcowahl/hack-time-mode",
   "unstable": {
    "version": [
-    20190529,
-    855
+    20190827,
+    956
    ],
-   "commit": "df8e86ab04beb655bf5b3860f8bea41cf1fbc3eb",
-   "sha256": "1n4kirb65r4s8k2kiga857fk8zylk14ibq0k2vdx5b8axbz71ggh"
+   "commit": "74465859154314228482b4f41fcda726c82c71c9",
+   "sha256": "1q9k7r09y532fcvzjkgcqnk5hdms55hrshawgxhiz3qwxxc3svsi"
   },
   "stable": {
    "version": [
     0,
     1,
-    0
+    1
    ],
-   "commit": "95ed4c8a2410e1232453b3a49274a46afb740b1e",
-   "sha256": "083b9kwhh4bq0dwn6iskrrmsgxicqg08p8k6n1m1xadgs61lgkjb"
+   "commit": "df8e86ab04beb655bf5b3860f8bea41cf1fbc3eb",
+   "sha256": "1n4kirb65r4s8k2kiga857fk8zylk14ibq0k2vdx5b8axbz71ggh"
   }
  },
  {
@@ -39734,16 +40001,16 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20190811,
-    602
+    20190830,
+    1604
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "b3ca0c03188afd173c7f8c6bb51a5aa0457e10c3",
-   "sha256": "1f5395949i6hb01cm932slxnqn3wlz8zrj51b1shqn0yiv0vqhvg"
+   "commit": "c00b5826c1d5797debe92ed235d50b068a348c14",
+   "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr"
   },
   "stable": {
    "version": [
@@ -40000,8 +40267,8 @@
   "repo": "tmalsburg/helm-bibtex",
   "unstable": {
    "version": [
-    20190708,
-    909
+    20190814,
+    1056
    ],
    "deps": [
     "biblio",
@@ -40012,8 +40279,8 @@
     "parsebib",
     "s"
    ],
-   "commit": "8978ba5236af767023976c5b793a2b3e29e43c7a",
-   "sha256": "00fw8j3mjrq8y3qbcgj0baxnspq94a8qgxlyvrc6siraryppw65h"
+   "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de",
+   "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6"
   },
   "stable": {
    "version": [
@@ -40588,14 +40855,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20190809,
-    1008
+    20190830,
+    635
    ],
    "deps": [
     "async"
    ],
-   "commit": "b3ca0c03188afd173c7f8c6bb51a5aa0457e10c3",
-   "sha256": "1f5395949i6hb01cm932slxnqn3wlz8zrj51b1shqn0yiv0vqhvg"
+   "commit": "c00b5826c1d5797debe92ed235d50b068a348c14",
+   "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr"
   },
   "stable": {
    "version": [
@@ -41133,14 +41400,14 @@
   "repo": "elpa-host/helm-file-preview",
   "unstable": {
    "version": [
-    20190630,
-    839
+    20190825,
+    247
    ],
    "deps": [
     "helm"
    ],
-   "commit": "6c67cc9a17f6e951dd79cfcdc6997b6357f5bf3b",
-   "sha256": "0fvmdhhkpa079zrz15h1adrff01c1csxwww5im8kqn2hk4qdycv2"
+   "commit": "7b332fc3ceb730d054bac464b78e4d6e009ff432",
+   "sha256": "0klcgqqyx4zkxy0vnqfkbydjv59za8g247x0rgk64iq62fsmm3k8"
   }
  },
  {
@@ -41296,6 +41563,38 @@
    "sha256": "1z7iwgl1v8nkwyz3h610l97amgq9slrfxxiicsnigc9vgsqlh987"
   }
  },
+ {
+  "ename": "helm-fuz",
+  "commit": "7b411e46e9246beb36acb3e468980e84c77c6015",
+  "sha256": "1j3fpmqn526pkrrms578fm470svqd2yran4mpxjx0xps45nsklsc",
+  "fetcher": "github",
+  "repo": "cireu/fuz.el",
+  "unstable": {
+   "version": [
+    20190815,
+    401
+   ],
+   "deps": [
+    "fuz",
+    "helm"
+   ],
+   "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90",
+   "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs"
+  },
+  "stable": {
+   "version": [
+    1,
+    3,
+    0
+   ],
+   "deps": [
+    "fuz",
+    "helm"
+   ],
+   "commit": "90ca9207a9c1decda24a552b94ff41169ecccb14",
+   "sha256": "0v1advw2yr8b4jwd713fijd1kx4yc5xzz5ck2qfdxy5ixi1b39nm"
+  }
+ },
  {
   "ename": "helm-fuzzier",
   "commit": "51dc6f01e0e5ee0593bea6616894bc0163878cd0",
@@ -42343,14 +42642,14 @@
   "repo": "emacs-helm/helm-mu",
   "unstable": {
    "version": [
-    20190410,
-    1718
+    20190819,
+    1311
    ],
    "deps": [
     "helm"
    ],
-   "commit": "7793d96694505380c470cb7b31b4bd8a2781e529",
-   "sha256": "01410wi46ljpy1040wk9dp2k21nyhc3k6kwxpy35874bqhqn5r3i"
+   "commit": "481964fb26c59ea280a1ec7bce192d724ddf7d12",
+   "sha256": "08cszx5iqr65sz66ank722c1kdvjff2k7kvhxdilhf3gb6f8ph9p"
   }
  },
  {
@@ -42475,14 +42774,14 @@
   "repo": "emacs-helm/helm-org",
   "unstable": {
    "version": [
-    20190813,
-    604
+    20190819,
+    617
    ],
    "deps": [
     "helm"
    ],
-   "commit": "7926896aa1195db7ca6394c1ce60152b98f5fca1",
-   "sha256": "0cxxjxh89qhxfxc5gwqm5jwvdcnmsyipzwibvmqmq800ims09fka"
+   "commit": "542dda7bc9a3b9dfb439e4f8a1e5f60cfb6cc256",
+   "sha256": "1xa32w80icrykpyfb89fhb0s4l7ysi0sc7f7lfwqz5najwbgqipl"
   },
   "stable": {
    "version": [
@@ -43215,8 +43514,8 @@
     "helm",
     "rtags"
    ],
-   "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2",
-   "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w"
+   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
+   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
   },
   "stable": {
    "version": [
@@ -43378,30 +43677,30 @@
   "repo": "emacs-helm/helm-slime",
   "unstable": {
    "version": [
-    20190703,
-    714
+    20190821,
+    1304
    ],
    "deps": [
     "cl-lib",
     "helm",
     "slime"
    ],
-   "commit": "e51f756f2a6e00231a34f2b46aba6c746a112624",
-   "sha256": "1aam9zxx7j3g2kp6n62hjrcw6rkdnyk90anihbm1z89kb2b00bgw"
+   "commit": "e0dbf04d447098a1d074bc04e125764ff82091b7",
+   "sha256": "0mrpjhpijdrq353fnfvdj9l9xfsz390qlcvifcair9732ma7i8l0"
   },
   "stable": {
    "version": [
     0,
-    3,
+    4,
     0
    ],
    "deps": [
     "cl-lib",
-    "helm-core",
+    "helm",
     "slime"
    ],
-   "commit": "ebe80eebd1dfba1f1c837876c8f73cefc8c4db87",
-   "sha256": "1qhb9446rpj17pm0hi3miy5gs5k3ld43bq29kzy0y26bf7ivfcjv"
+   "commit": "e0dbf04d447098a1d074bc04e125764ff82091b7",
+   "sha256": "0mrpjhpijdrq353fnfvdj9l9xfsz390qlcvifcair9732ma7i8l0"
   }
  },
  {
@@ -43530,26 +43829,26 @@
   "repo": "emacsorphanage/helm-swoop",
   "unstable": {
    "version": [
-    20190813,
-    920
+    20190822,
+    501
    ],
    "deps": [
     "helm"
    ],
-   "commit": "8ae7c47365d3cef4b81abe97af1532340821a21b",
-   "sha256": "06rfhd38fvfnzjxk119pwwddszv1sczxn5dn6r7qki39wwxcsqww"
+   "commit": "3cc15383fae9063de817d320e87a1f868a46eb83",
+   "sha256": "1jm1yvwbfqhrj0256n5ihvxb1zxhhhqv07yfzkfg2pv6k71hpd9h"
   },
   "stable": {
    "version": [
-    1,
-    7,
-    4
+    2,
+    0,
+    0
    ],
    "deps": [
     "helm"
    ],
-   "commit": "c66336b8245ddc51c4206f19c119f1081920985c",
-   "sha256": "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk"
+   "commit": "c5ec1f3acfb07155273c2de021f3521e198e4a9d",
+   "sha256": "0k0ns92g45x8dbymqpl6ylk5mj3wiw2h03f48q5cy1z8in0c4rjd"
   }
  },
  {
@@ -43850,14 +44149,14 @@
   "repo": "brotzeit/helm-xref",
   "unstable": {
    "version": [
-    20190721,
-    1455
+    20190821,
+    1252
    ],
    "deps": [
     "helm"
    ],
-   "commit": "cc90ed9e04f848b252ba50951f332f4c4208651b",
-   "sha256": "0gzfmnnvjc42r0pk1jxlcacl0bmr3jqav6rnj7cfk2g05af10xli"
+   "commit": "5290e2a05209b742d7efcd3e03b5f51ac1eab6ad",
+   "sha256": "1jkjm43fnwc4n9h5rrpkb2sgs2k0nb5fmxxn08b4iyz992lgmk7b"
   }
  },
  {
@@ -43961,8 +44260,8 @@
   "repo": "Wilfred/helpful",
   "unstable": {
    "version": [
-    20190807,
-    2141
+    20190814,
+    308
    ],
    "deps": [
     "dash",
@@ -43971,8 +44270,8 @@
     "f",
     "s"
    ],
-   "commit": "69474e9c49076ce82cea4eff237933b6cec0b5cf",
-   "sha256": "1jf0rj5k9aa1gbsvwwhnj5vkwpv1am5ya1xw5sxhzl3iabqz680i"
+   "commit": "e9e958a5643619d0e32b9934bf4e9195c57cb71f",
+   "sha256": "1xhcl3i4cpm5j0q0qd3rcgv5cqfikgqxp4wnw96xkalmyhqdgi28"
   },
   "stable": {
    "version": [
@@ -44020,6 +44319,35 @@
    "sha256": "178dvigiw162m01x7dm8pf61w2n3bq51lvk5q7jzpb9s35pz1697"
   }
  },
+ {
+  "ename": "hercules",
+  "commit": "c0a3b713c6c8465dc461d9776ccd27f06659993e",
+  "sha256": "1ggb8ax18nvcrcf1rqf8lkjjxb90kl05ivk0110h6pb9270x03hy",
+  "fetcher": "gitlab",
+  "repo": "jjzmajic/hercules.el",
+  "unstable": {
+   "version": [
+    20190820,
+    1712
+   ],
+   "deps": [
+    "which-key"
+   ],
+   "commit": "aace3409bc4d78fec3006b2906eb2ae99cadd9f4",
+   "sha256": "1s88hmw671in3lrmsbbc3w6fs1ccgzip8k46j79gyf50vzzfcpk7"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "deps": [
+    "which-key"
+   ],
+   "commit": "8d156df2b7ae2866bfe44ee1b9c038379524147a",
+   "sha256": "17izhdq6pgg25nkl1zlqri18dhjgxwkw95iy230adsbk8m0iys4g"
+  }
+ },
  {
   "ename": "heroku",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -45237,14 +45565,14 @@
   "url": "https://scm.osdn.net/gitroot/howm/howm.git",
   "unstable": {
    "version": [
-    20180929,
-    1214
+    20190818,
+    1144
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "374525133b96a801d7612cb65a026740a6d0361d",
-   "sha256": "06nwgwl165b5y7w5v6lgz0njapgn65fxbdxi0biw2qaswnz8vcwx"
+   "commit": "e011a70f5955b8eb2e30f7baf2f3833fc6d3216f",
+   "sha256": "0p8gphaqkyl9cmbs85vi31jgbc56j6ghwf5zhn523sy22vcw5j0j"
   }
  },
  {
@@ -45273,14 +45601,14 @@
   "repo": "Wilfred/ht.el",
   "unstable": {
    "version": [
-    20190611,
-    2131
+    20190830,
+    910
    ],
    "deps": [
     "dash"
    ],
-   "commit": "5650a8cd190badb49d28d21e72a2f55c9380de7b",
-   "sha256": "1hgd6nrj69283k240ngz7422776lw4fc9mvgwg7nvh41qb70vwgg"
+   "commit": "a5a046e7c26fbcda0b757a64b30ca3e5b1cc6d69",
+   "sha256": "15vqnl72ahydj0qjg7y7na1i6n8800fl0na2glgrrwyhzy0z2sa2"
   },
   "stable": {
    "version": [
@@ -45718,15 +46046,15 @@
   "repo": "abo-abo/hydra",
   "unstable": {
    "version": [
-    20190617,
-    859
+    20190821,
+    939
    ],
    "deps": [
     "cl-lib",
     "lv"
    ],
-   "commit": "a91dd72529aadd2d3cc14e132a3e0545eb2975a6",
-   "sha256": "1bbyj0l6176277qp20034lgs8ghx01fasnikkc76fndn3v4vsljn"
+   "commit": "435c55e9f75a8cf3ae6a4ba0c7725e3dc4e5963f",
+   "sha256": "0nzbjx5rnmzl0dhbrrmb5kbcmww6hzs1vwa62nlg9zfwq99zk42l"
   },
   "stable": {
    "version": [
@@ -45994,15 +46322,15 @@
   "repo": "plandes/icsql",
   "unstable": {
    "version": [
-    20190710,
-    306
+    20190815,
+    501
    ],
    "deps": [
     "buffer-manage",
     "choice-program"
    ],
-   "commit": "3d66e588556686563b8fb72d7654f840d88046c5",
-   "sha256": "0r6654zddbxsbqbrjdd9rbhvfvvdffbh4ggg67b3kcwmzwwjp92p"
+   "commit": "5e5cd04e3f3ad9963c29759293c1f7a54257866b",
+   "sha256": "0y9nsdkw8sahb3vgrgc278dys7m3nqzq6wgcifhhcsvv1bgs93hd"
   },
   "stable": {
    "version": [
@@ -46231,21 +46559,21 @@
     "memoize",
     "s"
    ],
-   "commit": "41b42779e22c064192b95e4de855ff7ebad45af6",
-   "sha256": "088b50iajgj602wsm1280gn5pqirycazndhs27r1li5d84fm1nvj"
+   "commit": "61c6fc60c2c7c70cf07fa533914bd2dae27c902a",
+   "sha256": "0qwi4prdx6flfzkzhqz15xbvlcxdb9gg3i1hz350p7h2kcfjkqpa"
   },
   "stable": {
    "version": [
     4,
-    12
+    13
    ],
    "deps": [
     "cl-lib",
     "memoize",
     "s"
    ],
-   "commit": "d56125deac540a2ab396d6d71f7c1eeae7f37588",
-   "sha256": "11wn2xf7dbgfhwdrjazshf4c5im1yxnqpyvq8633fjc1cn9s7vxw"
+   "commit": "41b42779e22c064192b95e4de855ff7ebad45af6",
+   "sha256": "088b50iajgj602wsm1280gn5pqirycazndhs27r1li5d84fm1nvj"
   }
  },
  {
@@ -46698,11 +47026,11 @@
   "repo": "jrosdahl/iflipb",
   "unstable": {
    "version": [
-    20190427,
-    1809
+    20190817,
+    547
    ],
-   "commit": "47d310a4576ae2195777d755cf86d5ea7525ef74",
-   "sha256": "0s35iiki06302q7bn2p5gdfv03y7w3d8rkk84hxr5azwhw1v2hcg"
+   "commit": "aeeb85633566ed3c13dbe94a6a4925d8930b7b85",
+   "sha256": "07010alf6ymhs0nyj3arafksba0rdvgzjw9wqqhayzw6qqannbb2"
   },
   "stable": {
    "version": [
@@ -47663,11 +47991,11 @@
   "repo": "ideasman42/emacs-inkpot-theme",
   "unstable": {
    "version": [
-    20181119,
-    706
+    20190816,
+    715
    ],
-   "commit": "054c125b49247a08af5a391992817776fd0e8af6",
-   "sha256": "06g4xsirag4gjd9khii4yhca29g5z9507lyyxxk35k36ckarg07i"
+   "commit": "54adc447d30e60b6e6c39220e8b36d93d63fecac",
+   "sha256": "0pk8wgbxrly5lz0xzbk0kf5rx8z3cbyv9wj6l8s1zdc0bzj7i1nk"
   }
  },
  {
@@ -48496,11 +48824,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20190809,
-    1551
+    20190825,
+    1023
    ],
-   "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e",
-   "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll"
+   "commit": "79333e9edfee38ec3b367c33711a68bdf7783259",
+   "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z"
   },
   "stable": {
    "version": [
@@ -48520,8 +48848,8 @@
   "repo": "tmalsburg/helm-bibtex",
   "unstable": {
    "version": [
-    20190708,
-    909
+    20190814,
+    1056
    ],
    "deps": [
     "biblio",
@@ -48532,8 +48860,8 @@
     "s",
     "swiper"
    ],
-   "commit": "8978ba5236af767023976c5b793a2b3e29e43c7a",
-   "sha256": "00fw8j3mjrq8y3qbcgj0baxnspq94a8qgxlyvrc6siraryppw65h"
+   "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de",
+   "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6"
   },
   "stable": {
    "version": [
@@ -48554,6 +48882,25 @@
    "sha256": "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"
   }
  },
+ {
+  "ename": "ivy-clojuredocs",
+  "commit": "ef20e3b6fa8d4586d6f17a4e9a6746390dbb2b50",
+  "sha256": "1p3fnj6zz2cxirn2dv54hnwabflxsj04vxjf0f7fbs931c7hrshx",
+  "fetcher": "github",
+  "repo": "wandersoncferreira/ivy-clojuredocs",
+  "unstable": {
+   "version": [
+    20190810,
+    258
+   ],
+   "deps": [
+    "edn",
+    "ivy"
+   ],
+   "commit": "7af9cef998a608a7f505120af4754779f3014106",
+   "sha256": "1zg730gby1l0h1vrhbzwba2ybh1rk7n9gj1a369mcd2kkdlsvw2m"
+  }
+ },
  {
   "ename": "ivy-dired-history",
   "commit": "ad37f6b04ff45fbffeadefc94db16baa27bcc2ac",
@@ -48741,15 +49088,15 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20190731,
-    1602
+    20190829,
+    630
    ],
    "deps": [
     "hydra",
     "ivy"
    ],
-   "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e",
-   "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll"
+   "commit": "79333e9edfee38ec3b367c33711a68bdf7783259",
+   "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z"
   },
   "stable": {
    "version": [
@@ -48913,15 +49260,15 @@
   "repo": "tumashu/ivy-posframe",
   "unstable": {
    "version": [
-    20190727,
-    959
+    20190819,
+    657
    ],
    "deps": [
     "ivy",
     "posframe"
    ],
-   "commit": "8ad466802de90d47992024394ea5f864c1cf0ac1",
-   "sha256": "013nsykqp50hdfady8j650lp3bfpmcl1ingf8b4pcwp6mcz2vg0w"
+   "commit": "d9ceee94171767b4aba6c55ebe93e51ccbe0fa8a",
+   "sha256": "1ghn9n4lc50p94byi0z2vfgkwyh4q4i19j26dkqr2lyvfhsvvdwj"
   }
  },
  {
@@ -49024,15 +49371,15 @@
   "repo": "Andersbakken/rtags",
   "unstable": {
    "version": [
-    20170523,
-    454
+    20190821,
+    1946
    ],
    "deps": [
     "ivy",
     "rtags"
    ],
-   "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2",
-   "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w"
+   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
+   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
   },
   "stable": {
    "version": [
@@ -50160,8 +50507,8 @@
     20180807,
     1352
    ],
-   "commit": "4c184256c4ccee3451357d3277c3e1bb16de2d98",
-   "sha256": "1mlqpzy5xg3wni1dchnmbs01dmlqimy167fknd6bsfb7ydf6ilqg"
+   "commit": "b4fec1497c76d36f7d8a2aad44983f8b6f501180",
+   "sha256": "0s80f6sq3ly9wiz5az1imrn5lyqhn0cdlq0vvfadk2ycvb370989"
   },
   "stable": {
    "version": [
@@ -50333,14 +50680,14 @@
   "repo": "mooz/js2-mode",
   "unstable": {
    "version": [
-    20190606,
-    1008
+    20190815,
+    1327
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "999c0e7d96f4d5be0950b6506d732dc3d7c53635",
-   "sha256": "0nwhw0qw1hbdh0jrdbsgzv4z9yc93x9yjfpan93cbcw0i9qfai8h"
+   "commit": "b3841a7a304d9d1328fdb0868fbbecf0c2f9831f",
+   "sha256": "0rl9vz194c29ljiwgk7xfcgc047hi2ybda7mlj3r1plhk80768n6"
   },
   "stable": {
    "version": [
@@ -50519,6 +50866,30 @@
    "sha256": "0xrjbx6rkm8a6pmzhdph0r6l468hj827dvvq2hxhcm8v5gk6m690"
   }
  },
+ {
+  "ename": "json-process-client",
+  "commit": "38cf8baad750427268659c8b25d35270add18317",
+  "sha256": "0lv4xdihjphpg31zdzkzrhp715sj7y2sl87c6cz6akhlfz2mmm0h",
+  "fetcher": "git",
+  "url": "https://gitlab.petton.fr/nico/json-process-client.git",
+  "unstable": {
+   "version": [
+    20190827,
+    1858
+   ],
+   "commit": "422606a7bf08d13646e3db4f6c2bddb69bd61dec",
+   "sha256": "16fyb0gwm4llwbmg12m4r9r8h540hcvhrsnlly6cry60h9p8dpc1"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    0
+   ],
+   "commit": "1d4a1fe2ecc682890dfc75e40054c9697c3046f6",
+   "sha256": "1r1mcd9xqibr7np2gsq8gpl310l05h75y2pnldlqqsszkhivyixd"
+  }
+ },
  {
   "ename": "json-reformat",
   "commit": "f8c7976237f327fdfa58eea26ac8679f40ef3163",
@@ -50735,11 +51106,11 @@
   "repo": "JuliaEditorSupport/julia-emacs",
   "unstable": {
    "version": [
-    20190407,
-    2119
+    20190813,
+    1326
    ],
-   "commit": "1eacdc608b6ce1947db0a86e61f2061f00a96bc1",
-   "sha256": "01bz57d8hnlr9g9xm987zaziyssgd5iacxcbgmg9lynksjgnpwsz"
+   "commit": "db84928742b3e4189dcc81997e4a3cad3eac7b68",
+   "sha256": "0hv43r037jacizmgql0sxxjj2g0f51k5zcxn7h30if86a6hhx659"
   }
  },
  {
@@ -50750,11 +51121,11 @@
   "repo": "tpapp/julia-repl",
   "unstable": {
    "version": [
-    20190420,
-    1455
+    20190828,
+    1646
    ],
-   "commit": "71380e8139e28ea527a85ddb9146f2980d62c1f8",
-   "sha256": "1kmmk5wf0ifyn894qadqxfpwy2j6m397r0lg14sa73r01ql2j010"
+   "commit": "94761603d368f05eaed3573312503db940f4edfe",
+   "sha256": "1h3h5s0ls3shwgg6fl3sk0iszqdd90nz2kl5cpj1bbqfgw0fivmj"
   },
   "stable": {
    "version": [
@@ -50916,8 +51287,8 @@
   "repo": "dzop/emacs-jupyter",
   "unstable": {
    "version": [
-    20190809,
-    349
+    20190828,
+    2043
    ],
    "deps": [
     "cl-lib",
@@ -50925,8 +51296,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "c4dc513c52c57a6f67d3c25c09079365dd2b06f5",
-   "sha256": "1bfxv5y8w0c3n81yb59f74014sdvdqf294kw01bq68kcg0xk6bx8"
+   "commit": "aa9b634e7b26347a9b938da4cb97184b73651a64",
+   "sha256": "0k1piakj4rzygy73jd6wv9hd6nhci3d056xfiaaala6vywfllvxg"
   },
   "stable": {
    "version": [
@@ -51201,6 +51572,26 @@
    "sha256": "1m0s1kdgz1psiidpxcrzm8qmvmrmk5g2k8lz1lq357z482l4i7ll"
   }
  },
+ {
+  "ename": "kaocha-runner",
+  "commit": "7be32636579e00518b81644ba88e2ed9c1cf7346",
+  "sha256": "1j68vpbqsqyx54igqpihpzlmr4w38i52ms1aj41s4bgr953fmr43",
+  "fetcher": "github",
+  "repo": "magnars/kaocha-runner.el",
+  "unstable": {
+   "version": [
+    20190826,
+    916
+   ],
+   "deps": [
+    "cider",
+    "parseedn",
+    "s"
+   ],
+   "commit": "5973bf9619d8c8b8f69824246210f31ea644127b",
+   "sha256": "1sr7zbdbg3hkcbmpr7fwpw26d6j4vk0a3cxnlr2pq2f5zy9n0hax"
+  }
+ },
  {
   "ename": "kaolin-themes",
   "commit": "043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4",
@@ -51297,6 +51688,21 @@
    "sha256": "0avcg307r4navvgj3hjkggk4gr7mzs4mljhxh223r8g69l9bm6m8"
   }
  },
+ {
+  "ename": "kconfig-mode",
+  "commit": "c359713acdb396c16d39fb6013d46677b5afa245",
+  "sha256": "17dhx5hjqhk4bljmj0v2xy379a0l89h8454x53mv6m9qm3rsnrhd",
+  "fetcher": "github",
+  "repo": "delaanthonio/kconfig-mode",
+  "unstable": {
+   "version": [
+    20190818,
+    2030
+   ],
+   "commit": "02bb919596cf673828e95872dc329f2424a99864",
+   "sha256": "1h0v9528d2ssjgqa8813l3anhz15aggsmf8yln0qpphhrlrkfmpz"
+  }
+ },
  {
   "ename": "kdeconnect",
   "commit": "c363866d30fb86ae636d30def8c3847711ada762",
@@ -51846,8 +52252,8 @@
     20180702,
     2029
    ],
-   "commit": "3ab5fde4ba63865333766685e025aae01933dbaf",
-   "sha256": "1k5qnrih9y8w49cbgi6prg98qqxrrn106g7h71azgpbav1mlfyk7"
+   "commit": "cefc5a72118021e01660734d08d1ad2433c7131e",
+   "sha256": "140h62p9i4h3jhf7rpsxn4ymg0dnxgf9kg070zc1fdvkj52gxxlw"
   },
   "stable": {
    "version": [
@@ -52101,20 +52507,20 @@
  },
  {
   "ename": "kubel",
-  "commit": "f1c7ff1c44946f232730066d6c8c25d5b41ffda7",
-  "sha256": "1rm85bwpsqj600jvri508nn5i17ynyd84aanf8cqqxk5d2wf9x1n",
+  "commit": "6fe35f90b858d0b6710b4bae8a2b80f97f1b8228",
+  "sha256": "17xsy0kj2dskmr8mmrlvhkrylzgbfd0jqay9qa9avzlh24v85jcm",
   "fetcher": "github",
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20190627,
-    246
+    20190819,
+    1434
    ],
    "deps": [
     "transient"
    ],
-   "commit": "4e5009540bb3305c9a0a298ffff25b933d6bbbdf",
-   "sha256": "08qshza3ph800n2wll4mdrgjv9mv41vq9aq7sa5v73ys3ghm4g7s"
+   "commit": "88995f796e6ba20cc91abfb012c23fe5ab29e19f",
+   "sha256": "0b33gp6qkclb1jxsxwjkwa74wri1zj2gx4sw11igbs58kkyzja52"
   }
  },
  {
@@ -52125,16 +52531,16 @@
   "repo": "chrisbarrett/kubernetes-el",
   "unstable": {
    "version": [
-    20190813,
-    239
+    20190822,
+    913
    ],
    "deps": [
     "dash",
     "magit",
     "magit-popup"
    ],
-   "commit": "e0eff360c83c61d531bf0a0032efa6b963ce2b57",
-   "sha256": "09zqayzl05yszxh619i2ri12g3c0lbbvbh4m4isyxvancxk88igs"
+   "commit": "7ef0e4be3a788bf45914308d6e2158384e3f605b",
+   "sha256": "0zmjv1wndhy4j0mamz6phadp37zc6kgn4byln2p7pbwc7r9mzmlj"
   },
   "stable": {
    "version": [
@@ -52165,8 +52571,8 @@
     "evil",
     "kubernetes"
    ],
-   "commit": "e0eff360c83c61d531bf0a0032efa6b963ce2b57",
-   "sha256": "09zqayzl05yszxh619i2ri12g3c0lbbvbh4m4isyxvancxk88igs"
+   "commit": "7ef0e4be3a788bf45914308d6e2158384e3f605b",
+   "sha256": "0zmjv1wndhy4j0mamz6phadp37zc6kgn4byln2p7pbwc7r9mzmlj"
   },
   "stable": {
    "version": [
@@ -52593,11 +52999,11 @@
   "repo": "galaunay/latexdiff.el",
   "unstable": {
    "version": [
-    20180521,
-    2232
+    20190827,
+    1651
    ],
-   "commit": "024ee7a4fd235695dacd9f53594fef3d79bee88b",
-   "sha256": "17xpkbrwfck0m6zp5d1b9b4slkgyvm8d92nzilb4s1rf9nqf9mvw"
+   "commit": "56d0b240867527d1b43d3ddec14059361929b971",
+   "sha256": "1gkhzladgh0dj5pvak822x6nq7f4h6382647flhv7c65fqszscbf"
   }
  },
  {
@@ -52721,11 +53127,11 @@
   "repo": "conao3/leaf.el",
   "unstable": {
    "version": [
-    20190728,
-    1307
+    20190828,
+    1538
    ],
-   "commit": "7868e13bc2b10259245dd4bfc4b830ddc136b4bd",
-   "sha256": "15899b2fpck7k7ksm1x2v5gcq6y3rb9l4xi5i8myj356lgk8ycv9"
+   "commit": "daa8b5194f5a05b74a9eb46f6787f46ddfe5778d",
+   "sha256": "05f9vdbk31jpqpc5afnwpnzwaswmlrvz9cr09ncrbjwcap06705i"
   },
   "stable": {
    "version": [
@@ -52745,14 +53151,14 @@
   "repo": "conao3/leaf-keywords.el",
   "unstable": {
    "version": [
-    20190716,
-    2321
+    20190816,
+    1859
    ],
    "deps": [
     "leaf"
    ],
-   "commit": "4191bab8346313c17a151bf98007781fb5f894df",
-   "sha256": "0f09d112fsj2gy5nfwsp39llpwl113y0f2jhfhhs20slxqi3hfcm"
+   "commit": "c314c8295973f75034f0dc2946b18087d3408e66",
+   "sha256": "114g469016pjar5wmr126cpd6cfiliz4w0lmw1rlmafc53h3wbr7"
   },
   "stable": {
    "version": [
@@ -52903,16 +53309,16 @@
   "repo": "kaiwk/leetcode.el",
   "unstable": {
    "version": [
-    20190706,
-    1622
+    20190827,
+    1032
    ],
    "deps": [
     "graphql",
     "request-deferred",
     "spinner"
    ],
-   "commit": "90324e6b57660c55f5c9fbf7bbb19e9855304206",
-   "sha256": "013bli8q39d280z1kknc29dsacq4g8wzk0119dhsl3acah5a168k"
+   "commit": "2b2f44bbd46d3c8db23473833824a237073f6c23",
+   "sha256": "1bcknygmz1ay2j90cs6rmiax5gsdwrysvv2w13cmz601bv3prrgf"
   }
  },
  {
@@ -53086,11 +53492,11 @@
   "repo": "fniessen/emacs-leuven-theme",
   "unstable": {
    "version": [
-    20190308,
-    1534
+    20190829,
+    921
    ],
-   "commit": "916c0f3b562b5b0e4f4294b83decda941fb183b1",
-   "sha256": "1garn9rkn1jmv1w329qdw0mbn11j467kfp64902ncajl3590x2ly"
+   "commit": "69ab5c2db93cf58a57354a5d78e825d191109717",
+   "sha256": "1bsshad7y9yicbzp2fp53jv4kkli1slkyw7b15db4bgzj8br55s5"
   }
  },
  {
@@ -53134,8 +53540,8 @@
     20170121,
     1254
    ],
-   "commit": "0775432025f43cafbb7063b5923286bbd700cdf0",
-   "sha256": "0q6svybyd73zadr0ymq0a6qydsrg547c5ax4f8kpgla0mc086w9m"
+   "commit": "9d15bc75a34052f7f2749bd38b3d0297ed60b29a",
+   "sha256": "07ysaihl24fiqz8n6hvdvaj53nyalk68dsn073zb8q88sdmzf33w"
   },
   "stable": {
    "version": [
@@ -53154,26 +53560,26 @@
   "repo": "DamienCassou/libelcouch",
   "unstable": {
    "version": [
-    20180604,
-    753
+    20190820,
+    1632
    ],
    "deps": [
     "request"
    ],
-   "commit": "1faa877fd83c31f612eacb1d12645b2b4cfb57ed",
-   "sha256": "01b72d98h00rkkrpdimm1c64f7470z92yjb46y8gv1r76n6zcfy8"
+   "commit": "fd90ff7989632452434fc19a609805f7276821f3",
+   "sha256": "0rpipbcfvi8ysx8aykj9sd23gkzq3knn656g84lb9h1zdjvc4zf1"
   },
   "stable": {
    "version": [
     0,
-    8,
+    9,
     0
    ],
    "deps": [
     "request"
    ],
-   "commit": "1396144ebbb9790d4c744db0d4aacc0211b8e8e6",
-   "sha256": "1r0wrqiqar3jw5xbp1qv7kj7m1fdzciyy9690hwiq99dcm8nlri3"
+   "commit": "fd90ff7989632452434fc19a609805f7276821f3",
+   "sha256": "0rpipbcfvi8ysx8aykj9sd23gkzq3knn656g84lb9h1zdjvc4zf1"
   }
  },
  {
@@ -53214,20 +53620,20 @@
   "repo": "mpdel/libmpdel",
   "unstable": {
    "version": [
-    20190427,
-    528
+    20190827,
+    1905
    ],
-   "commit": "38633ef7a1a40740d1a9528c4f0f0d40d489d9fe",
-   "sha256": "1fk4irsx916q81qpy6d6iarg8q30r1xm9syz63i8pfdf08l6wphj"
+   "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9",
+   "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln"
   },
   "stable": {
    "version": [
     1,
-    0,
+    1,
     0
    ],
-   "commit": "38633ef7a1a40740d1a9528c4f0f0d40d489d9fe",
-   "sha256": "1fk4irsx916q81qpy6d6iarg8q30r1xm9syz63i8pfdf08l6wphj"
+   "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9",
+   "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln"
   }
  },
  {
@@ -53297,8 +53703,8 @@
     20180219,
     1024
    ],
-   "commit": "4abfd658dd0985b960da08a3ec426cd860d57d2a",
-   "sha256": "1fqgwydk5cw98nb7m9rq7cmmmmh3qfhwvq2b4lvv47ahk9113402"
+   "commit": "a00f8e380a8b87269a8ea0b68af63383a74ca5e8",
+   "sha256": "024hsx5jhr9myssmw60mxyizbj184hq6zxv8b0k1ivll026hbnpi"
   },
   "stable": {
    "version": [
@@ -53504,6 +53910,30 @@
    "sha256": "01ycjy3amzbplp3zf0x5fahsja92gyg2252xhzcyiazmhaz7gkrd"
   }
  },
+ {
+  "ename": "lisp-butt-mode",
+  "commit": "ec923a5f6018404171e6ffc3fb36a649e8defb1b",
+  "sha256": "0n6inbcjcpw5l95r3z63bdzld3bn3i5ywl2niqfhh9dfv2k1k5wc",
+  "fetcher": "gitlab",
+  "repo": "marcowahl/lisp-butt-mode",
+  "unstable": {
+   "version": [
+    20190822,
+    1102
+   ],
+   "commit": "3199954a70594405ccb7b193e6e471264eae7b87",
+   "sha256": "12qvycibrxsd3mlpj7x673kwfxhyhg3266ghf3r11179yh12hgy9"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    3
+   ],
+   "commit": "f6ccceda1618aad0ec5a665dab912a7ebbc32f08",
+   "sha256": "0w4i478aybp9ca09ixmzsda83l9igqx5ryv0g8vpkmd2vg3r0dcy"
+  }
+ },
  {
   "ename": "lisp-extra-font-lock",
   "commit": "13e01d4faf9ecb4dde8b6eb4acdb0e48e3e5b6ea",
@@ -53542,8 +53972,8 @@
   "repo": "abo-abo/lispy",
   "unstable": {
    "version": [
-    20190802,
-    1214
+    20190827,
+    1516
    ],
    "deps": [
     "ace-window",
@@ -53552,8 +53982,8 @@
     "iedit",
     "zoutline"
    ],
-   "commit": "beb939a1afaf8ee39955b7bc0bc65326df817f48",
-   "sha256": "101hqw794a8hcrcwvjjzxydcdlwdvxxfhbablcafpiqj1dr4vn9m"
+   "commit": "7130b9d36f6d7eaed61e911772ba23e0c36659b3",
+   "sha256": "1swihyr4ir3a74kl8vppbl8s4yf3mwrvrjrpdfgvva0jys03bhsx"
   },
   "stable": {
    "version": [
@@ -54445,11 +54875,11 @@
   "repo": "jschaf/emacs-lorem-ipsum",
   "unstable": {
    "version": [
-    20140911,
-    2108
+    20190819,
+    2042
    ],
-   "commit": "4b39f6fed455d67f635b3837cf5668bf74d0f6cd",
-   "sha256": "0a3b18p3vdjci89prsgdzjnfxsl8p67vjhf8ai4qdng7zvh50lir"
+   "commit": "da75c155da327c7a7aedb80f5cfe409984787049",
+   "sha256": "04h97vnd758gsdfg30wkrhnh4hz7k63xbrw178dxfcwsylq32wi0"
   }
  },
  {
@@ -54514,8 +54944,8 @@
     "haskell-mode",
     "lsp-mode"
    ],
-   "commit": "8f2dbb6e827b1adce6360c56f795f29ecff1d7f6",
-   "sha256": "00j6d5rpsi7h5jz54zpjmbpg38fda4xy67xc4x67r834493ldzlq"
+   "commit": "64106be79350f9ce6903d22c66b29761dadb5001",
+   "sha256": "1d2jvcsx0x7w7f9q93gdi4x2fc6ymyr7d213m9ca5jj52rxjfsm2"
   }
  },
  {
@@ -54544,8 +54974,8 @@
   "repo": "emacs-lsp/lsp-java",
   "unstable": {
    "version": [
-    20190726,
-    817
+    20190817,
+    1436
    ],
    "deps": [
     "dash",
@@ -54556,8 +54986,8 @@
     "markdown-mode",
     "request"
    ],
-   "commit": "f407a9a7742fb3890bf9e2d8b8a83a0b9b39ee78",
-   "sha256": "0yyvbw398fn7dpjq3hj7hpc79fi1xzq9ggwldrfmb3717b4ba680"
+   "commit": "ccc40d3249c031e34fec13d4b82da694addb0274",
+   "sha256": "1nb40nnj7caz2mvfwnpwnicck1ippvnqhypqcglp6bvvz75h32z9"
   },
   "stable": {
    "version": [
@@ -54604,8 +55034,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20190813,
-    451
+    20190828,
+    1641
    ],
    "deps": [
     "dash",
@@ -54615,23 +55045,24 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "e4efbab6704e6b1241cccfa0992dbcc4ba08cdcb",
-   "sha256": "0by7frvvf1swarswa7vfv1pgq2pirvx5jl61nxdw3q2l1ak4v7mr"
+   "commit": "4835feb8189fab4b00ba54ba73837c931022931d",
+   "sha256": "0f859fhy245aq6r0w4ibyaqjr1i4s1f850w4867f9knfw67zj64h"
   },
   "stable": {
    "version": [
     6,
-    0
+    1
    ],
    "deps": [
     "dash",
     "dash-functional",
     "f",
     "ht",
+    "markdown-mode",
     "spinner"
    ],
-   "commit": "789b672500dcbb2350bb5b667ffc0fd037a8b2e3",
-   "sha256": "1v1mq6ixzlgiazj8fmg4xaqhsqn3l89iqy74yndhvzh2rdf0pbkl"
+   "commit": "50ddaf439cd62033d3bc0d12cca341fb0d4e1382",
+   "sha256": "0jn5slhv9zfs446a5966bfg9dq144g22v79wnkx9hxq7if78p652"
   }
  },
  {
@@ -54708,8 +55139,8 @@
   "repo": "emacs-lsp/lsp-python-ms",
   "unstable": {
    "version": [
-    20190809,
-    640
+    20190826,
+    1758
    ],
    "deps": [
     "cl-lib",
@@ -54717,8 +55148,8 @@
     "lsp-mode",
     "python"
    ],
-   "commit": "8b18a98ad68373aa4d7ef24ec728a250ca570a2a",
-   "sha256": "1mz6hy1k0g3m5x4cvyqb68811aa2iabmjw4v2qbjfwd5jbmyvy21"
+   "commit": "d2f9bddc3988a43e680b858e9da44f7b0a0eae55",
+   "sha256": "0hmmv8rjg89bgkhsf2wcllmz3rljhnnncg00wsiz6fiwh0dw8lpp"
   }
  },
  {
@@ -54766,8 +55197,8 @@
   "repo": "emacs-lsp/lsp-treemacs",
   "unstable": {
    "version": [
-    20190724,
-    1649
+    20190829,
+    2110
    ],
    "deps": [
     "dash",
@@ -54777,8 +55208,8 @@
     "lsp-mode",
     "treemacs"
    ],
-   "commit": "e3e049cb441ec5a8f43730da93996f73f6a6db95",
-   "sha256": "14v8lww136np4pmaq1hqlrpqi6kkpi367cjvfy0s92m3dv7yywsf"
+   "commit": "3adf416da2fcd7dd4eac33f87c3eff66d5b67624",
+   "sha256": "0dqa7ny01v7k16pjrb42393blccvck650803hbsf1bp40ainaks9"
   }
  },
  {
@@ -54789,8 +55220,8 @@
   "repo": "emacs-lsp/lsp-ui",
   "unstable": {
    "version": [
-    20190809,
-    1907
+    20190823,
+    541
    ],
    "deps": [
     "dash",
@@ -54798,8 +55229,8 @@
     "lsp-mode",
     "markdown-mode"
    ],
-   "commit": "1cfff2135ffbf7ac52d9c2ece3f2bd157ac51167",
-   "sha256": "1pbqjrhdv3n73p785fj3gl11rpaim0my78gp530239w10q5i7g9z"
+   "commit": "845fbd40f20d63b9eff592ddefeefd2263f6b27c",
+   "sha256": "0z8cds09wv275ckx13dbw6z84lfldij2lfx0az7cj1hkfsrwhxd4"
   },
   "stable": {
    "version": [
@@ -54902,11 +55333,11 @@
   "repo": "abo-abo/hydra",
   "unstable": {
    "version": [
-    20190716,
-    1741
+    20190821,
+    947
    ],
-   "commit": "a91dd72529aadd2d3cc14e132a3e0545eb2975a6",
-   "sha256": "1bbyj0l6176277qp20034lgs8ghx01fasnikkc76fndn3v4vsljn"
+   "commit": "435c55e9f75a8cf3ae6a4ba0c7725e3dc4e5963f",
+   "sha256": "0nzbjx5rnmzl0dhbrrmb5kbcmww6hzs1vwa62nlg9zfwq99zk42l"
   },
   "stable": {
    "version": [
@@ -55232,8 +55663,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20190812,
-    1330
+    20190825,
+    1416
    ],
    "deps": [
     "async",
@@ -55242,8 +55673,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "75d0810d131e2e61ae3c683797a10a2caca96073",
-   "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq"
+   "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021",
+   "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc"
   },
   "stable": {
    "version": [
@@ -55303,15 +55734,16 @@
   "repo": "abrochard/magit-circleci",
   "unstable": {
    "version": [
-    20190722,
-    1533
+    20190814,
+    1723
    ],
    "deps": [
+    "dash",
     "magit",
     "transient"
    ],
-   "commit": "a423b12d3158982cccf39a3d72f6fa00c4c6f387",
-   "sha256": "00xwfqdnajrykj0l3kzh4y3hp4rrbmyaj8wrwffswyylsacf9kca"
+   "commit": "03101bd9cdbdfd779471a4c6d3d00ebadc8ca4a2",
+   "sha256": "10jr06257g3wx45rrx8jp1lxrlf5xx9w07832p2jpwfvqwi9w0xh"
   }
  },
  {
@@ -55556,8 +55988,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "75d0810d131e2e61ae3c683797a10a2caca96073",
-   "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq"
+   "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021",
+   "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc"
   }
  },
  {
@@ -55713,14 +56145,14 @@
   "repo": "emacsorphanage/magit-svn",
   "unstable": {
    "version": [
-    20190324,
-    1459
+    20190821,
+    1455
    ],
    "deps": [
     "magit"
    ],
-   "commit": "f7dad9b0f6b81b23550ea5cca0f3219f184b746c",
-   "sha256": "1dpljj5l0jf28xsynj9wsgbn6wh6llx0wxvigrv37ccvrz4k2fgg"
+   "commit": "2cff1a30a30f2b3963342a7d185ec13fc12279c3",
+   "sha256": "0c4bn9wjjwb0f6hzh7d6vz33lrf75kal62329drzmbh1sla2s3h3"
   },
   "stable": {
    "version": [
@@ -55836,6 +56268,38 @@
    "sha256": "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q"
   }
  },
+ {
+  "ename": "magit-vcsh",
+  "commit": "9ee290ad797511ccc4ee2e1d3d773672796da3f9",
+  "sha256": "025ggdb40js7nmg0fqw3ncki4krswwyvl4q1m8250k09g5r57zij",
+  "fetcher": "gitlab",
+  "repo": "stepnem/magit-vcsh-el",
+  "unstable": {
+   "version": [
+    20190817,
+    2014
+   ],
+   "deps": [
+    "magit",
+    "vcsh"
+   ],
+   "commit": "fcff128cdbe3ef547dc64f2496cb6405b8ee21ca",
+   "sha256": "0x0dwl163qpws5d6h628if8iyzzxig9f7j1n7q6fxkbymx0js0vj"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    1
+   ],
+   "deps": [
+    "magit",
+    "vcsh"
+   ],
+   "commit": "fcff128cdbe3ef547dc64f2496cb6405b8ee21ca",
+   "sha256": "0x0dwl163qpws5d6h628if8iyzzxig9f7j1n7q6fxkbymx0js0vj"
+  }
+ },
  {
   "ename": "magithub",
   "commit": "e555b46f5de7591aa8e10a7cf67421e26a676db8",
@@ -55936,28 +56400,28 @@
   "repo": "jerrypnz/major-mode-hydra.el",
   "unstable": {
    "version": [
-    20190715,
-    937
+    20190814,
+    952
    ],
    "deps": [
     "dash",
     "pretty-hydra"
    ],
-   "commit": "854827d0585a4fc9310708bfae2514957f4dc341",
-   "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb"
+   "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992",
+   "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc"
   },
   "stable": {
    "version": [
     0,
     2,
-    0
+    1
    ],
    "deps": [
     "dash",
     "pretty-hydra"
    ],
-   "commit": "854827d0585a4fc9310708bfae2514957f4dc341",
-   "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb"
+   "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992",
+   "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc"
   }
  },
  {
@@ -56373,6 +56837,24 @@
    "sha256": "1x3anvy3hlmydxyfzr1rhaiy502yi1yz3v54sg8wc1w7jrvwaj29"
   }
  },
+ {
+  "ename": "mark-thing-at",
+  "commit": "bf5429d251d45fb9eb6d3c677b695f5298b1fb91",
+  "sha256": "1hzahlfxyqs47k406grxsi0qfgcx76884scnnlj2xirszd6j5mpz",
+  "fetcher": "github",
+  "repo": "plandes/mark-thing-at",
+  "unstable": {
+   "version": [
+    20190817,
+    1623
+   ],
+   "deps": [
+    "choice-program"
+   ],
+   "commit": "0d2220fdc81c33a36ab5f136856f9f2f79cd01a7",
+   "sha256": "0xxip63gkq76lhlafpgklpnj3n345fw95pdwhn5blzsjrx77ig6h"
+  }
+ },
  {
   "ename": "mark-tools",
   "commit": "9ca36020392807aca9658d13481868d8b6c23d51",
@@ -57278,8 +57760,8 @@
     20190718,
     1023
    ],
-   "commit": "bd94d345bf19e612c11737de2d7d401bcc4348a6",
-   "sha256": "167bh65vjpmqvfn6wvi8dd2c4n3dd1zw3m5y96wcgpiqvwjb01gm"
+   "commit": "a2fff37a09159ce94a3229ce137bb4e6e552339f",
+   "sha256": "12786wl1zmhdj5kkvfm9zv02j0lnrja18yrbc286v33xa77lpiwc"
   },
   "stable": {
    "version": [
@@ -57299,14 +57781,14 @@
   "repo": "Khady/merlin-eldoc",
   "unstable": {
    "version": [
-    20190314,
-    806
+    20190830,
+    517
    ],
    "deps": [
     "merlin"
    ],
-   "commit": "09760346e34ac22f2b55f43f0e36a2865c3b8026",
-   "sha256": "12bba6f6qxi6azlafzhymqyaf57qi479n34crixmk8v69ivdch8y"
+   "commit": "db7fab1eddfe34781b7e79694f8923b285698032",
+   "sha256": "1c13cgmi8z69b5imd9zlagfgrsdl3qv73n24wgc4ih99w1c7sc08"
   },
   "stable": {
    "version": [
@@ -57483,11 +57965,11 @@
   "repo": "kazu-yamamoto/Mew",
   "unstable": {
    "version": [
-    20190415,
-    338
+    20190825,
+    2345
    ],
-   "commit": "70d6da044a4f6ac8e40e489d4963b8a3d530b8a9",
-   "sha256": "0j569nski5f3z26qa1scpzbsx3xdvmw9sxhm1m9wj3ac5kvgk9hn"
+   "commit": "3bc70db24c4f1410eb91017ea37173ba7da70281",
+   "sha256": "054fcl303jjkswnjyx5apas8l6v8f8m3haxsvhn7f1xbcxvjmr9s"
   },
   "stable": {
    "version": [
@@ -57524,8 +58006,8 @@
     20190324,
     1908
    ],
-   "commit": "b18648118144c0a3f7c1d74aad3e98ff16402e2e",
-   "sha256": "0i8gc4n691fhfn4p99k08bcd5sddn9wjh3cr5djbfh3x78gm4m32"
+   "commit": "b79e48dd775de3e1a08e445953243f1491e244cf",
+   "sha256": "0b4kmm09c70jsidrvpla99p9sy9n2d3x628fxrd2z0l6rfwpcyrj"
   },
   "stable": {
    "version": [
@@ -57551,8 +58033,8 @@
    "deps": [
     "calfw"
    ],
-   "commit": "56e58bb8f22d621d271ada64b98eb6e09595e462",
-   "sha256": "1bz5s7y7jb00acgk140rbd2rr1i6ajnqvxbgs3yp19cxfnspbcj5"
+   "commit": "86d3682ff9491893da671237be3cde0b0010ca85",
+   "sha256": "0md61pfjvx8xakahpig39ldfzvwdjgr19qxr78c7bzl98hbjpgq4"
   },
   "stable": {
    "version": [
@@ -57720,6 +58202,24 @@
    "sha256": "187xynmpgkx498an246ywrqdhyyp2ag1l7yxnm0x0rbfgw67q5j1"
   }
  },
+ {
+  "ename": "mini-modeline",
+  "commit": "d8d20ab65df4c4a85a59a2a926ea14a262375490",
+  "sha256": "17zm255a85vmxc07h5cr6gcsb92gf8q5ma52z622ridbvzvfc5yc",
+  "fetcher": "github",
+  "repo": "kiennq/emacs-mini-modeline",
+  "unstable": {
+   "version": [
+    20190824,
+    1308
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "d0ed5f1ac1ff5cdb1db5fb2a99f2a09b9bc6f089",
+   "sha256": "0i1b220b5kb0h0yhn5s3dgnlvf6r9hd0iazh9nqbnw28n92gvp01"
+  }
+ },
  {
   "ename": "minibuf-isearch",
   "commit": "ebfd2f3f6a2dbd251c321738a4efaacc2200164b",
@@ -58298,8 +58798,8 @@
     20181029,
     516
    ],
-   "commit": "4985ba42f5a19f46ddbf9b3622453a9694995ce5",
-   "sha256": "13n3di05lgqfm4f8krn3p36yika5znhymp5vr2d747x54hqmgh7y"
+   "commit": "bec2268fb42db58d22479a7b7ca3a956ead1af94",
+   "sha256": "0yqdc1z6n9cpa16drjij2r77yqk9jhj1z532cnyqnk7r90avbhzs"
   },
   "stable": {
    "version": [
@@ -58683,11 +59183,11 @@
   "repo": "takaxp/moom",
   "unstable": {
    "version": [
-    20180910,
-    438
+    20190820,
+    1114
    ],
-   "commit": "a8820f19a8168ab395ba835872606280ad96916d",
-   "sha256": "1lpkmbabw9n50hf7yr6n4aim8x0km1wa15mpf7mv9w91ca2blg5d"
+   "commit": "52fe3ed21490e6a5266e5d2d7111199b997c2400",
+   "sha256": "00zk1ssfmks4bnw8j4zfxnjsvjzgdf9a3wb08h8jnbpkh48zff7i"
   },
   "stable": {
    "version": [
@@ -58974,6 +59474,25 @@
    "sha256": "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"
   }
  },
+ {
+  "ename": "mozc-cand-posframe",
+  "commit": "2c952ffcf7c2c358500df86e3ddeb6a10a119725",
+  "sha256": "0spxc1z7glls47k6cpq14cpbx9h0svl9qn954x8f1c7kcdy4wz6p",
+  "fetcher": "github",
+  "repo": "akirak/mozc-posframe",
+  "unstable": {
+   "version": [
+    20190817,
+    2037
+   ],
+   "deps": [
+    "mozc",
+    "posframe"
+   ],
+   "commit": "20df08f0bf239bc2a686ff2c6d9390b5ea6d89fa",
+   "sha256": "0azcwdig6xp5vxr6yidmnbqbrfhgb7jwfmyk4cci5ca8sfm4ycvp"
+  }
+ },
  {
   "ename": "mozc-im",
   "commit": "4b651b7f1c15b44577b3c2b7493264ed802cf073",
@@ -59066,14 +59585,15 @@
   "repo": "mpdel/mpdel",
   "unstable": {
    "version": [
-    20190507,
-    1339
+    20190827,
+    1854
    ],
    "deps": [
-    "libmpdel"
+    "libmpdel",
+    "navigel"
    ],
-   "commit": "1eb87264b6955235348880904378c199d65e3fa7",
-   "sha256": "0y43i4bngjnzv457kx7f6k38jsmsk4izfwx57pfp8bqz6f2yssb6"
+   "commit": "a16ff55e93109c37a204cde9a29699eb0b1d8e6f",
+   "sha256": "01kvgs4z4ppif339l8dq74ipjjyl8rdh0k03xy7zdivdna3mf06i"
   },
   "stable": {
    "version": [
@@ -59631,14 +60151,14 @@
   "repo": "magnars/multiple-cursors.el",
   "unstable": {
    "version": [
-    20190317,
-    1211
+    20190820,
+    749
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "5ffb19af48bf8a76ddc9f81745be052f050bddef",
-   "sha256": "11cnwg0szk0fk6nf853pc1gisjh6gcq6ic0673qggg03ly77p87c"
+   "commit": "b9b851a7670f4348f3a08b11ef12ed99676c8b84",
+   "sha256": "0gg781vaa8jhmq5pdis3lwx3k114a0an2ggzhgqyrx0y3wic51ff"
   },
   "stable": {
    "version": [
@@ -60443,6 +60963,36 @@
    "sha256": "0i0icyaa2zzzl0cr9n1zv44pg2lric8gic58dkjxjv8yyk6y01cn"
   }
  },
+ {
+  "ename": "navigel",
+  "commit": "af52934237a069f70b8be136576562ba45c04ffc",
+  "sha256": "0ns2f1p943d2mfai6fdl87swcwh0sgmv0m3wz1kf73zh6vi4i277",
+  "fetcher": "github",
+  "repo": "DamienCassou/navigel",
+  "unstable": {
+   "version": [
+    20190828,
+    449
+   ],
+   "deps": [
+    "tablist"
+   ],
+   "commit": "6f53ec5c5c070b524624ef23ea6a096f9d7c8af7",
+   "sha256": "197n5p9x1sbrghgnqzbapmdcbqcwqvkibpmfa2qadlvb9plry50m"
+  },
+  "stable": {
+   "version": [
+    0,
+    6,
+    0
+   ],
+   "deps": [
+    "tablist"
+   ],
+   "commit": "6f53ec5c5c070b524624ef23ea6a096f9d7c8af7",
+   "sha256": "197n5p9x1sbrghgnqzbapmdcbqcwqvkibpmfa2qadlvb9plry50m"
+  }
+ },
  {
   "ename": "navorski",
   "commit": "9246cef94029d2da2211345c076ed55deb91e8fa",
@@ -60864,11 +61414,11 @@
   "repo": "aaronjensen/night-owl-emacs",
   "unstable": {
    "version": [
-    20190808,
-    2050
+    20190825,
+    1559
    ],
-   "commit": "16fdaa15593cd86daf1100852045cdbd5c242d49",
-   "sha256": "0w4q9ar0kn0fgp554dwwb488za8kf80mi1dl0fh748b54m70j2c4"
+   "commit": "44c1b98f7c0d8b7ad31d6e1b3382bcf0294e03f2",
+   "sha256": "1nv2s0rz8ihixqxhxj3qn3h0zxfphgjzvldv3y32cg50gxnrb85n"
   },
   "stable": {
    "version": [
@@ -60906,8 +61456,8 @@
   "repo": "nim-lang/nim-mode",
   "unstable": {
    "version": [
-    20190710,
-    2254
+    20190823,
+    1009
    ],
    "deps": [
     "commenter",
@@ -60915,8 +61465,8 @@
     "flycheck-nimsuggest",
     "let-alist"
    ],
-   "commit": "0d46c05cdfa65d37f8cb5da860ff3052782f6bbd",
-   "sha256": "1lzrfllmcya7l2aqbh0j5wly3dx3wvag3b8gbmpjzd7cm4m6nax7"
+   "commit": "3fb6643ff684c5b5f3812cf66ea370a9c0e9559e",
+   "sha256": "1smv4a8rx9minmnw2vx8542lq6wy6n2prcxsvzrrilpykz1qdg38"
   },
   "stable": {
    "version": [
@@ -60942,11 +61492,11 @@
   "repo": "m-cat/nimbus-theme",
   "unstable": {
    "version": [
-    20190810,
-    1848
+    20190815,
+    1740
    ],
-   "commit": "0bbdedd23361ffbd7199c70481803b708fb65d59",
-   "sha256": "1v4cisqlqh2lqql29459lb475r4k95gz8qdvsn89hl58s27iq420"
+   "commit": "d2e627024ab7ce608b5203d4084c6a1588621545",
+   "sha256": "12zdk161d18f1yl6linx2g4fw1p4x68n5fbikkklw0ssqj0liqy2"
   }
  },
  {
@@ -60960,8 +61510,8 @@
     20181024,
     1439
    ],
-   "commit": "bd17f236231a58c44f1f5f09ff925aa666d672b7",
-   "sha256": "0xgb954shsahj8vm0mncl85cmy74xxxdqh4fp4bjv10gl8z2p8hf"
+   "commit": "61f90e918b608413daf07ffcb5c5c0930416951a",
+   "sha256": "1wsq7ap7yn5lvvb52ggzh7qk8wr8s4lfiip9v2qp73q25mlqnxww"
   },
   "stable": {
    "version": [
@@ -61214,8 +61764,8 @@
   "repo": "dickmao/nnreddit",
   "unstable": {
    "version": [
-    20190812,
-    2056
+    20190819,
+    2331
    ],
    "deps": [
     "anaphora",
@@ -61224,8 +61774,8 @@
     "request",
     "virtualenvwrapper"
    ],
-   "commit": "3e6c4a5cd073d3d02aad0620cb00201e1f659fa5",
-   "sha256": "0k85hvp88i4rmv4igwhflw1rf307wxqk7l0qipybgbccs2zca5hc"
+   "commit": "c16a75a6fd99f5c47f10b349131be1c3d85bbe9b",
+   "sha256": "0gabznnvg9gxd6rrvcik2iyrlmpl409vc5k37c3vfjrnjqnwk6ra"
   }
  },
  {
@@ -61251,14 +61801,14 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20190730,
-    2037
+    20190811,
+    1527
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "b36e1d28b97693850da258e103f24c40ec882753",
-   "sha256": "17y0m1n8vn6p0qykphbpbjbm3gzd2wprw6i2nwfd4g718hbsrkwi"
+   "commit": "e1e79c0211ad924ca220dac3a7a1a2e40710c073",
+   "sha256": "0cc4x62wynf71hzqk7gwx8g58gl4hm65pv0df8cir8g344li1c15"
   },
   "stable": {
    "version": [
@@ -61564,8 +62114,8 @@
     20190525,
     1602
    ],
-   "commit": "17806ecc955ce0375146ea1df51eae061a72bef8",
-   "sha256": "1ishc13x25c4gxkgb9h1c7s16b5h2wrsxn1pk8vpykziippkjwxs"
+   "commit": "e13862f127394fd4addc5d2cf604b3af399c8377",
+   "sha256": "0w2jzv378bkkvwb6k7i6sfpis6hf8zpgwx8m2sa44ry3hixqmbgw"
   },
   "stable": {
    "version": [
@@ -61614,28 +62164,28 @@
   "repo": "wasamasa/nov.el",
   "unstable": {
    "version": [
-    20190611,
-    922
+    20190821,
+    1920
    ],
    "deps": [
     "dash",
     "esxml"
    ],
-   "commit": "b57fae0814502496796ce5b8170d779b64df42a9",
-   "sha256": "15s0r64w37m7a8kbcm47svvadaz6amqb9zirmyv7placbrfyaqzp"
+   "commit": "ecbdecc927a3b3f7e0927d225e6e6464c244c2ae",
+   "sha256": "0z6h3vgp0vawr96ni7814csdzkq7q710kya8raf9ii90fkzwhpi1"
   },
   "stable": {
    "version": [
     0,
     2,
-    8
+    9
    ],
    "deps": [
     "dash",
     "esxml"
    ],
-   "commit": "b57fae0814502496796ce5b8170d779b64df42a9",
-   "sha256": "15s0r64w37m7a8kbcm47svvadaz6amqb9zirmyv7placbrfyaqzp"
+   "commit": "5184fbb1f3b3540be58a28f6dd469ff212ccc9bd",
+   "sha256": "0v01l1p35mcigixs6j4c5bpc7n7bd51kxa0p3l1xl0gr92774yq3"
   }
  },
  {
@@ -61762,8 +62312,8 @@
     20181022,
     2154
    ],
-   "commit": "b16092e8058af63ad2bc222f166b0aa3cb66bf9d",
-   "sha256": "0m1ih8ca4702zrkhl3zdvwbci96wyjlxhpfx95w372k25rca87dq"
+   "commit": "1efc30d38509647b417f05587fd7003457719256",
+   "sha256": "0px64jsdps477s9xiw96mhcf1fmgxf0gsp30gzhqfb1b1k4f306j"
   },
   "stable": {
    "version": [
@@ -63171,14 +63721,14 @@
   "repo": "oer/oer-reveal",
   "unstable": {
    "version": [
-    20190731,
-    811
+    20190826,
+    718
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "e6cd154de8cfa0382495a047804e3b1ac90b431c",
-   "sha256": "1kf7daxs7p58lw7m09ygisyhm8hnzsdp74f1wqwb5fbl5zxhhmpq"
+   "commit": "f62fe1497be473d776d22094a02cfff381c61cfc",
+   "sha256": "088khyvflg4akdszkpalv2j49g25g10b0xzrjji2h2lgb1w5dg1m"
   }
  },
  {
@@ -63548,10 +64098,10 @@
  },
  {
   "ename": "opam",
-  "commit": "fc4e2076ebaefe7e241607ff6920fe243d10ccd0",
-  "sha256": "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa",
+  "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0",
+  "sha256": "0hd08sb645jxz72m4g0jaggxa6l1dgimzgvd3mvvadihj6xkr2p3",
   "fetcher": "github",
-  "repo": "lunaryorn/opam.el",
+  "repo": "emacsorphanage/opam",
   "unstable": {
    "version": [
     20150719,
@@ -63896,6 +64446,30 @@
    "sha256": "0gkv2sfl9nb64qqh5xhgq68r9kfmsny3vpcmnzk2mqjcb9nh657s"
   }
  },
+ {
+  "ename": "org-analyzer",
+  "commit": "1e264f0cbd4ce919d28ae7b2fa00752dc83491fc",
+  "sha256": "18390jllqx2md5y5fjprx90nx11i0h1mdqx2q8jzv7napw957b1d",
+  "fetcher": "github",
+  "repo": "rksm/clj-org-analyzer",
+  "unstable": {
+   "version": [
+    20190827,
+    2211
+   ],
+   "commit": "e55960609c1ccd5feda307e28e72eac1f07e8e28",
+   "sha256": "0y1x04046gifmky3i46i23anr6q2f7ynj7lxp18v2iah3ri99v8f"
+  },
+  "stable": {
+   "version": [
+    0,
+    3,
+    5
+   ],
+   "commit": "10fe5da1bbad72093b784fb8c4c262e9daaa8b97",
+   "sha256": "0gf3bw8c5yll07mvh0ippvkqyf3m5bf36mwxabmmc64fpy0xb3jc"
+  }
+ },
  {
   "ename": "org-attach-screenshot",
   "commit": "f545cd8d1da39e7fbd61020e178de30053ba774b",
@@ -64048,14 +64622,14 @@
   "repo": "Kungsgeten/org-brain",
   "unstable": {
    "version": [
-    20190809,
-    1315
+    20190830,
+    757
    ],
    "deps": [
     "org"
    ],
-   "commit": "0f984e01a982ded563df9fab5355a29f781b2430",
-   "sha256": "09m4vsfmqfni5jdwxpkhfg3jzbd69d3di1z9wdc9bvbxrrd03a3a"
+   "commit": "e8a0dd5dd04c17dbbc954f3f2ec985996a539f01",
+   "sha256": "05l2yy3886nvkplca09q45lpzpwzx8fxd7fr96b4nb5i1187bagx"
   }
  },
  {
@@ -64090,14 +64664,14 @@
   "repo": "dengste/org-caldav",
   "unstable": {
    "version": [
-    20190812,
-    1918
+    20190817,
+    1004
    ],
    "deps": [
     "org"
    ],
-   "commit": "1fd520490303d9a3e45187f2fe56f00ac403c214",
-   "sha256": "1m1ics2pd7x07ylbkmm1darbqdzrp29x3jlckr1bwizk9dwaz0r4"
+   "commit": "a563500c9884f38ce08793e2964f8274adde163d",
+   "sha256": "18qi1iv5dc0gsvkv9ifal3cjpm568nlb907v8a53cnm4439x1l0l"
   }
  },
  {
@@ -64153,14 +64727,14 @@
   "repo": "Chobbes/org-chef",
   "unstable": {
    "version": [
-    20190807,
-    1453
+    20190815,
+    1459
    ],
    "deps": [
     "org"
    ],
-   "commit": "f42d75a9787f9644f03b6f9a379bbc40f6397605",
-   "sha256": "0ra8ky67i2f4saqv265dby0r1x9n4lv8vn607g0z7c9myff6bxnf"
+   "commit": "8715302a16b5dc2cafee732a4e6b10a263d65328",
+   "sha256": "0l656xd2zp7l7xb5qs8fw8qsa8sdw5fp305lwiz66zq041xcpg4w"
   }
  },
  {
@@ -64421,14 +64995,14 @@
   "repo": "abo-abo/org-download",
   "unstable": {
    "version": [
-    20190604,
-    1340
+    20190830,
+    1448
    ],
    "deps": [
     "async"
    ],
-   "commit": "ac72bf8fce3e855da60687027b6b8601cf1de480",
-   "sha256": "0ax5wd44765wnwabkam1g2r62gq8crx2qq733s2mg1z72cfvwxqb"
+   "commit": "10c9d7c8eed928c88a896310c882e3af4d8d0f61",
+   "sha256": "0i8wlx1i7y1vn5lqwjifvymvszg28a07vwqcm4jslf1v2ajs1lsl"
   },
   "stable": {
    "version": [
@@ -64700,8 +65274,8 @@
   "repo": "kidd/org-gcal.el",
   "unstable": {
    "version": [
-    20190812,
-    951
+    20190826,
+    2152
    ],
    "deps": [
     "alert",
@@ -64709,8 +65283,8 @@
     "org",
     "request-deferred"
    ],
-   "commit": "f0f9dc2ba7a5075b4f6755f96399c9dfee299ac7",
-   "sha256": "0s6bcyhg059409s0w191m1hpd8nfi1478jsilnby5fn1jhgdjmga"
+   "commit": "149ea8ee6ce538742d65d5a7925ab4536f421b1d",
+   "sha256": "02myllpdlizaqxfa8c8dk14481ly3c1yzb79dg1acna132p6sn93"
   },
   "stable": {
    "version": [
@@ -64810,11 +65384,11 @@
   "repo": "marcIhm/org-index",
   "unstable": {
    "version": [
-    20190703,
-    1328
+    20190829,
+    1443
    ],
-   "commit": "eeed0584b1ebcc29bdbfd354e23141fe9f94b945",
-   "sha256": "0bfxl3ab1xpbpyvcr0qx6nk4lc1xm9ci29klqnr9msy5i94i6b8k"
+   "commit": "687c10cb4a2c4a66730bdfce161068bc6b0d2fa2",
+   "sha256": "1nnj7zzcbrmlnnd6q6739pqm8jsmlik2ci6zlfpd05sj7kmg0l19"
   },
   "stable": {
    "version": [
@@ -64889,11 +65463,11 @@
   "repo": "bastibe/org-journal",
   "unstable": {
    "version": [
-    20190701,
-    1600
+    20190826,
+    1919
    ],
-   "commit": "eb7f9ab2f3e322586551c2f94c548868f8fb7aa2",
-   "sha256": "1h2w608a5r841bjcbacy2z5ph4mhykrg1zphrflz91ypsygn0qnj"
+   "commit": "cb15adcec09a891911bd2a85cbbfd45502e65f00",
+   "sha256": "10daayd273fc1vz6zxzjbi2blww12y2vzg93awmhn9awy5plg75z"
   },
   "stable": {
    "version": [
@@ -64928,7 +65502,7 @@
   "repo": "gizmomogwai/org-kanban",
   "unstable": {
    "version": [
-    20190802,
+    20190821,
     2107
    ],
    "deps": [
@@ -64936,8 +65510,8 @@
     "org",
     "s"
    ],
-   "commit": "1f9e420fd0030049714690c3d98cc75da83255bb",
-   "sha256": "0m9l4xsalavwm82wvlyfphi65lb65mkyp5dvpyjf86ijc9w8crvf"
+   "commit": "dd259135a4c3a320e020a335ea27fb4a2e488a53",
+   "sha256": "0k62s4kz8qmfq21r2jz7kfcyn6ydwxzfa5s2s2f26jny8flqva1d"
   },
   "stable": {
    "version": [
@@ -65068,8 +65642,8 @@
     "cl-lib",
     "seq"
    ],
-   "commit": "50bd8c22cde3b9b091889861e44a5043b53556f7",
-   "sha256": "01xz10xicsq07cyd6b42q3r8wnmsn91zjqkrh014d54alakkwhjj"
+   "commit": "65c09c5deba065752eb88875c54dc26abcdfaffb",
+   "sha256": "11chlfvil0wbvzaplzdymn4ajz85956hcs8bh3zds6ij806mqa4y"
   }
  },
  {
@@ -65222,14 +65796,14 @@
   "repo": "jeremy-compostella/org-msg",
   "unstable": {
    "version": [
-    20190710,
-    2230
+    20190822,
+    2115
    ],
    "deps": [
     "htmlize"
    ],
-   "commit": "2e01080507e2276d5c52140f2c66f692e8e62f47",
-   "sha256": "18l8rjzkrrqmfq86s0m23xry8c92mls8bw019drbqix5g7ijw2gv"
+   "commit": "df89f46a86abed5c39d66ad35b47ab763dd27781",
+   "sha256": "1xm1ym4x1916h8nkm5zpj5q25sj2n9iawibmf2ifk0yr8faaz2jb"
   }
  },
  {
@@ -65290,15 +65864,15 @@
   "repo": "weirdNox/org-noter",
   "unstable": {
    "version": [
-    20190807,
-    1809
+    20190829,
+    2358
    ],
    "deps": [
     "cl-lib",
     "org"
    ],
-   "commit": "d3df267a7432ecf0fb287a645e06dee7e7b80671",
-   "sha256": "0hj2h88zcg6vp3h1dash91gg2k1dqw2bib2glv0cp39b0xaspcsf"
+   "commit": "54e1bc5c1dbb291d4ed55c7961633b2977374055",
+   "sha256": "1kyxphldkqggn384mplvj8r3rbfwz7q8ba64i43b4j0ldglbvwgl"
   },
   "stable": {
    "version": [
@@ -65527,8 +66101,8 @@
   "repo": "org-pivotal/org-pivotal",
   "unstable": {
    "version": [
-    20181216,
-    1436
+    20190823,
+    1530
    ],
    "deps": [
     "a",
@@ -65536,8 +66110,8 @@
     "dash-functional",
     "request"
    ],
-   "commit": "84b026741a3f06ac4979b970a04f5c9bc38b8be1",
-   "sha256": "1dvr40i6zxkyimypk9m3p8jl2ff0xkp9pxdiggi5s6kkcrdw3cl7"
+   "commit": "11bde7699634926369fad0081d5e6d7525ac3260",
+   "sha256": "03zs5y0wm49pma739574sq6aky26l64j3bi6c8k52zzmg3pm3shy"
   }
  },
  {
@@ -65753,8 +66327,8 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20190813,
-    146
+    20190830,
+    1527
    ],
    "deps": [
     "dash",
@@ -65762,8 +66336,8 @@
     "s",
     "ts"
    ],
-   "commit": "5174aca4e8fe956abae7161d15058702bc8874c1",
-   "sha256": "1r2a1j4cdkw7rf981r06c3qc30c2irs3gawzkwxiflslkimpav42"
+   "commit": "58b298153c482e6517995bb94f28e03aaf9924bd",
+   "sha256": "0zkfczvmfwm09diihxr2yn1mdi7hxcd7p4hj4j0fkq6yrf296ca4"
   },
   "stable": {
    "version": [
@@ -65855,28 +66429,28 @@
   "repo": "oer/org-re-reveal",
   "unstable": {
    "version": [
-    20190802,
-    642
+    20190826,
+    749
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "dcbfcb80a3c6fd0f5af25d1fd17d8e0c6582e791",
-   "sha256": "0nm87rmbljw9mjv7fc6ivpqxnwak4xs0wjc903ihwd3y9vmc36p8"
+   "commit": "84edfb6c359b4cdd489a92adf7e31c40a3c893e8",
+   "sha256": "0lz38sjkfja3f4szjw3gb15ckggkr4bjjyb3zdcfli89781zdjrq"
   },
   "stable": {
    "version": [
+    2,
     1,
-    1,
-    10
+    0
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "dcbfcb80a3c6fd0f5af25d1fd17d8e0c6582e791",
-   "sha256": "0nm87rmbljw9mjv7fc6ivpqxnwak4xs0wjc903ihwd3y9vmc36p8"
+   "commit": "6941394ce00f02a1fe8e7db99fe0c0bfc0a19824",
+   "sha256": "0bfbgjlp37ysik8y6a4gcqhbmy73i5p87lhjhp4d13f7dxq9q07p"
   }
  },
  {
@@ -65887,15 +66461,15 @@
   "repo": "oer/org-re-reveal-ref",
   "unstable": {
    "version": [
-    20190804,
-    846
+    20190819,
+    921
    ],
    "deps": [
     "org-re-reveal",
     "org-ref"
    ],
-   "commit": "094fd1d320c64ac361a57402501f0e43787b357c",
-   "sha256": "0r1ns3fm22yxc6zf4p5rvbk49r6966fqfl1caf0w3fyqgvwvllxi"
+   "commit": "12a85e3f6f1b2f4c9e0169c8642a78f71d933633",
+   "sha256": "0c03rd2rr43hbm4s9fd05qmhy98yvqdxg8da3dkwizkynr47f2yn"
   }
  },
  {
@@ -65906,8 +66480,8 @@
   "repo": "alphapapa/org-recent-headings",
   "unstable": {
    "version": [
-    20190807,
-    1016
+    20190817,
+    624
    ],
    "deps": [
     "dash",
@@ -65916,8 +66490,8 @@
     "org",
     "s"
    ],
-   "commit": "c1984fe70322c35ee48b2d8bc410dd0a13ffbbc5",
-   "sha256": "13kcrki9v0w594g8q6rdzfx4002xzs8sz7c5fg7rvrm03sp93dqa"
+   "commit": "6336a0c36ef1048ba1f4e07716a421dce106d082",
+   "sha256": "1lpkjvlm969pr64j25zkpmsacjnr7qbq9zfwwzb9xyqlhaf5zzz0"
   },
   "stable": {
    "version": [
@@ -66195,15 +66769,15 @@
   "repo": "akirak/org-starter",
   "unstable": {
    "version": [
-    20190720,
-    1012
+    20190824,
+    814
    ],
    "deps": [
     "dash",
     "dash-functional"
    ],
-   "commit": "cf99a57ec95773a765e71b764abaff974d7fa278",
-   "sha256": "0ipqzbc3az4mayz49kc504kw0q3pcy6izbcdg8fmqrckgv79x54y"
+   "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae",
+   "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1"
   }
  },
  {
@@ -66214,15 +66788,15 @@
   "repo": "akirak/org-starter",
   "unstable": {
    "version": [
-    20190812,
-    215
+    20190817,
+    1823
    ],
    "deps": [
     "org-starter",
     "swiper"
    ],
-   "commit": "cf99a57ec95773a765e71b764abaff974d7fa278",
-   "sha256": "0ipqzbc3az4mayz49kc504kw0q3pcy6izbcdg8fmqrckgv79x54y"
+   "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae",
+   "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1"
   }
  },
  {
@@ -66287,17 +66861,18 @@
   "repo": "alphapapa/org-super-agenda",
   "unstable": {
    "version": [
-    20190809,
-    1550
+    20190815,
+    2140
    ],
    "deps": [
     "dash",
     "ht",
     "org",
-    "s"
+    "s",
+    "ts"
    ],
-   "commit": "4ad333643276ba1a604e8bec4a72ab68bafb8a94",
-   "sha256": "1rbivi5xjpbs4rbfldhrf0lw7q1nh99nlf8yi11kxf76z6d75vik"
+   "commit": "f65ff8109c97368ad640a6a50aaebd24046ce54a",
+   "sha256": "08aqq5sgj6y8mdj244j8024ampij49q08maws2sb1s40f0a7s697"
   },
   "stable": {
    "version": [
@@ -66707,8 +67282,8 @@
     20190409,
     1815
    ],
-   "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb",
-   "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z"
+   "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3",
+   "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y"
   }
  },
  {
@@ -67025,11 +67600,11 @@
   "repo": "kostafey/organic-green-theme",
   "unstable": {
    "version": [
-    20180522,
-    1620
+    20190828,
+    922
    ],
-   "commit": "200ac4a636eeb6faf1793d1937e62a343debc437",
-   "sha256": "18a04grh4k9npf566xki9fiivy5qvpvv5v8mpj66wfx919fwa44c"
+   "commit": "cde171651b08ef24326127a62992062e25c3e699",
+   "sha256": "0a970fv8y2pvbxw2iy09zyl70c2raacdsysdi6ywkxi63fid5l8r"
   }
  },
  {
@@ -67443,10 +68018,10 @@
  },
  {
   "ename": "osx-trash",
-  "commit": "1f4c86e5b86df6c5c2c484f041fa3e434bbfbbb1",
-  "sha256": "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj",
+  "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0",
+  "sha256": "05saq6w66n55m0wihwia6v2dd08xvblaw1zsbpf40l901flh9mrf",
   "fetcher": "github",
-  "repo": "lunaryorn/osx-trash.el",
+  "repo": "emacsorphanage/osx-trash",
   "unstable": {
    "version": [
     20160520,
@@ -67951,14 +68526,14 @@
   "repo": "kaushalmodi/ox-hugo",
   "unstable": {
    "version": [
-    20190802,
-    1755
+    20190830,
+    1623
    ],
    "deps": [
     "org"
    ],
-   "commit": "470a708152c4a17eca80c49e042d4eeb57645539",
-   "sha256": "0dv068ghbci85y88zcqp6w4qkc8xpgwayh1van05r1k6krms8jms"
+   "commit": "a8e0c6e1ceeecebd5d2cd17dd3062b3e8aecbfcb",
+   "sha256": "0j2prlgb3gprdg9ynaka7y9390qdns6182zj6qpjvayvxkzfi0p5"
   },
   "stable": {
    "version": [
@@ -68065,15 +68640,15 @@
   "repo": "jlumpe/ox-json",
   "unstable": {
    "version": [
-    20190802,
-    350
+    20190819,
+    1506
    ],
    "deps": [
     "org",
     "s"
    ],
-   "commit": "ce99a8a7cb2e2a483d23ebc2f821f3a183cf4b50",
-   "sha256": "0lgcrd4ckjfph4h0ias6cr83bnj903xiyak6pcvskp3wfgwg09wa"
+   "commit": "96b7d330b77b02f7039adabe488595847a008bda",
+   "sha256": "1whysxp4s84lhvgz8vnj2r51dfnk91v5plvbj61rac0077md6df5"
   },
   "stable": {
    "version": [
@@ -68097,11 +68672,11 @@
   "repo": "linktohack/ox-latex-subfigure",
   "unstable": {
    "version": [
-    20190718,
-    1529
+    20190816,
+    1905
    ],
-   "commit": "2e5b679212c33064eb25a8887e19a74897545389",
-   "sha256": "0mfjwwymlbyzppqicakyfl2yimlk48xvbr7sy2maip358898m5rj"
+   "commit": "5436eaf0cb036fed0a2042533ec1466a33cf9493",
+   "sha256": "1j9z7qr5nxbi96s22kkjp10jf29k7i61pwhs68j0lb4v238vdpsj"
   },
   "stable": {
    "version": [
@@ -68646,14 +69221,14 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20190805,
-    1628
+    20190818,
+    1456
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "64a6ac2343c791092ec2e43bab0c91293509c230",
-   "sha256": "0ac6kq9k6n3mznl0x5sgpalfa3v4cx9m0b7jc3s89dnyw6m4wp6h"
+   "commit": "4b71d9a5034953b0beac02b4722f09f43c5e0dbf",
+   "sha256": "1kc20sg0if2g3a2m6pjvwb7ddgcivmqfi104236s04dy4npzkwbm"
   },
   "stable": {
    "version": [
@@ -68895,8 +69470,8 @@
     20190519,
     2238
    ],
-   "commit": "6f19d894bda6a981c10a58df5e23419f4d2ba353",
-   "sha256": "0b9jlqf5hk5m5zywwfcgxjb88aqhij73fxwkp16psfm4bv0zy78p"
+   "commit": "2e1d274e11071bb8daea4d6f4c0369c84466de7a",
+   "sha256": "1w6ckbb8rmi65knwnapyjy9amzcikgw088c6d9h5gqzdknbfdrqc"
   },
   "stable": {
    "version": [
@@ -68999,16 +69574,16 @@
   "repo": "abo-abo/pamparam",
   "unstable": {
    "version": [
-    20190630,
-    1842
+    20190827,
+    1127
    ],
    "deps": [
     "hydra",
     "lispy",
     "worf"
    ],
-   "commit": "ef33bf4a84fa6fdd045e6e3d182429952f240c88",
-   "sha256": "07nlp4wfr7d856jjhxb8zqb9wsb425d6h48k2isy7jm4h7ksfm70"
+   "commit": "6fc4759d5431430ef9b3a182883d7e49ff7369fa",
+   "sha256": "0fmjii2j773alxj6nzg38qhyp3vsxh5x5mkbcazbchq1idfbhzlc"
   }
  },
  {
@@ -69113,11 +69688,11 @@
   "repo": "coldnew/pangu-spacing",
   "unstable": {
    "version": [
-    20190422,
-    514
+    20190823,
+    401
    ],
-   "commit": "3a741c1b669c7194fb766b784c10d52a8de9b87f",
-   "sha256": "12980pwsk4pvvya2x9nbwzkyxy75qfqzs0jxl4jdblgrhh104bs0"
+   "commit": "2e2dc6427b4427b045df37ba793884c6225c262e",
+   "sha256": "00zqb68vzcqd1mcxz3nsdydima14381dvqc4nncqm1l6hnapxf1h"
   },
   "stable": {
    "version": [
@@ -69139,8 +69714,8 @@
     20190124,
     1828
    ],
-   "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb",
-   "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z"
+   "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3",
+   "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y"
   }
  },
  {
@@ -69259,8 +69834,8 @@
    "deps": [
     "paredit"
    ],
-   "commit": "653d7a58fb370d5f7df367464d8d05e23a70b29d",
-   "sha256": "0q6a3cvanjh3j0kdpqa812yql2axgga45g6nljvxijm8i9ba2hqf"
+   "commit": "f04c522e6b088a11255a95cb1e6a08198b4d6537",
+   "sha256": "1jp6wk4zkfcma4akchbdh8wg5fi0i74m4cgnqnmvbyzwkbj6sf0q"
   },
   "stable": {
    "version": [
@@ -69369,8 +69944,8 @@
     "cl-lib",
     "dash"
    ],
-   "commit": "a7c041454e05ec2b88333a73e72debaa671ed596",
-   "sha256": "14ld7r2867aqa1rzk75bzf6qivqd1va4ilawggnxbbx5j2d82r1d"
+   "commit": "eaad857ae4351f72a561ee3dec8943713510003f",
+   "sha256": "1yjq2ddqmsl9jfy4qggwk5f8602ybvsx5qd544whm2b5xm0c5z9y"
   },
   "stable": {
    "version": [
@@ -69673,16 +70248,17 @@
   "repo": "zx2c4/password-store",
   "unstable": {
    "version": [
-    20190804,
-    2004
+    20190829,
+    1054
    ],
    "deps": [
+    "auth-source-pass",
     "f",
     "s",
     "with-editor"
    ],
-   "commit": "e93e03705fb5b81f3af85f04c07ad0ee2190b6aa",
-   "sha256": "0sxwz6awr60xh27q3ng90mmgjs9dpcjkags9dyvr3kc45dmdb931"
+   "commit": "b87e91f984f45615b6459ff3829baa9130b8ef75",
+   "sha256": "1xgfw238ph6fa8inrwqzfzfzqi16w4rr5sg79djb7iqz8njczbn8"
   },
   "stable": {
    "version": [
@@ -70964,11 +71540,11 @@
   "repo": "j0ni/phoenix-dark-pink",
   "unstable": {
    "version": [
-    20170729,
-    1403
+    20190821,
+    48
    ],
-   "commit": "4defbb76b00c1a29f060813898578152d6be623d",
-   "sha256": "03d7ak4ia3fifp0c8fm4qdydizsfsxvcvbzwfxlsk66s28p5wglc"
+   "commit": "ddd98a45775be105984ec598384e68df3d3e8046",
+   "sha256": "02fhna45wq3wja51yrwm0xysdvyck1r0a3dx41i5sh89504gl6a9"
   }
  },
  {
@@ -71091,14 +71667,14 @@
   "repo": "emacs-php/php-mode",
   "unstable": {
    "version": [
-    20190812,
-    1711
+    20190827,
+    1721
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "6969d273992fd49c730fcc3170f17771a272b67c",
-   "sha256": "0p1bqabzlxp56vgvz42salqfjv7h3ffmnjv76wbzpx1jx5hx8yqd"
+   "commit": "5a5b9073585b7afb679e32f1d61086d9122c8b3f",
+   "sha256": "1595ncllpfzgjwq8lwcpk8wxgjvcsigpppf6y5s8gj5g7rz4d45c"
   },
   "stable": {
    "version": [
@@ -71189,17 +71765,18 @@
   "repo": "emacs-php/phpactor.el",
   "unstable": {
    "version": [
-    20190812,
-    1454
+    20190824,
+    500
    ],
    "deps": [
+    "async",
     "cl-lib",
     "composer",
     "f",
     "php-runtime"
    ],
-   "commit": "01ced487c673e027332ecb99c444f819b05ab40b",
-   "sha256": "0ish3kvzn1j1arg6n1mglzsb46sc7hr7gqgnw2084kj56y5q6rjp"
+   "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4",
+   "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn"
   },
   "stable": {
    "version": [
@@ -71360,29 +71937,29 @@
   "repo": "ahungry/pickle-mode",
   "unstable": {
    "version": [
-    20190122,
-    1748
+    20190816,
+    341
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "0d0b1925b7b79e2c80a1877351e3c6ce52935c4b",
-   "sha256": "0hbymja9109fzw34ra5iyxvhfv0x8ffr8sayqihdfmrs2ymh045z"
+   "commit": "0dab75b9f75dc2d0cf28f876cc9e2d127e6dca15",
+   "sha256": "03jp4nhca78k8kl6r5g8c2spjxsamhmqq5p3fqhiniqm3sz5v6cf"
   }
  },
  {
   "ename": "picolisp-mode",
-  "commit": "fe116998dadeef6e61c0791efb396f9b8befa5d6",
-  "sha256": "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5",
+  "commit": "33b151c3aba268977b105965c816716d8b35ad6d",
+  "sha256": "1g45gmg3wd52yi3838bjlz3ccf71fznm6l3nkp7a7929q3rj9d90",
   "fetcher": "github",
-  "repo": "flexibeast/picolisp-mode",
+  "repo": "flexibeast/plisp-mode",
   "unstable": {
    "version": [
-    20190811,
-    1431
+    20190824,
+    806
    ],
-   "commit": "bf358e5e75adb7cfa1b7cde24209428a88d86b56",
-   "sha256": "15zb3g6b3n9242p10frzcyxa9gasnbmdjplsvjibzhxrrnhapans"
+   "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1",
+   "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9"
   }
  },
  {
@@ -71773,10 +72350,10 @@
  },
  {
   "ename": "pkg-info",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "1k23hmpcq534060qcxbrv4g6bw9nzcbjg192mbdp20kwidw7p81n",
+  "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0",
+  "sha256": "1pg26fnni5yi4agqmy1lf1k0wkrcjz1d845d8xryai6bf8fiwf0c",
   "fetcher": "github",
-  "repo": "lunaryorn/pkg-info.el",
+  "repo": "emacsorphanage/pkg-info",
   "unstable": {
    "version": [
     20150517,
@@ -71883,26 +72460,26 @@
   "repo": "skuro/plantuml-mode",
   "unstable": {
    "version": [
-    20190812,
-    1540
+    20190822,
+    1403
    ],
    "deps": [
     "dash"
    ],
-   "commit": "1e5f8beedd940458d043832c7d972dbfe492155e",
-   "sha256": "1pf9jpsbxqxd90y3md1h1fyd2v9swhf10kkknfln102k6chyy1jx"
+   "commit": "2f8170b30b9885b5a6992047662d5ba0f4ac2248",
+   "sha256": "0c9as4g2rc1py12wcmv4s4gn2cpsf55cm7b4yf8amld5viz7r7pg"
   },
   "stable": {
    "version": [
     1,
-    3,
-    1
+    4,
+    0
    ],
    "deps": [
     "dash"
    ],
-   "commit": "648feb5b12372bbf8ea37544c44ffcde0aceba69",
-   "sha256": "0xpnd9r2d2pb6dj3sj1b0bvhg6rm1m6y1ksvngc9yfpynrxgrxwv"
+   "commit": "b39c310e9cb5a2e7aa72d143348362307d561f88",
+   "sha256": "03sdkjs7al2g6kqsxr8z53lqsnir6wk2a59kgi08lki049zim0a0"
   }
  },
  {
@@ -72073,6 +72650,21 @@
    "sha256": "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2"
   }
  },
+ {
+  "ename": "plisp-mode",
+  "commit": "33b151c3aba268977b105965c816716d8b35ad6d",
+  "sha256": "157v6h0rss9q1nshq0s59nn8q4xm7lq8c83ljgc8g9cql5b632i6",
+  "fetcher": "github",
+  "repo": "flexibeast/plisp-mode",
+  "unstable": {
+   "version": [
+    20190824,
+    541
+   ],
+   "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1",
+   "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9"
+  }
+ },
  {
   "ename": "plsense",
   "commit": "fb1025f146514e9c142cd96cac9f2989d6d1a8c5",
@@ -73570,14 +74162,14 @@
     "hydra",
     "s"
    ],
-   "commit": "854827d0585a4fc9310708bfae2514957f4dc341",
-   "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb"
+   "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992",
+   "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc"
   },
   "stable": {
    "version": [
     0,
     2,
-    0
+    1
    ],
    "deps": [
     "dash",
@@ -73585,8 +74177,8 @@
     "hydra",
     "s"
    ],
-   "commit": "854827d0585a4fc9310708bfae2514957f4dc341",
-   "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb"
+   "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992",
+   "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc"
   }
  },
  {
@@ -73699,14 +74291,14 @@
   "repo": "travisjeffery/proced-narrow",
   "unstable": {
    "version": [
-    20190810,
-    420
+    20190818,
+    1923
    ],
    "deps": [
     "seq"
    ],
-   "commit": "df5cce50b3d1219b23d28e23cbf68e0c7807a15c",
-   "sha256": "00b2g7prijad6q2zw0vhwq1xb49kcc8ym116zfj5r8wxz9cmpzpr"
+   "commit": "079a6834869638ae3586a68474149575d7623ef0",
+   "sha256": "0771n655f4bhvw6qdjkk0m8l5qwbqdyk28whp52bmx95j56yfkvx"
   },
   "stable": {
    "version": [
@@ -74450,11 +75042,11 @@
   "repo": "ProofGeneral/PG",
   "unstable": {
    "version": [
-    20190727,
-    1325
+    20190821,
+    848
    ],
-   "commit": "aa36785c6e7166da0720e05ba708cdf22687a9d9",
-   "sha256": "0a64z8h3mw3hyfiq0grpagmjj63bh6ix97f9zaximzin0q6zfxkk"
+   "commit": "d53ded580e30d49e7a783280fd9ba96bc9c1c39c",
+   "sha256": "17hf4mxpijvgd2jrffibcz9ps4vv8w2alcgmh78xjlb6mm0p3ls0"
   },
   "stable": {
    "version": [
@@ -74557,8 +75149,8 @@
     20170526,
     1650
    ],
-   "commit": "c132a4aa165d8ce2b65af62d4bde4a7ce08d07c3",
-   "sha256": "06cqi10q6w07pshmfkzd40k40rm5slgsrbb6n0jdskhbw97wqk6h"
+   "commit": "36bdcb5a7a79aff977617bd1a83a7b25055e38bb",
+   "sha256": "00fgcysw557mgs0wfh095djnxd94qklf6h45bh8zw1dyhwfbmqpx"
   },
   "stable": {
    "version": [
@@ -74833,11 +75425,11 @@
   "repo": "flexibeast/pulseaudio-control",
   "unstable": {
    "version": [
-    20190420,
-    541
+    20190828,
+    1136
    ],
-   "commit": "552206807c9af6ec150540bbdda5d08393196e0a",
-   "sha256": "1bb14xcglvamvlqsx3dz75zq5ws17774g32484x5ksfpajpibwas"
+   "commit": "c47ea8fca65c0f964365488a392e51798d698cdd",
+   "sha256": "0j861dp8jzkp6a6956x9jy00bc905bzf3rwylws2vvrz9wpzp7r3"
   }
  },
  {
@@ -75379,16 +75971,17 @@
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20190812,
-    222
+    20190826,
+    51
    ],
    "deps": [
     "async",
     "popup",
-    "pyim-basedict"
+    "pyim-basedict",
+    "xr"
    ],
-   "commit": "d096fc941f3844825415e2d3a3a627babe003428",
-   "sha256": "10i54v0v8x8ljh5h06cw3zljfi1g8bdkiprainn59ik8mc8rhhlw"
+   "commit": "0b8a7ff8b0fcd1086ef938ae398c8efb4791e494",
+   "sha256": "0lac78442pyidlrnd8zy6c96adv1jdfismz0qd9a0rj4zyfnzp4r"
   },
   "stable": {
    "version": [
@@ -75533,8 +76126,8 @@
     20170402,
     1255
    ],
-   "commit": "a6b1e810df608430b04b65ad1ddc9ba1b8a22c89",
-   "sha256": "06cv6mah6wjbbwi196vn3fncf4drrhhr3gn1jndf2s14j98zpkh4"
+   "commit": "6b3afd4f6d75debd7f286f0d3c760ed10ab1e79f",
+   "sha256": "19rq53qmk3vzlh9l29f254jpvjbf28j6bzmhzakhy8sn1vchpqsq"
   }
  },
  {
@@ -75633,6 +76226,38 @@
    "sha256": "0887620iq8xn28aajx7z2pkgh19778w494n8icibwlk2mj2m3gxl"
   }
  },
+ {
+  "ename": "python-black",
+  "commit": "9e485ee04b19dda5d2165021da5018c3658a6cd7",
+  "sha256": "0jpr4zj8q4wfzfslr7v4a6975iz9jzd4ccmnci0ycbkbmrhy3mzj",
+  "fetcher": "github",
+  "repo": "wbolster/emacs-python-black",
+  "unstable": {
+   "version": [
+    20190817,
+    1754
+   ],
+   "deps": [
+    "dash",
+    "reformatter"
+   ],
+   "commit": "706d317f0874d7c5b5a3d844698bcfb8b1fe253e",
+   "sha256": "0fjnd85nlkck156dj6cahk8chhgkbgl2kwywqzi8bl4yj700m4dk"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "dash",
+    "reformatter"
+   ],
+   "commit": "706d317f0874d7c5b5a3d844698bcfb8b1fe253e",
+   "sha256": "0fjnd85nlkck156dj6cahk8chhgkbgl2kwywqzi8bl4yj700m4dk"
+  }
+ },
  {
   "ename": "python-cell",
   "commit": "0549866c5e96f673ec9dec298e7ff9d5779d443b",
@@ -75731,11 +76356,11 @@
   "repo": "python-mode-devs/python-mode",
   "unstable": {
    "version": [
-    20190724,
-    633
+    20190819,
+    1244
    ],
-   "commit": "3bd6df77ddf41a3cfa10d8b634aeb8c65eb14b64",
-   "sha256": "07gai9b86cjsb9s0rh0601mznpsajmslp98sdig77qm9vvnj1x6q"
+   "commit": "31603f1fc1d8a7568b7259d7ccfef58dde72430a",
+   "sha256": "17rb0427v6nwjxy7b2364ihhlzhnqib1xvb547x8kdl971hw3ngx"
   },
   "stable": {
    "version": [
@@ -76215,19 +76840,19 @@
   "repo": "jstranik/emacs-quilt",
   "unstable": {
    "version": [
-    20190304,
-    540
+    20190828,
+    506
    ],
-   "commit": "161ce2d8ba225bccef0ea8ae4937251b8ccaa892",
-   "sha256": "0r9j71rc2jcwfr6yqg8qx4fwypqg1d7p31af258ixygs3qy69x14"
+   "commit": "b56a1f1acc46cdf8655710e4c8f24f5f31f22c6a",
+   "sha256": "1fk1cj0bwb4hrfcy868ll4jf3mq9ni0m8srf01dljh436aj2pc7h"
   },
   "stable": {
    "version": [
     0,
-    5
+    6
    ],
-   "commit": "161ce2d8ba225bccef0ea8ae4937251b8ccaa892",
-   "sha256": "0r9j71rc2jcwfr6yqg8qx4fwypqg1d7p31af258ixygs3qy69x14"
+   "commit": "b56a1f1acc46cdf8655710e4c8f24f5f31f22c6a",
+   "sha256": "1fk1cj0bwb4hrfcy868ll4jf3mq9ni0m8srf01dljh436aj2pc7h"
   }
  },
  {
@@ -77636,8 +78261,8 @@
     20190529,
     2238
    ],
-   "commit": "b29fdd346d0d06bef4cafc75adbde51a46392e90",
-   "sha256": "0ahi9z3qpbg9zcb1fzbxqd6gb8ip44zdf9assimch7yklg5ph2ca"
+   "commit": "8372cc425967f055ba8a26f6098649467e776c5e",
+   "sha256": "1fmyqs06rrkyyclrsfrjsxcwkd0c20kimih2x5llhnxmw51i2y5s"
   },
   "stable": {
    "version": [
@@ -77725,11 +78350,11 @@
   "repo": "alvarogonzalezsotillo/region-occurrences-highlighter",
   "unstable": {
    "version": [
-    20190804,
-    1931
+    20190830,
+    1152
    ],
-   "commit": "3e08d7bc123d6fbb84f7f8a5a6fc28aae4ec8c19",
-   "sha256": "0cwi5b89l7f21xq5cfms96vshz7swz0m2kjd5f71206f38rlcir3"
+   "commit": "5f52084d77c22df3b57e96a7ce0dc69679088f4e",
+   "sha256": "1p0q7dgchh9cjj0rknas3g40d5lfcp9qrxfbpq6hqzz569f6pc2y"
   }
  },
  {
@@ -78108,11 +78733,11 @@
   "repo": "tkf/emacs-request",
   "unstable": {
    "version": [
-    20190730,
-    1014
+    20190819,
+    1735
    ],
-   "commit": "f466ab1af578abd1942c3c70c101c585d9166bb0",
-   "sha256": "0jiqm701kn9xv9bxw4xd3qg9r2qkhws5qsly1749rs7zhbjfpzd2"
+   "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6",
+   "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp"
   },
   "stable": {
    "version": [
@@ -78139,8 +78764,8 @@
     "deferred",
     "request"
    ],
-   "commit": "f466ab1af578abd1942c3c70c101c585d9166bb0",
-   "sha256": "0jiqm701kn9xv9bxw4xd3qg9r2qkhws5qsly1749rs7zhbjfpzd2"
+   "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6",
+   "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp"
   },
   "stable": {
    "version": [
@@ -78453,16 +79078,16 @@
   "repo": "dajva/rg.el",
   "unstable": {
    "version": [
-    20190403,
-    1533
+    20190828,
+    1339
    ],
    "deps": [
     "cl-lib",
     "s",
     "wgrep"
    ],
-   "commit": "450a1e54fb7c690166e61856b0d2002a71ccdf10",
-   "sha256": "01v5zz9psvkqw4cgq7b8r0b7wakxa5df4ki34g3nislrhmqp4n3x"
+   "commit": "64f25282fbba3cb436dbaabe73f5a5417f2daaa8",
+   "sha256": "003da113ak5bx2jdcy0ffkm2ihg013m1vk9v7pc5k65xb262c5wz"
   },
   "stable": {
    "version": [
@@ -79001,11 +79626,11 @@
   "repo": "Andersbakken/rtags",
   "unstable": {
    "version": [
-    20190621,
-    2006
+    20190820,
+    502
    ],
-   "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2",
-   "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w"
+   "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88",
+   "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm"
   },
   "stable": {
    "version": [
@@ -79476,8 +80101,8 @@
     20190517,
     2037
    ],
-   "commit": "c62185ae1c6edf0335261f169241eb8ee9713ad5",
-   "sha256": "0jq8hb8j484vqnd743d2azw4zg1gn2j0l6h60bd0vcqd2hgag1nw"
+   "commit": "48290d331d923031156bbbaf8360b774bf983d1e",
+   "sha256": "0xws8mrbrzhfy9kf2p68kwxvshayzbhrnqs6jjvv89h4aaj3630i"
   },
   "stable": {
    "version": [
@@ -79520,8 +80145,8 @@
   "repo": "brotzeit/rustic",
   "unstable": {
    "version": [
-    20190721,
-    1342
+    20190820,
+    1448
    ],
    "deps": [
     "dash",
@@ -79535,8 +80160,8 @@
     "spinner",
     "xterm-color"
    ],
-   "commit": "af0c3b88cb2fc4fabd66209c4dd91a520d924ec9",
-   "sha256": "0g9z58cxq4qjmgil1kzsnmf0fyp07db77l2alp1f25cgdfd92nbs"
+   "commit": "cb03a31bff0b1a13ff1ac90c1fd9bc89c55fbb0e",
+   "sha256": "0n0vrlv9l9d8qa4vrkvy5jaj6j4qvlqkjz1p5rya2vmiv4wb56ba"
   }
  },
  {
@@ -79571,11 +80196,11 @@
   "repo": "Kungsgeten/ryo-modal",
   "unstable": {
    "version": [
-    20180331,
-    818
+    20190816,
+    1209
    ],
-   "commit": "42f874467dfdce59b511f883496ce2624b133dd7",
-   "sha256": "0k9nmi014vb9c8rymy3w8xbnj1q85xlslpblacz78iqn1kr6wy1z"
+   "commit": "539abca4651dda2d667a44f172957df39fa76eb5",
+   "sha256": "1n3biqink9zfbj4r94519xn68xigkvx16caj35njfzc05pkmvawc"
   }
  },
  {
@@ -79923,26 +80548,26 @@
   "repo": "clojure-emacs/sayid",
   "unstable": {
    "version": [
-    20181223,
-    835
+    20190826,
+    1037
    ],
    "deps": [
     "cider"
    ],
-   "commit": "559a335926c12b37ff2928097b3e7eaefb88920d",
-   "sha256": "02h1dkzgs6439l2fjflkgvq40gvb353y47zhlasfqxy9cjj76d22"
+   "commit": "6febf397d5d610d28100fb1381a82d5e77f0d261",
+   "sha256": "0ra8xjsmagjwa1qakr1x4f9l88f3zj686dyk88q9qj1bvyam8r33"
   },
   "stable": {
    "version": [
     0,
     0,
-    17
+    18
    ],
    "deps": [
     "cider"
    ],
-   "commit": "56ec0343322cf30d689810a8f5cffee004bb8d07",
-   "sha256": "16dq2hg3k0vypb5rjyrz90abm7qxbjbs6pv0z9qvsyn0ahi65jn3"
+   "commit": "5412d0e129337f0f97a5501521f86dd7deee5804",
+   "sha256": "1immns40clz78frsd4dc5ck5n90ac5pfid40bw3phxwr4prhmgf6"
   }
  },
  {
@@ -79980,8 +80605,8 @@
     20190413,
     1246
    ],
-   "commit": "fc91c81ffafe07691cec7466399b18f267964328",
-   "sha256": "0i7jrxdfxin6aaz1v578vy50j0g5l3j9yj2pgn5dw5v04xk42822"
+   "commit": "c060053d3b4818bf6d0620b0711be845795c4157",
+   "sha256": "0w3s32kk7mr9605mmssxrh4izq1wllxccd1hs4hcn2fz04igd9b7"
   }
  },
  {
@@ -80343,11 +80968,11 @@
   "repo": "ideasman42/emacs-scroll-on-drag",
   "unstable": {
    "version": [
-    20190721,
-    2218
+    20190826,
+    8
    ],
-   "commit": "e509c10ccdf6f4239d448da8aa6f8b9cc36bb340",
-   "sha256": "00yy0bx874ijg8s16bp13n0w5q2fmjiklz0kgbwh4wpb7fawk8vv"
+   "commit": "271b4aa6b38c2550119a36efac2b92cf1233e6e3",
+   "sha256": "1ia2mcl42r69dlyxabjh76c550x0nf0irhpsdbda0h3in62f7q6m"
   }
  },
  {
@@ -81159,11 +81784,11 @@
   "repo": "Shopify/shadowenv.el",
   "unstable": {
    "version": [
-    20190731,
-    1807
+    20190818,
+    2128
    ],
-   "commit": "0e7c98455ef71be929005d1d6e2372712081de69",
-   "sha256": "025kyyyr4pd58lzm917dzlfk3l5z877rc97jp4mjknlf89idi7lk"
+   "commit": "1887f606db73846d7da6023cb8944efbc791377c",
+   "sha256": "1izivy5vz2x86yqbip69jz7sfrjwfm0gsya95ynic7q9qqnq7bmj"
   }
  },
  {
@@ -81502,11 +82127,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20190808,
-    238
+    20190826,
+    741
    ],
-   "commit": "8fd65dd9c7d2393ab66c65ee1de67a84dcc779ce",
-   "sha256": "1yqbw8ikfrwya59xa0a17f2wwgswkdqcxj9y64fb00syps09fv0m"
+   "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c",
+   "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n"
   }
  },
  {
@@ -81848,20 +82473,20 @@
   "repo": "rnkn/side-notes",
   "unstable": {
    "version": [
-    20190715,
-    504
+    20190816,
+    303
    ],
-   "commit": "aeaaeaffb9a6d6205f2230fdbc9a4afbc0088323",
-   "sha256": "00jkqzh2rnj4jb93lzfmasr75lxb25j3sfj4cgppdz24hzd2yznf"
+   "commit": "96c4677ba4dc91c8100c93d3af6f165c21db3e05",
+   "sha256": "1gway2ljpi1ac0ssy9r11pvy50j6c5y10wfs4bizlqhzdpjfinh2"
   },
   "stable": {
    "version": [
     0,
     2,
-    0
+    1
    ],
-   "commit": "2319ee180a4a67175b9e95322cd30b3ac70a9bdf",
-   "sha256": "05xaj5lhxaf07frzcayx5ybz778sgx8bplg5i75x24b7miqdcjl2"
+   "commit": "96c4677ba4dc91c8100c93d3af6f165c21db3e05",
+   "sha256": "1gway2ljpi1ac0ssy9r11pvy50j6c5y10wfs4bizlqhzdpjfinh2"
   }
  },
  {
@@ -82257,8 +82882,8 @@
    "deps": [
     "skewer-mode"
    ],
-   "commit": "927d6848a1ea9428d4cc995f76bd42f7b8da6bc8",
-   "sha256": "11zaq1p04igg0hbmazsf5c0xz7aigx120rwg5iq7niaz2277j1k1"
+   "commit": "8ce9d030e18133319181d5dabe3e905c8ca5fd6b",
+   "sha256": "1hkk9si9z9zd2x2cv2gs0z423prlwlhq847irypz2dm1bnm5dzrx"
   },
   "stable": {
    "version": [
@@ -82447,15 +83072,15 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20190724,
-    1352
+    20190818,
+    1634
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "11c0d8349347ab91449306f2448f2a558e747e90",
-   "sha256": "1yawjp5gcj3ainrbmlwjgxddzdbsfyq37kv5fjkzj8dywggdv8qy"
+   "commit": "cbab3e9a1bc4f1a03ee21f392a499f01333af816",
+   "sha256": "0y645w8lp1f51xx0f36fv2fz1lgk2w1rk7v6brxfg44igbb4c6sv"
   },
   "stable": {
    "version": [
@@ -82703,6 +83328,18 @@
    ],
    "commit": "c387ba34a75b172e8a75747220c416462ae9de31",
    "sha256": "1cr6p11vsplb6afh2avwb585q606npp692gb5vqs377nni5vx7km"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "sly"
+   ],
+   "commit": "c387ba34a75b172e8a75747220c416462ae9de31",
+   "sha256": "1cr6p11vsplb6afh2avwb585q606npp692gb5vqs377nni5vx7km"
   }
  },
  {
@@ -84261,11 +84898,11 @@
   "repo": "nashamri/spacemacs-theme",
   "unstable": {
    "version": [
-    20190801,
-    1302
+    20190820,
+    816
    ],
-   "commit": "db328e2092bc56e7bf861ad294b8748fd35e16f1",
-   "sha256": "1cz3rcm5n90nf4qailyn6m544waknxngvm20pflbmzgj3q5cklgv"
+   "commit": "32ddc1a9b9f4f58ebe8410abc1124b7acf0f36b1",
+   "sha256": "14bga23rf9zn18fbs8zdhksi2kyxq0s937fbjpl0q91x05b6m61f"
   }
  },
  {
@@ -84393,11 +85030,11 @@
   "repo": "brailcom/speechd-el",
   "unstable": {
    "version": [
-    20190616,
-    1309
+    20190821,
+    1129
    ],
-   "commit": "b3d62e62f9f23b08b62c1363e415c4f8a8f20029",
-   "sha256": "0nyh7v7qvwsayb1xdmbjagl3yxgs76fqm80w2r1xjmjzi0346qwb"
+   "commit": "1d4086a64ba554bb8c7d648c8d0e6c176277f6f3",
+   "sha256": "06sz5yl12mn0mq43bbv3ln14pk176ij8rxs95wi25yxdblznhsg0"
   }
  },
  {
@@ -84893,8 +85530,8 @@
     20170610,
     1537
    ],
-   "commit": "04970977b4abb4d44301651618bbf1cdb0b263dd",
-   "sha256": "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz"
+   "commit": "3f9df9c88d6a7f9b1ae907e401cad8d3d7d63bbf",
+   "sha256": "1crah9h86m5sdc7panj98ws9cv2as6kh9syal8m1p7rhimgvdx1v"
   },
   "stable": {
    "version": [
@@ -85089,11 +85726,11 @@
   "repo": "cjohansson/emacs-ssh-deploy",
   "unstable": {
    "version": [
-    20190610,
-    1256
+    20190816,
+    2237
    ],
-   "commit": "e1507feccf581160daece98b436dfac63020bb68",
-   "sha256": "1bbs2k65fggab61pgl8p5jgg8jxsggqkfcs55k6kg4s78gj2rqma"
+   "commit": "d0f7294d23380766dcabdb4ed21bc6a68e496110",
+   "sha256": "1w4zd38whpqidhfscbcns7y14ixw6lq2x6wirfjxybq3yilgz9j2"
   },
   "stable": {
    "version": [
@@ -85159,11 +85796,11 @@
   "stable": {
    "version": [
     9,
-    2,
+    3,
     0
    ],
-   "commit": "45b8242611fe0437fcff48f5f4f7d8f0552531ac",
-   "sha256": "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw"
+   "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905",
+   "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz"
   }
  },
  {
@@ -85187,15 +85824,15 @@
   "stable": {
    "version": [
     9,
-    2,
+    3,
     0
    ],
    "deps": [
     "stan-mode",
     "yasnippet"
    ],
-   "commit": "45b8242611fe0437fcff48f5f4f7d8f0552531ac",
-   "sha256": "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw"
+   "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905",
+   "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz"
   }
  },
  {
@@ -85353,8 +85990,8 @@
     20171130,
     1559
    ],
-   "commit": "114bc99e7f65b6959d91b3a0452deca55c38dc32",
-   "sha256": "0w3fdbzscb7dc54q7qdp2k2kqvrqya1919qnj7nq4zsc6bw9v0x6"
+   "commit": "143146feada95b8be228d339114f2c469a78bbb9",
+   "sha256": "0dknxxp320zy3zrrbqsgl4d8jj4i2xcmsa6n91zpvdnb035658pp"
   },
   "stable": {
    "version": [
@@ -86264,14 +86901,14 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20190801,
-    1110
+    20190822,
+    1708
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e",
-   "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll"
+   "commit": "79333e9edfee38ec3b367c33711a68bdf7783259",
+   "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z"
   },
   "stable": {
    "version": [
@@ -86502,8 +87139,8 @@
   "repo": "countvajhula/symex.el",
   "unstable": {
    "version": [
-    20190809,
-    443
+    20190810,
+    432
    ],
    "deps": [
     "cider",
@@ -86520,8 +87157,8 @@
     "slime",
     "smartparens"
    ],
-   "commit": "163d54eb483a9986587c586cabfcaa15210a2b5d",
-   "sha256": "1y8va209v32f6rd7f420aqyh8fs9srxyc9hinb9q6i1bs92vkry9"
+   "commit": "745dc44bc1569a05ade034981277ee5955677798",
+   "sha256": "0c1sibigy0kvhizxg2198k9kqgb57cmcjx7l0jmar2cgnmndbrgj"
   },
   "stable": {
    "version": [
@@ -87320,14 +87957,14 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20190812,
-    2131
+    20190830,
+    1446
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "5444e2a02374c245769417148ccf2dad0a0c633a",
-   "sha256": "0byddvnkyabcxy64f2w64sqcki4zfxjwkvzvkrcan46san6hsn87"
+   "commit": "f8f28c739dcc8f52c3e66368b06c0cfcd48e83a9",
+   "sha256": "0ynhw9ai906y4405r8wdalx09hinfns9n01cg96nc4fgbqkhbpdw"
   },
   "stable": {
    "version": [
@@ -87855,6 +88492,21 @@
    "sha256": "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y"
   }
  },
+ {
+  "ename": "terraform-doc",
+  "commit": "81ba99e4734f231294800cc2b0a27fba2eb396e0",
+  "sha256": "0n62yicjsjikgbw5fckjxzgx5vfzn4ydi7jizm27ycpwxbw59ifl",
+  "fetcher": "github",
+  "repo": "TxGVNN/terraform-doc",
+  "unstable": {
+   "version": [
+    20190813,
+    1254
+   ],
+   "commit": "2ec10ea7bef5a75edfffeb515dd268e19c1f8c9c",
+   "sha256": "0r70fc7vv2rjnwnsg7myc1c15f3ql6hp6zrf5msmf8r2iz32jnpp"
+  }
+ },
  {
   "ename": "terraform-mode",
   "commit": "93e06adf34bc613edf95feaca64c69a0a2a4b567",
@@ -88315,8 +88967,8 @@
     20180905,
     1050
    ],
-   "commit": "01ea3cb8cee36e31a0ab8015426b57eb4ce29cdc",
-   "sha256": "0mfgr1303lpfa0nzh4lbxpiiijwv41bh3r631hjj9cpz8jkwicc7"
+   "commit": "562e52d2ecc53b86c56c7ee4e88288b45fe2e4e3",
+   "sha256": "10hxy7iwz24qcagpmi6vvkw7zv04ly4r5ym3sw8wzhcsb1fslzgf"
   },
   "stable": {
    "version": [
@@ -88382,20 +89034,20 @@
    "deps": [
     "haskell-mode"
    ],
-   "commit": "17db036b9895fb7b54dda5e3cf2cb0ce5980b457",
-   "sha256": "1gys96kr6vq7h2jz15c9340idxv6915anw98is1mfl4ak6pqq3w1"
+   "commit": "621d95f6563d550bf777a51a2010f23382d61a78",
+   "sha256": "0ps8zjfkwjan5ziil6jhz7ls3mzgk970js0gaja3ndwsd5nlsmq2"
   },
   "stable": {
    "version": [
     1,
-    2,
-    0
+    4,
+    2
    ],
    "deps": [
     "haskell-mode"
    ],
-   "commit": "ba2eb0a503b604a806e45b914d16ece6899bd9be",
-   "sha256": "1cimnm9d5cm5bw8fjdm2gw5dlcrxcwkfjdh4dh9s7bgrbqjgdcmj"
+   "commit": "eabe03946d2d537e38d8f38f8c30d38a18202279",
+   "sha256": "0nwmic0iimy0fgc1m9ixi4mv8ckpc8cv8wjij1882ggd0isi4k59"
   }
  },
  {
@@ -88406,8 +89058,8 @@
   "repo": "ananthakumaran/tide",
   "unstable": {
    "version": [
-    20190706,
-    2322
+    20190829,
+    1315
    ],
    "deps": [
     "cl-lib",
@@ -88416,8 +89068,8 @@
     "s",
     "typescript-mode"
    ],
-   "commit": "dd90f5ad6c537d38b5f56599687c3bc9b21072a6",
-   "sha256": "1rpha2fbhmj891hbpm24din84j2m1ccjignwr237fhv34yy55z07"
+   "commit": "13f64933c19590ebd02a4b141bb6be88d7aaf2b0",
+   "sha256": "19kl8r426hi93q1nj5mwadx6wiymx0f77db4w51jcf5kp0rr2hs0"
   },
   "stable": {
    "version": [
@@ -88862,8 +89514,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "ef0c6b84d92eecd05aa5cd4a35b73652f21b311a",
-   "sha256": "0wh0fwl2mimb48g2sf2nhmr3xxwvgkgr3566187x3kw8zxgh1nv7"
+   "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949",
+   "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq"
   }
  },
  {
@@ -89390,8 +90042,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20190812,
-    546
+    20190826,
+    1125
    ],
    "deps": [
     "ace-window",
@@ -89403,8 +90055,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936",
-   "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk"
+   "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f",
+   "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359"
   },
   "stable": {
    "version": [
@@ -89440,8 +90092,8 @@
     "evil",
     "treemacs"
    ],
-   "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936",
-   "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk"
+   "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f",
+   "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359"
   },
   "stable": {
    "version": [
@@ -89471,8 +90123,8 @@
     "cl-lib",
     "treemacs"
    ],
-   "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936",
-   "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk"
+   "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f",
+   "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359"
   },
   "stable": {
    "version": [
@@ -89503,8 +90155,8 @@
     "pfuture",
     "treemacs"
    ],
-   "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936",
-   "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk"
+   "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f",
+   "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359"
   },
   "stable": {
    "version": [
@@ -89535,8 +90187,8 @@
     "projectile",
     "treemacs"
    ],
-   "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936",
-   "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk"
+   "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f",
+   "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359"
   },
   "stable": {
    "version": [
@@ -89705,15 +90357,15 @@
   "repo": "alphapapa/ts.el",
   "unstable": {
    "version": [
-    20190812,
-    1655
+    20190819,
+    102
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "31bd5a86aa35f7b8143170892ffaf6425284f3fd",
-   "sha256": "004z24vxk7xrc9in7q8rpaif79sw219zh86hj2fyczv2jixl6i9r"
+   "commit": "93c074f2895a204e003e8c7f3033c37d6486fac8",
+   "sha256": "0lpyv78k04vbp9glnv14dawcfgi3m49847wlgwfmkdq5cr3fn735"
   },
   "stable": {
    "version": [
@@ -90385,11 +91037,11 @@
   "repo": "jackkamm/undo-propose-el",
   "unstable": {
    "version": [
-    20190409,
-    636
+    20190824,
+    1554
    ],
-   "commit": "5f1fa99a04369a959aad01b476fe4f34229f28cd",
-   "sha256": "1p9h1fqmva07mcs46rqrg9vqn537b615as84s9b7xh76k1r8h1c0"
+   "commit": "21a5cdc8ebfe8113f7039867c4abb0197c0fe71c",
+   "sha256": "035hav4lfxwgikg3zpb4cz1nf08qfp27awl87dqbm2ly6d74lpny"
   }
  },
  {
@@ -90577,11 +91229,11 @@
   "repo": "astoff/unicode-math-input.el",
   "unstable": {
    "version": [
-    20181230,
-    1223
+    20190813,
+    1436
    ],
-   "commit": "ed87837d2303fb07ec81508930bc3b2a4d857fcd",
-   "sha256": "1xk8snjby46fprj3vd0yf2zmcqcqx6jcljgaxijdh6wqbl2ard3b"
+   "commit": "ba45edbfb8fa453e29c4c6c73af60f06637951d6",
+   "sha256": "1sil8lnvpdwk0g30mbqymp6ib325q28a8zn3n9y6j39ngphpkffl"
   }
  },
  {
@@ -91087,14 +91739,14 @@
   "repo": "elpa-host/use-ttf",
   "unstable": {
    "version": [
-    20190701,
-    1222
+    20190823,
+    939
    ],
    "deps": [
     "s"
    ],
-   "commit": "0b56d4b062bb86e6b2e5425a0e76b4b2997a80d7",
-   "sha256": "0k3zy8zpv4isr5nd3xyvncbjdcpyfgc9swylhc8padr3ifkxvb3p"
+   "commit": "8c7f50a2b6f5bd55cdd92e351371386ff4b6edce",
+   "sha256": "0xg98ngrdlfjcb902qaljwhh9jszkafc2vm1x8627lnw1k7i6b3q"
   }
  },
  {
@@ -91240,14 +91892,14 @@
   "repo": "dougm/vagrant-tramp",
   "unstable": {
    "version": [
-    20190125,
-    1859
+    20190816,
+    1846
    ],
    "deps": [
     "dash"
    ],
-   "commit": "77256deca35bb797cbba499837f3658d1a17d2e3",
-   "sha256": "0j7ff9b3ic4a6kzn7k0c52knlgangql7sjsxahwvym6w18r52d5a"
+   "commit": "47c6fdc07722934eacce9f91c47bb1ee7d46b86f",
+   "sha256": "0a423h6klk0m3vjkds27a3h60xq8n72j15p1izrhgdzf1642w1g1"
   }
  },
  {
@@ -91485,6 +92137,30 @@
    "sha256": "1xd42bdi6x89gc9xjrwvzzdaanv9vwlbbjwp25bs1nsd53k5nvak"
   }
  },
+ {
+  "ename": "vcsh",
+  "commit": "a5f56f914d7cc11f45be0474897998accb0fec2e",
+  "sha256": "0cclih5yfgal3bi3n2na4sc4xw1rqalml3nknhgypxrlx4j784pb",
+  "fetcher": "gitlab",
+  "repo": "stepnem/vcsh-el",
+  "unstable": {
+   "version": [
+    20190817,
+    2011
+   ],
+   "commit": "2051e4ee20709f82ab2396ab2ccfbe887a3c6a67",
+   "sha256": "168rhydrz7h7bhaf885j4lqxz5x50is7gsypj0vypi6xv71zhd03"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    1
+   ],
+   "commit": "2051e4ee20709f82ab2396ab2ccfbe887a3c6a67",
+   "sha256": "168rhydrz7h7bhaf885j4lqxz5x50is7gsypj0vypi6xv71zhd03"
+  }
+ },
  {
   "ename": "vdiff",
   "commit": "e90f19c8fa4b0d267d269b76f117995e812e899c",
@@ -91753,14 +92429,14 @@
   "repo": "baron42bba/vertica-snippets",
   "unstable": {
    "version": [
-    20190705,
-    949
+    20190828,
+    1121
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "a7288bf5d55b554ea78c4b5fa1046d38d91ed2b0",
-   "sha256": "10jj3ipw65wazr46lwnrhj1q51b6scnn2m98yg105vcb8vssbszd"
+   "commit": "4869b7da62799e846b17258f6828dee016a991f4",
+   "sha256": "1phhrkk0yyxq4nlrcwad4dvspg6rwda5lzsmch2w64nr5v4ppvl7"
   }
  },
  {
@@ -92007,8 +92683,8 @@
     "dash",
     "s"
    ],
-   "commit": "c3da41a3995c98dae2c751688655ea0cbe72493b",
-   "sha256": "0s5qnzb8ar3qp5fq69sa29x8xy917jbdi8xciqjl6dzk2a7nvqsv"
+   "commit": "107e7e0bf923f44d217712772cd58b414d0065cb",
+   "sha256": "1qqfcif4by8psc4kp9wnna7pm321a7d0xjkwznq2fwc5cqgbp0vz"
   },
   "stable": {
    "version": [
@@ -92272,11 +92948,11 @@
   "repo": "akermu/emacs-libvterm",
   "unstable": {
    "version": [
-    20190812,
-    1520
+    20190822,
+    1225
    ],
-   "commit": "fad40c1436afcf73fe39ea2ec535628866c72b23",
-   "sha256": "0kbb2f7p8ivznyqxx1ji60iqks3sbp6fb6nzfw9q5phagryl5bys"
+   "commit": "097d9806ffab9120f078bea22e9b49502807786b",
+   "sha256": "0x402pq4kq8agzbq1imxg3qm2v6agq2ni1x2a6yqrvwy5vq72qxs"
   }
  },
  {
@@ -92287,14 +92963,14 @@
   "repo": "jixiuf/vterm-toggle",
   "unstable": {
    "version": [
-    20190803,
-    1103
+    20190816,
+    633
    ],
    "deps": [
     "vterm"
    ],
-   "commit": "96cac28e72dc5739958fa674acd51ceed8835556",
-   "sha256": "1scfbjr3vksn0d93gb3n0mi8gi49579szn24f78vkqwd99ivifwr"
+   "commit": "ecb5a44650515ea554ead078dcf824888e8c234b",
+   "sha256": "0jsf7sac45zc43linajmzkqv4lsxyf5m6zvhq01skpvb5y3hl881"
   }
  },
  {
@@ -92400,11 +93076,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20190808,
-    238
+    20190830,
+    742
    ],
-   "commit": "8fd65dd9c7d2393ab66c65ee1de67a84dcc779ce",
-   "sha256": "1yqbw8ikfrwya59xa0a17f2wwgswkdqcxj9y64fb00syps09fv0m"
+   "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c",
+   "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n"
   }
  },
  {
@@ -92492,11 +93168,11 @@
   "repo": "darkstego/wakib-keys",
   "unstable": {
    "version": [
-    20180818,
-    1829
+    20190828,
+    916
    ],
-   "commit": "abf7e18bf85c09963537156a447f0d01ff8d6c1b",
-   "sha256": "0icxgmyw68m19yqp6446rilfyv25xrm8ih44vg10nkdlk8m5kh9l"
+   "commit": "4f3e2c10b8d3b0bd48afb4db9df93ff2ce61c2cd",
+   "sha256": "0dmcbv4d2h2jxxblq6kqqy4rs8aci1zxl8wccz6zi3v9si4f7sql"
   }
  },
  {
@@ -93398,8 +94074,8 @@
     20190106,
     2022
    ],
-   "commit": "72427144b054b0238a86e1348c45d986b8830d9d",
-   "sha256": "1zlk534jbwrsabcg3kqlzk4h4hwya60lh6q2n1v4yn4rpf5ghsag"
+   "commit": "121854747776df1b78d0ef89efb6d01c2c1e8c89",
+   "sha256": "1qli6vwdnm73jnv37lyf1xb5ykav322xjm1fqmgb1369k2fgkl44"
   },
   "stable": {
    "version": [
@@ -93980,11 +94656,11 @@
   "repo": "twlz0ne/with-emacs.el",
   "unstable": {
    "version": [
-    20190623,
-    302
+    20190820,
+    1326
    ],
-   "commit": "0766fb87668bb92ef95a9ecab5180c2933ac0743",
-   "sha256": "0nzb4fswxfqzscsg0gbhfrfy9z0y9fn7cl78zh6wdmmnfsdbl314"
+   "commit": "b398e54bcce2fc023b0c0b6fa1ba6686192d8b9b",
+   "sha256": "0hdz7adag2m97h07j3llzdnwwg2dp6n2q46hx7klp3khdlgrh2z1"
   }
  },
  {
@@ -95137,25 +95813,25 @@
   "repo": "atomontage/xterm-color",
   "unstable": {
    "version": [
-    20190602,
-    1201
+    20190816,
+    941
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ff64312ad412c8b3e87a059139f288205d221e15",
-   "sha256": "1hl2n0mlnskz0f43dz41h11dkyw1pn3x9sq61w0qzjkkbbyz5cqk"
+   "commit": "44e6df835bd4173ee4ccc7e29842e9dae76f2668",
+   "sha256": "0i9ivc5xhl5y5v0l18kbhfg8s2abb9zaimyx951b8bc0f5as68xm"
   },
   "stable": {
    "version": [
     1,
-    8
+    9
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "a452ab38a7cfae97078062ff8885b5d74fd1e5a6",
-   "sha256": "02kpajb993yshhjhsizpfcbrcndyzkf4dqfipifhxxng50dhp95i"
+   "commit": "44e6df835bd4173ee4ccc7e29842e9dae76f2668",
+   "sha256": "0i9ivc5xhl5y5v0l18kbhfg8s2abb9zaimyx951b8bc0f5as68xm"
   }
  },
  {
@@ -95455,11 +96131,11 @@
   "repo": "Kungsgeten/yankpad",
   "unstable": {
    "version": [
-    20190617,
-    1004
+    20190824,
+    1946
    ],
-   "commit": "f443ccb94579dcf28ac50ba4053fa7649e079665",
-   "sha256": "08khi9mp35pp5niz212vpm0yab577m9a23wl7gsymcfcif0drbza"
+   "commit": "c364607804e943b301ded8a30d7e19dda217568a",
+   "sha256": "0sqcli05kyafn2x9sd92az3hqc010pypr0dw31mv0vslg0rfkn8m"
   },
   "stable": {
    "version": [
@@ -95652,25 +96328,25 @@
   "repo": "AndreaCrotti/yasnippet-snippets",
   "unstable": {
    "version": [
-    20190725,
-    1049
+    20190821,
+    901
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "f5dbb814767ac4e6398144b6d372f2effcc9c4a1",
-   "sha256": "1gj5y4c8fxq578x3d0n3yhkwaab6lvsgvmqi1g65ynm5xdlxvm5w"
+   "commit": "71ae4a665f0db13165f14687cf5828d4510ef557",
+   "sha256": "1gaycwqy1s2jvkqswjcbm49157ci5k8apsqlj2x5qs55w71zm5p8"
   },
   "stable": {
    "version": [
     0,
-    13
+    14
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "7e94b9e948e16b3b1778aacb05c65e75d81fc188",
-   "sha256": "0pdfdyxl440ngx77j2b9zymh50r9pqzway2maad64ijaz9l2g2bm"
+   "commit": "71ae4a665f0db13165f14687cf5828d4510ef557",
+   "sha256": "1gaycwqy1s2jvkqswjcbm49157ci5k8apsqlj2x5qs55w71zm5p8"
   }
  },
  {

From d9076f6503540dfbc8201777ffc41aa9ca83facf Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 30 Aug 2019 17:18:40 -0400
Subject: [PATCH 514/794] sgtpuzzles: 20180429.31384ca -> 20190415.e2135d5

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

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index ce8d38ca5d1..428be470b3e 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "sgt-puzzles-r${version}";
-  version = "20180429.31384ca";
+  version = "20190415.e2135d5";
 
   src = fetchurl {
    url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-   sha256 = "0r97kyy0rxgzw78lby2kwi8fg1yimw8a3biy5psgd983d0nwcf9l";
+   sha256 = "02p9kpvmqa0cm9y0lzdy7g8h4b4mqma8d9jfvgi2yysbgjfzq2ak";
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ];

From 50eba5b6886b84c5aa08ddf1717c087c5cf4979c Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Wed, 28 Aug 2019 21:06:30 -0400
Subject: [PATCH 515/794] pythonPackages.openrazer: init at 2.6.0

---
 .../python-modules/openrazer/common.nix       | 17 ++++++++++++
 .../python-modules/openrazer/pylib.nix        | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/openrazer/common.nix
 create mode 100644 pkgs/development/python-modules/openrazer/pylib.nix

diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
new file mode 100644
index 00000000000..eac2751ce3e
--- /dev/null
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -0,0 +1,17 @@
+{ stdenv
+, fetchFromGitHub
+}: rec {
+  version = "2.6.0";
+  src = fetchFromGitHub {
+    owner = "openrazer";
+    repo = "openrazer";
+    rev = "v${version}";
+    sha256 = "1s5irs3avrlp891mxan3z8p55ias9rq26rqp2qrlcc6i4vl29di0";
+  };
+  meta = with stdenv.lib; {
+    homepage = https://openrazer.github.io/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ roelvandijk ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix
new file mode 100644
index 00000000000..2f9ff467b2d
--- /dev/null
+++ b/pkgs/development/python-modules/openrazer/pylib.nix
@@ -0,0 +1,26 @@
+{ buildPythonPackage
+, dbus-python
+, fetchFromGitHub
+, numpy
+, stdenv
+, openrazer-daemon
+}:
+
+let
+  common = import ./common.nix { inherit stdenv fetchFromGitHub; };
+in
+buildPythonPackage (common // rec {
+  pname = "openrazer";
+
+  sourceRoot = "source/pylib";
+
+  propagatedBuildInputs = [
+    dbus-python
+    numpy
+    openrazer-daemon
+  ];
+
+  meta = common.meta // {
+    description = "An entirely open source Python library that allows you to manage your Razer peripherals on GNU/Linux";
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bdaae932f68..9570f110c07 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2569,6 +2569,7 @@ in {
 
   odfpy = callPackage ../development/python-modules/odfpy { };
 
+  openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { };
   oset = callPackage ../development/python-modules/oset { };
 
   pamela = callPackage ../development/python-modules/pamela { };

From bcbadc5ba238574467175dcfc80abe7738114935 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Wed, 28 Aug 2019 21:13:56 -0400
Subject: [PATCH 516/794] kernel: openrazer: init at 2.6.0

---
 pkgs/os-specific/linux/openrazer/driver.nix | 39 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/os-specific/linux/openrazer/driver.nix

diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix
new file mode 100644
index 00000000000..355108f56e4
--- /dev/null
+++ b/pkgs/os-specific/linux/openrazer/driver.nix
@@ -0,0 +1,39 @@
+{ coreutils
+, fetchFromGitHub
+, kernel
+, stdenv
+, utillinux
+}:
+
+let
+  common = import ../../../development/python-modules/openrazer/common.nix { inherit stdenv fetchFromGitHub; };
+in
+stdenv.mkDerivation (common // {
+  name = "openrazer-${common.version}-${kernel.version}";
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  buildFlags = [
+    "KERNELDIR=${kernel.dev}/lib/modules/${kernel.version}/build"
+  ];
+
+  installPhase = ''
+    binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hid"
+    mkdir -p "$binDir"
+    cp -v driver/*.ko "$binDir"
+    RAZER_MOUNT_OUT="$out/bin/razer_mount"
+    RAZER_RULES_OUT="$out/etc/udev/rules.d/99-razer.rules"
+    install -m 644 -v -D install_files/udev/99-razer.rules $RAZER_RULES_OUT
+    install -m 755 -v -D install_files/udev/razer_mount $RAZER_MOUNT_OUT
+    substituteInPlace $RAZER_RULES_OUT \
+      --replace razer_mount $RAZER_MOUNT_OUT
+    substituteInPlace $RAZER_MOUNT_OUT \
+      --replace /usr/bin/logger ${utillinux}/bin/logger \
+      --replace chgrp ${coreutils}/bin/chgrp \
+      --replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" ""
+  '';
+
+  meta = common.meta // {
+    description = "An entirely open source Linux driver that allows you to manage your Razer peripherals on GNU/Linux";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e21f26634a3..0c29526f5e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15856,6 +15856,8 @@ in
     nvidia_x11_beta      = nvidiaPackages.beta;
     nvidia_x11           = nvidiaPackages.stable;
 
+    openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { };
+
     ply = callPackage ../os-specific/linux/ply { };
 
     r8168 = callPackage ../os-specific/linux/r8168 { };

From d2c4d4d6b69d7ebf954ffe2729d87c815a6a59a7 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Wed, 28 Aug 2019 21:14:32 -0400
Subject: [PATCH 517/794] openrazer-daemon: init at 2.6.0

---
 .../python-modules/openrazer/daemon.nix       | 45 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/openrazer/daemon.nix

diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix
new file mode 100644
index 00000000000..6e3ab1e7833
--- /dev/null
+++ b/pkgs/development/python-modules/openrazer/daemon.nix
@@ -0,0 +1,45 @@
+{ buildPythonApplication
+, daemonize
+, dbus-python
+, fetchFromGitHub
+, fetchpatch
+, gobject-introspection
+, gtk3
+, makeWrapper
+, pygobject3
+, pyudev
+, setproctitle
+, stdenv
+, wrapGAppsHook
+}:
+
+let
+  common = import ./common.nix { inherit stdenv fetchFromGitHub; };
+in
+buildPythonApplication (common // rec {
+  pname = "openrazer_daemon";
+
+  sourceRoot = "source/daemon";
+
+  outputs = [ "out" "man" ];
+
+  nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+
+  propagatedBuildInputs = [
+    daemonize
+    dbus-python
+    gobject-introspection
+    gtk3
+    pygobject3
+    pyudev
+    setproctitle
+  ];
+
+  postBuild = ''
+    DESTDIR="$out" PREFIX="" make install manpages
+  '';
+
+  meta = common.meta // {
+    description = "An entirely open source user-space daemon that allows you to manage your Razer peripherals on GNU/Linux";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c29526f5e4..5fa6f97cf94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19998,6 +19998,8 @@ in
 
   openmpt123 = callPackage ../applications/audio/openmpt123 { };
 
+  openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon;
+
   opusfile = callPackage ../applications/audio/opusfile { };
 
   opusTools = callPackage ../applications/audio/opus-tools { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9570f110c07..169eeb5b41c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2570,6 +2570,8 @@ in {
   odfpy = callPackage ../development/python-modules/odfpy { };
 
   openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { };
+  openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { };
+
   oset = callPackage ../development/python-modules/oset { };
 
   pamela = callPackage ../development/python-modules/pamela { };

From e9b167bef4a76d0d5ae262e19d79fee360b8ebd5 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Wed, 28 Aug 2019 21:17:25 -0400
Subject: [PATCH 518/794] nixos/hardware/openrazer: init at 2.6.0

---
 nixos/modules/hardware/openrazer.nix | 133 +++++++++++++++++++++++++++
 nixos/modules/module-list.nix        |   1 +
 2 files changed, 134 insertions(+)
 create mode 100644 nixos/modules/hardware/openrazer.nix

diff --git a/nixos/modules/hardware/openrazer.nix b/nixos/modules/hardware/openrazer.nix
new file mode 100644
index 00000000000..883db7f2f4f
--- /dev/null
+++ b/nixos/modules/hardware/openrazer.nix
@@ -0,0 +1,133 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.hardware.openrazer;
+  kernelPackages = config.boot.kernelPackages;
+
+  toPyBoolStr = b: if b then "True" else "False";
+
+  daemonExe = "${pkgs.openrazer-daemon}/bin/openrazer-daemon --config ${daemonConfFile}";
+
+  daemonConfFile = pkgs.writeTextFile {
+    name = "razer.conf";
+    text = ''
+      [General]
+      verbose_logging = ${toPyBoolStr cfg.verboseLogging}
+
+      [Startup]
+      sync_effects_enabled = ${toPyBoolStr cfg.syncEffectsEnabled}
+      devices_off_on_screensaver = ${toPyBoolStr cfg.devicesOffOnScreensaver}
+      mouse_battery_notifier = ${toPyBoolStr cfg.mouseBatteryNotifier}
+
+      [Statistics]
+      key_statistics = ${toPyBoolStr cfg.keyStatistics}
+    '';
+  };
+
+  dbusServiceFile = pkgs.writeTextFile rec {
+    name = "org.razer.service";
+    destination = "/share/dbus-1/services/${name}";
+    text = ''
+      [D-BUS Service]
+      Name=org.razer
+      Exec=${daemonExe}
+      SystemdService=openrazer-daemon.service
+    '';
+  };
+
+  drivers = [
+    "razerkbd"
+    "razermouse"
+    "razerfirefly"
+    "razerkraken"
+    "razermug"
+    "razercore"
+  ];
+in
+{
+  options = {
+    hardware.openrazer = {
+      enable = mkEnableOption "OpenRazer drivers and userspace daemon.";
+
+      verboseLogging = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable verbose logging. Logs debug messages.
+        '';
+      };
+
+      syncEffectsEnabled = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Set the sync effects flag to true so any assignment of
+          effects will work across devices.
+        '';
+      };
+
+      devicesOffOnScreensaver = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Turn off the devices when the systems screensaver kicks in.
+        '';
+      };
+
+      mouseBatteryNotifier = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Mouse battery notifier.
+        '';
+      };
+
+      keyStatistics = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Collects number of keypresses per hour per key used to
+          generate a heatmap.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    boot.extraModulePackages = [ kernelPackages.openrazer ];
+    boot.kernelModules = drivers;
+
+    # Makes the man pages available so you can succesfully run
+    # > systemctl --user help openrazer-daemon
+    environment.systemPackages = [ pkgs.python3Packages.openrazer-daemon.man ];
+
+    services.udev.packages = [ kernelPackages.openrazer ];
+    services.dbus.packages = [ dbusServiceFile ];
+
+    # A user must be a member of the plugdev group in order to start
+    # the openrazer-daemon. Therefore we make sure that the plugdev
+    # group exists.
+    users.groups.plugdev = {};
+
+    systemd.user.services.openrazer-daemon = {
+      description = "Daemon to manage razer devices in userspace";
+      unitConfig.Documentation = "man:openrazer-daemon(8)";
+        # Requires a graphical session so the daemon knows when the screensaver
+        # starts. See the 'devicesOffOnScreensaver' option.
+        wantedBy = [ "graphical-session.target" ];
+        partOf = [ "graphical-session.target" ];
+        serviceConfig = {
+          Type = "dbus";
+          BusName = "org.razer";
+          ExecStart = "${daemonExe} --foreground";
+          Restart = "always";
+      };
+    };
+  };
+
+  meta = {
+    maintainers = with lib.maintainers; [ roelvandijk ];
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 22fd5d7609d..b3331f4a63d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -58,6 +58,7 @@
   ./hardware/network/intel-2200bg.nix
   ./hardware/nitrokey.nix
   ./hardware/opengl.nix
+  ./hardware/openrazer.nix
   ./hardware/pcmcia.nix
   ./hardware/raid/hpsa.nix
   ./hardware/steam-hardware.nix

From 80a3988150200da2839716dde04f728562930dec Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 19 Feb 2019 19:38:32 +0100
Subject: [PATCH 519/794] remove empty nix file

Nix repl hangs when evaluating empty files.

    find -name "*.nix" -empty -delete
---
 pkgs/development/interpreters/lua-5/build-rocks.nix    | 0
 pkgs/development/interpreters/lua-5/build-rockspec.nix | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 pkgs/development/interpreters/lua-5/build-rocks.nix
 delete mode 100644 pkgs/development/interpreters/lua-5/build-rockspec.nix

diff --git a/pkgs/development/interpreters/lua-5/build-rocks.nix b/pkgs/development/interpreters/lua-5/build-rocks.nix
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/pkgs/development/interpreters/lua-5/build-rockspec.nix b/pkgs/development/interpreters/lua-5/build-rockspec.nix
deleted file mode 100644
index e69de29bb2d..00000000000

From 0d220e4ed62355e8c2598f9e7b3e5a8e8eba43c2 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 26 Aug 2019 15:52:19 -0400
Subject: [PATCH 520/794] nixos/fontconfig-penultimate: disable by default

It currently lacks an emoji font-family which means it has to be
disabled for them to function [0].  Additionally it's fallen out of
necessity to ship custom font rendering settings (as far as I'm aware
of).

[0]: https://github.com/NixOS/nixpkgs/pull/67215
---
 nixos/doc/manual/release-notes/rl-1909.xml            | 6 ++++++
 nixos/modules/config/fonts/fontconfig-penultimate.nix | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index a211a8dfb86..560b3198517 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -585,6 +585,12 @@
       features.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     We no longer enable custom font rendering settings with <option>fonts.fontconfig.penultimate.enable</option> by default.
+     The defaults from fontconfig are sufficient.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix
index 24ed9c97668..7100f10dcfc 100644
--- a/nixos/modules/config/fonts/fontconfig-penultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix
@@ -269,7 +269,7 @@ in
         penultimate = {
           enable = mkOption {
             type = types.bool;
-            default = true;
+            default = false;
             description = ''
               Enable fontconfig-penultimate settings to supplement the
               NixOS defaults by providing per-font rendering defaults and

From 90319d5e33d3fe04ce8ec5137c4df77addcbdeb5 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 27 Aug 2019 04:03:10 -0400
Subject: [PATCH 521/794] nixos/seahorse: move to programs

---
 nixos/modules/module-list.nix                 |  2 +-
 nixos/modules/programs/seahorse.nix           | 44 +++++++++++++++++++
 .../services/desktops/gnome3/seahorse.nix     | 38 ----------------
 3 files changed, 45 insertions(+), 39 deletions(-)
 create mode 100644 nixos/modules/programs/seahorse.nix
 delete mode 100644 nixos/modules/services/desktops/gnome3/seahorse.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 22fd5d7609d..2ca47441fa4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -138,6 +138,7 @@
   ./programs/qt5ct.nix
   ./programs/screen.nix
   ./programs/sedutil.nix
+  ./programs/seahorse.nix
   ./programs/slock.nix
   ./programs/shadow.nix
   ./programs/shell.nix
@@ -301,7 +302,6 @@
   ./services/desktops/gnome3/gnome-settings-daemon.nix
   ./services/desktops/gnome3/gnome-user-share.nix
   ./services/desktops/gnome3/rygel.nix
-  ./services/desktops/gnome3/seahorse.nix
   ./services/desktops/gnome3/sushi.nix
   ./services/desktops/gnome3/tracker.nix
   ./services/desktops/gnome3/tracker-miners.nix
diff --git a/nixos/modules/programs/seahorse.nix b/nixos/modules/programs/seahorse.nix
new file mode 100644
index 00000000000..c08b0a85374
--- /dev/null
+++ b/nixos/modules/programs/seahorse.nix
@@ -0,0 +1,44 @@
+# Seahorse.
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+ # Added 2019-08-27
+  imports = [
+    (mkRenamedOptionModule
+      [ "services" "gnome3" "seahorse" "enable" ]
+      [ "programs" "seahorse" "enable" ])
+  ];
+
+
+  ###### interface
+
+  options = {
+
+    programs.seahorse = {
+
+      enable = mkEnableOption "Seahorse, a GNOME application for managing encryption keys and passwords in the GNOME Keyring";
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.programs.seahorse.enable {
+
+    environment.systemPackages = [
+      pkgs.gnome3.seahorse
+    ];
+
+    services.dbus.packages = [
+      pkgs.gnome3.seahorse
+    ];
+
+  };
+
+}
diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix
deleted file mode 100644
index 9631157934f..00000000000
--- a/nixos/modules/services/desktops/gnome3/seahorse.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-# Seahorse daemon.
-
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.gnome3.seahorse = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable Seahorse search provider for the GNOME Shell activity search.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.gnome3.seahorse.enable {
-
-    environment.systemPackages = [ pkgs.gnome3.seahorse pkgs.gnome3.dconf ];
-
-    services.dbus.packages = [ pkgs.gnome3.seahorse ];
-
-  };
-
-}

From dcbad82b286c253dca091aaacee1f4ea86f92797 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 26 Aug 2019 06:42:34 -0400
Subject: [PATCH 522/794] nixos/gnome3: cleanup core-utilities

core-utilities is meant to be the base utilities for a GNOME system.

The following are removed and the gnome3 module will no longer include:
- accerciser
- gnome-nettool
- gnome-power-manager
- gucharmap
- nautilus-sendto
  See https://gitlab.gnome.org/GNOME/gnome-build-meta/merge_requests/246
- gnome-usage
- vinagre
- gnome-documents
  See https://gitlab.gnome.org/GNOME/gnome-build-meta/merge_requests/157
- dconf-editor
- gnome-todo
- gnome-tweaks
- evolution

The following were added:
- cheese
- geary
---
 .../services/x11/desktop-managers/gnome3.nix  | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 0caa93ad217..dc3610683ad 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -37,7 +37,7 @@ let
        picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png'
 
        [org.gnome.shell]
-       favorite-apps=[ 'org.gnome.Epiphany.desktop', 'evolution.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]
+       favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]
 
        ${cfg.extraGSettingsOverrides}
      EOF
@@ -281,23 +281,43 @@ in
       ];
     })
 
+    # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-utilities.bst
     (mkIf serviceCfg.core-utilities.enable {
       environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
-        baobab eog epiphany evince gucharmap nautilus totem yelp gnome-calculator
-        gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-monitor simple-scan
-        gnome-terminal evolution file-roller gedit gnome-clocks gnome-music gnome-tweaks
-        pkgs.gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-        gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-packagekit
-        gnome-software gnome-power-manager gnome-todo pkgs.gnome-usage
+        baobab
+        cheese
+        eog
+        epiphany
+        geary
+        gedit
+        gnome-calculator
+        gnome-calendar
+        gnome-characters
+        gnome-clocks
+        gnome-contacts
+        gnome-font-viewer
+        gnome-logs
+        gnome-maps
+        gnome-music
+        gnome-photos
+        gnome-screenshot
+        gnome-software
+        gnome-system-monitor
+        gnome-weather
+        nautilus
+        simple-scan
+        totem
+        yelp
+        # Unsure if sensible for NixOS
+        /* gnome-boxes */
       ] config.environment.gnome3.excludePackages);
 
       # Enable default programs
       programs.evince.enable = mkDefault true;
       programs.file-roller.enable = mkDefault true;
       programs.gnome-disks.enable = mkDefault true;
-      programs.gnome-documents.enable = mkDefault true;
       programs.gnome-terminal.enable = mkDefault true;
-      services.gnome3.seahorse.enable = mkDefault true;
+      programs.seahorse.enable = mkDefault true;
       services.gnome3.sushi.enable = mkDefault true;
 
       # Let nautilus find extensions

From 7820be7a8fa6ae65c445799087c3ac2923254bea Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 26 Aug 2019 06:50:20 -0400
Subject: [PATCH 523/794] nixos/gnome3: additions to core-shell

Adds:

- gnome-color-manager
- services.avahi
  It appears that GeoClue requires its daemon and IIRC has
  been default enabled in other distros for a while.
- orca
  It's the default screen-reader.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index dc3610683ad..6f344f4121b 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -238,6 +238,8 @@ in
       services.dbus.packages =
         optional config.services.printing.enable pkgs.system-config-printer;
 
+      services.avahi.enable = mkDefault true;
+
       services.geoclue2.enable = mkDefault true;
       services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent
 
@@ -261,16 +263,19 @@ in
         source-sans-pro
       ];
 
+      # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-shell.bst
       environment.systemPackages = with pkgs.gnome3; [
         adwaita-icon-theme
         gnome-backgrounds
         gnome-bluetooth
+        gnome-color-manager
         gnome-control-center
         gnome-getting-started-docs
         gnome-shell
         gnome-shell-extensions
         gnome-themes-extra
         gnome-user-docs
+        pkgs.orca
         pkgs.glib # for gsettings
         pkgs.gnome-menus
         pkgs.gtk3.out # for gtk-launch

From aaad52ba7af22bc4771c54b740f31e5b424aff46 Mon Sep 17 00:00:00 2001
From: "luz.paz" <luzpaz@users.noreply.github.com>
Date: Fri, 30 Aug 2019 21:18:27 -0400
Subject: [PATCH 524/794] olive-editor: 0.1.0 -> 0.1.1

Commit updated according to #65399
---
 pkgs/applications/video/olive-editor/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix
index 15db28b05e4..efa06f4794e 100644
--- a/pkgs/applications/video/olive-editor/default.nix
+++ b/pkgs/applications/video/olive-editor/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, pkgconfig, which, qmake, 
+{ stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation,
   qtbase, qtmultimedia, frei0r, opencolorio, hicolor-icon-theme, ffmpeg-full,
   CoreFoundation  }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "olive-editor";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "olive-editor";
     repo = "olive";
     rev = version;
-    sha256 = "191nk4c35gys4iypykcidn6h27c3sbjfy117q7h9h1qilz2wm94z";
+    sha256 = "15q4qwf5rc3adssywl72jrhkpqk55ihpd5h5wf07baw0s47vv5kq";
   };
 
   nativeBuildInputs = [ 

From bd1e4424e51ec3240933377f0746c4e9d10e856e Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 31 Aug 2019 01:39:25 +0200
Subject: [PATCH 525/794] monero-gui: cleanup for qt wrappers

---
 .../blockchains/monero-gui/default.nix        | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index aaff39f1c6b..92f6f008021 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchFromGitHub
-, wrapQtAppsHook, makeDesktopItem
+{ mkDerivation, lib, makeDesktopItem, fetchFromGitHub
 , qtbase, qmake, qtmultimedia, qttools
 , qtgraphicaleffects, qtdeclarative
 , qtlocation, qtquickcontrols, qtquickcontrols2
@@ -9,22 +8,10 @@
 , hidapi
 }:
 
-with stdenv.lib;
+with lib;
 
-let
-  qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}";
-
-  qml2ImportPath = concatMapStringsSep ":" qmlPath [
-    qtbase.bin qtmultimedia.bin qtgraphicaleffects
-    qtdeclarative.bin qtlocation.bin
-    qtquickcontrols qtquickcontrols2.bin
-    qtwebchannel.bin qtwebengine.bin qtxmlpatterns
-  ];
-
-in
-
-stdenv.mkDerivation rec {
-  name = "monero-gui-${version}";
+mkDerivation rec {
+  pname = "monero-gui";
   version = "0.14.1.2";
 
   src = fetchFromGitHub {
@@ -34,7 +21,7 @@ stdenv.mkDerivation rec {
     sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k";
   };
 
-  nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
+  nativeBuildInputs = [ qmake pkgconfig ];
 
   buildInputs = [
     qtbase qtmultimedia qtgraphicaleffects
@@ -46,9 +33,7 @@ stdenv.mkDerivation rec {
     cppzmq hidapi
   ];
 
-  patches = [
-    ./move-log-file.patch
-  ];
+  patches = [ ./move-log-file.patch ];
 
   postPatch = ''
     echo '

From 60216e84720c68745b0665a4747a6f9695563984 Mon Sep 17 00:00:00 2001
From: averelld <averelld@users.noreply.github.com>
Date: Sat, 31 Aug 2019 06:06:40 +0200
Subject: [PATCH 526/794] hexchat: 2.12.4 -> 2.14.2 (#67714)

---
 .../networking/irc/hexchat/default.nix        | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index 34c4fcf0c88..815b74f85c9 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -1,43 +1,52 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2
-, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy
-, libsexy, enchant1, libnotify, openssl, intltool
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3
+, pciutils, dbus-glib, libcanberra-gtk2, libproxy
+, libsexy, enchant2, libnotify, openssl, isocodes
 , desktop-file-utils, hicolor-icon-theme
-, autoconf, automake, autoconf-archive
+, meson, ninja
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.12.4";
-  name = "hexchat-${version}";
+  version = "2.14.2";
+  pname = "hexchat";
 
   src = fetchFromGitHub {
     owner = "hexchat";
     repo = "hexchat";
     rev = "v${version}";
-    sha256 = "1z8v7jg1mc2277k3jihnq4rixw1q27305aw6b6rpb1x7vpiy2zr3";
+    sha256 = "1kz81xfis0bw2cfd6ndw32jdzdl5azk9ixqj4a3lginmlj6fs45a";
   };
 
-  nativeBuildInputs = [
-    pkgconfig libtool intltool
-    autoconf autoconf-archive automake
-  ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
 
   buildInputs = [
-    gtk2 lua perl python2 pciutils dbus-glib libcanberra-gtk2 libproxy
+    gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy
     libsexy libnotify openssl desktop-file-utils hicolor-icon-theme
+    isocodes
   ];
 
-  enableParallelBuilding = true;
+  patches = [
+    #https://github.com/hexchat/hexchat/issues/2237
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/hexchat/raw/8a08a0c8a8da503b18f2fbb15194c5f3728a689a/f/0001-Python-plugin-Call-EndInterpreter-when-deinit-ing-th.patch";
+      sha256 = "1199dj3wvjqj6h5vlm7lzhaax84j9ki6an8y8fs4rww27iq0lk8g";
+    })
+  ];
 
-  #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path
-  patchPhase = ''
-    sed -i "s,libenchant.so.1,${enchant1}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c
+  #hexchat and hexchat-text loads enchant spell checking library at run time and so it needs to have route to the path
+  postPatch = ''
+    sed -i "s,libenchant-2.so.2,${enchant2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c
+    sed -i "/flag.startswith('-I')/i if flag.contains('no-such-path')\ncontinue\nendif" plugins/perl/meson.build
+    chmod +x meson_post_install.py
+    for f in meson_post_install.py \
+             src/common/make-te.py \
+             plugins/perl/generate_header.py \
+             po/validate-textevent-translations
+    do
+      patchShebangs $f
+    done
   '';
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
-  configureFlags = [ "--enable-shm" "--enable-textfe" ];
+  mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ];
 
   meta = with stdenv.lib; {
     description = "A popular and easy to use graphical IRC (chat) client";

From 5a581c420c33f1188484f9d45d1cba6e97ae1d45 Mon Sep 17 00:00:00 2001
From: averelld <averelld@users.noreply.github.com>
Date: Sat, 31 Aug 2019 06:19:16 +0200
Subject: [PATCH 527/794] python.pkgs.handout: init at 1.0.0 (#66263)

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

diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix
new file mode 100644
index 00000000000..9a398080609
--- /dev/null
+++ b/pkgs/development/python-modules/handout/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, imageio, imageio-ffmpeg }:
+
+buildPythonPackage rec {
+  pname = "handout";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16y1wqx8j4kf6fa94x22njrkdfb2cfi0dvc7a4q2qsa8m3ri0b43";
+  };
+
+  propagatedBuildInputs = [ imageio imageio-ffmpeg ];
+
+  meta = with stdenv.lib; {
+    description = "Turn Python scripts into handouts with Markdown and figures";
+    homepage = "https://github.com/danijar/handout";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ averelld ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bdaae932f68..9099552add2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -645,6 +645,8 @@ in {
 
   habanero = callPackage ../development/python-modules/habanero { };
 
+  handout = callPackage ../development/python-modules/handout { };
+
   helper = callPackage ../development/python-modules/helper { };
 
   histbook = callPackage ../development/python-modules/histbook { };

From d7c7fc460300e30cbb105bf2e0d9021f368be492 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 31 Aug 2019 06:30:50 +0200
Subject: [PATCH 528/794] nixos/tests/systemd: Fix x-initrd-mount flakiness
 (#67798)

It turns out that checking for the last mount time of an ext4 file
system isn't a very reliable way to check whether the file system was
properly unmounted.

When creating that test in the first place (88530e02b6fa9b5429dc09972b),
I was reluctant to inspect the file system when the VM is down and was
searching for a way to check for a clean unmount *after* the file system
was mounted again to make sure we don't need to create a 512 MB raw
image on the host.

Fortunately however, when converting from qcow2, qemu-img actually
writes a sparse file, so for most file systems (that is, file systems
supporting sparse files) this shouldn't waste a lot of disk space.

So when investigating the flakiness, I found that whenever the test is
failing, the unmount of /test-x-initrd-mount was done *before* the final
step during which systemd remounts+unmounts all the remaining file
systems.

I haven't investigated why this is the case, but the test is a
regression test for https://github.com/NixOS/nixpkgs/issues/35268, which
actually didn't unmount the file system *at* *all*, so really all we
need to take care here is whether the unmount has happened and not
*how*.

To make sure that checking the filesystem state is enough for this, I
temporarily replaced the $machine->shutdown call with $machine->crash
and verified that the file system state is "not clean".

Signed-off-by: aszlig <aszlig@nix.build>
Fixes: https://github.com/NixOS/nixpkgs/issues/67555
---
 nixos/tests/systemd.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index 1c201e3b5dc..4b71b4d6759 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -71,11 +71,13 @@ import ./make-test.nix ({ pkgs, ... }: {
 
     # Regression test for https://github.com/NixOS/nixpkgs/issues/35268
     subtest "file system with x-initrd.mount is not unmounted", sub {
+      $machine->succeed('mountpoint -q /test-x-initrd-mount');
       $machine->shutdown;
-      $machine->waitForUnit('multi-user.target');
-      # If the file system was unmounted during the shutdown the file system
-      # has a last mount time, because the file system wasn't checked.
-      $machine->fail('dumpe2fs /dev/vdb | grep -q "^Last mount time: *n/a"');
+      system('qemu-img', 'convert', '-O', 'raw',
+             'vm-state-machine/empty2.qcow2', 'x-initrd-mount.raw');
+      my $extinfo = `${pkgs.e2fsprogs}/bin/dumpe2fs x-initrd-mount.raw`;
+      die "File system was not cleanly unmounted: $extinfo"
+        unless $extinfo =~ /^Filesystem state: *clean$/m;
     };
 
     subtest "systemd-shutdown works", sub {

From 1bf70fd2f178647d40784e6c6fce8431b3b5f0d8 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Sat, 31 Aug 2019 06:35:33 +0200
Subject: [PATCH 529/794] bazel: cctools runtime dependency on darwin (#66724)

The bazel build patches paths like `/usr/bin/install_name_tool` to refer
to `${cctools}/bin/install_name_tool` instead. If the corresponding
runtime dependency is not denoted, then darwin users can encounter "file
not found" errors, e.g. when they fetch bazel from a binary cache and
don't have `cctools` in their own nix store.
---
 pkgs/development/tools/build-managers/bazel/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 1007f4df8ca..7e6b584f966 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -511,6 +511,8 @@ stdenv.mkDerivation rec {
     # The templates get tar’d up into a .jar,
     # so nix can’t detect python is needed in the runtime closure
     echo "${python3}" >> $out/nix-support/depends
+  '' + lib.optionalString stdenv.isDarwin ''
+    echo "${cctools}" >> $out/nix-support/depends
   '';
 
   dontStrip = true;

From 72f711eadaf18315adc1188a9c1b2198713b8ae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 31 Aug 2019 07:36:28 +0200
Subject: [PATCH 530/794] maturin: 0.7.0 -> 0.7.1

Change:

- maturin build --interpreter/maturin publish --interpreter builds
  only a source distribution.
---
 pkgs/development/tools/rust/maturin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
index 4b07129ae0e..7bd49132d0e 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -5,16 +5,16 @@ let
   inherit (darwin.apple_sdk.frameworks) Security;
 in rustPlatform.buildRustPackage rec {
   name = "maturin-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    sha256 = "1qscn8ycyg9ldkp1v5178mlw8r5ak2p12x52c0w4hgij7y1q5s39";
+    sha256 = "0srsb305gld6zmz7qm5zk4gawqqlywdpray04z8xcij146mccci2";
   };
 
-  cargoSha256 = "0fk9dgwkgkkmxxd8ydl0vp14jhzi65pkz36v5h3nkp4cb4n4cvdj";
+  cargoSha256 = "0bscwbrzjaps4yqcrqhan56kdmh0n014w4ldsbv3sbhpw5izz335";
 
   nativeBuildInputs = [ pkgconfig ];
 

From b79f6f68a7d9c8476da46b497643d9053881d968 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Fri, 30 Aug 2019 23:30:22 -0600
Subject: [PATCH 531/794] neofetch: 6.0.0 -> 6.1.0

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

diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index 18ae88547a0..5850c4a90af 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "neofetch-${version}";
-  version = "6.0.0";
+  pname = "neofetch";
+  version = "6.1.0";
+
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "neofetch";
     rev = version;
-    sha256 = "0j0r40llyry1sgc6p9wd7jrpydps2lnj4rwajjp37697g2bik89i";
+    sha256 = "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch";
   };
 
   dontBuild = true;
 
-
   makeFlags = [
-    "PREFIX=$(out)"
-    "SYSCONFDIR=$(out)/etc"
+    "PREFIX=${placeholder "out"}"
+    "SYSCONFDIR=${placeholder "out"}/etc"
   ];
 
   meta = with stdenv.lib; {

From 18508dcb6a6c5e3341e6591e5812ada177b9c1d6 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sat, 31 Aug 2019 14:47:01 +0800
Subject: [PATCH 532/794] cargo-watch: init at 7.2.1

---
 .../tools/rust/cargo-watch/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/rust/cargo-watch/default.nix

diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix
new file mode 100644
index 00000000000..3ffef315c31
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-watch/default.nix
@@ -0,0 +1,27 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-watch";
+  version = "7.2.1";
+
+  src = fetchFromGitHub {
+    owner = "passcod";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "13zjsypj0ay9xb5j5fhl3yfn57kp2yngl138vmnyfk1h7gjdxpk3";
+  };
+
+  cargoSha256 = "1c3h9il3y0swvcdrrqgh5r7di522i1cc8zk1kfmx97chy8bhsqvg";
+
+  # `test with_cargo` tries to call cargo-watch as a cargo subcommand
+  # (calling cargo-watch with command `cargo watch`)
+  checkPhase = "PATH=target/debug:$PATH cargo test";
+
+  meta = with lib; {
+    description = "A Cargo subcommand for watching over Cargo project's source";
+    homepage = https://github.com/passcod/cargo-watch;
+    license = licenses.cc0;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ xrelkd ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3756ecb0a65..0180e8e2d60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8356,6 +8356,7 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
   cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };
+  cargo-watch = callPackage ../development/tools/rust/cargo-watch { };
   cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
   cargo-generate = callPackage ../development/tools/rust/cargo-generate {
     inherit (darwin.apple_sdk.frameworks) Security;

From d33df05f5073f370da22c737c84fc6a44a89a02e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 24 Aug 2019 07:02:11 +0000
Subject: [PATCH 533/794] ocamlPackages.domain-name: init at 0.3.0

---
 .../ocaml-modules/domain-name/default.nix     | 29 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/domain-name/default.nix

diff --git a/pkgs/development/ocaml-modules/domain-name/default.nix b/pkgs/development/ocaml-modules/domain-name/default.nix
new file mode 100644
index 00000000000..cb0105ff46f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/domain-name/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildDunePackage, fetchurl
+, alcotest
+, astring, fmt
+}:
+
+buildDunePackage rec {
+  pname = "domain-name";
+  version = "0.3.0";
+
+  src = fetchurl {
+    url = "https://github.com/hannesm/domain-name/releases/download/v${version}/domain-name-v${version}.tbz";
+    sha256 = "12kc9p2a2fi1ipc2hyhbzivxpph3npglxwdgvhd6v20rqqdyvnad";
+  };
+
+  minimumOCamlVersion = "4.03";
+
+  buildInputs = [ alcotest ];
+
+  propagatedBuildInputs = [ astring fmt ];
+
+  doCheck = true;
+
+  meta = {
+    homepage = "https://github.com/hannesm/domain-name";
+    description = "RFC 1035 Internet domain names";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 7eabfccf85f..72ca022adc6 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -215,6 +215,8 @@ let
 
     dolog = callPackage ../development/ocaml-modules/dolog { };
 
+    domain-name = callPackage ../development/ocaml-modules/domain-name { };
+
     dtoa = callPackage ../development/ocaml-modules/dtoa { };
 
     dune = callPackage ../development/tools/ocaml/dune { };

From e9edc7537a86fb1ab7b4c9637b414ed2ea70b8a4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 24 Aug 2019 07:02:17 +0000
Subject: [PATCH 534/794] ocamlPackages.gmap: init at 0.3.0

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

diff --git a/pkgs/development/ocaml-modules/gmap/default.nix b/pkgs/development/ocaml-modules/gmap/default.nix
new file mode 100644
index 00000000000..2585dfcaa96
--- /dev/null
+++ b/pkgs/development/ocaml-modules/gmap/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildDunePackage, fetchurl, alcotest }:
+
+buildDunePackage rec {
+  pname = "gmap";
+  version = "0.3.0";
+
+  src = fetchurl {
+    url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz";
+    sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84";
+  };
+
+  minimumOCamlVersion = "4.03";
+
+  buildInputs = [ alcotest ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Heterogenous maps over a GADT";
+    homepage = "https://github.com/hannesm/gmap";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 72ca022adc6..64e2effa724 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -273,6 +273,8 @@ let
 
     gen = callPackage ../development/ocaml-modules/gen { };
 
+    gmap = callPackage ../development/ocaml-modules/gmap { };
+
     herelib = callPackage ../development/ocaml-modules/herelib { };
 
     higlo = callPackage ../development/ocaml-modules/higlo { };

From 10ffd51a96dc2f341f2aaf93b564dca7e8a2d555 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 24 Aug 2019 07:02:21 +0000
Subject: [PATCH 535/794] ocamlPackages.bigarray-compat: init at 1.0.0

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

diff --git a/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/pkgs/development/ocaml-modules/bigarray-compat/default.nix
new file mode 100644
index 00000000000..6d833b48f26
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bigarray-compat/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildDunePackage, fetchFromGitHub }:
+
+buildDunePackage rec {
+  pname = "bigarray-compat";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "mirage";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "06j1dwlpisxshdd0nab4n4x266gg1s1n8na16lpgw3fvcznwnimz";
+  };
+
+  meta = {
+    description = "Compatibility library to use Stdlib.Bigarray when possible";
+    inherit (src.meta) homepage;
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 64e2effa724..8f7f76a3e25 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -61,6 +61,8 @@ let
 
     batteries = callPackage ../development/ocaml-modules/batteries { };
 
+    bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { };
+
     bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { };
 
     bistro = callPackage ../development/ocaml-modules/bistro { };

From 81760f32353fa7f309a49fda17d90f43ac1e9a42 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 24 Aug 2019 07:02:26 +0000
Subject: [PATCH 536/794] ocamlPackages.cstruct: 3.1.1 -> 4.0.0

ocamlPackages.cstruct-sexp: init at 4.0.0

ocamlPackages.x509: 0.6.1 -> 0.7.1

ocamlPackages.tls: 0.9.0 -> 0.10.4

jackline: 2018-05-11 -> 2019-08-08
---
 .../instant-messengers/jackline/default.nix   |  6 ++--
 .../ocaml-modules/cstruct/default.nix         | 14 ++++-----
 .../development/ocaml-modules/cstruct/ppx.nix |  6 ++--
 .../ocaml-modules/cstruct/sexp.nix            | 16 ++++++++++
 .../ocaml-modules/cstruct/unix.nix            |  2 +-
 .../development/ocaml-modules/git/default.nix |  4 +--
 .../ocaml-modules/nocrypto/default.nix        | 12 ++++++--
 .../development/ocaml-modules/tls/default.nix | 15 +++++-----
 .../ocaml-modules/x509/default.nix            | 29 ++++++++-----------
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 10 files changed, 63 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/cstruct/sexp.nix

diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index 689445d7dcb..e9a2b9edec3 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -3,14 +3,14 @@
 assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
 
 stdenv.mkDerivation rec {
-  version = "2018-05-11";
+  version = "2019-08-08";
   name = "jackline-${version}";
 
   src = fetchFromGitHub {
     owner  = "hannesm";
     repo   = "jackline";
-    rev    = "bc36b1c8b80fee6baba4f91011cd01b82a06e8eb";
-    sha256 = "1xx2yx8a95m84sa1bkxi3rlx7pd39zkqwk3znj0zzz3cni6apfrz";
+    rev    = "b934594010a563ded9c0f436e3fab8f1cae29856";
+    sha256 = "076h03jd970xlii90ax6kvgyq67g81gs30yvdzps366n7zzy3yfc";
   };
 
   buildInputs = with ocamlPackages; [
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index 37c7f660ca6..01a32fc09a2 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchurl, buildDunePackage, sexplib, ocplib-endian }:
+{ lib, fetchurl, buildDunePackage }:
 
 buildDunePackage rec {
   pname = "cstruct";
-  version = "3.1.1";
+  version = "4.0.0";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz";
-    sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2";
+    url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz";
+    sha256 = "1q4fsc2m6d96yf42g3wb3gcnhpnxw800df5mh3yr25pprj8y4m1a";
   };
 
-  propagatedBuildInputs = [ sexplib ocplib-endian ];
-
   meta = {
     description = "Access C-like structures directly from OCaml";
-    license = stdenv.lib.licenses.isc;
+    license = lib.licenses.isc;
     homepage = "https://github.com/mirage/ocaml-cstruct";
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix
index 78600b78306..b5c39533e73 100644
--- a/pkgs/development/ocaml-modules/cstruct/ppx.nix
+++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, cstruct, ppx_tools_versioned }:
+{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned }:
 
 if !lib.versionAtLeast (cstruct.version or "1") "3"
 then cstruct
@@ -8,8 +8,8 @@ buildDunePackage {
 	pname = "ppx_cstruct";
 	inherit (cstruct) version src meta;
 
-  minimumOCamlVersion = "4.02";
+	minimumOCamlVersion = "4.03";
 
-	buildInputs = [ ppx_tools_versioned ];
+	buildInputs = [ sexplib ppx_tools_versioned ];
 	propagatedBuildInputs = [ cstruct ];
 }
diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix
new file mode 100644
index 00000000000..9a1ef0dd301
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix
@@ -0,0 +1,16 @@
+{ lib, buildDunePackage, alcotest, cstruct, sexplib }:
+
+if !lib.versionAtLeast (cstruct.version or "1") "3"
+then cstruct
+else
+
+buildDunePackage {
+	pname = "cstruct-sexp";
+	inherit (cstruct) version src meta;
+
+	doCheck = true;
+	buildInputs = [ alcotest ];
+
+	propagatedBuildInputs = [ cstruct sexplib ];
+}
+
diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix
index 604ad4fb083..7cb5d665869 100644
--- a/pkgs/development/ocaml-modules/cstruct/unix.nix
+++ b/pkgs/development/ocaml-modules/cstruct/unix.nix
@@ -8,7 +8,7 @@ buildDunePackage {
 	pname = "cstruct-unix";
 	inherit (cstruct) version src meta;
 
-  minimumOCamlVersion = "4.02";
+	minimumOCamlVersion = "4.06";
 
 	propagatedBuildInputs = [ cstruct ];
 }
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index 944195fd0a3..35f8f5d52e9 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, buildDunePackage
-, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri
+, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, ocplib-endian, uri
 , alcotest, mtime, nocrypto
 }:
 
@@ -15,7 +15,7 @@ buildDunePackage rec {
 	};
 
 	buildInputs = [ alcotest mtime nocrypto ];
-	propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ];
+	propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph ocplib-endian uri ];
 	doCheck = true;
 
 	meta = {
diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix
index 813b4d7f7a4..9108fd248c0 100644
--- a/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg
-, cpuid, ocb-stubblr
+, cpuid, ocb-stubblr, sexplib
 , cstruct, zarith, ppx_sexp_conv
 , cstruct-lwt ? null
 }:
@@ -33,10 +33,18 @@ stdenv.mkDerivation rec {
       url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0004-pack-package-workaround-ocamlbuild-272.patch";
       sha256 = "16k0w78plvqhl17qiqq1mckxhhcdysqgs94l54a1bn0l6fx3rvb9";
     })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0005-use-modern-cstruct-findlib.patch";
+      sha256 = "021k38zbdidw6g7j4vjxlnbsrnzq07bnavxzdjq23nbwlifs2nq9";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0006-explicit-dependency-on-sexplib.patch";
+      sha256 = "15kd0qgi96yxr3qkmaqny591l0s6qmwpprxd5xdx9qwv72hq813z";
+    })
   ];
 
   buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ];
-  propagatedBuildInputs = [ cstruct ppx_sexp_conv zarith ] ++ optional withLwt cstruct-lwt;
+  propagatedBuildInputs = [ cstruct ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt;
 
   buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}";
   inherit (topkg) installPhase;
diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
index 181946802d7..2a29179f4cd 100644
--- a/pkgs/development/ocaml-modules/tls/default.nix
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg
-, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit
+, ppx_sexp_conv, result, x509, nocrypto, cstruct-sexp, ppx_cstruct, cstruct-unix, ounit
 , lwt     ? null}:
 
 with stdenv.lib;
@@ -11,23 +11,24 @@ then throw "tls is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-  version = "0.9.0";
+  version = "0.10.4";
   name = "ocaml${ocaml.version}-tls-${version}";
 
   src = fetchFromGitHub {
     owner  = "mirleft";
     repo   = "ocaml-tls";
     rev    = "${version}";
-    sha256 = "0qgw8lq8pk9hss7b5i6fr08pi711i0zqx7yyjgcil47ipjig6c31";
+    sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g";
   };
 
-  buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ounit ppx_cstruct cstruct-unix ];
-  propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++
+  buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_cstruct ]
+  ++ optionals doCheck [ ounit cstruct-unix ];
+  propagatedBuildInputs = [ cstruct-sexp nocrypto result x509 ] ++
                           optional withLwt lwt;
 
-  buildPhase = "${topkg.run} build --tests true --with-mirage false --with-lwt ${if withLwt then "true" else "false"}";
+  buildPhase = "${topkg.run} build --tests ${boolToString doCheck} --with-mirage false --with-lwt ${boolToString withLwt}";
 
-  doCheck = true;
+  doCheck = versionAtLeast ocaml.version "4.06";
   checkPhase = "${topkg.run} test";
 
   inherit (topkg) installPhase;
diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix
index 8d4bd4c82b3..63ddc6e67bd 100644
--- a/pkgs/development/ocaml-modules/x509/default.nix
+++ b/pkgs/development/ocaml-modules/x509/default.nix
@@ -1,28 +1,23 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
-, asn1-combinators, astring, nocrypto, ppx_sexp_conv
-, ounit, cstruct-unix
+{ lib, fetchurl, buildDunePackage, ocaml
+, alcotest, cstruct-unix
+, asn1-combinators, domain-name, fmt, gmap, nocrypto, rresult
 }:
 
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-x509-${version}";
-  version = "0.6.1";
+buildDunePackage rec {
+  pname = "x509";
+  version = "0.7.1";
 
   src = fetchurl {
-    url = "https://github.com/mirleft/ocaml-x509/releases/download/${version}/x509-${version}.tbz";
-    sha256 = "1c62mw9rnzq0rs3ihbhfs18nv4mdzwag7893hlqgji3wmaai70pk";
+    url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz";
+    sha256 = "0hnklgdm1fwwqi0nfvpdbp7ddqvrh9h8697mr99bxqdfhg6sxh1w";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild topkg ppx_sexp_conv ounit cstruct-unix ];
-  propagatedBuildInputs = [ asn1-combinators astring nocrypto ];
+  buildInputs = lib.optionals doCheck [ alcotest cstruct-unix ];
+  propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap nocrypto rresult ];
 
-  buildPhase = "${topkg.run} build --tests true";
+  doCheck = lib.versionAtLeast ocaml.version "4.06";
 
-  doCheck = true;
-  checkPhase = "${topkg.run} test";
-
-  inherit (topkg) installPhase;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/mirleft/ocaml-x509;
     description = "X509 (RFC5280) handling in OCaml";
     license = licenses.bsd2;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 8f7f76a3e25..9dbc36e8601 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -188,6 +188,8 @@ let
       lwt = ocaml_lwt;
     };
 
+    cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {};
+
     cstruct-unix = callPackage ../development/ocaml-modules/cstruct/unix.nix {};
 
     csv =

From c3c8f17439bc3aa4313c1137f99c3160b60825c4 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Sat, 31 Aug 2019 10:08:48 +0200
Subject: [PATCH 537/794] maintainers: add endocrimes

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f5c00ff6268..f67bd770f74 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1822,6 +1822,12 @@
     githubId = 18535642;
     name = "Emily";
   };
+  endocrimes = {
+    email = "dani@builds.terrible.systems";
+    github = "endocrimes";
+    githubId = 1330683;
+    name = "Danielle Lancashire";
+  };
   ederoyd46 = {
     email = "matt@ederoyd.co.uk";
     github = "ederoyd46";

From 1c9253ce2b512bbe625a6fafbae58228498f42fb Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Sat, 31 Aug 2019 10:09:32 +0200
Subject: [PATCH 538/794] gotestsum: Init at 0.3.5

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

diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix
new file mode 100644
index 00000000000..36e41bddf25
--- /dev/null
+++ b/pkgs/development/tools/gotestsum/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+  pname = "gotestsum";
+  version = "0.3.5";
+
+  src = fetchFromGitHub {
+    owner = "gotestyourself";
+    repo = "gotestsum";
+    rev = "v${version}";
+    sha256 = "1d4sbvk9wqzl3g3da8inqdkvd43rkwvmq969jlgl1k1agv5xjxqv";
+  };
+
+  modSha256 = "1dgs643pmcw68yc003zss52hbvsy6hxzwkrhr0qmsqkmzxryb3bn";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/gotestyourself/gotestsum";
+    description = "A human friendly `go test` runner";
+    platforms = platforms.linux ++ platforms.darwin;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ endocrimes ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f996f185d2..39caf0596fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16198,6 +16198,8 @@ in
 
   gotests = callPackage ../development/tools/gotests { };
 
+  gotestsum = callPackage ../development/tools/gotestsum { };
+
   impl = callPackage ../development/tools/impl { };
 
   quicktemplate = callPackage ../development/tools/quicktemplate { };

From 74d7ce42485a778d4f9c1abe3b453dd93b419d89 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Fri, 30 Aug 2019 18:29:29 +0200
Subject: [PATCH 539/794] nixos/{namecoind,bitcoind}: removing the altcoin
 prefix

---
 nixos/modules/services/networking/bitcoind.nix  | 4 ++--
 nixos/modules/services/networking/namecoind.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix
index d3501636b41..1439d739da9 100644
--- a/nixos/modules/services/networking/bitcoind.nix
+++ b/nixos/modules/services/networking/bitcoind.nix
@@ -59,8 +59,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.altcoins.bitcoind;
-        defaultText = "pkgs.altcoins.bitcoind";
+        default = pkgs.bitcoind;
+        defaultText = "pkgs.bitcoind";
         description = "The package providing bitcoin binaries.";
       };
       configFile = mkOption {
diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
index a569ca87e26..c8ee0a2f564 100644
--- a/nixos/modules/services/networking/namecoind.nix
+++ b/nixos/modules/services/networking/namecoind.nix
@@ -175,7 +175,7 @@ in
       serviceConfig = {
         User  = "namecoin";
         Group = "namecoin";
-        ExecStart  = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${configFile} -datadir=${dataDir} -printtoconsole";
+        ExecStart  = "${pkgs.namecoind}/bin/namecoind -conf=${configFile} -datadir=${dataDir} -printtoconsole";
         ExecStop   = "${pkgs.coreutils}/bin/kill -KILL $MAINPID";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         Nice = "10";

From c2cd35c4cb30415f5f075c7a4d13c92d8198ed55 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Fri, 30 Aug 2019 18:00:43 +0000
Subject: [PATCH 540/794] out-of-tree: 1.0.1 -> 1.1.1

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

diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix
index 7064cb8285e..0e4810f0ba4 100644
--- a/pkgs/development/tools/out-of-tree/default.nix
+++ b/pkgs/development/tools/out-of-tree/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "out-of-tree";
-  version = "1.0.1";
+  version = "1.1.1";
 
   buildInputs = [ makeWrapper ];
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
   src = fetchgit {
     rev = "refs/tags/v${version}";
     url = "https://code.dumpstack.io/tools/${pname}.git";
-    sha256 = "0p0ps73w6lmsdyf7irqgbhfxjg5smgbn081d06pnr1zmxvw8dryx";
+    sha256 = "048jda3vng11mg62fd3d8vs9yjsp569zlfylnkqv8sb6wd1qn66d";
   };
 
   goDeps = ./deps.nix;

From e1c44d481c687e58c603997e75af32942bee7b20 Mon Sep 17 00:00:00 2001
From: Quentin Vaucher <quentin.vaucher@protonmail.com>
Date: Sat, 31 Aug 2019 11:09:21 +0200
Subject: [PATCH 541/794] timetable: 1.0.6 -> 1.0.8

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

diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix
index bbf252d2892..fa2d5939218 100644
--- a/pkgs/applications/office/timetable/default.nix
+++ b/pkgs/applications/office/timetable/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "timetable";
-  version = "1.0.6";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "080xgp917v6j40qxy0y1iycz01yylbcr8pahx6zd6mpi022ccfv0";
+    sha256 = "0s825al10s0hwfzl90bplwwasx89wx28n41sg2md71l9hfqy296q";
   };
 
   nativeBuildInputs = [

From 560ce2a4a7e212eb884a16f27380295849d4005d Mon Sep 17 00:00:00 2001
From: averelld <averelld@users.noreply.github.com>
Date: Sat, 31 Aug 2019 11:40:35 +0200
Subject: [PATCH 542/794] anki: 2.1.11 -> 2.1.14 (#67738)

* anki: 2.1.11 -> 2.1.14

* anki: 2.1.14 -> 2.1.15
---
 pkgs/games/anki/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index b0efc54db36..cd7f941ccd1 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -18,6 +18,7 @@
 , pytest
 , glibcLocales
 , nose
+, jsonschema
 , send2trash
 , CoreAudio
 # This little flag adds a huge number of dependencies, but we assume that
@@ -31,10 +32,10 @@ let
     # when updating, also update rev-manual to a recent version of
     # https://github.com/dae/ankidocs
     # The manual is distributed independently of the software.
-    version = "2.1.11";
-    sha256-pkg = "0rcjam7f017yg0fx5apdc309lsx59lfw33nikczz7hrw6gby6z3q";
-    rev-manual = "f933104fecd8a83c33494bdb2b59817a3318202f";
-    sha256-manual = "12j4x1bh8x6yinym4d1ard32vfl22iq2wz1lfwz6s3ljhggkc52h";
+    version = "2.1.15";
+    sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss";
+    rev-manual = "8f6387867ac37ef3fe9d0b986e70f898d1a49139";
+    sha256-manual = "0pm5slxn78r44ggvbksz7rv9hmlnsvn9z811r6f63dsc8vm6mfml";
 
     manual = stdenv.mkDerivation {
       name = "anki-manual-${version}";
@@ -84,7 +85,7 @@ buildPythonApplication rec {
 
     propagatedBuildInputs = [
       pyqtwebengine sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator
-      markdown
+      markdown jsonschema
     ]
       ++ lib.optional plotsSupport matplotlib
       ++ lib.optional stdenv.isDarwin [ CoreAudio ]

From e3aaada61de9d9d4940e8a2416f041e842c8893d Mon Sep 17 00:00:00 2001
From: John Chadwick <johnwchadwick@gmail.com>
Date: Sat, 31 Aug 2019 03:00:20 -0700
Subject: [PATCH 543/794] lightspark: init at 0.8.1 (#67425)

---
 pkgs/misc/lightspark/default.nix | 37 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/misc/lightspark/default.nix

diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix
new file mode 100644
index 00000000000..bb3ade6b616
--- /dev/null
+++ b/pkgs/misc/lightspark/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg, glew, pcre
+, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, gnome2, lzma, nasm
+, llvm_39, glibmm
+}:
+
+stdenv.mkDerivation rec {
+  pname = "lightspark";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner = "lightspark";
+    repo = "lightspark";
+    rev = "${version}";
+    sha256 = "0chydd516wfi73n8dvivk6nwxb9kjimdfghyv9sffmqmza0mv13s";
+  };
+
+  patchPhase = ''
+    sed -i 's/SET(ETCDIR "\/etc")/SET(ETCDIR "etc")/g' CMakeLists.txt
+  '';
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+
+  buildInputs = [
+    curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg
+    gnome2.pango lzma nasm llvm_39 glibmm
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Open source Flash Player implementation";
+    homepage = "https://lightspark.github.io/";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ jchw ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3756ecb0a65..0441485de6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12568,6 +12568,8 @@ in
 
   lightlocker = callPackage ../misc/screensavers/light-locker { };
 
+  lightspark = callPackage ../misc/lightspark { };
+
   lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { };
 
   linenoise = callPackage ../development/libraries/linenoise { };

From 44ce76322d41ac7151fc9c84fb06912f69855bd5 Mon Sep 17 00:00:00 2001
From: averelld <averelld@users.noreply.github.com>
Date: Sat, 31 Aug 2019 12:01:34 +0200
Subject: [PATCH 544/794] mattermost-desktop: 4.2.0 -> 4.2.3 (#67717)

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

diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
index 1fb74314811..4b8e270c489 100644
--- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
@@ -38,18 +38,18 @@ let
 in
   stdenv.mkDerivation rec {
     name = "mattermost-desktop-${version}";
-    version = "4.2.0";
+    version = "4.2.3";
 
     src =
       if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
           url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz";
-          sha256 = "0hka94gwpscjn61032c0grpjv5gjb0j8rkx6pgwci617n29xkyf6";
+          sha256 = "14xyn8dp0xxl4j9xdsjik9p6srqdxbirgcgym2sv64p01w3kc9wf";
         }
       else if stdenv.hostPlatform.system == "i686-linux" then
         fetchurl {
           url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz";
-          sha256 = "1nx2sgbnr60h6kn56wv54m7cvyx27d64bfprpb94hqd5c2z21x80";
+          sha256 = "063rrxw76mjz71wp9xd3ppkq3s017vrzms879r2cilypmay7fhgs";
         }
       else
         throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}";

From b4e1c45e4cfaf581f0c2b58bd82fc88837c0f487 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 31 Aug 2019 12:16:02 +0200
Subject: [PATCH 545/794] vimPlugins: update (#67823)

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4dcfbeecb76..cf1ea84a9c5 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2019-08-12";
+    version = "2019-08-18";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "28c93ab1854ef41a46855401cc4addbaf7dfb9d4";
-      sha256 = "12kfvnycdf4sshajhzj3b5l92zbdgvnj1sdzfj7mc77d0k4mzskq";
+      rev = "73812c3e41c1c7fcf1705811f35ac4c9ccec003e";
+      sha256 = "166hgzyx1j1n717icj0mq2n8jkg4kpi1iy5gk3q0l28nd88w5hlb";
     };
   };
 
@@ -138,12 +138,12 @@ let
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
     pname = "awesome-vim-colorschemes";
-    version = "2019-07-28";
+    version = "2019-08-29";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
-      rev = "6b89c217ffa50f92a7afdcb01d2af071ff9b80a0";
-      sha256 = "03d12fi90kbhf74p1yh721nfa26r2ns7ad5k6a7n6fwl3anrq4g4";
+      rev = "112b534f5a2b3c919cd9aa04767827bceae9ed18";
+      sha256 = "09lhlllzapjawhhhsz5av11h1k944nq3bsg55xrfqsx8yghgdy7z";
     };
   };
 
@@ -281,12 +281,12 @@ let
 
   coc-emmet = buildVimPluginFrom2Nix {
     pname = "coc-emmet";
-    version = "2019-06-17";
+    version = "2019-08-22";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-emmet";
-      rev = "557bc1b88a84d9191337169484603a56fdb30adb";
-      sha256 = "1fla5i3fimm5h31qrivralbmhb88n1pkwzdfj74i6rd20fmv4xcx";
+      rev = "0fd6e93dcab3507240962a480b42e08e818d1fa9";
+      sha256 = "196cvnynkm34sa90gznp81l2l3wl2sxfishqzwr8xxlk2cdcshxn";
     };
   };
 
@@ -303,23 +303,23 @@ let
 
   coc-git = buildVimPluginFrom2Nix {
     pname = "coc-git";
-    version = "2019-08-11";
+    version = "2019-08-20";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-git";
-      rev = "30021c6a3aa7a33617ce1cb187468851bbaf1eb5";
-      sha256 = "09r0ygsjv5d3v6js1ghb49j74plp0jkja2pmd1pbjgafxm02mb2y";
+      rev = "d778033c08580768d2a48b78f4c1b7ab63af12bd";
+      sha256 = "1bxx8y5yp9v95clp8dic8q8zr85dl7i2qq4iibmazg9hzcigc3s6";
     };
   };
 
   coc-go = buildVimPluginFrom2Nix {
     pname = "coc-go";
-    version = "2019-08-06";
+    version = "2019-08-23";
     src = fetchFromGitHub {
       owner = "josa42";
       repo = "coc-go";
-      rev = "3f2748c87c89242c59d3583e8effa0de76c8abe7";
-      sha256 = "1c7v1j3vny20dkc898hgr6val3jk1vc2aswsqm3cb2c3mqwhsrls";
+      rev = "27ef3358055b68c5b592c920c9d0e8aa1522c71e";
+      sha256 = "1v1lwkxzwi1l20561m1nxbmgmjgzn83lvx0mb2c4z3p7brbjmv0y";
     };
   };
 
@@ -435,12 +435,12 @@ let
 
   coc-python = buildVimPluginFrom2Nix {
     pname = "coc-python";
-    version = "2019-07-27";
+    version = "2019-08-20";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-python";
-      rev = "a1ed2aff825b9c48d4be98207470db0a19b2e2c6";
-      sha256 = "0n8famcsy05vzaf48fczbfz68868wjkaq8bl4k6206glppmxybw3";
+      rev = "65ff16f71ead209e83d34c639594a66df2e19c49";
+      sha256 = "11bmf8rzdkgrmanyfmjckm2s3nby143lnra80q9bj2fs3dh9l5hd";
     };
   };
 
@@ -479,12 +479,12 @@ let
 
   coc-snippets = buildVimPluginFrom2Nix {
     pname = "coc-snippets";
-    version = "2019-07-26";
+    version = "2019-08-17";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-snippets";
-      rev = "bcfc9ecbf5e31e89a321a2f6e6bf6c3042aef166";
-      sha256 = "1nkkl7j3328gjmmdrbpqvypsd52vqggaa9cxw98r2qn754nx2gwi";
+      rev = "ffd2b091e5bb5995aac95d1ebe98f87f3df763b1";
+      sha256 = "1n23nvfh99jvnmf901g5zck8hyx3qq5cr4vz119a7ra5dj4bka95";
     };
   };
 
@@ -501,23 +501,23 @@ let
 
   coc-stylelint = buildVimPluginFrom2Nix {
     pname = "coc-stylelint";
-    version = "2019-06-19";
+    version = "2019-08-20";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-stylelint";
-      rev = "627d6aa41f4d64fba5bee5830a9fc0b9799ab5d5";
-      sha256 = "1jgd2w9kxgrf3sg55jfg8i2afwvsyvjs656fhb48ynhw0dxf0nvp";
+      rev = "288a372261cbc23ae4a6e26b1621c6e3218d00ad";
+      sha256 = "1qir8diqnv1a78lzw9p3jsbni52gdg38rx1lj5i4iyff9282ir2x";
     };
   };
 
   coc-tabnine = buildVimPluginFrom2Nix {
     pname = "coc-tabnine";
-    version = "2019-08-11";
+    version = "2019-08-23";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-tabnine";
-      rev = "819e2c523df6f809e0f83e4b5079bc9702adbe66";
-      sha256 = "1l1hajj7hihm5klar28j6jqsad6bnjcy3h2cddvhavm696azibfv";
+      rev = "d6617d0ae2b2ba0f415961fed1ffc3827d06db54";
+      sha256 = "1drxhjr6yv4qja0z9pypq14lj18rkw0hpwcg0ji2fgiqrf2l9ywj";
     };
   };
 
@@ -545,23 +545,23 @@ let
 
   coc-tsserver = buildVimPluginFrom2Nix {
     pname = "coc-tsserver";
-    version = "2019-08-01";
+    version = "2019-08-27";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-tsserver";
-      rev = "8daf0e45d513ab3b9eb91e126e50c48b901d8cf9";
-      sha256 = "1zf75zahvcq5kcrpn5m69i0sj3dv4g2m8x3jffjqnx3cnirm42r4";
+      rev = "c80ae7b19b038f380639e1c5b5e3c3a0b9252f6c";
+      sha256 = "06pd5k72sa3d6psdkcdar70b456p2dqzbbk2x166gkxavjqjkyid";
     };
   };
 
   coc-vetur = buildVimPluginFrom2Nix {
     pname = "coc-vetur";
-    version = "2019-07-09";
+    version = "2019-08-22";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-vetur";
-      rev = "ebd982bde36db01d85e02ca48898be303d878d38";
-      sha256 = "0dxwvx9mwhlxpa1wn1cy3psb2s2rafibmvin4rnzxb467bkwbgiz";
+      rev = "444c297e2a418d816b6094446b57f2333ef9047a";
+      sha256 = "01d51z6iyl2p5lhkr86a3gri0d8g7ydb8qvlp0xqrr2fy97xdx9v";
     };
   };
 
@@ -656,12 +656,12 @@ let
 
   context_filetype-vim = buildVimPluginFrom2Nix {
     pname = "context_filetype-vim";
-    version = "2019-02-25";
+    version = "2019-08-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "context_filetype.vim";
-      rev = "c3f806b4d06230607bc0a3bf619bf9c3ec1c9d95";
-      sha256 = "17acbqlws0i82japyd2a94wf1arn6y8mb6sfbm6xzicvicffyqmd";
+      rev = "9d495ce4ddfdae8f0b268fcec3a7a5e0062456e8";
+      sha256 = "0g5ixgg8p2vrpjhyy52xln7a5f8rcbglgyir620ynzhz1phdilg4";
     };
   };
 
@@ -799,12 +799,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2019-08-17";
+    version = "2019-08-29";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "c263e50e03e62dc15fc912fd9eaca75752d33fd0";
-      sha256 = "19avsx03wv3piq6c1x105na08f90c0p24rz8x59c2yv0p1gdm74n";
+      rev = "161d4a7cd490dad3a708e8461e11f3bf2af2c0ea";
+      sha256 = "026lkyd768v4a0pyfzrlsqyln4bvmhp99p4vjhmmi079vjs7z7b1";
     };
   };
 
@@ -912,12 +912,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2019-08-14";
+    version = "2019-08-31";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "bb2b16309b94695a3344c713282368b3329a2412";
-      sha256 = "0dbph7p921ibh2nyfansj5pzqw98vh1w4m9kv04n3wwyygzym5q9";
+      rev = "93722cc5d0a1877fdad0845330b3a41c5e392a34";
+      sha256 = "0ay5j8drbd0m8hn9zpxsd56z2y07imm8lmkvfamja353mwb8nlh9";
     };
   };
 
@@ -990,12 +990,12 @@ let
 
   emmet-vim = buildVimPluginFrom2Nix {
     pname = "emmet-vim";
-    version = "2019-07-24";
+    version = "2019-08-27";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "emmet-vim";
-      rev = "461700696ea317722c4a8d92a31a7267cdcc0bfb";
-      sha256 = "1jfz9n875lqnhxi09rddw1wpacjda1l36xyc3a4yyaxbfb62sqxf";
+      rev = "10b3746ecb52064d44bbcb1fdf6b21cca551f30c";
+      sha256 = "1crm0qj8wwizgvzn4jlwbpnjbddp08fs9i46nr56q38hc6mgir4x";
       fetchSubmodules = true;
     };
   };
@@ -1024,12 +1024,12 @@ let
 
   falcon = buildVimPluginFrom2Nix {
     pname = "falcon";
-    version = "2019-08-14";
+    version = "2019-08-29";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "d642592f062c5e4d195e627ac4104d4e0355a125";
-      sha256 = "053kgsgsqnazzzignfvmgca46gm8z75alq7hsix4lvj3hrmx9lac";
+      rev = "f5ec61dade10692257e5f45609bb42f8fbf07c23";
+      sha256 = "08j1rhah96k7w4x569w84qxgn4ishia0xxy102z8v5zgxjpcyhld";
     };
   };
 
@@ -1135,12 +1135,12 @@ let
 
   ghcid = buildVimPluginFrom2Nix {
     pname = "ghcid";
-    version = "2019-08-07";
+    version = "2019-08-21";
     src = fetchFromGitHub {
       owner = "ndmitchell";
       repo = "ghcid";
-      rev = "f7aee1f324d2a731a13b4495260a1aeaf0c0b52a";
-      sha256 = "1s0byckwkxwhrzrhdhjvfzzyg3pvbkbc3pikp395pzcf8kmpmvcv";
+      rev = "12cbd4cf3109459a1577be30da82cffe22bdf4b6";
+      sha256 = "0wzcpk9wsdhmz888g2x9b1ljf437agq536bd2d801dzv3ynqf4jl";
     };
   };
 
@@ -1179,12 +1179,12 @@ let
 
   gitv = buildVimPluginFrom2Nix {
     pname = "gitv";
-    version = "2019-03-02";
+    version = "2019-08-22";
     src = fetchFromGitHub {
       owner = "gregsexton";
       repo = "gitv";
-      rev = "89af431fb0fabe55bd3287d268f6b12ee336f666";
-      sha256 = "0d60xf7kdl3ipjgw2cliky783jj5jsrz8bgd7gv5z08r853y76pv";
+      rev = "a73599c34202709eaa7da78f4fe32b97c6ef83f8";
+      sha256 = "0hhamv2q3z8cy4n9yzxq0jvs2x8qx4wx6c2qpsk82jsnghmzipd6";
     };
   };
 
@@ -1256,12 +1256,12 @@ let
 
   iceberg-vim = buildVimPluginFrom2Nix {
     pname = "iceberg-vim";
-    version = "2019-07-20";
+    version = "2019-08-31";
     src = fetchFromGitHub {
       owner = "cocopon";
       repo = "iceberg.vim";
-      rev = "c94e82ab8c62c2b6f09c00752199692e4af1c836";
-      sha256 = "00vpwcq0ap4ss60v57gbhbdp4vx632qlfxdbc7jh0iawdpm1bdsq";
+      rev = "ddc3e4ea485771e4f0b939fd8259f3152eb1bd29";
+      sha256 = "0128yxhafndllc383ncw4ka0r7q8mwvb3nx70f4plb6m3f07x8rm";
     };
   };
 
@@ -1333,12 +1333,12 @@ let
 
   iosvkem = buildVimPluginFrom2Nix {
     pname = "iosvkem";
-    version = "2019-03-22";
+    version = "2019-08-20";
     src = fetchFromGitHub {
       owner = "neutaaaaan";
       repo = "iosvkem";
-      rev = "e552c65165b42df79d462d9222ae022116bdb26a";
-      sha256 = "0va122hl4lilakvc0ww59p5nqddj9fb9gk0hi68885fygqz0l6n5";
+      rev = "9c5d1e70f5335cc995e61ceba870818a946f26c3";
+      sha256 = "0ppd8x9rh2mqd743zsvxakzha878lg7c7a3as5nlfjpb89g5dmn6";
     };
   };
 
@@ -1366,12 +1366,12 @@ let
 
   jedi-vim = buildVimPluginFrom2Nix {
     pname = "jedi-vim";
-    version = "2019-08-11";
+    version = "2019-08-18";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "b3d715c5fccddbae95c0f8b5485e98c7b8143827";
-      sha256 = "0hf6k5nabhfaqgf76962hdihpvja93fahz6psf98q2xrz09c7i86";
+      rev = "4f2499e4f2cb8bbecda6130a9dbb306fbb746ebe";
+      sha256 = "1gnyrfx0qbap7vm2rvg0w70ybjdny7c1ixzymqd1w9wv7krz5h8y";
       fetchSubmodules = true;
     };
   };
@@ -1488,12 +1488,12 @@ let
 
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
-    version = "2019-08-14";
+    version = "2019-08-20";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "09c61dc3f650eccd2c165c36db8330496321aa50";
-      sha256 = "14g79s9pn8bb50kwd50sw8knss5mgq8iihxa2bwkjr55jj5ghkwb";
+      rev = "8b3aa1632c08784928458b2b85faf5c89feefccf";
+      sha256 = "0bxvxkk0zps2qxnzp8dip7ngpv9b1a74y2wjzjqqvxzljk81a714";
     };
   };
 
@@ -1686,12 +1686,12 @@ let
 
   neoformat = buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2019-08-01";
+    version = "2019-08-26";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "528b5e47ec9c29fbbd470f2af71b8ad994a96bdb";
-      sha256 = "09cq8a4ryhxvnpjvpbm0dq22ccqfmym59avxr4c0ablx1sqy9lhy";
+      rev = "eb94d083bc0c9a4e4bec8a205fc65f6a464bd0f7";
+      sha256 = "1va2dvqjjlcyl2in9wjh6c8gmnxlnl13j7gmf2g37j6jm28l16r9";
     };
   };
 
@@ -1708,12 +1708,12 @@ let
 
   neomake = buildVimPluginFrom2Nix {
     pname = "neomake";
-    version = "2019-08-15";
+    version = "2019-08-22";
     src = fetchFromGitHub {
       owner = "neomake";
       repo = "neomake";
-      rev = "cad94240c8284ab3502c62acc18e420ca22107de";
-      sha256 = "12i0qwckg7fl5gim7k20kvd1xcqspws994nq5b8nn08ljw01dcfq";
+      rev = "723336c47844d7f58b7c37a6c3e62ddabcdf392b";
+      sha256 = "0psiadnx4qzqzn6p2yc7az5l624xb5mczn3y39irbdrl6l2rcd81";
     };
   };
 
@@ -1763,12 +1763,12 @@ let
 
   neoterm = buildVimPluginFrom2Nix {
     pname = "neoterm";
-    version = "2019-06-22";
+    version = "2019-08-20";
     src = fetchFromGitHub {
       owner = "kassio";
       repo = "neoterm";
-      rev = "f974a6e3c70f0591b76c196d6e6b2c20649e94c4";
-      sha256 = "0wr4s52jfdhxm5zf6i46skrs8hjlf5w3c0wcrxjnszykza9d6whl";
+      rev = "c96ff95c9a41d716bbdca41b4cc2dc62e4b188a1";
+      sha256 = "0jbrgsdljh9n1cr3dpgq83gpd3hx7ss4hbc0i0hls15laczlzipc";
     };
   };
 
@@ -1796,23 +1796,23 @@ let
 
   nerdcommenter = buildVimPluginFrom2Nix {
     pname = "nerdcommenter";
-    version = "2019-08-07";
+    version = "2019-08-27";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
-      rev = "a05185584d7cae7791fb40b7656cf642fdbe4938";
-      sha256 = "1yri2gw2i4nkssm6fd1l8b9hkinb6h70wsavkb712ivdzqpcls6y";
+      rev = "2504a3d84e97be144019ef184f0c2aed42f3152d";
+      sha256 = "0djfm8k4yqaycydg4hpvnapyh2d5k0r3alhlk09rj1arsw2kzh38";
     };
   };
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2019-08-09";
+    version = "2019-08-28";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "184fbb6ffea6dc69726b229a08153c9d08522386";
-      sha256 = "1h4wqmiplk3ay56db20dxxw90i9rij2kp2zjfhbfz525pxjg82gn";
+      rev = "3d508aedce35e1d952d3ce92378ad27ea5960fa6";
+      sha256 = "098g4qq3h8nklynj4qnj02f6ivw10q07c69ssdrhgjwilpgv4nrk";
     };
   };
 
@@ -1895,12 +1895,12 @@ let
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
     pname = "nvimdev-nvim";
-    version = "2019-08-05";
+    version = "2019-08-21";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
-      rev = "4f2f53872672f44049cef04a1f8f3cc4f921eae8";
-      sha256 = "1yci56rdxqk5zfzqlkmhsw5s7c9xladhl3d4ks1j2b4dcb8gdsf5";
+      rev = "d27d00b3c529adc13c9882e7a3cb5c63df038dcc";
+      sha256 = "1z6i891h574yg3s1y96vwik1pxhy707rn5rsqqb7yxnfw6xy57cq";
     };
   };
 
@@ -2080,6 +2080,17 @@ let
     };
   };
 
+  readline-vim = buildVimPluginFrom2Nix {
+    pname = "readline-vim";
+    version = "2019-08-24";
+    src = fetchFromGitHub {
+      owner = "ryvnf";
+      repo = "readline.vim";
+      rev = "40964933819e2a719e6e34adcf3e8b2210c5c6ce";
+      sha256 = "1jc8lzl49nl7r3v1b7fk6zpiba41h51qsi2w4lhf8v6lnzbazii7";
+    };
+  };
+
   Recover-vim = buildVimPluginFrom2Nix {
     pname = "Recover-vim";
     version = "2019-06-04";
@@ -2113,17 +2124,6 @@ let
     };
   };
 
-  readline-vim = buildVimPluginFrom2Nix {
-    pname = "readline-vim";
-    version = "2019-06-10";
-    src = fetchFromGitHub {
-    owner = "ryvnf";
-    repo = "readline.vim";
-    rev = "a7c754acaf0aec922d4a6bde908a636578ef82cc";
-    sha256 = "16fawg7fnlipn1f41cn1qc83dhr63qhr1bwn3qmr8sy7rbk5lihr";
-    };
-  };
-
   riv-vim = buildVimPluginFrom2Nix {
     pname = "riv-vim";
     version = "2019-02-18";
@@ -2159,12 +2159,12 @@ let
 
   rust-vim = buildVimPluginFrom2Nix {
     pname = "rust-vim";
-    version = "2019-08-15";
+    version = "2019-08-30";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "a49b1473eca309e5f5cf2486100d9efe23a6e4ff";
-      sha256 = "0m6rryyg3mka2h9j9v8sm1zm8cqwmvix38aa1p114w2vrpfxbs0x";
+      rev = "e99f3f5bc60e15c488989f6208769a271ccf0e9f";
+      sha256 = "1sq6z878llxx78x7b8y3g1z9w1c412kj7zv9kq50njff43rddjiy";
     };
   };
 
@@ -2555,12 +2555,12 @@ let
 
   unite-vim = buildVimPluginFrom2Nix {
     pname = "unite-vim";
-    version = "2019-03-29";
+    version = "2019-08-27";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "unite.vim";
-      rev = "e1d3bb9f836a8645807b790345b69666bf22bb2f";
-      sha256 = "0i0lys3926s7n6iq03fg0flsp2rmvzwvfjmldcv31vjjrhzlbqmx";
+      rev = "5addeca429f64130d74d2f7cb8255afdb9e309d2";
+      sha256 = "03bqljjc1h43qimm81mv8ywkx5388kd6clm2f7887diiww0fgvfi";
     };
   };
 
@@ -2577,12 +2577,12 @@ let
 
   verilog_systemverilog-vim = buildVimPluginFrom2Nix {
     pname = "verilog_systemverilog-vim";
-    version = "2019-07-26";
+    version = "2019-08-25";
     src = fetchFromGitHub {
       owner = "vhda";
       repo = "verilog_systemverilog.vim";
-      rev = "b397068789f1844ef28e207a4efc03f157874f80";
-      sha256 = "15dmlzyhmg0rw8wkkln7xr2qmlz4gilqpi22wkzziwvsjc4hs2az";
+      rev = "217b4cfcfbe8633693c9751cf3eeafe8c48e2846";
+      sha256 = "11g2ybrxndssf6g1dxhx68gycfnkv2wmara6h7kwgy0sjn4r413x";
     };
   };
 
@@ -2819,12 +2819,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2019-08-11";
+    version = "2019-08-26";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "a40184536b3b93b6272585da9c36dca802d47a01";
-      sha256 = "0ygv6mc8fby6chzms7ah6sbq7yf7jhcnavbw52dra2sdfm2h2kch";
+      rev = "6409c7b317a283333a720f48cca5f259c1ea29ef";
+      sha256 = "1wr7202idpyydnjbkc7sk8wr02ipdq40x4rwhi955yx76gwl111a";
     };
   };
 
@@ -2874,12 +2874,12 @@ let
 
   vim-autoformat = buildVimPluginFrom2Nix {
     pname = "vim-autoformat";
-    version = "2019-07-08";
+    version = "2019-08-19";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
-      rev = "a7009a968869319bf0811110fd2006738ba27370";
-      sha256 = "1c0zdsxv3x0bvjbvbr633g16464lhq66yy4jpw6pwsw6h2p78iha";
+      rev = "69f7f2d80d3722f62847a58443da1d6cdf81b292";
+      sha256 = "0vxblych7afny8i8kyk2f85xc9k2y4sv7i9jf3mkpykimsq2w4hm";
     };
   };
 
@@ -2907,12 +2907,12 @@ let
 
   vim-better-whitespace = buildVimPluginFrom2Nix {
     pname = "vim-better-whitespace";
-    version = "2019-01-25";
+    version = "2019-08-19";
     src = fetchFromGitHub {
       owner = "ntpeters";
       repo = "vim-better-whitespace";
-      rev = "f5726c4bbe84a762d5ec62d57af439138a36af76";
-      sha256 = "0mk15jv0vsqvww0jk3469755lb4hhjmxqkbk7byvxch63ai8jlsy";
+      rev = "a05c728a962cdc7285f31ae5814cb64404fa7efc";
+      sha256 = "1aymm36hakvvwhp8bnr0ys2xsadw8b3m8681lir3ymj55vc8cl5y";
     };
   };
 
@@ -2951,12 +2951,12 @@ let
 
   vim-choosewin = buildVimPluginFrom2Nix {
     pname = "vim-choosewin";
-    version = "2019-07-19";
+    version = "2019-08-21";
     src = fetchFromGitHub {
       owner = "t9md";
       repo = "vim-choosewin";
-      rev = "ee5690220fa712a448577522b9508e79a07830c6";
-      sha256 = "1w42lm1rg6002030rigs5pvqf98wdpljm1pyzzikl6hgarv3c8q1";
+      rev = "6da5c0b96e63f51f0801266b781dee0562e74da9";
+      sha256 = "0f1x57gzvv97h8maz8i1h5dmgxqvf4lwf1bza380l0nm7m5bdpg5";
     };
   };
 
@@ -3072,12 +3072,12 @@ let
 
   vim-css-color = buildVimPluginFrom2Nix {
     pname = "vim-css-color";
-    version = "2019-06-12";
+    version = "2019-08-28";
     src = fetchFromGitHub {
       owner = "ap";
       repo = "vim-css-color";
-      rev = "5a31c72cc51cb11118e44fb50ff77fc596348f77";
-      sha256 = "17a2i40z5145px4p4swvm003h4mdxd2hp89pyvrqal910d2g3hgb";
+      rev = "1f9fe5c1f9e0a6bfc41b14d070f4d878d445ae96";
+      sha256 = "0h0hdv492kw0gs8kn62gyvs29pjwvvg8gbsisx4wpw6qa6w457hn";
     };
   };
 
@@ -3105,12 +3105,12 @@ let
 
   vim-devicons = buildVimPluginFrom2Nix {
     pname = "vim-devicons";
-    version = "2019-07-08";
+    version = "2019-08-18";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
-      rev = "0c9e6faaf246767c850eb92f48c4bdc068cdf235";
-      sha256 = "1kmdzf34clhvcjwxr47phvw835nfhm70swar5s6cf2pis1wllmjw";
+      rev = "830f0fe48a337ed26384c43929032786f05c8d24";
+      sha256 = "06lsb8lwdbb6l0nznmxb9akd4ss9cw76d03z9h4q9yfjydyqf5kn";
     };
   };
 
@@ -3127,12 +3127,12 @@ let
 
   vim-dirvish = buildVimPluginFrom2Nix {
     pname = "vim-dirvish";
-    version = "2019-08-05";
+    version = "2019-08-27";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
-      rev = "3020cce00581054e9177297ee5461737a35de7de";
-      sha256 = "1qvkgjfrwl2qmi2b1cvznvbmsn8rqgm4wcgb79il07ij4lnwf9g9";
+      rev = "e8a213d9d0a21f03fc03319fa7560521b6cd6928";
+      sha256 = "1vhjlpjjg5bdfcalf10z9gjnrnc98yf5r3ink9dhljj5vnx23zaw";
     };
   };
 
@@ -3215,12 +3215,12 @@ let
 
   vim-elixir = buildVimPluginFrom2Nix {
     pname = "vim-elixir";
-    version = "2019-08-15";
+    version = "2019-08-22";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
-      rev = "1b7f422a1e6b0693032e54a14277a2aa2ec437f5";
-      sha256 = "0v7gmqk5i6l49lz5r6v783qrc2fw5afchgllqc25jmlbr0bhd8fm";
+      rev = "e9d495bb85981467105c375f665b10249b7bcc53";
+      sha256 = "1lm2lhj9sqijc5b7yqa0vs56n2jg0q0xlxs4mf1pjwhdi0wmqd5y";
     };
   };
 
@@ -3259,12 +3259,12 @@ let
 
   vim-fireplace = buildVimPluginFrom2Nix {
     pname = "vim-fireplace";
-    version = "2019-08-12";
+    version = "2019-08-19";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
-      rev = "8712a165da4d1de9fb6ae918322ece843ac742e0";
-      sha256 = "0yjljc01dk75q6rhr3kwa8lhr9ymya0i4bwvsvr09kz7dgsqf5s7";
+      rev = "0b46f733955c63a73dc49c316f8bc97a4119fddc";
+      sha256 = "1q8mnd6sd0nl8i13jvzkl79sbz0ncvx015bihymglj8wcpzrrwni";
     };
   };
 
@@ -3325,12 +3325,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2019-08-16";
+    version = "2019-08-23";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "442d56e23cd75a336b28cf5e46bf0def8c65dff5";
-      sha256 = "0viijvsds2a6l34bjca3yrsizmips1l8g2hcqd1v7v2bqhf4jsqh";
+      rev = "b97a9abe29c39c4e1a45ae199dbb470df362f538";
+      sha256 = "0lf5r91ba9xzzy1vs6g81mdgghcyica6xiir1xpg2aqksk0aidri";
     };
   };
 
@@ -3369,12 +3369,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2019-08-16";
+    version = "2019-08-28";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "46f15ed42ad987b003ef5e81ec114c748c73ea89";
-      sha256 = "0lr3i22b949d64d2l1gvlgb3hzmhhvkdjjz7nqr5bda0pj3rxhzw";
+      rev = "88d396f1b49747fadbbde5c038a85067d94954e5";
+      sha256 = "02blbk7vq5p25713ys30djkivks4ywg69drh9apyb3g5mjwi60m6";
     };
   };
 
@@ -3402,12 +3402,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2019-08-12";
+    version = "2019-08-23";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "007b69c27b63fbcbe2e0766073b09281274b0231";
-      sha256 = "14klcx69p5ngl3qvanc0l23ind2hsgzj917a80a6lvs78h4mwp7w";
+      rev = "635b9e7f27905070788cef60c0ba520209bf4f09";
+      sha256 = "0zmymzafryi7mchv8wz3ynxi8a597c69zvx2s57xyhhczpcah4ms";
     };
   };
 
@@ -3424,12 +3424,12 @@ let
 
   vim-grepper = buildVimPluginFrom2Nix {
     pname = "vim-grepper";
-    version = "2019-05-31";
+    version = "2019-08-30";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
-      rev = "a73a9dc920bd0b3ba8b298c258bd4d4814d9a162";
-      sha256 = "15dcrla2z1r5phabfn72b6vbsyji8nsw3g5lif14pkg7ps3py79n";
+      rev = "1b9cec58509ba2bc212ad21e4a58eb3acf501b9f";
+      sha256 = "1rhp1rb97v9fv7w4qs350k5gqslbmkjn3lrq2a5bgnhar5xybs4k";
     };
   };
 
@@ -3666,12 +3666,12 @@ let
 
   vim-javascript-syntax = buildVimPluginFrom2Nix {
     pname = "vim-javascript-syntax";
-    version = "2019-07-22";
+    version = "2019-08-21";
     src = fetchFromGitHub {
       owner = "jelera";
       repo = "vim-javascript-syntax";
-      rev = "77f90362a05eeb7733648d522ce9bf54ca3b9299";
-      sha256 = "00mv80fsvngdihrjfhfgz91lq5anfizkirgcaz0ld1d9i8arqsmc";
+      rev = "e65e4f01ba94761323450208c9bf7141428784db";
+      sha256 = "09561jf3cmzpm8jn8k34fd3av6i1mqi6n32bisri96jkabw8dpv7";
     };
   };
 
@@ -3733,12 +3733,12 @@ let
 
   vim-jsx-pretty = buildVimPluginFrom2Nix {
     pname = "vim-jsx-pretty";
-    version = "2019-08-07";
+    version = "2019-08-26";
     src = fetchFromGitHub {
       owner = "MaxMEllon";
       repo = "vim-jsx-pretty";
-      rev = "49a4b2e2a66b43c1335d1df378d5ebb6f381fe05";
-      sha256 = "0pfscx95cjkw48ccn53x04wkrbh2kan2p3djyk2f5ml9n1ln8if5";
+      rev = "9a0f7e8072f4e7e80c74b1e24fa82e359046b25a";
+      sha256 = "1l5cwlbmihzxldpxlvn5gc47s0awqs908skzq43cy44iql829hir";
     };
   };
 
@@ -3854,12 +3854,12 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2019-08-13";
+    version = "2019-08-22";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "6583613e4cf1842e6e273893bb0275d2e90ea27a";
-      sha256 = "1wmzr31y9c0sj2bfq1l2a5dny6l7s74q0dfp6b0ajw9i6q5nbv25";
+      rev = "c2a8fad6bc39a8a90fccee32a34861969f55ad5a";
+      sha256 = "16hb0lan77ics7192cpnw2i2aigbab5g63pq0j992vja7pmh6hab";
     };
   };
 
@@ -4041,12 +4041,12 @@ let
 
   vim-pandoc = buildVimPluginFrom2Nix {
     pname = "vim-pandoc";
-    version = "2019-07-29";
+    version = "2019-08-26";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
-      rev = "b41a18b75dd8dee5217bca9f68d91f8fd2ea6084";
-      sha256 = "0hw3znmb8zsacnkavgqcqbv4yb1b8vj9fm5h4z5lslxnnlg09pg9";
+      rev = "53f14ea43997e46c2c4686a1d89bcebfec1c8c50";
+      sha256 = "1qcng9hszv4fcqhzdq7sfvdhl0x4zv91blk328n2jrqp831c0ds1";
     };
   };
 
@@ -4107,12 +4107,12 @@ let
 
   vim-pencil = buildVimPluginFrom2Nix {
     pname = "vim-pencil";
-    version = "2017-06-14";
+    version = "2019-08-30";
     src = fetchFromGitHub {
       owner = "reedes";
       repo = "vim-pencil";
-      rev = "2dcd974b7255e4af83cf79a208f04a3489065e22";
-      sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0";
+      rev = "4e0f08de173fcde5f3cb93da2c8129b1588e469a";
+      sha256 = "1vhqcd0gls9bys1anjlfyx4mh3rfkc076g6j9h1r4j09zn0bw1qn";
     };
   };
 
@@ -4122,8 +4122,8 @@ let
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
-      rev = "307b0f244d99408decda3a98f58e864d49626818";
-      sha256 = "1fbiasm3w4ww4qdyaphk1xl9phqjxl12fsapza084ix48lhfh5pw";
+      rev = "ebd534c88bfd49f8d3c758d96ad04ce3f77ee6f8";
+      sha256 = "1r3ic5mii9q4kqpwyq37cjbrrzj93fhj9b46zqkb5i1nw2vydl6l";
     };
   };
 
@@ -4162,12 +4162,12 @@ let
 
   vim-projectionist = buildVimPluginFrom2Nix {
     pname = "vim-projectionist";
-    version = "2019-07-29";
+    version = "2019-08-22";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
-      rev = "94001f00825c36fab63b9f3ca47a204111e561a2";
-      sha256 = "0pppaavma07c3lxqlbk8cghdsirncxng52mjmv5qk8yar8kxqvbr";
+      rev = "b1a826329c0891416f2357bf77a43ac49b441e6d";
+      sha256 = "0za2hnsg888nl3ddhawll053j64sgqhiqpxciqi05j50bz34cs8n";
     };
   };
 
@@ -4239,12 +4239,12 @@ let
 
   vim-rhubarb = buildVimPluginFrom2Nix {
     pname = "vim-rhubarb";
-    version = "2019-06-27";
+    version = "2019-08-19";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rhubarb";
-      rev = "c509c7eedeea641f5b0bdae708581ff610fbff5b";
-      sha256 = "19zhhnlrnkgsxacykck9q19rhk4gj31qjj6i4sl6bzi086kmf0z9";
+      rev = "9edacf9d5b4d6e0570af33f88500f51ec4288c2e";
+      sha256 = "0m91nvxjkgmbgaib3q27rk2nzkpxx18pa8nrv143r2k8na9bry0p";
     };
   };
 
@@ -4316,12 +4316,12 @@ let
 
   vim-sensible = buildVimPluginFrom2Nix {
     pname = "vim-sensible";
-    version = "2019-08-07";
+    version = "2019-08-22";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sensible";
-      rev = "c176d137892f33945d3d4dd766fd21611e9b5ddf";
-      sha256 = "11adqaccwph4z5a4kyycd1gbc1l9np4za0d4fbd3cnh1zqf2xzjz";
+      rev = "b9febff7aac028a851d2568d3dcef91d9b6971bc";
+      sha256 = "00852qj3v3py63k23rrxmx8w5yrin3q21vz9css0xg12l5r1j1wv";
     };
   };
 
@@ -4338,12 +4338,12 @@ let
 
   vim-signify = buildVimPluginFrom2Nix {
     pname = "vim-signify";
-    version = "2019-08-16";
+    version = "2019-08-22";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "ffab0c9d71bf33529b3dd52783b45652e8b500ad";
-      sha256 = "1d8z1nnnsyxh0sm248nzjc169vfx8650b7bg9g60k8v9knkgajyc";
+      rev = "2b5070441dea482cc4f88556b19002f2da6f3566";
+      sha256 = "185c8x8nly7jxv0vpf0dsbpby2nsfqdxkyzc6mips6in7ymgg3b3";
     };
   };
 
@@ -4382,12 +4382,12 @@ let
 
   vim-sneak = buildVimPluginFrom2Nix {
     pname = "vim-sneak";
-    version = "2019-05-31";
+    version = "2019-08-21";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-sneak";
-      rev = "5b670df36291ca75f5ded5cd7608948d58ff6325";
-      sha256 = "1s400mmp2g9n41svzxizm046901d5hd43hy4yh0ps8b5iq4kspma";
+      rev = "27cc3ce0fd19f0414024a81ee1eee6b17f155122";
+      sha256 = "162gvzm7f0dsgv52ixd79ggzxddgpmrxqsqa41nv72mw61s0pmax";
     };
   };
 
@@ -4459,12 +4459,12 @@ let
 
   vim-startify = buildVimPluginFrom2Nix {
     pname = "vim-startify";
-    version = "2019-08-15";
+    version = "2019-08-27";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
-      rev = "d7849587e5cf36ea4858fe2aab4f7b5faff76d33";
-      sha256 = "11nsz9g3m95av5andi1ry0aqq6s9k7jn1sk7m1djnqqqs46vzpmr";
+      rev = "13b67af7aa6a454adbf1f0925bf41737889ed830";
+      sha256 = "015vak1awjzxwwrhkq6hdwf7wb7v0llswm95ky7zvkpqv8yncxhh";
     };
   };
 
@@ -4547,23 +4547,23 @@ let
 
   vim-terraform = buildVimPluginFrom2Nix {
     pname = "vim-terraform";
-    version = "2019-08-06";
+    version = "2019-08-29";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "8b0a0ee7f2463f6949a5ce778169a782b80cdab4";
-      sha256 = "0d66hv8r7hnahs6nh6jj00xbly38xgfz6ilg5zlab2kgswmkzxrf";
+      rev = "ed2b552cbf8d8c14a56f75d106a6efb4303f5233";
+      sha256 = "0a67ayc12l6gc4b80lxic1qvr2sfbgsa6bxshdsq9p661vsmym1p";
     };
   };
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2019-08-16";
+    version = "2019-08-29";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "4729346c46c34ce03d6e12b39727d85cdfcec44b";
-      sha256 = "1aazaydi9136i4b5pq9jd4ccrgcx72gyra7ja05igmszkhcznlq9";
+      rev = "1b82c6929e9d87ca756569c1640320d027498364";
+      sha256 = "0hf76jlv916jpdncfgh2wyczpj4c7rzak3m1j3vnysav000p3vhd";
     };
   };
 
@@ -4613,12 +4613,12 @@ let
 
   vim-themis = buildVimPluginFrom2Nix {
     pname = "vim-themis";
-    version = "2019-03-26";
+    version = "2019-08-18";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-themis";
-      rev = "f95b4a888a91cc9373cf2f801658287ff984592f";
-      sha256 = "149zspfxdnp10lj8vv7lvbck8bascpxc1kxjqpn00wslw7rjs5yg";
+      rev = "85ca1f5f197a30ce52d382bcdcaedeed4e132848";
+      sha256 = "17lnvcw7vnwnl54yhw0jpsqnk0pni1wqg4kbm53bv4pvk8ivr95d";
     };
   };
 
@@ -4646,12 +4646,12 @@ let
 
   vim-toml = buildVimPluginFrom2Nix {
     pname = "vim-toml";
-    version = "2019-02-18";
+    version = "2019-08-28";
     src = fetchFromGitHub {
       owner = "cespare";
       repo = "vim-toml";
-      rev = "2295e612d936671048035dbc447f5400cbee60de";
-      sha256 = "1iay39zsp00d5mrqzggr40g6253qfk17wvjvmdp3xn50jraj8gwh";
+      rev = "a4ec206052aa347d7df90dc4b6697b7f2b7929bc";
+      sha256 = "1dgykq4vl7vvj2f8lvg58rzqddm53i278g26ljwfimgqc8l6gmqd";
     };
   };
 
@@ -4712,12 +4712,12 @@ let
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2019-06-20";
+    version = "2019-08-23";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "c91e356a33569bc39bb01392362b8747355b356e";
-      sha256 = "07xm2289932j7lrxaf1gx3rxbzx4f059mkx78chj915pndx72q33";
+      rev = "473427fc6e5aabdf69ad0ca28808de841d70bdb8";
+      sha256 = "0cnj7z3r9cws283wrpg1a40ykpk0lwjkb44gp77996cggr9nqbjz";
     };
   };
 
@@ -4767,12 +4767,12 @@ let
 
   vim-wordy = buildVimPluginFrom2Nix {
     pname = "vim-wordy";
-    version = "2018-03-10";
+    version = "2019-08-29";
     src = fetchFromGitHub {
       owner = "reedes";
       repo = "vim-wordy";
-      rev = "14b9dbf76a82e29273a74768573900361200467f";
-      sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk";
+      rev = "87a77cb293ed1193c01e0f93c4dd70cddde76b08";
+      sha256 = "19wvm1al41ys429rb2agb7d3xfv1kh2287r8sgiy1f6whjn236z6";
     };
   };
 
@@ -4866,12 +4866,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2019-08-14";
+    version = "2019-08-27";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "866699bdae3696130159e7115954c64de8e7bdcd";
-      sha256 = "0302k0ss9drp37dzs123w6y1p16vxgmwn06z86x837n02xzpwwzq";
+      rev = "23a3b356ba1e90d4a9dbb085712376cab83ab19e";
+      sha256 = "1rp3jfsx991k2jl7wr8b32la5b881pn17k6dy27lwpw0sd0x3ha4";
     };
   };
 
@@ -5009,12 +5009,12 @@ let
 
   yats-vim = buildVimPluginFrom2Nix {
     pname = "yats-vim";
-    version = "2019-07-14";
+    version = "2019-08-23";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "632bed9406fe891da8ec7b86320ff1c274d8318e";
-      sha256 = "19g2ppq0ircmbj6vv5rs00fqa8vq1faw4hv1asq2ym31f3y3ccax";
+      rev = "24fa9013a5a5d053262830553e81f84d9bf7552f";
+      sha256 = "17mjrlzb60vkgvyiag11xmrf8a5sp94z1rx1mzcc4ys6j1if9136";
       fetchSubmodules = true;
     };
   };

From 66ed329b99402bed21ae7834994720a68f3149e1 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 31 Aug 2019 10:59:24 +0200
Subject: [PATCH 546/794] nixos-generators: init at 1.0.0

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

diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix
new file mode 100644
index 00000000000..4e51b9b46dd
--- /dev/null
+++ b/pkgs/tools/nix/nixos-generators/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, jq, findutils, nix  }:
+
+stdenv.mkDerivation rec {
+  pname = "nixos-generators";
+  version = "1.0.0";
+  src = fetchFromGitHub {
+    owner = "nix-community";
+    repo = "nixos-generators";
+    rev = version;
+    sha256 = "10xncifdfhilxclxyf72h7dcfn8yn1h34qbkvdq9l76ghv5qjniq";
+  };
+  nativeBuildInputs = [ makeWrapper ];
+  installFlags = [ "PREFIX=$(out)" ];
+  postFixup = ''
+    wrapProgram $out/bin/nixos-generate \
+      --prefix PATH : ${lib.makeBinPath [ jq coreutils findutils nix ] }
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Collection of image builders";
+    homepage    = "https://github.com/nix-community/nixos-generators";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ lassulus ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3756ecb0a65..36f83710f6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24103,6 +24103,8 @@ in
 
   nixos-container = callPackage ../tools/virtualization/nixos-container { };
 
+  nixos-generators = callPackage ../tools/nix/nixos-generators { };
+
   norwester-font = callPackage ../data/fonts/norwester  {};
 
   nut = callPackage ../applications/misc/nut { };

From 661b311057ae4713f1f473659361961e86bad155 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Fri, 30 Aug 2019 21:36:57 -0600
Subject: [PATCH 547/794] discord-canary: 0.0.93 -> 0.0.95

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

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 189092a6d5e..1d9d645b0ed 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -27,10 +27,10 @@ in {
     pname = "discord-canary";
     binaryName = "DiscordCanary";
     desktopName = "Discord Canary";
-    version = "0.0.93";
+    version = "0.0.95";
     src = fetchurl {
-      url = "https://dl-canary.discordapp.net/apps/linux/0.0.93/discord-canary-0.0.93.tar.gz";
-      sha256 = "1jzm5fm7a1p68ims7bv5am0bpbvrhbynzblpj9qrzzrwakdaywbi";
+      url = "https://dl-canary.discordapp.net/apps/linux/0.0.95/discord-canary-0.0.95.tar.gz";
+      sha256 = "06qhm73kc88pq0lgbi7qjy4gx9ighkmx128fdm1dpzfv62fjdasw";
     };
   };
 }.${branch}

From 58cba198a4bdc798c785fb1c10b4634ffb61cbe1 Mon Sep 17 00:00:00 2001
From: Chris Rendle-Short <chris@killred.net>
Date: Wed, 28 Aug 2019 21:44:08 +1000
Subject: [PATCH 548/794] freecad: fix missing app icon and name when running
 under Wayland

Has been upstreamed and should be safe to remove in versions >= 0.19
---
 .../applications/graphics/freecad/default.nix | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index b8f4d544503..b34f777892a 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, mkDerivation, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts
-, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu
-, soqt, libf2c, libGLU, makeWrapper, pkgconfig
-, mpi ? null }:
+{ stdenv, mkDerivation, fetchurl, fetchpatch, cmake, ninja, coin3d, xercesc, ode
+, eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile
+, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU
+, makeWrapper, pkgconfig, mpi ? null }:
 
 assert mpi != null;
 
@@ -19,13 +19,20 @@ in mkDerivation rec {
   nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ];
   buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts
     zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
-    libGLU libXmu
-  ] ++ (with qt5; [
-    qtbase qttools qtwebkit
-  ]) ++ (with pythonPackages; [
+    libGLU libXmu qtbase qttools qtwebkit
+  ] ++ (with pythonPackages; [
     matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
   ]);
 
+  # Fix missing app icon on Wayland. Has been upstreamed and should be safe to
+  # remove in versions >= 0.19
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch";
+      sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h";
+    })
+  ];
+
   cmakeFlags = [
     "-DBUILD_QT5=ON"
     "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include"

From a8aeb913b075f85c67b552620b06c3bb577fe5ea Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Fri, 30 Aug 2019 23:28:26 -0700
Subject: [PATCH 549/794] python: thespian: 3.9.9 -> 3.9.10

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

diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix
index cd4a30f656a..f4c498bed95 100644
--- a/pkgs/development/python-modules/thespian/default.nix
+++ b/pkgs/development/python-modules/thespian/default.nix
@@ -1,13 +1,13 @@
 { fetchPypi, buildPythonPackage, lib }:
 
 buildPythonPackage rec {
-  version = "3.9.9";
+  version = "3.9.10";
   pname = "thespian";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "c89e1973465feb88b694f3884d24723932a6b0e4df8d909f61e44ff371af7380";
+    sha256 = "bffb04b93afcbab0268332445f02757c326f95056eb7e1e2f0515c1dfb92ac7d";
   };
 
   # Do not run the test suite: it takes a long time and uses

From 35ac3344e747e61abcf1847add8d76a6a2812e8a Mon Sep 17 00:00:00 2001
From: Alexander <lebastr@gmail.com>
Date: Sat, 31 Aug 2019 15:06:46 +0300
Subject: [PATCH 550/794] colmap: init at 3.5 (#67759)

* colmap: init at 3.5
---
 .../science/misc/colmap/default.nix           | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/science/misc/colmap/default.nix

diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix
new file mode 100644
index 00000000000..672569ed100
--- /dev/null
+++ b/pkgs/applications/science/misc/colmap/default.nix
@@ -0,0 +1,37 @@
+{ mkDerivation, lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen,
+  freeimage, glog, libGLU, glew, qtbase,
+  cudaSupport ? false, cudatoolkit ? null }:
+
+assert !cudaSupport || cudatoolkit != null;
+
+let boost_static = boost.override { enableStatic = true; };
+in 
+mkDerivation rec {
+  version = "3.5";
+  pname = "colmap";
+  src = fetchFromGitHub {
+     owner = "colmap";
+     repo = "colmap";
+     rev = version;
+     sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8";
+  };
+  
+  buildInputs = [
+    boost_static ceres-solver eigen
+    freeimage glog libGLU glew qtbase
+  ] ++ lib.optional cudaSupport cudatoolkit;
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    description = "COLMAP - Structure-From-Motion and Multi-View Stereo pipeline";
+    longDescription = ''
+       COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline
+       with a graphical and command-line interface.
+    '';
+    homepage = https://colmap.github.io/index.html;
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ lebastr ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d0a21b95e4..ee3a4f7d68e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7377,6 +7377,9 @@ in
 
   colm = callPackage ../development/compilers/colm { };
 
+  colmap = libsForQt5.callPackage ../applications/science/misc/colmap { };
+  colmapWithCuda = colmap.override { cudaSupport = true; };
+
   chickenPackages_4 = callPackage ../development/compilers/chicken/4 { };
   chickenPackages_5 = callPackage ../development/compilers/chicken/5 { };
   chickenPackages = chickenPackages_5;

From ccf6d84366cb2ba946c6a0c2914fa9a473bd54e8 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 31 Aug 2019 08:14:46 -0400
Subject: [PATCH 551/794] yubioath-desktop: Fix desktop launcher icon (#67793)

---
 pkgs/applications/misc/yubioath-desktop/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix
index 843bc0c1c23..d7a019c1c41 100644
--- a/pkgs/applications/misc/yubioath-desktop/default.nix
+++ b/pkgs/applications/misc/yubioath-desktop/default.nix
@@ -44,6 +44,7 @@ mkDerivation rec {
       cp resources/icons/*.{icns,ico,png,xpm} $out/share/yubioath/icons
       substituteInPlace $out/share/applications/yubioath-desktop.desktop \
         --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \
+        --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/yubioath.png"
   '';
 
   meta = with stdenv.lib; {

From 798d16c384918088943feb14d70fc85d8266814b Mon Sep 17 00:00:00 2001
From: joncojonathan <joncojonathan@gmail.com>
Date: Sat, 31 Aug 2019 13:45:17 +0100
Subject: [PATCH 552/794] veracrypt: 1.23 -> 1.23-hotfix-2

Applied upstream hotfix
---
 pkgs/applications/misc/veracrypt/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index 8b64bcca667..ceacf5a8374 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }:
+{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, unzip, wxGTK, lvm2 }:
 
 with stdenv.lib;
 
@@ -6,16 +6,17 @@ stdenv.mkDerivation rec {
   pname = "veracrypt";
   name = "${pname}-${version}";
   version = "1.23";
+  minorVersion = "-Hotfix-2";
 
   src = fetchurl {
-    url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2";
-    sha256 = "009lqi43n2w272sxv7y7dz9sqx15qkx6lszkswr8mwmkpgkm0px1";
+    url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}${minorVersion}_Source.zip";
+    sha256 = "229de81b2478cfa5fa73e74e60798a298cd616e9852b9f47b484c80bc2a2c259";
   };
 
   sourceRoot = "src";
 
   nativeBuildInputs = [ makeself pkgconfig yasm ];
-  buildInputs = [ fuse lvm2 wxGTK ];
+  buildInputs = [ fuse lvm2 unzip wxGTK ];
 
   enableParallelBuilding = true;
 

From 107af97c9090cf0d0722889553fcc3ffc45b22ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 31 Aug 2019 14:45:33 +0200
Subject: [PATCH 553/794] python-mailman-hyperkitty: initial version 1.1.0

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

diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix
new file mode 100644
index 00000000000..fd89260ab94
--- /dev/null
+++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchPypi, mailman, mock }:
+
+buildPythonPackage rec {
+  pname = "mailman-hyperkitty";
+  version = "1.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx";
+  };
+
+  propagatedBuildInputs = [ mailman ];
+  checkInputs = [ mock ];
+
+  checkPhase = ''
+    python -m nose2 -v
+  '';
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Mailman archiver plugin for HyperKitty";
+    homepage = https://gitlab.com/mailman/mailman-hyperkitty;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ globin peti ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9099552add2..8eaf7cd0ae8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -717,6 +717,8 @@ in {
 
   mailmanclient = callPackage ../development/python-modules/mailmanclient { };
 
+  mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { };
+
   manhole = callPackage ../development/python-modules/manhole { };
 
   markerlib = callPackage ../development/python-modules/markerlib { };

From a919868ff14a65ad40319b1cfe5100c0cc0f85ec Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 31 Aug 2019 09:17:48 -0400
Subject: [PATCH 554/794] linux: Remove 5.1

The 5.1.x series is not supported anymore
---
 pkgs/os-specific/linux/kernel/linux-5.1.nix | 18 ------------------
 pkgs/top-level/all-packages.nix             |  9 ---------
 2 files changed, 27 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-5.1.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix
deleted file mode 100644
index ad3b292656e..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-5.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
-
-with stdenv.lib;
-
-buildLinux (args // rec {
-  version = "5.1.21";
-
-  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
-
-  # branchVersion needs to be x.y
-  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1xj1wfhjz2s5a8j6zx3fsd7rrrkvw5waszzylf2gn3ag6615yjan";
-  };
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee3a4f7d68e..e23691b9b89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15743,14 +15743,6 @@ in
       ];
   };
 
-  linux_5_1 = callPackage ../os-specific/linux/kernel/linux-5.1.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        kernelPatches.modinst_arg_list_too_long
-        kernelPatches.export_kernel_fpu_functions
-      ];
-  };
-
   linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -15961,7 +15953,6 @@ in
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
   linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
-  linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1);
   linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2);
 
   # When adding to this list:

From 1da1a7a4794de78db9461e094de0b5dd312cbe41 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 4 Jul 2019 00:23:31 +0000
Subject: [PATCH 555/794] pari: 2.11.1 -> 2.11.2

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

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 72827112c50..89ae354e7c7 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, fetchpatch
 , gmp
 , readline
 , libX11
@@ -13,25 +12,13 @@ assert withThread -> libpthreadstubs != null;
 
 stdenv.mkDerivation rec {
   pname = "pari";
-  version = "2.11.1";
+  version = "2.11.2";
 
   src = fetchurl {
     url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz";
-    sha256 = "1jfax92jpydjd02fwl30r6b8kfzqqd6sm4yx94gidyz9lqjb7a94";
+    sha256 = "0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa";
   };
 
-  patches = [
-    # Fix a off-by-one bug that can potentially lead to segfaults (accepted upstream)
-    # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2117
-    # https://trac.sagemath.org/ticket/27335
-    (fetchpatch {
-      name = "fix-off-by-one-error.patch";
-      # only relevant parts of https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=patch;h=aa1ee6e0898d177e6bcf49237d82c804bc410985
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/red_montgomery.patch?id=bbea55c96e1f05302b3c7f593cf64492497047c5";
-      sha256 = "0vqkmhgv9splsdswp6zjnkj50z76rc1m6k9iy3cf9dxwqw3h3nr6";
-    })
-  ];
-
   buildInputs = [
     gmp
     readline

From c4adeddb5f8e945517068968d06ea838b7c24bd3 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Wed, 7 Aug 2019 21:30:58 +0200
Subject: [PATCH 556/794] opencv: dont try cuda on 32 bit

config.cudaSupport can be true and cudatoolkit doesn't work with i686,
which can happen inside pkgsi686Linux wrapping.
---
 pkgs/development/libraries/opencv/3.x.nix | 3 ++-
 pkgs/development/libraries/opencv/4.x.nix | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index d5dc716c4a8..34615f44eb4 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -14,7 +14,8 @@
 , enableOpenblas  ? true, openblas
 , enableContrib   ? true
 
-, enableCuda      ? config.cudaSupport or false, cudatoolkit
+, enableCuda      ? (config.cudaSupport or false) &&
+                    stdenv.hostPlatform.isx86_64, cudatoolkit
 
 , enableUnfree    ? false
 , enableIpp       ? false
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 3fdc392e92b..44bd9c32aef 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -14,7 +14,8 @@
 , enableOpenblas  ? true, openblas
 , enableContrib   ? true
 
-, enableCuda      ? config.cudaSupport or false, cudatoolkit
+, enableCuda      ? (config.cudaSupport or false) &&
+                    stdenv.hostPlatform.isx86_64, cudatoolkit
 
 , enableUnfree    ? false
 , enableIpp       ? false

From 09781e81c315cc4e9e079c5c96e3d0714fb7bcbd Mon Sep 17 00:00:00 2001
From: timor <timor.dd@googlemail.com>
Date: Mon, 5 Aug 2019 20:12:36 +0200
Subject: [PATCH 557/794] udis86: init at 1.7.2

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

diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/development/tools/udis86/default.nix
new file mode 100644
index 00000000000..6996d5bf13f
--- /dev/null
+++ b/pkgs/development/tools/udis86/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, python }:
+
+stdenv.mkDerivation rec {
+  pname = "udis86";
+  version = "1.7.2";
+
+  src = fetchFromGitHub {
+    owner = "vmt";
+    repo = "udis86";
+    rev = "v${version}";
+    url = "https://github.com/vmt/udis86/archive/v${version}.tar.gz";
+    sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1";
+  };
+
+  nativeBuildInputs = [ autoreconfHook python ];
+
+  configureFlags = [
+    "--enable-shared"
+  ];
+
+  outputs = [ "bin" "out" "dev" "lib" ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://udis86.sourceforge.net";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ timor ];
+    description = ''
+      Easy-to-use, minimalistic x86 disassembler library (libudis86)
+    '';
+    platforms = platforms.all ;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d022733584..713da107127 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9916,6 +9916,8 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreFoundation;
   };
 
+  udis86 = callPackage  ../development/tools/udis86 { };
+
   uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { };
 
   uhd = callPackage ../applications/radio/uhd { };

From cbbe9f0f211a7c96e7daa7a6e9242b46f841fff2 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sat, 31 Aug 2019 15:56:10 +0000
Subject: [PATCH 558/794] patchutils: add perl to buildInputs

This was silently producing perl scripts with empty shebang lines,
breaking a bunch of the binaries.
---
 pkgs/tools/text/patchutils/generic.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix
index 87d925e333f..9d7ac4b53f0 100644
--- a/pkgs/tools/text/patchutils/generic.nix
+++ b/pkgs/tools/text/patchutils/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, perl
 , version, sha256, patches ? []
 , ...
 }:
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
+  buildInputs = [ perl ];
   hardeningDisable = [ "format" ];
 
   doCheck = false; # fails

From 478e7184f88db1364cc75107036f7c4decc0cc41 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Thu, 8 Aug 2019 22:48:27 +0200
Subject: [PATCH 559/794] nixos/modules: Remove all usages of types.string

And replace them with a more appropriate type

Also fix up some minor module problems along the way
---
 nixos/modules/config/users-groups.nix         | 12 +++----
 nixos/modules/hardware/video/nvidia.nix       |  4 +--
 nixos/modules/installer/cd-dvd/sd-image.nix   |  4 +--
 nixos/modules/programs/thefuck.nix            |  2 +-
 nixos/modules/programs/xss-lock.nix           |  2 +-
 nixos/modules/programs/yabar.nix              |  8 ++---
 .../programs/zsh/zsh-syntax-highlighting.nix  |  4 +--
 nixos/modules/security/pam.nix                |  2 +-
 nixos/modules/security/sudo.nix               | 12 +++----
 .../services/amqp/activemq/default.nix        |  6 ++--
 nixos/modules/services/audio/alsa.nix         |  2 +-
 nixos/modules/services/audio/ympd.nix         |  2 +-
 .../services/backup/postgresql-backup.nix     |  2 +-
 nixos/modules/services/backup/rsnapshot.nix   |  4 +--
 .../modules/services/databases/cassandra.nix  | 10 +++---
 nixos/modules/services/databases/couchdb.nix  |  8 ++---
 .../services/databases/foundationdb.nix       |  8 ++---
 nixos/modules/services/databases/hbase.nix    |  4 +--
 nixos/modules/services/databases/influxdb.nix |  4 +--
 nixos/modules/services/databases/mongodb.nix  |  4 +--
 nixos/modules/services/databases/openldap.nix |  8 ++---
 nixos/modules/services/databases/opentsdb.nix |  4 +--
 nixos/modules/services/databases/riak.nix     |  4 +--
 nixos/modules/services/games/factorio.nix     | 16 ++++-----
 nixos/modules/services/hardware/freefall.nix  |  2 +-
 nixos/modules/services/hardware/fwupd.nix     |  4 +--
 nixos/modules/services/hardware/sane.nix      |  2 +-
 nixos/modules/services/hardware/tcsd.nix      | 10 +++---
 .../services/logging/SystemdJournal2Gelf.nix  |  6 ++--
 nixos/modules/services/logging/awstats.nix    |  4 +--
 nixos/modules/services/logging/logcheck.nix   |  2 +-
 nixos/modules/services/logging/rsyslogd.nix   |  4 +--
 nixos/modules/services/mail/exim.nix          |  8 ++---
 nixos/modules/services/mail/nullmailer.nix    |  4 +--
 nixos/modules/services/mail/postfix.nix       |  4 +--
 nixos/modules/services/mail/postgrey.nix      | 12 +++----
 nixos/modules/services/mail/rspamd.nix        |  4 +--
 nixos/modules/services/misc/airsonic.nix      |  2 +-
 nixos/modules/services/misc/apache-kafka.nix  | 12 +++----
 .../services/misc/cpuminer-cryptonight.nix    |  8 ++---
 nixos/modules/services/misc/exhibitor.nix     |  2 +-
 nixos/modules/services/misc/fstrim.nix        |  2 +-
 nixos/modules/services/misc/logkeys.nix       |  2 +-
 nixos/modules/services/misc/mediatomb.nix     |  2 +-
 nixos/modules/services/misc/paperless.nix     |  2 +-
 nixos/modules/services/misc/subsonic.nix      |  2 +-
 nixos/modules/services/misc/uhub.nix          | 10 +++---
 nixos/modules/services/monitoring/apcupsd.nix |  4 +--
 nixos/modules/services/monitoring/bosun.nix   | 10 +++---
 .../services/monitoring/datadog-agent.nix     |  2 +-
 .../services/monitoring/dd-agent/dd-agent.nix | 15 ++++----
 .../modules/services/monitoring/graphite.nix  | 16 ++++-----
 .../modules/services/monitoring/heapster.nix  |  6 ++--
 .../modules/services/monitoring/kapacitor.nix |  8 ++---
 nixos/modules/services/monitoring/munin.nix   |  2 +-
 .../monitoring/prometheus/exporters/node.nix  |  2 +-
 .../services/monitoring/riemann-tools.nix     |  2 +-
 .../services/monitoring/scollector.nix        |  6 ++--
 nixos/modules/services/monitoring/ups.nix     |  4 +--
 nixos/modules/services/monitoring/uptime.nix  |  2 +-
 .../services/network-filesystems/davfs2.nix   |  4 +--
 .../services/network-filesystems/drbd.nix     |  2 +-
 .../services/network-filesystems/rsyncd.nix   |  2 +-
 .../network-filesystems/yandex-disk.nix       |  6 ++--
 nixos/modules/services/networking/aria2.nix   |  8 ++---
 nixos/modules/services/networking/autossh.nix |  6 ++--
 .../modules/services/networking/charybdis.nix | 10 +++---
 nixos/modules/services/networking/connman.nix |  4 +--
 .../services/networking/gogoclient.nix        |  2 +-
 nixos/modules/services/networking/hostapd.nix |  8 ++---
 .../services/networking/jormungandr.nix       |  2 +-
 nixos/modules/services/networking/kippo.nix   | 12 +++----
 nixos/modules/services/networking/morty.nix   |  4 +--
 .../modules/services/networking/mosquitto.nix |  6 ++--
 .../services/networking/networkmanager.nix    |  2 +-
 .../modules/services/networking/nix-serve.nix |  4 +--
 nixos/modules/services/networking/nylon.nix   |  8 ++---
 .../modules/services/networking/openntpd.nix  |  2 +-
 nixos/modules/services/networking/openvpn.nix |  4 +--
 .../modules/services/networking/ostinato.nix  |  4 +--
 nixos/modules/services/networking/polipo.nix  | 10 +++---
 nixos/modules/services/networking/pptpd.nix   |  4 +--
 nixos/modules/services/networking/prosody.nix |  2 +-
 .../modules/services/networking/radicale.nix  |  4 +--
 nixos/modules/services/networking/shout.nix   |  2 +-
 .../modules/services/networking/smokeping.nix | 36 ++++++++++---------
 .../modules/services/networking/softether.nix |  2 +-
 nixos/modules/services/networking/stunnel.nix | 10 +++---
 nixos/modules/services/networking/toxvpn.nix  |  4 +--
 nixos/modules/services/networking/vsftpd.nix  |  2 +-
 nixos/modules/services/networking/xinetd.nix  | 14 ++++----
 nixos/modules/services/networking/xl2tpd.nix  |  4 +--
 nixos/modules/services/security/haka.nix      |  4 +--
 nixos/modules/services/security/munge.nix     |  2 +-
 .../services/security/oauth2_proxy.nix        |  4 +--
 .../services/security/oauth2_proxy_nginx.nix  |  4 +--
 nixos/modules/services/torrent/flexget.nix    |  4 +--
 nixos/modules/services/web-apps/youtrack.nix  | 18 +++++-----
 .../apache-httpd/per-server-options.nix       |  2 +-
 nixos/modules/services/web-servers/caddy.nix  |  4 +--
 .../services/web-servers/nginx/default.nix    |  2 +-
 .../modules/services/web-servers/traefik.nix  |  2 +-
 nixos/modules/services/web-servers/uwsgi.nix  |  2 +-
 nixos/modules/services/web-servers/zope2.nix  | 10 +++---
 .../x11/desktop-managers/surf-display.nix     | 10 +++---
 .../services/x11/display-managers/lightdm.nix |  2 +-
 .../services/x11/hardware/libinput.nix        |  6 ++--
 .../services/x11/hardware/synaptics.nix       |  6 ++--
 .../services/x11/window-managers/xmonad.nix   |  2 +-
 nixos/modules/system/boot/binfmt.nix          |  2 +-
 .../modules/system/boot/loader/grub/grub.nix  | 12 +++----
 .../boot/loader/raspberrypi/raspberrypi.nix   |  4 +--
 nixos/modules/tasks/network-interfaces.nix    |  4 +--
 nixos/modules/virtualisation/anbox.nix        |  2 +-
 nixos/modules/virtualisation/containers.nix   |  8 ++---
 nixos/modules/virtualisation/kvmgt.nix        |  4 +--
 nixos/modules/virtualisation/xen-dom0.nix     |  2 +-
 pkgs/build-support/writers/default.nix        |  8 ++---
 118 files changed, 325 insertions(+), 324 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 25f1c67ce83..c91eb0ebb87 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -181,7 +181,7 @@ let
       };
 
       hashedPassword = mkOption {
-        type = with types; uniq (nullOr str);
+        type = with types; nullOr str;
         default = null;
         description = ''
           Specifies the hashed password for the user.
@@ -191,7 +191,7 @@ let
       };
 
       password = mkOption {
-        type = with types; uniq (nullOr str);
+        type = with types; nullOr str;
         default = null;
         description = ''
           Specifies the (clear text) password for the user.
@@ -203,7 +203,7 @@ let
       };
 
       passwordFile = mkOption {
-        type = with types; uniq (nullOr string);
+        type = with types; nullOr str;
         default = null;
         description = ''
           The full path to a file that contains the user's password. The password
@@ -215,7 +215,7 @@ let
       };
 
       initialHashedPassword = mkOption {
-        type = with types; uniq (nullOr str);
+        type = with types; nullOr str;
         default = null;
         description = ''
           Specifies the initial hashed password for the user, i.e. the
@@ -230,7 +230,7 @@ let
       };
 
       initialPassword = mkOption {
-        type = with types; uniq (nullOr str);
+        type = with types; nullOr str;
         default = null;
         description = ''
           Specifies the initial password for the user, i.e. the
@@ -304,7 +304,7 @@ let
       };
 
       members = mkOption {
-        type = with types; listOf string;
+        type = with types; listOf str;
         default = [];
         description = ''
           The user names of the group members, added to the
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index da3c8ee5a9f..3ab2afc9740 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -88,7 +88,7 @@ in
     };
 
     hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption {
-      type = lib.types.string;
+      type = lib.types.str;
       default = "";
       example = "PCI:1:0:0";
       description = ''
@@ -98,7 +98,7 @@ in
     };
 
     hardware.nvidia.optimus_prime.intelBusId = lib.mkOption {
-      type = lib.types.string;
+      type = lib.types.str;
       default = "";
       example = "PCI:0:2:0";
       description = ''
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 07f6f627e6c..34b95478944 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -54,7 +54,7 @@ in
     };
 
     firmwarePartitionID = mkOption {
-      type = types.string;
+      type = types.str;
       default = "0x2178694e";
       description = ''
         Volume ID for the /boot/firmware partition on the SD card. This value
@@ -63,7 +63,7 @@ in
     };
 
     rootPartitionUUID = mkOption {
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       default = null;
       example = "14e19a7b-0ae0-484d-9d54-43bd6fdc20c7";
       description = ''
diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix
index 21ed6603c1b..b909916158d 100644
--- a/nixos/modules/programs/thefuck.nix
+++ b/nixos/modules/programs/thefuck.nix
@@ -17,7 +17,7 @@ in
 
         alias = mkOption {
           default = "fuck";
-          type = types.string;
+          type = types.str;
 
           description = ''
             `thefuck` needs an alias to be configured.
diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix
index 070463311db..a7ad9b89db4 100644
--- a/nixos/modules/programs/xss-lock.nix
+++ b/nixos/modules/programs/xss-lock.nix
@@ -12,7 +12,7 @@ in
     lockerCommand = mkOption {
       default = "${pkgs.i3lock}/bin/i3lock";
       example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy'';
-      type = types.string;
+      type = types.separatedString " ";
       description = "Locker to be used with xsslock";
     };
 
diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix
index db085211366..5de9331ac52 100644
--- a/nixos/modules/programs/yabar.nix
+++ b/nixos/modules/programs/yabar.nix
@@ -76,7 +76,7 @@ in
             font = mkOption {
               default = "sans bold 9";
               example = "Droid Sans, FontAwesome Bold 9";
-              type = types.string;
+              type = types.str;
 
               description = ''
                 The font that will be used to draw the status bar.
@@ -95,7 +95,7 @@ in
 
             extra = mkOption {
               default = {};
-              type = types.attrsOf types.string;
+              type = types.attrsOf types.str;
 
               description = ''
                 An attribute set which contains further attributes of a bar.
@@ -107,7 +107,7 @@ in
               type = types.attrsOf(types.submodule {
                 options.exec = mkOption {
                   example = "YABAR_DATE";
-                  type = types.string;
+                  type = types.str;
                   description = ''
                      The type of the indicator to be executed.
                   '';
@@ -125,7 +125,7 @@ in
 
                 options.extra = mkOption {
                   default = {};
-                  type = types.attrsOf (types.either types.string types.int);
+                  type = types.attrsOf (types.either types.str types.int);
 
                   description = ''
                     An attribute set which contains further attributes of a indicator.
diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 89087a229eb..7184e5d9b9a 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -33,7 +33,7 @@ in
 
       patterns = mkOption {
         default = {};
-        type = types.attrsOf types.string;
+        type = types.attrsOf types.str;
 
         example = literalExample ''
           {
@@ -50,7 +50,7 @@ in
       };
       styles = mkOption {
         default = {};
-        type = types.attrsOf types.string;
+        type = types.attrsOf types.str;
 
         example = literalExample ''
           {
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 89e71c5136e..9c7ddc2f4ee 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -685,7 +685,7 @@ in
       };
       id = mkOption {
         example = "42";
-        type = types.string;
+        type = types.str;
         description = "client id";
       };
 
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index 573588aaeec..10ee036be84 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -91,7 +91,7 @@ in
       type = with types; listOf (submodule {
         options = {
           users = mkOption {
-            type = with types; listOf (either string int);
+            type = with types; listOf (either str int);
             description = ''
               The usernames / UIDs this rule should apply for.
             '';
@@ -99,7 +99,7 @@ in
           };
 
           groups = mkOption {
-            type = with types; listOf (either string int);
+            type = with types; listOf (either str int);
             description = ''
               The groups / GIDs this rule should apply for.
             '';
@@ -107,7 +107,7 @@ in
           };
 
           host = mkOption {
-            type = types.string;
+            type = types.str;
             default = "ALL";
             description = ''
               For what host this rule should apply.
@@ -115,7 +115,7 @@ in
           };
 
           runAs = mkOption {
-            type = with types; string;
+            type = with types; str;
             default = "ALL:ALL";
             description = ''
               Under which user/group the specified command is allowed to run.
@@ -130,11 +130,11 @@ in
             description = ''
               The commands for which the rule should apply.
             '';
-            type = with types; listOf (either string (submodule {
+            type = with types; listOf (either str (submodule {
 
               options = {
                 command = mkOption {
-                  type = with types; string;
+                  type = with types; str;
                   description = ''
                     A command being either just a path to a binary to allow any arguments,
                     the full command with arguments pre-set or with <code>""</code> used as the argument,
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 27bfd91cd2d..7729da27304 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -40,7 +40,7 @@ in {
         '';
       };
       configurationURI = mkOption {
-        type = types.string;
+        type = types.str;
         default = "xbean:activemq.xml";
         description = ''
           The URI that is passed along to the BrokerFactory to
@@ -51,7 +51,7 @@ in {
         '';
       };
       baseDir = mkOption {
-        type = types.string;
+        type = types.str;
         default = "/var/activemq";
         description = ''
           The base directory where ActiveMQ stores its persistent data and logs.
@@ -81,7 +81,7 @@ in {
         '';
       };
       extraJavaOptions = mkOption {
-        type = types.string;
+        type = types.separatedString " ";
         default = "";
         example = "-Xmx2G -Xms2G -XX:MaxPermSize=512M";
         description = ''
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index 376aad66e23..4939adc4ee6 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -64,7 +64,7 @@ in
         };
 
         volumeStep = mkOption {
-          type = types.string;
+          type = types.str;
           default = "1";
           example = "1%";
           description = ''
diff --git a/nixos/modules/services/audio/ympd.nix b/nixos/modules/services/audio/ympd.nix
index 919b7662251..551bd941fe6 100644
--- a/nixos/modules/services/audio/ympd.nix
+++ b/nixos/modules/services/audio/ympd.nix
@@ -23,7 +23,7 @@ in {
 
       mpd = {
         host = mkOption {
-          type = types.string;
+          type = types.str;
           default = "localhost";
           description = "The host where MPD is listening.";
           example = "localhost";
diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index 17b410a97f3..13a36ae32ac 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -81,7 +81,7 @@ in {
       };
 
       pgdumpOptions = mkOption {
-        type = types.string;
+        type = types.separatedString " ";
         default = "-Cbo";
         description = ''
           Command line options for pg_dump. This options is not used
diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index bb5dcab1dcf..6635a51ec2c 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
@@ -2,7 +2,7 @@
 
 with lib;
 
-let 
+let
   cfg = config.services.rsnapshot;
   cfgfile = pkgs.writeText "rsnapshot.conf" ''
     config_version	1.2
@@ -52,7 +52,7 @@ in
       cronIntervals = mkOption {
         default = {};
         example = { hourly = "0 * * * *"; daily = "50 21 * * *"; };
-        type = types.attrsOf types.string;
+        type = types.attrsOf types.str;
         description = ''
           Periodicity at which intervals should be run by cron.
           Note that the intervals also have to exist in configuration
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix
index a9da3a3c562..9c8b6c50af1 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -259,7 +259,7 @@ in {
         '';
     };
     incrementalRepairOptions = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default = [];
       example = [ "--partitioner-range" ];
       description = ''
@@ -267,7 +267,7 @@ in {
         '';
     };
     maxHeapSize = mkOption {
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       default = null;
       example = "4G";
       description = ''
@@ -287,7 +287,7 @@ in {
       '';
     };
     heapNewSize = mkOption {
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       default = null;
       example = "800M";
       description = ''
@@ -352,11 +352,11 @@ in {
       type = types.listOf (types.submodule {
         options = {
           username = mkOption {
-            type = types.string;
+            type = types.str;
             description = "Username for JMX";
           };
           password = mkOption {
-            type = types.string;
+            type = types.str;
             description = "Password for JMX";
           };
         };
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 77e404116c8..53224db1d89 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -56,7 +56,7 @@ in {
 
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = "couchdb";
         description = ''
           User account under which couchdb runs.
@@ -64,7 +64,7 @@ in {
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "couchdb";
         description = ''
           Group account under which couchdb runs.
@@ -106,7 +106,7 @@ in {
       };
 
       bindAddress = mkOption {
-        type = types.string;
+        type = types.str;
         default = "127.0.0.1";
         description = ''
           Defines the IP address by which CouchDB will be accessible.
@@ -138,7 +138,7 @@ in {
       };
 
       configFile = mkOption {
-        type = types.string;
+        type = types.path;
         description = ''
           Configuration file for persisting runtime changes. File
           needs to be readable and writable from couchdb user/group.
diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 3746b875c7f..8f8d0da7c8d 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -140,7 +140,7 @@ in
     };
 
     logSize = mkOption {
-      type        = types.string;
+      type        = types.str;
       default     = "10MiB";
       description = ''
         Roll over to a new log file after the current log file
@@ -149,7 +149,7 @@ in
     };
 
     maxLogSize = mkOption {
-      type        = types.string;
+      type        = types.str;
       default     = "100MiB";
       description = ''
         Delete the oldest log file when the total size of all log
@@ -171,7 +171,7 @@ in
     };
 
     memory = mkOption {
-      type        = types.string;
+      type        = types.str;
       default     = "8GiB";
       description = ''
         Maximum memory used by the process. The default value is
@@ -193,7 +193,7 @@ in
     };
 
     storageMemory = mkOption {
-      type        = types.string;
+      type        = types.str;
       default     = "1GiB";
       description = ''
         Maximum memory used for data storage. The default value is
diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix
index 589c8cf5ec8..2d1a47bbaa3 100644
--- a/nixos/modules/services/databases/hbase.nix
+++ b/nixos/modules/services/databases/hbase.nix
@@ -53,7 +53,7 @@ in {
 
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = "hbase";
         description = ''
           User account under which HBase runs.
@@ -61,7 +61,7 @@ in {
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "hbase";
         description = ''
           Group account under which HBase runs.
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index 6868050c844..2f176a03872 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -129,13 +129,13 @@ in
       user = mkOption {
         default = "influxdb";
         description = "User account under which influxdb runs";
-        type = types.string;
+        type = types.str;
       };
 
       group = mkOption {
         default = "influxdb";
         description = "Group under which influxdb runs";
-        type = types.string;
+        type = types.str;
       };
 
       dataDir = mkOption {
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index c458a1d648a..12879afed47 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -65,9 +65,9 @@ in
         default = false;
         description = "Enable client authentication. Creates a default superuser with username root!";
       };
-      
+
       initialRootPassword = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = null;
         description = "Password for the root user if auth is enabled.";
       };
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index d8e2c715afb..5bf57a1bf9c 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -47,26 +47,26 @@ in
       };
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = "openldap";
         description = "User account under which slapd runs.";
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "openldap";
         description = "Group account under which slapd runs.";
       };
 
       urlList = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [ "ldap:///" ];
         description = "URL list slapd should listen on.";
         example = [ "ldaps:///" ];
       };
 
       dataDir = mkOption {
-        type = types.string;
+        type = types.path;
         default = "/var/db/openldap";
         description = "The database directory.";
       };
diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix
index b26fa9093ef..c4bd71f3d60 100644
--- a/nixos/modules/services/databases/opentsdb.nix
+++ b/nixos/modules/services/databases/opentsdb.nix
@@ -34,7 +34,7 @@ in {
       };
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = "opentsdb";
         description = ''
           User account under which OpenTSDB runs.
@@ -42,7 +42,7 @@ in {
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "opentsdb";
         description = ''
           Group account under which OpenTSDB runs.
diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix
index ac086cf5599..885215209bd 100644
--- a/nixos/modules/services/databases/riak.nix
+++ b/nixos/modules/services/databases/riak.nix
@@ -29,7 +29,7 @@ in
       };
 
       nodeName = mkOption {
-        type = types.string;
+        type = types.str;
         default = "riak@127.0.0.1";
         description = ''
           Name of the Erlang node.
@@ -37,7 +37,7 @@ in
       };
 
       distributedCookie = mkOption {
-        type = types.string;
+        type = types.str;
         default = "riak";
         description = ''
           Cookie for distributed node communication.  All nodes in the
diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index d04673a6c8b..f3831156f45 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -55,7 +55,7 @@ in
         '';
       };
       saveName = mkOption {
-        type = types.string;
+        type = types.str;
         default = "default";
         description = ''
           The name of the savegame that will be used by the server.
@@ -81,7 +81,7 @@ in
         '';
       };
       stateDirName = mkOption {
-        type = types.string;
+        type = types.str;
         default = "factorio";
         description = ''
           Name of the directory under /var/lib holding the server's data.
@@ -102,14 +102,14 @@ in
         '';
       };
       game-name = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = "Factorio Game";
         description = ''
           Name of the game as it will appear in the game listing.
         '';
       };
       description = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = "";
         description = ''
           Description of the game that will appear in the listing.
@@ -130,28 +130,28 @@ in
         '';
       };
       username = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = null;
         description = ''
           Your factorio.com login credentials. Required for games with visibility public.
         '';
       };
       password = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = null;
         description = ''
           Your factorio.com login credentials. Required for games with visibility public.
         '';
       };
       token = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = null;
         description = ''
           Authentication token. May be used instead of 'password' above.
         '';
       };
       game-password = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = null;
         description = ''
           Game password.
diff --git a/nixos/modules/services/hardware/freefall.nix b/nixos/modules/services/hardware/freefall.nix
index 066ccaa4d7c..83f1e8c84f2 100644
--- a/nixos/modules/services/hardware/freefall.nix
+++ b/nixos/modules/services/hardware/freefall.nix
@@ -28,7 +28,7 @@ in {
     };
 
     devices = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default = [ "/dev/sda" ];
       description = ''
         Device paths to all internal spinning hard drives.
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index 223adfee96e..6c341bcbf24 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -43,7 +43,7 @@ in {
       };
 
       blacklistDevices = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [];
         example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ];
         description = ''
@@ -52,7 +52,7 @@ in {
       };
 
       blacklistPlugins = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [ "test" ];
         example = [ "udev" ];
         description = ''
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index fe05c5a5c06..3f52658ff01 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -76,7 +76,7 @@ in
     };
 
     hardware.sane.configDir = mkOption {
-      type = types.string;
+      type = types.str;
       internal = true;
       description = "The value of SANE_CONFIG_DIR.";
     };
diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix
index d4b0a9495d7..3876280ee6b 100644
--- a/nixos/modules/services/hardware/tcsd.nix
+++ b/nixos/modules/services/hardware/tcsd.nix
@@ -49,13 +49,13 @@ in
 
       user = mkOption {
         default = "tss";
-        type = types.string;
+        type = types.str;
         description = "User account under which tcsd runs.";
       };
 
       group = mkOption {
         default = "tss";
-        type = types.string;
+        type = types.str;
         description = "Group account under which tcsd runs.";
       };
 
@@ -65,19 +65,19 @@ in
         description = ''
           The location of the system persistent storage file.
           The system persistent storage file holds keys and data across
-          restarts of the TCSD and system reboots. 
+          restarts of the TCSD and system reboots.
         '';
       };
 
       firmwarePCRs = mkOption {
         default = "0,1,2,3,4,5,6,7";
-        type = types.string;
+        type = types.str;
         description = "PCR indices used in the TPM for firmware measurements.";
       };
 
       kernelPCRs = mkOption {
         default = "8,9,10,11,12";
-        type = types.string;
+        type = types.str;
         description = "PCR indices used in the TPM for kernel measurements.";
       };
 
diff --git a/nixos/modules/services/logging/SystemdJournal2Gelf.nix b/nixos/modules/services/logging/SystemdJournal2Gelf.nix
index e90d9e7a12b..f26aef7262b 100644
--- a/nixos/modules/services/logging/SystemdJournal2Gelf.nix
+++ b/nixos/modules/services/logging/SystemdJournal2Gelf.nix
@@ -16,7 +16,7 @@ in
       };
 
       graylogServer = mkOption {
-        type = types.string;
+        type = types.str;
         example = "graylog2.example.com:11201";
         description = ''
           Host and port of your graylog2 input. This should be a GELF
@@ -25,7 +25,7 @@ in
       };
 
       extraOptions = mkOption {
-        type = types.string;
+        type = types.separatedString " ";
         default = "";
         description = ''
           Any extra flags to pass to SystemdJournal2Gelf. Note that
@@ -56,4 +56,4 @@ in
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix
index 54799d699a7..a92ff3bee49 100644
--- a/nixos/modules/services/logging/awstats.nix
+++ b/nixos/modules/services/logging/awstats.nix
@@ -32,7 +32,7 @@ in
     };
 
     updateAt = mkOption {
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       default = null;
       example = "hourly";
       description = ''
@@ -50,7 +50,7 @@ in
         description = ''Enable the awstats web service. This switches on httpd.'';
       };
       urlPrefix = mkOption {
-        type = types.string;
+        type = types.str;
         default = "/awstats";
         description = "The URL prefix under which the awstats service appears.";
       };
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index f139190a170..e7d6e3d6263 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -155,7 +155,7 @@ in
 
       config = mkOption {
         default = "FQDN=1";
-        type = types.string;
+        type = types.lines;
         description = ''
           Config options that you would like in logcheck.conf.
         '';
diff --git a/nixos/modules/services/logging/rsyslogd.nix b/nixos/modules/services/logging/rsyslogd.nix
index 1ea96b8f132..b924d94e0b0 100644
--- a/nixos/modules/services/logging/rsyslogd.nix
+++ b/nixos/modules/services/logging/rsyslogd.nix
@@ -46,7 +46,7 @@ in
       };
 
       defaultConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = defaultConf;
         description = ''
           The default <filename>syslog.conf</filename> file configures a
@@ -56,7 +56,7 @@ in
       };
 
       extraConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = "";
         example = "news.* -/var/log/news";
         description = ''
diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index c0581129135..47812dd1e40 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -21,7 +21,7 @@ in
       };
 
       config = mkOption {
-        type = types.string;
+        type = types.lines;
         default = "";
         description = ''
           Verbatim Exim configuration.  This should not contain exim_user,
@@ -30,7 +30,7 @@ in
       };
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = "exim";
         description = ''
           User to use when no root privileges are required.
@@ -42,7 +42,7 @@ in
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "exim";
         description = ''
           Group to use when no root privileges are required.
@@ -50,7 +50,7 @@ in
       };
 
       spoolDir = mkOption {
-        type = types.string;
+        type = types.path;
         default = "/var/spool/exim";
         description = ''
           Location of the spool directory of exim.
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index 9997d287013..2c2910e0aa9 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -14,7 +14,7 @@ with lib;
       };
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = "nullmailer";
         description = ''
           User to use to run nullmailer-send.
@@ -22,7 +22,7 @@ with lib;
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "nullmailer";
         description = ''
           Group to use to run nullmailer-send.
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 2b08ab1e6aa..c9b3ff0c8f8 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -509,7 +509,7 @@ in
       };
 
       localRecipients = mkOption {
-        type = with types; nullOr (listOf string);
+        type = with types; nullOr (listOf str);
         default = null;
         description = ''
           List of accepted local users. Specify a bare username, an
@@ -530,7 +530,7 @@ in
 
       dnsBlacklists = mkOption {
         default = [];
-        type = with types; listOf string;
+        type = with types; listOf str;
         description = "dns blacklist servers to use with smtpd_client_restrictions";
       };
 
diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 8e2b9c5dbc5..660c4ca74b1 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -12,7 +12,7 @@ with lib; let
   inetSocket = with types; {
     options = {
       addr = mkOption {
-        type = nullOr string;
+        type = nullOr str;
         default = null;
         example = "127.0.0.1";
         description = "The address to bind to. Localhost if null";
@@ -34,7 +34,7 @@ with lib; let
       };
 
       mode = mkOption {
-        type = string;
+        type = str;
         default = "0777";
         description = "Mode of the unix socket";
       };
@@ -63,17 +63,17 @@ in {
         description = "Socket to bind to";
       };
       greylistText = mkOption {
-        type = string;
+        type = str;
         default = "Greylisted for %%s seconds";
         description = "Response status text for greylisted messages; use %%s for seconds left until greylisting is over and %%r for mail domain of recipient";
       };
       greylistAction = mkOption {
-        type = string;
+        type = str;
         default = "DEFER_IF_PERMIT";
         description = "Response status for greylisted messages (see access(5))";
       };
       greylistHeader = mkOption {
-        type = string;
+        type = str;
         default = "X-Greylist: delayed %%t seconds by postgrey-%%v at %%h; %%d";
         description = "Prepend header to greylisted mails; use %%t for seconds delayed due to greylisting, %%v for the version of postgrey, %%d for the date, and %%h for the host";
       };
@@ -88,7 +88,7 @@ in {
         description = "Delete entries from whitelist if they haven't been seen for N days";
       };
       retryWindow = mkOption {
-        type = either string natural;
+        type = either str natural;
         default = 2;
         example = "12h";
         description = "Allow N days for the first retry. Use string with appended 'h' to specify time in hours";
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index e59d5715de0..e1ba6307811 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -308,7 +308,7 @@ in
       };
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = "rspamd";
         description = ''
           User to use when no root privileges are required.
@@ -316,7 +316,7 @@ in
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "rspamd";
         description = ''
           Group to use when no root privileges are required.
diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
index 8b2ec82c770..4480445c1ea 100644
--- a/nixos/modules/services/misc/airsonic.nix
+++ b/nixos/modules/services/misc/airsonic.nix
@@ -34,7 +34,7 @@ in {
       };
 
       listenAddress = mkOption {
-        type = types.string;
+        type = types.str;
         default = "127.0.0.1";
         description = ''
           The host name or IP address on which to bind Airsonic.
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index 9eeae955699..798e902ccae 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -46,7 +46,7 @@ in {
     hostname = mkOption {
       description = "Hostname the broker should bind to.";
       default = "localhost";
-      type = types.string;
+      type = types.str;
     };
 
     logDirs = mkOption {
@@ -54,13 +54,13 @@ in {
       default = [ "/tmp/kafka-logs" ];
       type = types.listOf types.path;
     };
-    
+
     zookeeper = mkOption {
       description = "Zookeeper connection string";
       default = "localhost:2181";
-      type = types.string;
+      type = types.str;
     };
- 
+
     extraProperties = mkOption {
       description = "Extra properties for server.properties.";
       type = types.nullOr types.lines;
@@ -79,8 +79,8 @@ in {
     log4jProperties = mkOption {
       description = "Kafka log4j property configuration.";
       default = ''
-        log4j.rootLogger=INFO, stdout 
-        
+        log4j.rootLogger=INFO, stdout
+
         log4j.appender.stdout=org.apache.log4j.ConsoleAppender
         log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
         log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n
diff --git a/nixos/modules/services/misc/cpuminer-cryptonight.nix b/nixos/modules/services/misc/cpuminer-cryptonight.nix
index f31526f8d10..907b9d90da2 100644
--- a/nixos/modules/services/misc/cpuminer-cryptonight.nix
+++ b/nixos/modules/services/misc/cpuminer-cryptonight.nix
@@ -28,15 +28,15 @@ in
         '';
       };
       url = mkOption {
-        type = types.string;
+        type = types.str;
         description = "URL of mining server";
       };
       user = mkOption {
-        type = types.string;
+        type = types.str;
         description = "Username for mining server";
       };
       pass = mkOption {
-        type = types.string;
+        type = types.str;
         default = "x";
         description = "Password for mining server";
       };
@@ -63,4 +63,4 @@ in
 
   };
 
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix
index 665084a8ae0..f526270cb4b 100644
--- a/nixos/modules/services/misc/exhibitor.nix
+++ b/nixos/modules/services/misc/exhibitor.nix
@@ -252,7 +252,7 @@ in
         example = ["host1:2181" "host2:2181"];
       };
       zkConfigExhibitorPath = mkOption {
-        type = types.string;
+        type = types.str;
         description = ''
           If the ZooKeeper shared config is also running Exhibitor, the URI path for the REST call
         '';
diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix
index 15f283f093c..b8841a7fe74 100644
--- a/nixos/modules/services/misc/fstrim.nix
+++ b/nixos/modules/services/misc/fstrim.nix
@@ -14,7 +14,7 @@ in {
       enable = mkEnableOption "periodic SSD TRIM of mounted partitions in background";
 
       interval = mkOption {
-        type = types.string;
+        type = types.str;
         default = "weekly";
         description = ''
           How often we run fstrim. For most desktop and server systems
diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix
index ad13d9eaa67..0082db63a06 100644
--- a/nixos/modules/services/misc/logkeys.nix
+++ b/nixos/modules/services/misc/logkeys.nix
@@ -11,7 +11,7 @@ in {
     device = mkOption {
       description = "Use the given device as keyboard input event device instead of /dev/input/eventX default.";
       default = null;
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       example = "/dev/input/event15";
     };
   };
diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix
index e8e9c0946d7..dbf12fd1da3 100644
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixos/modules/services/misc/mediatomb.nix
@@ -163,7 +163,7 @@ in {
       };
 
       serverName = mkOption {
-        type = types.string;
+        type = types.str;
         default = "mediatomb";
         description = ''
           How to identify the server on the network.
diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index 4e6cd80e242..3985dc0b303 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -50,7 +50,7 @@ in
     };
 
     ocrLanguages = mkOption {
-      type = with types; nullOr (listOf string);
+      type = with types; nullOr (listOf str);
       default = null;
       description = ''
         Languages available for OCR via Tesseract, specified as
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
index 1612b197f35..c1e1a7f40f0 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -17,7 +17,7 @@ let cfg = config.services.subsonic; in {
       };
 
       listenAddress = mkOption {
-        type = types.string;
+        type = types.str;
         default = "0.0.0.0";
         description = ''
           The host name or IP address on which to bind Subsonic.
diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix
index 005951b9231..753580c3e40 100644
--- a/nixos/modules/services/misc/uhub.nix
+++ b/nixos/modules/services/misc/uhub.nix
@@ -51,7 +51,7 @@ in
       };
 
       address = mkOption {
-        type = types.string;
+        type = types.str;
         default = "any";
 	description = "Address to bind the hub to.";
       };
@@ -83,7 +83,7 @@ in
             description = "Whether to enable the Sqlite authentication database plugin";
 	  };
           file = mkOption {
-            type = types.string;
+            type = types.path;
             example = "/var/db/uhub-users";
             description = "Path to user database. Use the uhub-passwd utility to create the database and add/remove users.";
           };
@@ -96,7 +96,7 @@ in
             description = "Whether to enable the logging plugin.";
           };
           file = mkOption {
-            type = types.string;
+            type = types.str;
             default = "";
             description = "Path of log file.";
           };
@@ -117,7 +117,7 @@ in
             default = "";
             type = types.lines;
             description = ''
-              Welcome message displayed to clients after connecting 
+              Welcome message displayed to clients after connecting
               and with the <literal>!motd</literal> command.
             '';
           };
@@ -183,4 +183,4 @@ in
     };
   };
 
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 49957e65290..75218aa1d46 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -91,7 +91,7 @@ in
           BATTERYLEVEL 50
           MINUTES 5
         '';
-        type = types.string;
+        type = types.lines;
         description = ''
           Contents of the runtime configuration file, apcupsd.conf. The default
           settings makes apcupsd autodetect USB UPSes, limit network access to
@@ -106,7 +106,7 @@ in
         example = {
           doshutdown = ''# shell commands to notify that the computer is shutting down'';
         };
-        type = types.attrsOf types.string;
+        type = types.attrsOf types.lines;
         description = ''
           Each attribute in this option names an apcupsd event and the string
           value it contains will be executed in a shell, in response to that
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 8bf741adb6e..b1c12cce1f8 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -41,7 +41,7 @@ in {
       };
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = "bosun";
         description = ''
           User account under which bosun runs.
@@ -49,7 +49,7 @@ in {
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "bosun";
         description = ''
           Group account under which bosun runs.
@@ -57,7 +57,7 @@ in {
       };
 
       opentsdbHost = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = "localhost:4242";
         description = ''
           Host and port of the OpenTSDB database that stores bosun data.
@@ -66,7 +66,7 @@ in {
       };
 
       influxHost = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = null;
         example = "localhost:8086";
         description = ''
@@ -75,7 +75,7 @@ in {
       };
 
       listenAddress = mkOption {
-        type = types.string;
+        type = types.str;
         default = ":8070";
         description = ''
           The host address and port that bosun's web interface will listen on.
diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index 7f78db74677..02a9f316fc3 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -87,7 +87,7 @@ in {
       description = "The hostname to show in the Datadog dashboard (optional)";
       default = null;
       example = "mymachine.mydomain";
-      type = types.uniq (types.nullOr types.string);
+      type = types.nullOr types.str;
     };
 
     logLevel = mkOption {
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index abc8d65d58f..c0ea1eeb424 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -145,41 +145,40 @@ in {
       description = "The hostname to show in the Datadog dashboard (optional)";
       default = null;
       example = "mymachine.mydomain";
-      type = types.uniq (types.nullOr types.string);
+      type = types.nullOr types.str;
     };
 
     postgresqlConfig = mkOption {
       description = "Datadog PostgreSQL integration configuration";
       default = null;
-      type = types.uniq (types.nullOr types.string);
+      type = types.nullOr types.lines;
     };
 
     nginxConfig = mkOption {
       description = "Datadog nginx integration configuration";
       default = null;
-      type = types.uniq (types.nullOr types.string);
+      type = types.nullOr types.lines;
     };
 
     mongoConfig = mkOption {
       description = "MongoDB integration configuration";
       default = null;
-      type = types.uniq (types.nullOr types.string);
+      type = types.nullOr types.lines;
     };
 
     jmxConfig = mkOption {
       description = "JMX integration configuration";
       default = null;
-      type = types.uniq (types.nullOr types.string);
+      type = types.nullOr types.lines;
     };
 
     processConfig = mkOption {
       description = ''
         Process integration configuration
-
-        See http://docs.datadoghq.com/integrations/process/
+        See <link xlink:href="https://docs.datadoghq.com/integrations/process/"/>
       '';
       default = null;
-      type = types.uniq (types.nullOr types.string);
+      type = types.nullOr types.lines;
     };
 
   };
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index d6473220c14..64cb6c3da1e 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -11,7 +11,7 @@ let
 
   graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings" {
       inherit graphiteLocalSettings;
-      preferLocalBuild = true; 
+      preferLocalBuild = true;
     } ''
     mkdir -p $out
     ln -s $graphiteLocalSettings $out/graphite_local_settings.py
@@ -215,7 +215,7 @@ in {
       storageAggregation = mkOption {
         description = "Defines how to aggregate data to lower-precision retentions.";
         default = null;
-        type = types.uniq (types.nullOr types.string);
+        type = types.nullOr types.str;
         example = ''
           [all_min]
           pattern = \.min$
@@ -227,7 +227,7 @@ in {
       storageSchemas = mkOption {
         description = "Defines retention rates for storing metrics.";
         default = "";
-        type = types.uniq (types.nullOr types.string);
+        type = types.nullOr types.str;
         example = ''
           [apache_busyWorkers]
           pattern = ^servers\.www.*\.workers\.busyWorkers$
@@ -238,14 +238,14 @@ in {
       blacklist = mkOption {
         description = "Any metrics received which match one of the experssions will be dropped.";
         default = null;
-        type = types.uniq (types.nullOr types.string);
+        type = types.nullOr types.str;
         example = "^some\.noisy\.metric\.prefix\..*";
       };
 
       whitelist = mkOption {
         description = "Only metrics received which match one of the experssions will be persisted.";
         default = null;
-        type = types.uniq (types.nullOr types.string);
+        type = types.nullOr types.str;
         example = ".*";
       };
 
@@ -255,7 +255,7 @@ in {
           in a search and replace fashion.
         '';
         default = null;
-        type = types.uniq (types.nullOr types.string);
+        type = types.nullOr types.str;
         example = ''
           [post]
           _sum$ =
@@ -272,7 +272,7 @@ in {
       relayRules = mkOption {
         description = "Relay rules are used to send certain metrics to a certain backend.";
         default = null;
-        type = types.uniq (types.nullOr types.string);
+        type = types.nullOr types.str;
         example = ''
           [example]
           pattern = ^mydata\.foo\..+
@@ -289,7 +289,7 @@ in {
       aggregationRules = mkOption {
         description = "Defines if and how received metrics will be aggregated.";
         default = null;
-        type = types.uniq (types.nullOr types.string);
+        type = types.nullOr types.str;
         example = ''
           <env>.applications.<app>.all.requests (60) = sum <env>.applications.<app>.*.requests
           <env>.applications.<app>.all.latency (60) = avg <env>.applications.<app>.*.latency
diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix
index fbdff2eb5db..6da0831b4c5 100644
--- a/nixos/modules/services/monitoring/heapster.nix
+++ b/nixos/modules/services/monitoring/heapster.nix
@@ -15,19 +15,19 @@ in {
     source = mkOption {
       description = "Heapster metric source";
       example = "kubernetes:https://kubernetes.default";
-      type = types.string;
+      type = types.str;
     };
 
     sink = mkOption {
       description = "Heapster metic sink";
       example = "influxdb:http://localhost:8086";
-      type = types.string;
+      type = types.str;
     };
 
     extraOpts = mkOption {
       description = "Heapster extra options";
       default = "";
-      type = types.string;
+      type = types.separatedString " ";
     };
 
     package = mkOption {
diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix
index 0f236d25c9e..9b4ff3c5612 100644
--- a/nixos/modules/services/monitoring/kapacitor.nix
+++ b/nixos/modules/services/monitoring/kapacitor.nix
@@ -116,17 +116,17 @@ in
       url = mkOption {
         description = "The URL to an InfluxDB server that serves as the default database";
         example = "http://localhost:8086";
-        type = types.string;
+        type = types.str;
       };
 
       username = mkOption {
         description = "The username to connect to the remote InfluxDB server";
-        type = types.string;
+        type = types.str;
       };
 
       password = mkOption {
         description = "The password to connect to the remote InfluxDB server";
-        type = types.string;
+        type = types.str;
       };
     };
 
@@ -137,7 +137,7 @@ in
         description = "The URL to the Alerta REST API";
         default = "http://localhost:5000";
         example = "http://localhost:5000";
-        type = types.string;
+        type = types.str;
       };
 
       token = mkOption {
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index ffe223fedbe..8af0650c738 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -233,7 +233,7 @@ in
         # In the meantime this at least suppresses a useless graph full of
         # NaNs in the output.
         default = [ "munin_stats" ];
-        type = with types; listOf string;
+        type = with types; listOf str;
         description = ''
           Munin plugins to disable, even if
           <literal>munin-node-configure --suggest</literal> tries to enable
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
index 7e394e8463e..adc2abe0b91 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
@@ -9,7 +9,7 @@ in
   port = 9100;
   extraOpts = {
     enabledCollectors = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default = [];
       example = ''[ "systemd" ]'';
       description = ''
diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix
index 2b647b6b1ad..86a11694e7b 100644
--- a/nixos/modules/services/monitoring/riemann-tools.nix
+++ b/nixos/modules/services/monitoring/riemann-tools.nix
@@ -35,7 +35,7 @@ in {
         '';
       };
       extraArgs = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [];
         description = ''
           A list of commandline-switches forwarded to a riemann-tool.
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index dc0899c7e68..38cd2213de7 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -51,7 +51,7 @@ in {
       };
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = "scollector";
         description = ''
           User account under which scollector runs.
@@ -59,7 +59,7 @@ in {
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "scollector";
         description = ''
           Group account under which scollector runs.
@@ -67,7 +67,7 @@ in {
       };
 
       bosunHost = mkOption {
-        type = types.string;
+        type = types.str;
         default = "localhost:8070";
         description = ''
           Host and port of the bosun server that will store the collected
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index 429b40227d4..1bdc4e4410f 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@@ -55,7 +55,7 @@ let
 
       description = mkOption {
         default = "";
-        type = types.string;
+        type = types.str;
         description = ''
           Description of the UPS.
         '';
@@ -71,7 +71,7 @@ let
 
       summary = mkOption {
         default = "";
-        type = types.string;
+        type = types.lines;
         description = ''
           Lines which would be added inside ups.conf for handling this UPS.
         '';
diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix
index c0993f3bc2e..245badc3e44 100644
--- a/nixos/modules/services/monitoring/uptime.nix
+++ b/nixos/modules/services/monitoring/uptime.nix
@@ -57,7 +57,7 @@ in {
     nodeEnv = mkOption {
       description = "The node environment to run in (development, production, etc.)";
 
-      type = types.string;
+      type = types.str;
 
       default = "production";
     };
diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix
index c16e12378d7..100d458d536 100644
--- a/nixos/modules/services/network-filesystems/davfs2.nix
+++ b/nixos/modules/services/network-filesystems/davfs2.nix
@@ -21,7 +21,7 @@ in
     };
 
     davUser = mkOption {
-      type = types.string;
+      type = types.str;
       default = "davfs2";
       description = ''
         When invoked by root the mount.davfs daemon will run as this user.
@@ -30,7 +30,7 @@ in
     };
 
     davGroup = mkOption {
-      type = types.string;
+      type = types.str;
       default = "davfs2";
       description = ''
         The group of the running mount.davfs daemon. Ordinary users must be
diff --git a/nixos/modules/services/network-filesystems/drbd.nix b/nixos/modules/services/network-filesystems/drbd.nix
index 57b1fbb597c..4ab74ed8e1c 100644
--- a/nixos/modules/services/network-filesystems/drbd.nix
+++ b/nixos/modules/services/network-filesystems/drbd.nix
@@ -23,7 +23,7 @@ let cfg = config.services.drbd; in
 
     services.drbd.config = mkOption {
       default = "";
-      type = types.string;
+      type = types.lines;
       description = ''
         Contents of the <filename>drbd.conf</filename> configuration file.
       '';
diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix
index 054057d52ab..b17ec3aa930 100644
--- a/nixos/modules/services/network-filesystems/rsyncd.nix
+++ b/nixos/modules/services/network-filesystems/rsyncd.nix
@@ -35,7 +35,7 @@ in
       };
 
       motd = mkOption {
-        type = types.string;
+        type = types.str;
         default = "";
         description = ''
           Message of the day to display to clients on each connect.
diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix
index e93f45b4986..0aa01ef9e6d 100644
--- a/nixos/modules/services/network-filesystems/yandex-disk.nix
+++ b/nixos/modules/services/network-filesystems/yandex-disk.nix
@@ -29,7 +29,7 @@ in
 
       username = mkOption {
         default = "";
-        type = types.string;
+        type = types.str;
         description = ''
           Your yandex.com login name.
         '';
@@ -37,7 +37,7 @@ in
 
       password = mkOption {
         default = "";
-        type = types.string;
+        type = types.str;
         description = ''
           Your yandex.com password. Warning: it will be world-readable in /nix/store.
         '';
@@ -57,7 +57,7 @@ in
 
       excludes = mkOption {
         default = "";
-        type = types.string;
+        type = types.commas;
         example = "data,backup";
         description = ''
           Comma-separated list of directories which are excluded from synchronization.
diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix
index 53829bf1886..c5b146283de 100644
--- a/nixos/modules/services/networking/aria2.nix
+++ b/nixos/modules/services/networking/aria2.nix
@@ -47,8 +47,8 @@ in
         '';
       };
       downloadDir = mkOption {
-        type = types.string;
-        default = "${downloadDir}";
+        type = types.path;
+        default = downloadDir;
         description = ''
           Directory to store downloaded files.
         '';
@@ -66,7 +66,7 @@ in
         description = "Specify a port number for JSON-RPC/XML-RPC server to listen to. Possible Values: 1024-65535";
       };
       rpcSecret = mkOption {
-        type = types.string;
+        type = types.str;
         default = "aria2rpc";
         description = ''
           Set RPC secret authorization token.
@@ -74,7 +74,7 @@ in
         '';
       };
       extraArguments = mkOption {
-        type = types.string;
+        type = types.separatedString " ";
         example = "--rpc-listen-all --remote-time=true";
         default = "";
         description = ''
diff --git a/nixos/modules/services/networking/autossh.nix b/nixos/modules/services/networking/autossh.nix
index a098a155e99..a8d9a027e9f 100644
--- a/nixos/modules/services/networking/autossh.nix
+++ b/nixos/modules/services/networking/autossh.nix
@@ -20,12 +20,12 @@ in
         type = types.listOf (types.submodule {
           options = {
             name = mkOption {
-              type = types.string;
+              type = types.str;
               example = "socks-peer";
               description = "Name of the local AutoSSH session";
             };
             user = mkOption {
-              type = types.string;
+              type = types.str;
               example = "bill";
               description = "Name of the user the AutoSSH session should run as";
             };
@@ -40,7 +40,7 @@ in
               '';
             };
             extraArguments = mkOption {
-              type = types.string;
+              type = types.separatedString " ";
               example = "-N -D4343 bill@socks.example.net";
               description = ''
                 Arguments to be passed to AutoSSH and retransmitted to SSH
diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix
index e3aba063f87..da26246e703 100644
--- a/nixos/modules/services/networking/charybdis.nix
+++ b/nixos/modules/services/networking/charybdis.nix
@@ -21,14 +21,14 @@ in
       enable = mkEnableOption "Charybdis IRC daemon";
 
       config = mkOption {
-        type = types.string;
+        type = types.str;
         description = ''
           Charybdis IRC daemon configuration file.
         '';
       };
 
       statedir = mkOption {
-        type = types.string;
+        type = types.path;
         default = "/var/lib/charybdis";
         description = ''
           Location of the state directory of charybdis.
@@ -36,7 +36,7 @@ in
       };
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = "ircd";
         description = ''
           Charybdis IRC daemon user.
@@ -44,7 +44,7 @@ in
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "ircd";
         description = ''
           Charybdis IRC daemon group.
@@ -101,7 +101,7 @@ in
       };
 
     }
-    
+
     (mkIf (cfg.motd != null) {
       environment.etc."charybdis/ircd.motd".text = cfg.motd;
     })
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index c3ca6fbe725..1cd3fd2ade5 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -45,7 +45,7 @@ in {
       };
 
       networkInterfaceBlacklist = mkOption {
-        type = with types; listOf string;
+        type = with types; listOf str;
         default = [ "vmnet" "vboxnet" "virbr" "ifb" "ve" ];
         description = ''
           Default blacklisted interfaces, this includes NixOS containers interfaces (ve).
@@ -53,7 +53,7 @@ in {
       };
 
       extraFlags = mkOption {
-        type = with types; listOf string;
+        type = with types; listOf str;
         default = [ ];
         example = [ "--nodnsproxy" ];
         description = ''
diff --git a/nixos/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix
index 9d16f0efb43..c9b03bca711 100644
--- a/nixos/modules/services/networking/gogoclient.nix
+++ b/nixos/modules/services/networking/gogoclient.nix
@@ -34,7 +34,7 @@ in
 
       password = mkOption {
         default = "";
-        type = types.string;
+        type = types.str;
         description = ''
           Path to a file (as a string), containing your gogoNET password, if any.
         '';
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 54a5bed2563..2915b54f05b 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -81,7 +81,7 @@ in
       driver = mkOption {
         default = "nl80211";
         example = "hostapd";
-        type = types.string;
+        type = types.str;
         description = ''
           Which driver <command>hostapd</command> will use.
           Most applications will probably use the default.
@@ -91,7 +91,7 @@ in
       ssid = mkOption {
         default = "nixos";
         example = "mySpecialSSID";
-        type = types.string;
+        type = types.str;
         description = "SSID to be used in IEEE 802.11 management frames.";
       };
 
@@ -119,7 +119,7 @@ in
       group = mkOption {
         default = "wheel";
         example = "network";
-        type = types.string;
+        type = types.str;
         description = ''
           Members of this group can control <command>hostapd</command>.
         '';
@@ -135,7 +135,7 @@ in
       wpaPassphrase = mkOption {
         default = "my_sekret";
         example = "any_64_char_string";
-        type = types.string;
+        type = types.str;
         description = ''
           WPA-PSK (pre-shared-key) passphrase. Clients will need this
           passphrase to associate with this access point.
diff --git a/nixos/modules/services/networking/jormungandr.nix b/nixos/modules/services/networking/jormungandr.nix
index 0c66b85fe8a..68f1e9af9ff 100644
--- a/nixos/modules/services/networking/jormungandr.nix
+++ b/nixos/modules/services/networking/jormungandr.nix
@@ -54,7 +54,7 @@ in {
      };
 
       genesisBlockHash = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = null;
         example = "d70495af81ae8600aca3e642b2427327cb6001ec4d7a0037e96a00dabed163f9";
         description = ''
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 40c38254a57..7ef989b2a78 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -26,22 +26,22 @@ rec {
       };
       hostname = mkOption {
         default = "nas3";
-        type = types.string;
+        type = types.str;
         description = ''Hostname for kippo to present to SSH login'';
       };
       varPath = mkOption {
         default = "/var/lib/kippo";
-        type = types.string;
+        type = types.path;
         description = ''Path of read/write files needed for operation and configuration.'';
       };
       logPath = mkOption {
         default = "/var/log/kippo";
-        type = types.string;
+        type = types.path;
         description = ''Path of log files needed for operation and configuration.'';
       };
       pidPath = mkOption {
         default = "/run/kippo";
-        type = types.string;
+        type = types.path;
         description = ''Path of pid files needed for operation.'';
       };
       extraConfig = mkOption {
@@ -109,8 +109,8 @@ rec {
 
       serviceConfig.ExecStart = "${pkgs.kippo.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
       serviceConfig.PermissionsStartOnly = true;
-      serviceConfig.User = "kippo"; 
-      serviceConfig.Group = "kippo"; 
+      serviceConfig.User = "kippo";
+      serviceConfig.Group = "kippo";
     };
 };
 }
diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix
index cc81e27e939..1b3084fe9ab 100644
--- a/nixos/modules/services/networking/morty.nix
+++ b/nixos/modules/services/networking/morty.nix
@@ -27,7 +27,7 @@ in
       };
 
       key = mkOption {
-        type = types.string;
+        type = types.str;
         default = "";
         description = "HMAC url validation key (hexadecimal encoded).
 	Leave blank to disable. Without validation key, anyone can
@@ -56,7 +56,7 @@ in
       };
 
       listenAddress = mkOption {
-        type = types.string;
+        type = types.str;
         default = "127.0.0.1";
         description = "The address on which the service listens";
         defaultText = "127.0.0.1 (localhost)";
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 1d49c137723..d2feb93e2b7 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -49,7 +49,7 @@ in
       host = mkOption {
         default = "127.0.0.1";
         example = "0.0.0.0";
-        type = types.string;
+        type = types.str;
         description = ''
           Host to listen on without SSL.
         '';
@@ -88,7 +88,7 @@ in
         host = mkOption {
           default = "0.0.0.0";
           example = "localhost";
-          type = types.string;
+          type = types.str;
           description = ''
             Host to listen on with SSL.
           '';
@@ -135,7 +135,7 @@ in
             };
 
             acl = mkOption {
-              type = types.listOf types.string;
+              type = types.listOf types.str;
               example = [ "topic read A/B" "topic A/#" ];
               description = ''
                 Control client access to topics on the broker.
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 551636a33d2..0042a7df8e1 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -156,7 +156,7 @@ in {
       };
 
       unmanaged = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [];
         description = ''
           List of interfaces that will not be managed by NetworkManager.
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index ca458d089dc..347d87b3f38 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -19,7 +19,7 @@ in
       };
 
       bindAddress = mkOption {
-        type = types.string;
+        type = types.str;
         default = "0.0.0.0";
         description = ''
           IP address where nix-serve will bind its listening socket.
@@ -44,7 +44,7 @@ in
       };
 
       extraParams = mkOption {
-        type = types.string;
+        type = types.separatedString " ";
         default = "";
         description = ''
           Extra command line parameters for nix-serve.
diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix
index b061ce34ed2..7c171281a92 100644
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixos/modules/services/networking/nylon.nix
@@ -65,7 +65,7 @@ let
       };
 
       acceptInterface = mkOption {
-        type = types.string;
+        type = types.str;
         default = "lo";
         description = ''
           Tell nylon which interface to listen for client requests on, default is "lo".
@@ -73,7 +73,7 @@ let
       };
 
       bindInterface = mkOption {
-        type = types.string;
+        type = types.str;
         default = "enp3s0f0";
         description = ''
           Tell nylon which interface to use as an uplink, default is "enp3s0f0".
@@ -89,7 +89,7 @@ let
       };
 
       allowedIPRanges = mkOption {
-        type = with types; listOf string;
+        type = with types; listOf str;
         default = [ "192.168.0.0/16" "127.0.0.1/8" "172.16.0.1/12" "10.0.0.0/8" ];
         description = ''
            Allowed client IP ranges are evaluated first, defaults to ARIN IPv4 private ranges:
@@ -98,7 +98,7 @@ let
       };
 
       deniedIPRanges = mkOption {
-        type = with types; listOf string;
+        type = with types; listOf str;
         default = [ "0.0.0.0/0" ];
         description = ''
           Denied client IP ranges, these gets evaluated after the allowed IP ranges, defaults to all IPv4 addresses:
diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix
index 57638ebc9c0..f3920aa8064 100644
--- a/nixos/modules/services/networking/openntpd.nix
+++ b/nixos/modules/services/networking/openntpd.nix
@@ -40,7 +40,7 @@ in
     };
 
     extraOptions = mkOption {
-      type = with types; string;
+      type = with types; separatedString " ";
       default = "";
       example = "-s";
       description = ''
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index f47122ee70b..05be97e66a3 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -182,12 +182,12 @@ in
               options = {
                 username = mkOption {
                   description = "The username to store inside the credentials file.";
-                  type = types.string;
+                  type = types.str;
                 };
 
                 password = mkOption {
                   description = "The password to store inside the credentials file.";
-                  type = types.string;
+                  type = types.str;
                 };
               };
             });
diff --git a/nixos/modules/services/networking/ostinato.nix b/nixos/modules/services/networking/ostinato.nix
index 13f784dc53c..5e8cce5b89a 100644
--- a/nixos/modules/services/networking/ostinato.nix
+++ b/nixos/modules/services/networking/ostinato.nix
@@ -50,7 +50,7 @@ in
 
       rpcServer = {
         address = mkOption {
-          type = types.string;
+          type = types.str;
           default = "0.0.0.0";
           description = ''
             By default, the Drone RPC server will listen on all interfaces and
@@ -63,7 +63,7 @@ in
 
       portList = {
         include = mkOption {
-          type = types.listOf types.string;
+          type = types.listOf types.str;
           default = [];
           example = ''[ "eth*" "lo*" ]'';
           description = ''
diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix
index 529115a1c6e..dbe3b738097 100644
--- a/nixos/modules/services/networking/polipo.nix
+++ b/nixos/modules/services/networking/polipo.nix
@@ -30,7 +30,7 @@ in
       };
 
       proxyAddress = mkOption {
-        type = types.string;
+        type = types.str;
         default = "127.0.0.1";
         description = "IP address on which Polipo will listen.";
       };
@@ -51,7 +51,7 @@ in
       };
 
       parentProxy = mkOption {
-        type = types.string;
+        type = types.str;
         default = "";
         example = "localhost:8124";
         description = ''
@@ -61,7 +61,7 @@ in
       };
 
       socksParentProxy = mkOption {
-        type = types.string;
+        type = types.str;
         default = "";
         example = "localhost:9050";
         description = ''
@@ -74,7 +74,7 @@ in
         type = types.lines;
         default = "";
         description = ''
-          Polio configuration. Contents will be added 
+          Polio configuration. Contents will be added
           verbatim to the configuration file.
         '';
       };
@@ -111,4 +111,4 @@ in
 
   };
 
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix
index d8b9e8f8341..3e7753b9dd3 100644
--- a/nixos/modules/services/networking/pptpd.nix
+++ b/nixos/modules/services/networking/pptpd.nix
@@ -8,13 +8,13 @@ with lib;
       enable = mkEnableOption "pptpd, the Point-to-Point Tunneling Protocol daemon";
 
       serverIp = mkOption {
-        type        = types.string;
+        type        = types.str;
         description = "The server-side IP address.";
         default     = "10.124.124.1";
       };
 
       clientIpRange = mkOption {
-        type        = types.string;
+        type        = types.str;
         description = "The range from which client IPs are drawn.";
         default     = "10.124.124.2-11";
       };
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 40bd9015b1e..1ae063aa6bb 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -297,7 +297,7 @@ in
       };
 
       dataDir = mkOption {
-        type = types.string;
+        type = types.path;
         description = "Directory where Prosody stores its data";
         default = "/var/lib/prosody";
       };
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index d6fabbcd470..1daced4a6c7 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -41,7 +41,7 @@ in
     };
 
     services.radicale.config = mkOption {
-      type = types.string;
+      type = types.str;
       default = "";
       description = ''
         Radicale configuration, this will set the service
@@ -50,7 +50,7 @@ in
     };
 
     services.radicale.extraArgs = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default = [];
       description = "Extra arguments passed to the Radicale daemon.";
     };
diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
index f511a9af256..e548ec66962 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixos/modules/services/networking/shout.nix
@@ -35,7 +35,7 @@ in {
     };
 
     listenAddress = mkOption {
-      type = types.string;
+      type = types.str;
       default = "0.0.0.0";
       description = "IP interface to listen on for http connections.";
     };
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index c41d0edaf17..20228ceaaff 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -55,7 +55,7 @@ in
         description = "Enable the smokeping service";
       };
       alertConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = ''
           to = root@localhost
           from = smokeping@localhost
@@ -73,19 +73,20 @@ in
         description = "Configuration for alerts.";
       };
       cgiUrl = mkOption {
-        type = types.string;
-        default = "http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi";
+        type = types.str;
+        default = "http://${cfg.hostName}:${toString cfg.port}/smokeping.cgi";
+        defaultText = "http://\${hostName}:\${toString port}/smokeping.cgi";
         example = "https://somewhere.example.com/smokeping.cgi";
         description = "URL to the smokeping cgi.";
       };
       config = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.lines;
         default = null;
         description = "Full smokeping config supplied by the user. Overrides " +
           "and replaces any other configuration supplied.";
       };
       databaseConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = ''
           step     = 300
           pings    = 20
@@ -122,14 +123,15 @@ in
         description = "Any additional customization not already included.";
       };
       hostName = mkOption {
-        type = types.string;
+        type = types.str;
         default = config.networking.hostName;
         example = "somewhere.example.com";
         description = "DNS name for the urls generated in the cgi.";
       };
       imgUrl = mkOption {
-        type = types.string;
-        default = "http://${cfg.hostName}:${builtins.toString cfg.port}/cache";
+        type = types.str;
+        default = "http://${cfg.hostName}:${toString cfg.port}/cache";
+        defaultText = "http://\${hostName}:\${toString port}/cache";
         example = "https://somewhere.example.com/cache";
         description = "Base url for images generated in the cgi.";
       };
@@ -140,19 +142,19 @@ in
         description = "DNS name for the urls generated in the cgi.";
       };
       mailHost = mkOption {
-        type = types.string;
+        type = types.str;
         default = "";
         example = "localhost";
         description = "Use this SMTP server to send alerts";
       };
       owner = mkOption {
-        type = types.string;
+        type = types.str;
         default = "nobody";
         example = "Joe Admin";
         description = "Real name of the owner of the instance";
       };
       ownerEmail = mkOption {
-        type = types.string;
+        type = types.str;
         default = "no-reply@${cfg.hostName}";
         example = "no-reply@yourdomain.com";
         description = "Email contact for owner";
@@ -170,7 +172,7 @@ in
         description = "TCP port to use for the web server.";
       };
       presentationConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = ''
           + charts
           menu = Charts
@@ -211,12 +213,12 @@ in
         description = "presentation graph style";
       };
       presentationTemplate = mkOption {
-        type = types.string;
+        type = types.str;
         default = "${pkgs.smokeping}/etc/basepage.html.dist";
         description = "Default page layout for the web UI.";
       };
       probeConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = ''
           + FPing
           binary = ${config.security.wrapperDir}/fping
@@ -230,12 +232,12 @@ in
         description = "Use this sendmail compatible script to deliver alerts";
       };
       smokeMailTemplate = mkOption {
-        type = types.string;
+        type = types.str;
         default = "${cfg.package}/etc/smokemail.dist";
         description = "Specify the smokemail template for alerts.";
       };
       targetConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = ''
 					probe = FPing
 					menu = Top
@@ -253,7 +255,7 @@ in
         description = "Target configuration";
       };
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = "smokeping";
         description = "User that runs smokeping and (optionally) thttpd";
       };
diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
index 65df93a00da..669c69d832b 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixos/modules/services/networking/softether.nix
@@ -50,7 +50,7 @@ in
       };
 
       dataDir = mkOption {
-        type = types.string;
+        type = types.path;
         default = "/var/lib/softether";
         description = ''
           Data directory for SoftEther VPN.
diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix
index 89a14966eca..cbc899f2b4d 100644
--- a/nixos/modules/services/networking/stunnel.nix
+++ b/nixos/modules/services/networking/stunnel.nix
@@ -35,12 +35,12 @@ let
   clientConfig = {
     options = {
       accept = mkOption {
-        type = types.string;
+        type = types.str;
         description = "IP:Port on which connections should be accepted.";
       };
 
       connect = mkOption {
-        type = types.string;
+        type = types.str;
         description = "IP:Port destination to connect to.";
       };
 
@@ -63,7 +63,7 @@ let
       };
 
       verifyHostname = mkOption {
-        type = with types; nullOr string;
+        type = with types; nullOr str;
         default = null;
         description = "If set, stunnel checks if the provided certificate is valid for the given hostname.";
       };
@@ -88,13 +88,13 @@ in
       };
 
       user = mkOption {
-        type = with types; nullOr string;
+        type = with types; nullOr str;
         default = "nobody";
         description = "The user under which stunnel runs.";
       };
 
       group = mkOption {
-        type = with types; nullOr string;
+        type = with types; nullOr str;
         default = "nogroup";
         description = "The group under which stunnel runs.";
       };
diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix
index 7830dfb1834..7daacba185f 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixos/modules/services/networking/toxvpn.nix
@@ -8,7 +8,7 @@ with lib;
       enable = mkEnableOption "toxvpn running on startup";
 
       localip = mkOption {
-        type        = types.string;
+        type        = types.str;
         default     = "10.123.123.1";
         description = "your ip on the vpn";
       };
@@ -20,7 +20,7 @@ with lib;
       };
 
       auto_add_peers = mkOption {
-        type        = types.listOf types.string;
+        type        = types.listOf types.str;
         default     = [];
         example     = ''[ "toxid1" "toxid2" ]'';
         description = "peers to automacally connect to on startup";
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 31e1e65fa9c..67be60da567 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -164,7 +164,7 @@ in
       };
 
       anonymousUmask = mkOption {
-        type = types.string;
+        type = types.str;
         default = "077";
         example = "002";
         description = "Anonymous write umask.";
diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index 2d7cd5cebb4..8dc6f845ed8 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
@@ -53,7 +53,7 @@ in
 
     services.xinetd.extraDefaults = mkOption {
       default = "";
-      type = types.string;
+      type = types.lines;
       description = ''
         Additional configuration lines added to the default section of xinetd's configuration.
       '';
@@ -70,13 +70,13 @@ in
         options = {
 
           name = mkOption {
-            type = types.string;
+            type = types.str;
             example = "login";
             description = "Name of the service.";
           };
 
           protocol = mkOption {
-            type = types.string;
+            type = types.str;
             default = "tcp";
             description =
               "Protocol of the service.  Usually <literal>tcp</literal> or <literal>udp</literal>.";
@@ -90,25 +90,25 @@ in
           };
 
           user = mkOption {
-            type = types.string;
+            type = types.str;
             default = "nobody";
             description = "User account for the service";
           };
 
           server = mkOption {
-            type = types.string;
+            type = types.str;
             example = "/foo/bin/ftpd";
             description = "Path of the program that implements the service.";
           };
 
           serverArgs = mkOption {
-            type = types.string;
+            type = types.separatedString " ";
             default = "";
             description = "Command-line arguments for the server program.";
           };
 
           flags = mkOption {
-            type = types.string;
+            type = types.str;
             default = "";
             description = "";
           };
diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix
index d0a3ed7bb5e..7dbe51422d9 100644
--- a/nixos/modules/services/networking/xl2tpd.nix
+++ b/nixos/modules/services/networking/xl2tpd.nix
@@ -8,13 +8,13 @@ with lib;
       enable = mkEnableOption "xl2tpd, the Layer 2 Tunnelling Protocol Daemon";
 
       serverIp = mkOption {
-        type        = types.string;
+        type        = types.str;
         description = "The server-side IP address.";
         default     = "10.125.125.1";
       };
 
       clientIpRange = mkOption {
-        type        = types.string;
+        type        = types.str;
         description = "The range from which client IPs are drawn.";
         default     = "10.125.125.2-11";
       };
diff --git a/nixos/modules/services/security/haka.nix b/nixos/modules/services/security/haka.nix
index b64a1b4d03e..618e689924f 100644
--- a/nixos/modules/services/security/haka.nix
+++ b/nixos/modules/services/security/haka.nix
@@ -69,7 +69,7 @@ in
       configFile = mkOption {
         default = "empty.lua";
         example = "/srv/haka/myfilter.lua";
-        type = types.string;
+        type = types.str;
         description = ''
           Specify which configuration file Haka uses.
           It can be absolute path or a path relative to the sample directory of
@@ -80,7 +80,7 @@ in
       interfaces = mkOption {
         default = [ "eth0" ];
         example = [ "any" ];
-        type = with types; listOf string;
+        type = with types; listOf str;
         description = ''
           Specify which interface(s) Haka listens to.
           Use 'any' to listen to all interfaces.
diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix
index 1c4f8e20552..89178886471 100644
--- a/nixos/modules/services/security/munge.nix
+++ b/nixos/modules/services/security/munge.nix
@@ -19,7 +19,7 @@ in
 
       password = mkOption {
         default = "/etc/munge/munge.key";
-        type = types.string;
+        type = types.path;
         description = ''
           The path to a daemon's secret key.
         '';
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index 61f203ef9e7..bb03f7fc9e4 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -284,7 +284,7 @@ in
     ####################################################
     # UPSTREAM Configuration
     upstream = mkOption {
-      type = with types; coercedTo string (x: [x]) (listOf string);
+      type = with types; coercedTo str (x: [x]) (listOf str);
       default = [];
       description = ''
         The http url(s) of the upstream endpoint or <literal>file://</literal>
@@ -523,7 +523,7 @@ in
     };
 
     keyFile = mkOption {
-      type = types.nullOr types.string;
+      type = types.nullOr types.path;
       default = null;
       description = ''
         oauth2_proxy allows passing sensitive configuration via environment variables.
diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix
index a9ad5497a65..be6734f439f 100644
--- a/nixos/modules/services/security/oauth2_proxy_nginx.nix
+++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix
@@ -6,14 +6,14 @@ in
 {
   options.services.oauth2_proxy.nginx = {
     proxy = mkOption {
-      type = types.string;
+      type = types.str;
       default = config.services.oauth2_proxy.httpAddress;
       description = ''
         The address of the reverse proxy endpoint for oauth2_proxy
       '';
     };
     virtualHosts = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default = [];
       description = ''
         A list of nginx virtual hosts to put behind the oauth2 proxy
diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix
index ca63f529a5d..6ac85f8fa17 100644
--- a/nixos/modules/services/torrent/flexget.nix
+++ b/nixos/modules/services/torrent/flexget.nix
@@ -19,7 +19,7 @@ in {
       user = mkOption {
         default = "deluge";
         example = "some_user";
-        type = types.string;
+        type = types.str;
         description = "The user under which to run flexget.";
       };
 
@@ -33,7 +33,7 @@ in {
       interval = mkOption {
         default = "10m";
         example = "1h";
-        type = types.string;
+        type = types.str;
         description = "When to perform a <command>flexget</command> run. See <command>man 7 systemd.time</command> for the format.";
       };
 
diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix
index 691cbdc8d1d..830edac20ba 100644
--- a/nixos/modules/services/web-apps/youtrack.nix
+++ b/nixos/modules/services/web-apps/youtrack.nix
@@ -28,28 +28,28 @@ in
         The interface youtrack will listen on.
       '';
       default = "127.0.0.1";
-      type = types.string;
+      type = types.str;
     };
 
     baseUrl = mkOption {
       description = ''
         Base URL for youtrack. Will be auto-detected and stored in database.
       '';
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       default = null;
     };
 
     extraParams = mkOption {
       default = {};
       description = ''
-        Extra parameters to pass to youtrack. See 
+        Extra parameters to pass to youtrack. See
         https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html
         for more information.
       '';
       example = {
         "jetbrains.youtrack.overrideRootPassword" = "tortuga";
       };
-      type = types.attrsOf types.string;
+      type = types.attrsOf types.str;
     };
 
     package = mkOption {
@@ -73,7 +73,7 @@ in
       description = ''
         Where to keep the youtrack database.
       '';
-      type = types.string;
+      type = types.path;
       default = "/var/lib/youtrack";
     };
 
@@ -83,7 +83,7 @@ in
         If null, do not setup anything.
       '';
       default = null;
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
     };
 
     jvmOpts = mkOption {
@@ -92,7 +92,7 @@ in
         See https://www.jetbrains.com/help/youtrack/standalone/Configure-JVM-Options.html
         for more information.
       '';
-      type = types.string;
+      type = types.separatedString " ";
       example = "-XX:MetaspaceSize=250m";
       default = "";
     };
@@ -101,7 +101,7 @@ in
       description = ''
         Maximum Java heap size
       '';
-      type = types.string;
+      type = types.str;
       default = "1g";
     };
 
@@ -109,7 +109,7 @@ in
       description = ''
         Maximum java Metaspace memory.
       '';
-      type = types.string;
+      type = types.str;
       default = "350m";
     };
   };
diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index 536e707137c..9d747549c27 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -33,7 +33,7 @@ with lib;
                 description = "port to listen on";
               };
               ip = mkOption {
-                type = types.string;
+                type = types.str;
                 default = "*";
                 description = "Ip to listen on. 0.0.0.0 for ipv4 only, * for all.";
               };
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 6a1db608784..132c50735d9 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -27,13 +27,13 @@ in {
     ca = mkOption {
       default = "https://acme-v02.api.letsencrypt.org/directory";
       example = "https://acme-staging-v02.api.letsencrypt.org/directory";
-      type = types.string;
+      type = types.str;
       description = "Certificate authority ACME server. The default (Let's Encrypt production server) should be fine for most people.";
     };
 
     email = mkOption {
       default = "";
-      type = types.string;
+      type = types.str;
       description = "Email address (for Let's Encrypt certificate)";
     };
 
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 5c65a2388d6..b94b338fd4a 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -473,7 +473,7 @@ in
       };
 
       clientMaxBodySize = mkOption {
-        type = types.string;
+        type = types.str;
         default = "10m";
         description = "Set nginx global client_max_body_size.";
       };
diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix
index 5bac895d43a..8de7df0d446 100644
--- a/nixos/modules/services/web-servers/traefik.nix
+++ b/nixos/modules/services/web-servers/traefik.nix
@@ -67,7 +67,7 @@ in {
 
     group = mkOption {
       default = "traefik";
-      type = types.string;
+      type = types.str;
       example = "docker";
       description = ''
         Set the group that traefik runs under.
diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 3f858d90fa4..af70f32f32d 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -72,7 +72,7 @@ in {
       };
 
       runDir = mkOption {
-        type = types.string;
+        type = types.path;
         default = "/run/uwsgi";
         description = "Where uWSGI communication sockets can live";
       };
diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix
index 4cad2a2ff77..3abd506827c 100644
--- a/nixos/modules/services/web-servers/zope2.nix
+++ b/nixos/modules/services/web-servers/zope2.nix
@@ -11,7 +11,7 @@ let
 
       name = mkOption {
         default = "${name}";
-        type = types.string;
+        type = types.str;
         description = "The name of the zope2 instance. If undefined, the name of the attribute set will be used.";
       };
 
@@ -23,19 +23,19 @@ let
 
       http_address = mkOption {
         default = "localhost:8080";
-        type = types.string;
+        type = types.str;
         description = "Give a port and address for the HTTP server.";
       };
 
       user = mkOption {
         default = "zope2";
-        type = types.string;
+        type = types.str;
         description = "The name of the effective user for the Zope process.";
       };
 
       clientHome = mkOption {
         default = "/var/lib/zope2/${name}";
-        type = types.string;
+        type = types.path;
         description = "Home directory of zope2 instance.";
       };
       extra = mkOption {
@@ -52,7 +52,7 @@ let
             </blobstorage>
           </zodb_db>
           '';
-        type = types.string;
+        type = types.lines;
         description = "Extra zope.conf";
       };
 
diff --git a/nixos/modules/services/x11/desktop-managers/surf-display.nix b/nixos/modules/services/x11/desktop-managers/surf-display.nix
index 232bbf5c55d..140dde828da 100644
--- a/nixos/modules/services/x11/desktop-managers/surf-display.nix
+++ b/nixos/modules/services/x11/desktop-managers/surf-display.nix
@@ -48,7 +48,7 @@ in {
       enable = mkEnableOption "surf-display as a kiosk browser session";
 
       defaultWwwUri = mkOption {
-        type = types.string;
+        type = types.str;
         default = "${pkgs.surf-display}/share/surf-display/empty-page.html";
         example = "https://www.example.com/";
         description = "Default URI to display.";
@@ -69,7 +69,7 @@ in {
       };
 
       screensaverSettings = mkOption {
-        type = types.string;
+        type = types.separatedString " ";
         default = "";
         description = ''
           Screensaver settings, see <literal>man 1 xset</literal> for possible options.
@@ -77,7 +77,7 @@ in {
       };
 
       pointerButtonMap = mkOption {
-        type = types.string;
+        type = types.str;
         default = "1 0 0 4 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0";
         description = ''
           Disable right and middle pointer device click in browser sessions
@@ -87,14 +87,14 @@ in {
       };
 
       hideIdlePointer = mkOption {
-        type = types.string;
+        type = types.str;
         default = "yes";
         example = "no";
         description = "Hide idle mouse pointer.";
       };
 
       extraConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = "";
         example = ''
           # Enforce fixed resolution for all displays (default: not set):
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index afa0cebbc52..9aed255f878 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -114,7 +114,7 @@ in
 
         };
         name = mkOption {
-          type = types.string;
+          type = types.str;
           description = ''
             The name of a .desktop file in the directory specified
             in the 'package' option.
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index a0a5e265685..bd289976532 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -41,13 +41,13 @@ in {
       };
 
       accelSpeed = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = null;
         description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
       };
 
       buttonMapping = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = null;
         description =
           ''
@@ -61,7 +61,7 @@ in {
       };
 
       calibrationMatrix = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = null;
         description =
           ''
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index f032c593885..e39a56528e8 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -44,19 +44,19 @@ in {
       };
 
       accelFactor = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = "0.001";
         description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
       };
 
       minSpeed = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = "0.6";
         description = "Cursor speed factor for precision finger motion.";
       };
 
       maxSpeed = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = "1.0";
         description = "Cursor speed factor for highest-speed finger motion.";
       };
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index a6055f26789..0e131412276 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -59,7 +59,7 @@ in
 
       config = mkOption {
         default = null;
-        type = with lib.types; nullOr (either path string);
+        type = with lib.types; nullOr (either path str);
         description = ''
           Configuration from which XMonad gets compiled. If no value
           is specified, the xmonad config from $HOME/.xmonad is taken.
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index a550ffd6320..a32c9dc1f2b 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -239,7 +239,7 @@ in {
           List of systems to emulate. Will also configure Nix to
           support your new systems.
         '';
-        type = types.listOf types.string;
+        type = types.listOf types.str;
       };
     };
   };
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index eca9dad6422..d8f347a54d6 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -8,7 +8,7 @@ let
 
   efi = config.boot.loader.efi;
 
-  grubPkgs = 
+  grubPkgs =
     # Package set of targeted architecture
     if cfg.forcei686 then pkgs.pkgsi686Linux else pkgs;
 
@@ -333,7 +333,7 @@ in
       };
 
       backgroundColor = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         example = "#7EBAE4";
         default = null;
         description = ''
@@ -399,7 +399,7 @@ in
         example = "text";
         type = types.str;
         description = ''
-          The gfxpayload to pass to GRUB when loading a graphical boot interface under EFI. 
+          The gfxpayload to pass to GRUB when loading a graphical boot interface under EFI.
         '';
       };
 
@@ -408,7 +408,7 @@ in
         example = "keep";
         type = types.str;
         description = ''
-          The gfxpayload to pass to GRUB when loading a graphical boot interface under BIOS. 
+          The gfxpayload to pass to GRUB when loading a graphical boot interface under BIOS.
         '';
       };
 
@@ -535,7 +535,7 @@ in
         default = false;
         type = types.bool;
         description = ''
-          Whether to force the use of a ia32 boot loader on x64 systems. Required 
+          Whether to force the use of a ia32 boot loader on x64 systems. Required
           to install and run NixOS on 64bit x86 systems with 32bit (U)EFI.
         '';
       };
@@ -554,7 +554,7 @@ in
         systemHasTPM = mkOption {
           default = "";
           example = "YES_TPM_is_activated";
-          type = types.string;
+          type = types.str;
           description = ''
             Assertion that the target system has an activated TPM. It is a safety
             check before allowing the activation of 'trustedBoot.enable'. TrustedBoot
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index 7db60daa60b..1c8354e5269 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -10,7 +10,7 @@ let
   builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
   builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
 
-  builder = 
+  builder =
     if cfg.uboot.enable then
       "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c"
     else
@@ -86,7 +86,7 @@ in
 
       firmwareConfig = mkOption {
         default = null;
-        type = types.nullOr types.string;
+        type = types.nullOr types.lines;
         description = ''
           Extra options that will be appended to <literal>/boot/config.txt</literal> file.
           For possible values, see: https://www.raspberrypi.org/documentation/configuration/config-txt/
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 5ac753c92a7..16dde917515 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -836,7 +836,7 @@ in
         options = {
 
           device = mkOption {
-            type = types.string;
+            type = types.str;
             example = "wlp6s0";
             description = "The name of the underlying hardware WLAN device as assigned by <literal>udev</literal>.";
           };
@@ -852,7 +852,7 @@ in
           };
 
           meshID = mkOption {
-            type = types.nullOr types.string;
+            type = types.nullOr types.str;
             default = null;
             description = "MeshID of interface with type <literal>mesh</literal>.";
           };
diff --git a/nixos/modules/virtualisation/anbox.nix b/nixos/modules/virtualisation/anbox.nix
index c63b971ead0..da5df358073 100644
--- a/nixos/modules/virtualisation/anbox.nix
+++ b/nixos/modules/virtualisation/anbox.nix
@@ -56,7 +56,7 @@ in
 
       dns = mkOption {
         default = "1.1.1.1";
-        type = types.string;
+        type = types.str;
         description = ''
           Container DNS server.
         '';
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index b61558b2201..0c0d8551e4a 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -337,7 +337,7 @@ let
 
   networkOptions = {
     hostBridge = mkOption {
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       default = null;
       example = "br0";
       description = ''
@@ -387,7 +387,7 @@ let
     };
 
     hostAddress6 = mkOption {
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       default = null;
       example = "fc00::1";
       description = ''
@@ -409,7 +409,7 @@ let
     };
 
     localAddress6 = mkOption {
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       default = null;
       example = "fc00::2";
       description = ''
@@ -565,7 +565,7 @@ in
             };
 
             interfaces = mkOption {
-              type = types.listOf types.string;
+              type = types.listOf types.str;
               default = [];
               example = [ "eth1" "eth2" ];
               description = ''
diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix
index 289e26e1703..78753da5532 100644
--- a/nixos/modules/virtualisation/kvmgt.nix
+++ b/nixos/modules/virtualisation/kvmgt.nix
@@ -9,7 +9,7 @@ let
 
   vgpuOptions = {
     uuid = mkOption {
-      type = types.string;
+      type = types.str;
       description = "UUID of VGPU device. You can generate one with <package>libossp_uuid</package>.";
     };
   };
@@ -23,7 +23,7 @@ in {
       '';
       # multi GPU support is under the question
       device = mkOption {
-        type = types.string;
+        type = types.str;
         default = "0000:00:02.0";
         description = "PCI ID of graphics card. You can figure it with <command>ls /sys/class/mdev_bus</command>.";
       };
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 70e575b6c0d..06d5c63476f 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -119,7 +119,7 @@ in
 
     virtualisation.xen.domains = {
         extraConfig = mkOption {
-          type = types.string;
+          type = types.lines;
           default = "";
           description =
             ''
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index ae7b42449fb..8dbe0dbdbd0 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -10,12 +10,12 @@ rec {
   #   makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world"
   makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content:
     assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
-    assert lib.or (types.path.check content) (types.string.check content);
+    assert lib.or (types.path.check content) (types.str.check content);
     let
       name = last (builtins.split "/" nameOrPath);
     in
 
-    pkgs.runCommand name (if (types.string.check content) then {
+    pkgs.runCommand name (if (types.str.check content) then {
       inherit content interpreter;
       passAsFile = [ "content" ];
     } else {
@@ -42,11 +42,11 @@ rec {
   #   writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; }
   makeBinWriter = { compileScript }: nameOrPath: content:
     assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
-    assert lib.or (types.path.check content) (types.string.check content);
+    assert lib.or (types.path.check content) (types.str.check content);
     let
       name = last (builtins.split "/" nameOrPath);
     in
-    pkgs.runCommand name (if (types.string.check content) then {
+    pkgs.runCommand name (if (types.str.check content) then {
       inherit content;
       passAsFile = [ "content" ];
     } else {

From 03391cd336b128a1639c648baf0f6c1a1271e0d2 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 31 Aug 2019 18:19:15 +0200
Subject: [PATCH 560/794] lib/types: Make usage of types.string emit a warning

---
 lib/types.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index 9c00656ab91..bcb5de0c379 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -217,7 +217,8 @@ rec {
 
     # Deprecated; should not be used because it quietly concatenates
     # strings, which is usually not what you want.
-    string = separatedString "";
+    string = warn "types.string is deprecated because it quietly concatenates strings"
+      (separatedString "");
 
     attrs = mkOptionType {
       name = "attrs";

From c48170ac027a956f7883f31335e5288e8f3d0492 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 31 Aug 2019 18:44:35 +0200
Subject: [PATCH 561/794] release-notes: mention restricted SysRq key
 combinations

This was missing from #66482.
---
 nixos/doc/manual/release-notes/rl-1909.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 560b3198517..0af2483aa30 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -547,8 +547,8 @@
       </para>
      </listitem>
     </itemizedlist>
-
-     This also configures the kernel to pass coredumps to <literal>systemd-coredump</literal>.
+     This also configures the kernel to pass coredumps to <literal>systemd-coredump</literal>,
+     and restricts the SysRq key combinations to the sync command only.
      These sysctl snippets can be found in <literal>/etc/sysctl.d/50-*.conf</literal>,
      and overridden via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link>
      (which will place the parameters in <literal>/etc/sysctl.d/60-nixos.conf</literal>).

From ea3bae4f4d23b35458957884c7b1aba0d88b0cee Mon Sep 17 00:00:00 2001
From: Julian Stecklina <js@alien8.de>
Date: Sat, 31 Aug 2019 19:36:22 +0200
Subject: [PATCH 562/794] cryptpad: 2.25.0 -> 3.0.0 (#67838)

---
 .../web-apps/cryptpad/bower-packages.nix       |  8 ++++----
 pkgs/servers/web-apps/cryptpad/default.nix     |  1 -
 .../cryptpad/node-packages-generated.nix       | 18 +++++++++---------
 .../web-apps/cryptpad/node-packages.json       |  2 +-
 .../web-apps/cryptpad/node-packages.nix        |  2 +-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
index 8d3d3def695..9b87924e0b9 100644
--- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
@@ -13,7 +13,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a")
   (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9")
   (fetchbower "chainpad-crypto" "0.2.2" "^0.2.0" "1zmhc24zgg7jkb6c7r5syhxmlk61vmcsa2l0ip37dk52ygl6yfg5")
-  (fetchbower "chainpad-listmap" "0.5.2" "^0.5.0" "0zmg6y5pzf75i84mlnvif6v1g7f4s1vyyzd6ng9ql4b9sdlf4zpc")
+  (fetchbower "chainpad-listmap" "0.7.0" "^0.7.0" "141hk4x7kwzgiazsghyg4h4df519m72qh3xfb3lzwy245c2nh1ak")
   (fetchbower "chainpad" "5.1.2" "^5.1.0" "1qzdbaf15vaz2573dzm4sxi28m56hi1gi2z00f5ilayxshrbdrlc")
   (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg")
   (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l")
@@ -22,7 +22,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556")
   (fetchbower "bootstrap" "4.3.1" "^v4.0.0" "081xw746bshhy8m14x7y8y6ryl38jz3l5545v62vjzr6b4609xd9")
   (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1")
-  (fetchbower "nthen" "0.1.10" "^0.1.5" "0ipaydp1g63hgjis9qpp4nzf7p0b06g0xnz8nlxnwarkknci55y8")
+  (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5")
   (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf")
   (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6")
   (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811")
@@ -33,7 +33,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi")
   (fetchbower "jszip" "Stuk/jszip#3.2.2" "Stuk/jszip#^3.1.5" "1k0va2ps2x29d1virg51n5s5rdjk21zfh7h14nnljcfnvxvk3rpp")
   (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5")
-  (fetchbower "chainpad-netflux" "0.7.6" "^0.7.0" "02qjk0qv423r2ksxma49i4l45p42j20ifr2rrr23dz0fq44j6llc")
-  (fetchbower "netflux-websocket" "0.1.20" "^0.1.19" "0bpkkg4vfyhiwwf2d2hxld6zsppjx4clknrwsivp4m0vx2ddc54s")
+  (fetchbower "chainpad-netflux" "0.9.0" "^0.9.0" "0qx9ihnpmcrmg2lwkpm330bhj8zsp1gdxxrbsd05bwd8pm2x11av")
+  (fetchbower "netflux-websocket" "0.1.20" "^0.1.20" "1xwqq7nw7fmhglndbplarkdzxfmkq831aqs8nm6qj0hz2ggbibhz")
   (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz")
 ]; }
diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix
index f406aa83e35..77e529f26ab 100644
--- a/pkgs/servers/web-apps/cryptpad/default.nix
+++ b/pkgs/servers/web-apps/cryptpad/default.nix
@@ -15,7 +15,6 @@ let
   bowerPackages = buildBowerComponents {
     name = "${cryptpad.name}-bower-packages";
     # this list had to be tweaked by hand:
-    # * remove the # in the sortablejs dependency
     # * add the second bootstrap ~3.1.1 entry
     generated = ./bower-packages.nix;
     src = cryptpad.src;
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
index b2a943dc2df..6189bfdf4cb 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
@@ -364,13 +364,13 @@ let
         sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
       };
     };
-    "nthen-0.1.10" = {
+    "nthen-0.1.8" = {
       name = "nthen";
       packageName = "nthen";
-      version = "0.1.10";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nthen/-/nthen-0.1.10.tgz";
-        sha512 = "W5LOhoFlQZSVg9SnRUJHgm3lOiT3HV6xq+Qo0dGKju2FWsDrKPwcgbJ9o5CORGz7UKKVhPScY9wOJHUogVG2UA==";
+        url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz";
+        sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw==";
       };
     };
     "on-finished-2.3.0" = {
@@ -619,14 +619,14 @@ let
   };
 in
 {
-  "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" = nodeEnv.buildNodePackage {
+  "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.0.0" = nodeEnv.buildNodePackage {
     name = "cryptpad";
     packageName = "cryptpad";
-    version = "2.25.0";
+    version = "3.0.0";
     src = fetchgit {
       url = "https://github.com/xwiki-labs/cryptpad.git";
-      rev = "0b17df3302fc4a7683a8790f305c8a2c7b1b4fe8";
-      sha256 = "261531da1745f9ff930bce3729afba2b7a52ee02f51340426ecf6b19204a21b7";
+      rev = "166ab65cd47a64e020528089244ed5be34f6e3c8";
+      sha256 = "35a3b733b5c128b7c7e1c0e7473f4a6a446d663f4c787745b36b1071205c1fd7";
     };
     dependencies = [
       sources."accepts-1.3.7"
@@ -669,7 +669,7 @@ in
       sources."mime-types-2.1.24"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
-      sources."nthen-0.1.10"
+      sources."nthen-0.1.8"
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.3"
       sources."path-to-regexp-0.1.7"
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json
index c37d984ae12..b370e09931b 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.json
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.json
@@ -1,3 +1,3 @@
 [
-  { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" }
+  { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.0.0" }
 ]
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index 36c5996286f..cae300a53f4 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages-generated.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file

From e54007370fafe4b0d50ce4f0b5dcfab34e80042d Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sat, 31 Aug 2019 17:23:21 +0000
Subject: [PATCH 563/794] vulkan-headers, vulkan-tools: fix version

This fixes an assertion error in vulkan-loader on version == vulkan-headers.version:

assertion failed at /nix/store/ca66sbxzxlxlfpb579nxxnw97z2ql1gv-source/pkgs/development/libraries/vulkan-loader/default.nix:8:1

The sha256 for vulkan-headers and vulkan-tools are unchanged because
they were already set to the newer version. The correct version was
lost in the staging-next merge.
---
 pkgs/development/libraries/vulkan-headers/default.nix | 2 +-
 pkgs/tools/graphics/vulkan-tools/default.nix          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 032181e458e..4ea8d69a498 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "vulkan-headers";
-  version = "1.1.106";
+  version = "1.1.114.0";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index 9ea1c2d7343..5851e4a2d46 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools";
-  version = "1.1.106.0";
+  version = "1.1.114.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";

From 29d9be2e720e15e13962215b63200a3081b183b0 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 30 Aug 2019 23:40:32 -0400
Subject: [PATCH 564/794] rtmpdump: fix build with OpenSSL 1.1

---
 pkgs/tools/video/rtmpdump/default.nix | 10 +++++++++-
 pkgs/top-level/all-packages.nix       |  4 +---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index af56ba3e7eb..e5615093e48 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, zlib
+{ stdenv, fetchgit, fetchpatch, zlib
 , gnutlsSupport ? false, gnutls ? null, nettle ? null
 , opensslSupport ? true, openssl ? null
 }:
@@ -20,6 +20,14 @@ stdenv.mkDerivation rec {
     sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig";
   };
 
+  patches = [
+    # Fix build with OpenSSL 1.1
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch?id=1e7bef484f96e7647f5f0911d3c8caa48131c33b";
+      sha256 = "1wds98pk8qr7shkfl8k49iirxiwd972h18w84bamiqln29wv6ql1";
+    })
+  ];
+
   makeFlags = [ ''prefix=$(out)'' ]
     ++ optional gnutlsSupport "CRYPTO=GNUTLS"
     ++ optional opensslSupport "CRYPTO=OPENSSL"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccdb4e25cd9..9eca129bf31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5792,9 +5792,7 @@ in
 
   rt = callPackage ../servers/rt { };
 
-  rtmpdump = callPackage ../tools/video/rtmpdump {
-    openssl = openssl_1_0_2;
-  };
+  rtmpdump = callPackage ../tools/video/rtmpdump { };
   rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
 
   reaverwps = callPackage ../tools/networking/reaver-wps {};

From 38cac86769abaa1e14d2dbe3b375fee802fb3b57 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 30 Aug 2019 23:43:51 -0400
Subject: [PATCH 565/794] rtmpdump: 2015-12-30 -> 2019-03-30

---
 pkgs/tools/video/rtmpdump/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index e5615093e48..06c035552e5 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -9,15 +9,15 @@ assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSuppo
 assert opensslSupport -> openssl != null && !gnutlsSupport;
 
 with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "rtmpdump";
-  version = "2015-12-30";
+  version = "2019-03-30";
 
   src = fetchgit {
-    url = git://git.ffmpeg.org/rtmpdump;
+    url = "git://git.ffmpeg.org/rtmpdump";
     # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4')
-    rev = "fa8646daeb19dfd12c181f7d19de708d623704c0";
-    sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig";
+    rev = "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3";
+    sha256 = "07ias612jgmxpam9h418kvlag32da914jsnjsfyafklpnh8gdzjb";
   };
 
   patches = [
@@ -40,9 +40,11 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
+  separateDebugInfo = true;
+
   meta = {
     description = "Toolkit for RTMP streams";
-    homepage    = http://rtmpdump.mplayerhq.hu/;
+    homepage    = "http://rtmpdump.mplayerhq.hu/";
     license     = licenses.gpl2;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ codyopel ];

From e0795aa5e8c759bca435270facb5f90fefaa909a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 31 Aug 2019 21:02:19 +0300
Subject: [PATCH 566/794] tensorflow: fix python2 build

Avoid using PYTHONPATH, switch to python envs instead.
---
 .../python-modules/tensorflow/default.nix     | 56 ++++++++-----------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 899e8936843..5f808bafe6f 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -58,8 +58,23 @@ let
   variant = if cudaSupport then "-gpu" else "";
   pname = "tensorflow${variant}";
 
-  # TODO: remove after there's support for setupPyDistFlags
-  setuppy = ../../../development/interpreters/python/run_setup.py;
+  pythonEnv = python.withPackages (_:
+    [ # python deps needed during wheel build time
+      numpy
+      keras-preprocessing
+      protobuf
+      wrapt
+      gast
+      astor
+      absl-py
+      termcolor
+      keras-applications
+      setuptools
+      wheel
+  ] ++ lib.optionals (!isPy3k)
+  [ future
+    mock
+  ]);
 
   bazel-build = buildBazelPackage rec {
     name = "${pname}-${version}";
@@ -96,27 +111,15 @@ let
     # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow
 
     nativeBuildInputs = [
-      swig which cython
+      swig which pythonEnv
     ];
 
     buildInputs = [
-      python
       jemalloc
       openmpi
       glibcLocales
       git
 
-      # python deps needed during wheel build time
-      numpy
-      keras-preprocessing
-      protobuf
-      wrapt
-      gast
-      astor
-      absl-py
-      termcolor
-      keras-applications
-
       # libs taken from system through the TF_SYS_LIBS mechanism
       # grpc
       sqlite
@@ -133,20 +136,12 @@ let
       giflib
       re2
       pkgs.lmdb
-
-      # for building the wheel
-      setuptools
-      wheel
-    ] ++ lib.optionals (!isPy3k) [
-      future
-      mock
     ] ++ lib.optionals cudaSupport [
       cudatoolkit
       cudnn
       nvidia_x11
     ];
 
-
     # arbitrarily set to the current latest bazel version, overly careful
     TF_IGNORE_MAX_BAZEL_VERSION = true;
 
@@ -194,8 +189,8 @@ let
 
     INCLUDEDIR = "${includes_joined}/include";
 
-    PYTHON_BIN_PATH = python.interpreter;
- 
+    PYTHON_BIN_PATH = pythonEnv.interpreter;
+
     TF_NEED_GCP = true;
     TF_NEED_HDFS = true;
     TF_ENABLE_XLA = tfFeature xlaSupport;
@@ -237,6 +232,9 @@ let
       export PYTHON_LIB_PATH="$NIX_BUILD_TOP/site-packages"
       export CC_OPT_FLAGS="${lib.concatStringsSep " " opt_flags}"
       mkdir -p "$PYTHON_LIB_PATH"
+
+      # To avoid mixing Python 2 and Python 3
+      unset PYTHONPATH
     '';
 
     configurePhase = ''
@@ -313,13 +311,7 @@ in buildPythonPackage rec {
     rm $out/bin/tensorboard
   '';
 
-  # TODO: remove after there's support for setupPyDistFlags
-  buildPhase = ''
-    runHook preBuild
-    cp ${setuppy} nix_run_setup
-    ${python.interpreter} nix_run_setup --project_name ${pname} bdist_wheel
-    runHook postBuild
-  '';
+  setupPyGlobalFlags = [ "--project_name ${pname}" ];
 
   # tensorflow/tools/pip_package/setup.py
   propagatedBuildInputs = [

From 37538f8ec0ba294c91616d60022b300d3df27af4 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sat, 31 Aug 2019 11:08:29 -0700
Subject: [PATCH 567/794] openxr-loader: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix
index d1a20552ff7..8013d686585 100644
--- a/pkgs/development/libraries/openxr-loader/default.nix
+++ b/pkgs/development/libraries/openxr-loader/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openxr-loader";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenXR-SDK-Source";
     rev = "release-${version}";
-    sha256 = "1sif2w2vm793j6493364i6pp6s6yqi7fwa6iky5abzmzda51cg5q";
+    sha256 = "11lkihykwkq0sbmijqxmn52lg6mcn6gkcpj1c7fhzm0hm1b9p9dn";
   };
 
   nativeBuildInputs = [ cmake python3 ];

From 8dec5e6224c84cfcd027acdc288eda073ff5359a Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Thu, 4 Jul 2019 02:14:56 -0600
Subject: [PATCH 568/794] ispell: 3.3.02 -> 3.4.00

---
 pkgs/tools/text/ispell/default.nix            | 19 +++++--
 .../patches/0005-Do-not-reorder-words.patch   | 52 -------------------
 2 files changed, 15 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch

diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix
index dbec8d353d9..2f61536ed2c 100644
--- a/pkgs/tools/text/ispell/default.nix
+++ b/pkgs/tools/text/ispell/default.nix
@@ -1,14 +1,17 @@
 { stdenv, fetchurl, bison, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ispell-3.3.02";
+  pname = "ispell";
+  version = "3.4.00";
+
   src = fetchurl {
-    url = "http://fmg-www.cs.ucla.edu/geoff/tars/${name}.tar.gz";
+    url = "http://fmg-www.cs.ucla.edu/geoff/tars/${pname}-${version}.tar.gz";
     sha256 = "1d7c2fqrdjckp91ajpkn5nnmpci2qrxqn8b6cyl0zn1afb9amxbz";
   };
+
   buildInputs = [ bison ncurses ];
+
   patches = [
-    ./patches/0005-Do-not-reorder-words.patch
     ./patches/0007-Use-termios.patch
     ./patches/0008-Tex-backslash.patch
     ./patches/0009-Fix-FTBFS-on-glibc.patch
@@ -21,6 +24,7 @@ stdenv.mkDerivation rec {
     ./patches/0025-Languages.patch
     ./patches/0030-Display-whole-multibyte-character.patch
   ];
+
   postPatch = ''
     cat >> local.h <<EOF
     ${stdenv.lib.optionalString (!stdenv.isDarwin) "#define USG"}
@@ -37,11 +41,18 @@ stdenv.mkDerivation rec {
     #define MINIMENU
     #define HAS_RENAME
     EOF
-
   '';
+
   preBuild = ''
     for dir in $out/share/emacs/site-lisp $out/share/info $out/share/man/man1 $out/share/man/man4 $out/bin $out/lib; do
     mkdir -p $dir
     done
   '';
+
+  meta = with stdenv.lib; {
+    description = "An interactive spell-checking program for Unix";
+    homepage = "https://www.cs.hmc.edu/~geoff/ispell.html";
+    license = licenses.free;
+    platforms = platforms.unix;
+  };
 }
diff --git a/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch b/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch
deleted file mode 100644
index 2d74c078601..00000000000
--- a/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Geoff Kuenning <geoff@cs.hmc.edu>
-Date: Thu, 3 Nov 2005 14:14:15 -0800
-Subject: 0005 Do not reorder words
-
-ispell reorders words in personal dictionary without good reason.
-
-The correct approach is to build the internal data structure with variant
-spellings stored in the same order as they appear in the personal dictionary.
-Fortunately, this is easy, though the patch is to a different file. This one
-has been tested (That's what I get for trying to rush out a fix before a
-meeting!).
----
- makedent.c |   18 +++++++++++-------
- 1 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/makedent.c b/makedent.c
-index 0453d11..d121345 100644
---- a/makedent.c
-+++ b/makedent.c
-@@ -447,9 +447,10 @@ int combinecaps (hdrp, newp)
-     if (retval == 0)
- 	{
- 	/*
--	** Couldn't combine the two entries.  Add a new variant.  For
--	** ease, we'll stick it right behind the header, rather than
--	** at the end of the list.
-+	** Couldn't combine the two entries.  Add a new variant.  We
-+	** stick it at the end of the variant list because it's
-+	** important to maintain order; this causes the personal
-+	** dictionary to have a stable ordering.
- 	*/
- 	forcevheader (hdrp, oldp, newp);
- 	tdent = (struct dent *) mymalloc (sizeof (struct dent));
-@@ -460,10 +461,13 @@ int combinecaps (hdrp, newp)
- 	    return -1;
- 	    }
- 	*tdent = *newp;
--	tdent->next = hdrp->next;
--	hdrp->next = tdent;
--	tdent->flagfield |= (hdrp->flagfield & MOREVARIANTS);
--	hdrp->flagfield |= MOREVARIANTS;
-+	for (oldp = hdrp;
-+	  oldp->next != NULL  &&  oldp->flagfield & MOREVARIANTS;
-+	  oldp = oldp->next)
-+	    ;
-+	tdent->next = oldp->next;
-+	oldp->next = tdent;
-+	oldp->flagfield |= MOREVARIANTS;
- 	combineaffixes (hdrp, newp);
- 	hdrp->flagfield |= (newp->flagfield & KEEP);
- 	if (captype (newp->flagfield) == FOLLOWCASE)
--- 

From 0c6a81a8b10eb597bda9b77af8d5e187f0a6ddc8 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Sat, 31 Aug 2019 16:46:45 +0200
Subject: [PATCH 569/794] consul: 1.5.2 -> 1.6.0

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

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 4c8877e92de..b7c2e01e97a 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "consul";
-  version = "1.5.2";
+  version = "1.6.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/consul";
@@ -17,9 +17,9 @@ buildGoPackage rec {
   # to apply your changes as patches on top of a release commit.
   src = fetchFromGitHub {
     owner = "hashicorp";
-    repo = "consul";
+    repo = pname;
     inherit rev;
-    sha256 = "1fn9xxdszil4zdal08cyq6gbs2larpr4zmjmv2w2ykiacbfhpa6h";
+    sha256 = "16rngyv9dp19gjbjwfvnmlfxbq67fxs55hgvvcyn9mplm1j0bb52";
   };
 
   preBuild = ''

From b7461c8828e5b2613ece1440b36796149ce5b7aa Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 31 Aug 2019 21:46:13 +0200
Subject: [PATCH 570/794] gns3Packages.{server,gui}Preview: 2.2.0rc3 ->
 2.2.0rc4

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

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 94d5be030da..c5cf7a7c2ee 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -2,7 +2,7 @@
 
 let
   stableVersion = "2.1.21";
-  previewVersion = "2.2.0rc3";
+  previewVersion = "2.2.0rc4";
   addVersion = args:
     let version = if args.stable then stableVersion else previewVersion;
         branch = if args.stable then "stable" else "preview";
@@ -18,7 +18,7 @@ in {
   };
   guiPreview = mkGui {
     stable = false;
-    sha256Hash = "0lj2av2kbh1drr8jzd71j85xaiwp53q1g348lk2qqzr35yh16n99";
+    sha256Hash = "14fzjaanaxya97wrya2lybxz6qv72fk4ws8i92zvjz4jkvjdk9n3";
   };
 
   serverStable = mkServer {
@@ -27,6 +27,6 @@ in {
   };
   serverPreview = mkServer {
     stable = false;
-    sha256Hash = "0a4gx0qhy50v7nivqn8c2kz07crgzg2105hzmwag8xw6bpqmgm1d";
+    sha256Hash = "03s2kq5f8whk14rhprg9yp3918641b1cwj6djcbjw8xpz0n3w022";
   };
 }

From 2aa9b655f487328b978f526e85f9723f0172c295 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Thu, 4 Jul 2019 02:53:50 -0600
Subject: [PATCH 571/794] kallisto: 0.43.1 -> 0.46.0

---
 .../science/biology/kallisto/default.nix      | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index 16639db1781..de93ae5d782 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -1,25 +1,28 @@
-{ stdenv, fetchFromGitHub, cmake, hdf5, zlib }:
+{ stdenv, fetchFromGitHub, autoconf, cmake, hdf5, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "kallisto";
-  version = "0.43.1";
+  version = "0.46.0";
 
   src = fetchFromGitHub {
     repo = "kallisto";
     owner = "pachterlab";
     rev = "v${version}";
-    sha256 = "04697pf7jvy7vw126s1rn09q4iab9223jvb1nb0jn7ilwkq7pgwz";
+    sha256 = "09vgdqwpigl4x3sdw5vjfyknsllkli339mh8xapbf7ldm0jldfn9";
   };
 
-  nativeBuildInputs = [ cmake ];
-  
+  nativeBuildInputs = [ autoconf cmake ];
+
   buildInputs = [ hdf5 zlib ];
 
+  # Parallel build fails in some cases: https://github.com/pachterlab/kallisto/issues/160
+  enableParallelBuilding = false;
+
   meta = with stdenv.lib; {
-    description = "kallisto is a program for quantifying abundances of transcripts from RNA-Seq data";
-    homepage = https://pachterlab.github.io/kallisto;
+    description = "Kallisto is a program for quantifying abundances of transcripts from RNA-Seq data";
+    homepage = "https://pachterlab.github.io/kallisto";
     license = licenses.bsd2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.arcadio ];
+    maintainers = with maintainers; [ arcadio ];
   };
 }

From f6c47d01a4900312ac5b84f1ccc0010bed29bfd2 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Sat, 31 Aug 2019 10:45:48 +0200
Subject: [PATCH 572/794] nomad: 0.9.4 -> 0.9.5

This commit updates nomad from 0.9.4 to 0.9.5.

It also introduces the 'ui' build tag as it is incredibly useful when
working in development and production environments - and the assets are
included in release commits.
---
 .../networking/cluster/nomad/default.nix      | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index ce7b9beb4f8..a4236a9408c 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "nomad";
-  version = "0.9.4";
+  version = "0.9.5";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/nomad";
@@ -10,14 +10,26 @@ buildGoPackage rec {
 
   src = fetchFromGitHub {
     owner = "hashicorp";
-    repo = "nomad";
+    repo = pname;
     inherit rev;
-    sha256 = "1jgvnmmrz7ffpm6aamdrvklj94n7b43swk9cycqhlfbnzijianpn";
+    sha256 = "01491470idb11z0ab4anb5caw46vy9s94a17l92j0z2f3f4k6xfl";
   };
 
-  # We disable Nvidia GPU scheduling on Linux, as it doesn't work there:
-  # Ref: https://github.com/hashicorp/nomad/issues/5535
-  buildFlags = stdenv.lib.optionalString (stdenv.isLinux) "-tags nonvidia";
+  # ui:
+  #  Nomad release commits include the compiled version of the UI, but the file
+  #  is only included if we build with the ui tag.
+  # nonvidia:
+  #  We disable Nvidia GPU scheduling on Linux, as it doesn't work there:
+  #  Ref: https://github.com/hashicorp/nomad/issues/5535
+  preBuild = let
+    tags = ["ui"]
+      ++ stdenv.lib.optional stdenv.isLinux "nonvidia";
+    tagsString = stdenv.lib.concatStringsSep " " tags;
+  in ''
+    export buildFlagsArray=(
+      -tags="${tagsString}"
+    )
+ '';
 
   meta = with stdenv.lib; {
     homepage = https://www.nomadproject.io/;

From 19c18e104b14f3203a419c5ea3159e615e312c58 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 31 Aug 2019 22:48:50 +0200
Subject: [PATCH 573/794] waypipe: init at 0.6.1 (#67713)

waypipe: init at 0.6.1
---
 .../networking/remote/waypipe/default.nix     | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/applications/networking/remote/waypipe/default.nix

diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix
new file mode 100644
index 00000000000..d253e766284
--- /dev/null
+++ b/pkgs/applications/networking/remote/waypipe/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitLab
+, meson, ninja, pkgconfig, scdoc
+, wayland, wayland-protocols, openssh
+, mesa, lz4, zstd, ffmpeg_4, libva
+}:
+
+stdenv.mkDerivation rec {
+  pname = "waypipe-unstable";
+  version = "0.6.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "mstoeckl";
+    repo = "waypipe";
+    rev = "v${version}";
+    sha256 = "13kp5snkksli0sj5ldkgybcs1s865f0qdak2w8796xvy8dg9jda8";
+  };
+
+  postPatch = ''
+    substituteInPlace src/waypipe.c \
+      --replace "/usr/bin/ssh" "${openssh}/bin/ssh"
+  '';
+
+  nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
+
+  buildInputs = [
+    wayland wayland-protocols
+    # Optional dependencies:
+    mesa lz4 zstd ffmpeg_4 libva
+  ];
+
+  enableParallelBuilding = true;
+
+  mesonFlags = [ "-Dwerror=false" ]; # TODO: Report warnings upstream
+
+  meta = with stdenv.lib; {
+    description = "A network proxy for Wayland clients (applications)";
+    longDescription = ''
+      waypipe is a proxy for Wayland clients. It forwards Wayland messages and
+      serializes changes to shared memory buffers over a single socket. This
+      makes application forwarding similar to ssh -X feasible.
+    '';
+    homepage = https://mstoeckl.com/notes/gsoc/blog.html;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccdb4e25cd9..fde7cde73e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21152,6 +21152,8 @@ in
 
   way-cooler = callPackage ../applications/window-managers/way-cooler {};
 
+  waypipe = callPackage ../applications/networking/remote/waypipe { };
+
   wayv = callPackage ../tools/X11/wayv {};
 
   webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};

From bbb525d541c0dc30af4885de2623f007ad58f361 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 31 Aug 2019 22:21:33 +0200
Subject: [PATCH 574/794] google-compute-config: remove amazon pv-grub comment

---
 nixos/modules/virtualisation/google-compute-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index 79766970c75..df05328b8b8 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -21,7 +21,7 @@ in
   boot.initrd.kernelModules = [ "virtio_scsi" ];
   boot.kernelModules = [ "virtio_pci" "virtio_net" ];
 
-  # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
+  # Generate a GRUB menu.
   boot.loader.grub.device = "/dev/sda";
   boot.loader.timeout = 0;
 

From a811437e6ebf93d62552d0a2a7495c0f75952f59 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 31 Aug 2019 22:22:47 +0200
Subject: [PATCH 575/794] google-compute-config.nix: update comment about ssh
 login

also move OS Login next to it, for better understandability
---
 nixos/modules/virtualisation/google-compute-config.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index df05328b8b8..827e7efdb35 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -29,12 +29,16 @@ in
   # way to select them anyway.
   boot.loader.grub.configurationLimit = 0;
 
-  # Allow root logins only using the SSH key that the user specified
-  # at instance creation time.
+  # Allow root logins only using SSH keys
+  # and disable password authentication in general
   services.openssh.enable = true;
   services.openssh.permitRootLogin = "prohibit-password";
   services.openssh.passwordAuthentication = mkDefault false;
 
+  # enable OS Login. This also requires setting enable-oslogin=TRUE metadata on
+  # instance or project level
+  security.googleOsLogin.enable = true;
+
   # Use GCE udev rules for dynamic disk volumes
   services.udev.packages = [ gce ];
 
@@ -65,8 +69,6 @@ in
   # GC has 1460 MTU
   networking.interfaces.eth0.mtu = 1460;
 
-  security.googleOsLogin.enable = true;
-
   systemd.services.google-clock-skew-daemon = {
     description = "Google Compute Engine Clock Skew Daemon";
     after = [

From 106a1fe265b6314ee20e5f0822676e6a6877803a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 31 Aug 2019 22:42:34 +0200
Subject: [PATCH 576/794] google-compute-config: sync with upstream units

With local-fs.target part of sysinit.target
(https://github.com/NixOS/nixpkgs/pull/61321), we don't need to add it
explicitly to certain units anymore, and can change dependencies like
they are in other distros (I picked from Google's official CentOS 7
image here).

Like them, use StandardOutput=journal+console to pipe google-*.service
output to the serial console as well.
---
 .../virtualisation/google-compute-config.nix  | 67 +++++++++----------
 1 file changed, 30 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index 827e7efdb35..61bced59862 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -69,86 +69,79 @@ in
   # GC has 1460 MTU
   networking.interfaces.eth0.mtu = 1460;
 
-  systemd.services.google-clock-skew-daemon = {
-    description = "Google Compute Engine Clock Skew Daemon";
-    after = [
-      "network.target"
-      "google-instance-setup.service"
-      "google-network-setup.service"
-    ];
-    requires = ["network.target"];
-    wantedBy = ["multi-user.target"];
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${gce}/bin/google_clock_skew_daemon --debug";
-    };
-  };
-
   systemd.services.google-instance-setup = {
     description = "Google Compute Engine Instance Setup";
-    after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service"];
-    before = ["sshd.service"];
-    wants = ["local-fs.target" "network-online.target" "network.target"];
-    wantedBy = [ "sshd.service" "multi-user.target" ];
+    after = [ "network-online.target" "network.target" "rsyslog.service" ];
+    before = [ "sshd.service" ];
     path = with pkgs; [ ethtool openssh ];
     serviceConfig = {
-      ExecStart = "${gce}/bin/google_instance_setup --debug";
+      ExecStart = "${gce}/bin/google_instance_setup";
+      StandardOutput="journal+console";
       Type = "oneshot";
     };
+    wantedBy = [ "sshd.service" "multi-user.target" ];
   };
 
   systemd.services.google-network-daemon = {
     description = "Google Compute Engine Network Daemon";
-    after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service" "google-instance-setup.service"];
-    wants = ["local-fs.target" "network-online.target" "network.target"];
-    requires = ["network.target"];
-    partOf = ["network.target"];
-    wantedBy = [ "multi-user.target" ];
+    after = [ "network-online.target" "network.target" "google-instance-setup.service" ];
     path = with pkgs; [ iproute ];
     serviceConfig = {
-      ExecStart = "${gce}/bin/google_network_daemon --debug";
+      ExecStart = "${gce}/bin/google_network_daemon";
+      StandardOutput="journal+console";
+      Type="simple";
     };
+    wantedBy = [ "multi-user.target" ];
   };
 
+  systemd.services.google-clock-skew-daemon = {
+    description = "Google Compute Engine Clock Skew Daemon";
+    after = [ "network.target" "google-instance-setup.service" "google-network-daemon.service" ];
+    serviceConfig = {
+      ExecStart = "${gce}/bin/google_clock_skew_daemon";
+      StandardOutput="journal+console";
+      Type = "simple";
+    };
+    wantedBy = ["multi-user.target"];
+  };
+
+
   systemd.services.google-shutdown-scripts = {
     description = "Google Compute Engine Shutdown Scripts";
     after = [
-      "local-fs.target"
       "network-online.target"
       "network.target"
       "rsyslog.service"
-      "systemd-resolved.service"
       "google-instance-setup.service"
       "google-network-daemon.service"
     ];
-    wants = [ "local-fs.target" "network-online.target" "network.target"];
-    wantedBy = [ "multi-user.target" ];
     serviceConfig = {
       ExecStart = "${pkgs.coreutils}/bin/true";
-      ExecStop = "${gce}/bin/google_metadata_script_runner --debug --script-type shutdown";
-      Type = "oneshot";
+      ExecStop = "${gce}/bin/google_metadata_script_runner --script-type shutdown";
       RemainAfterExit = true;
-      TimeoutStopSec = "infinity";
+      StandardOutput="journal+console";
+      TimeoutStopSec = "0";
+      Type = "oneshot";
     };
+    wantedBy = [ "multi-user.target" ];
   };
 
   systemd.services.google-startup-scripts = {
     description = "Google Compute Engine Startup Scripts";
     after = [
-      "local-fs.target"
       "network-online.target"
       "network.target"
       "rsyslog.service"
       "google-instance-setup.service"
       "google-network-daemon.service"
     ];
-    wants = ["local-fs.target" "network-online.target" "network.target"];
-    wantedBy = [ "multi-user.target" ];
     serviceConfig = {
-      ExecStart = "${gce}/bin/google_metadata_script_runner --debug --script-type startup";
+      ExecStart = "${gce}/bin/google_metadata_script_runner --script-type startup";
       KillMode = "process";
+      StandardOutput = "journal+console";
       Type = "oneshot";
     };
+    wantedBy = [ "multi-user.target" ];
   };
 
 

From 80f07c17154b449e75da01634c439ed5aa39d650 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Sat, 31 Aug 2019 00:57:19 +0200
Subject: [PATCH 577/794] calibre: 3.46.0 -> 3.47.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 39fdc8e5e1c..b4c8bbb3f31 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -6,11 +6,11 @@
 
 mkDerivation rec {
   pname = "calibre";
-  version = "3.46.0";
+  version = "3.47.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1dlss01kaz2qlg9ji8c9dn9rd73mmpm5yjg50zp49cwx9y2vjiz9";
+    sha256 = "0mjj47w9pa7ihycialijrfq2qk107dcxwcwriz3b2mg4lixlawy4";
   };
 
   patches = [

From 6f9e18a47de1d0ade7e6ff95a77a61f8cf382046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 31 Aug 2019 18:54:22 -0300
Subject: [PATCH 578/794] qogir-theme: 2019-05-03 -> 2019-08-31

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

diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix
index 4d91b60960b..6461697b04f 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/pkgs/data/themes/qogir/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qogir-theme";
-  version = "2019-05-03";
+  version = "2019-08-31";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "031nqr47b3x8ahcym7cfc75y8sy53dcmrrrlywi7m1a10ckfp0pd";
+    sha256 = "1pqfnqc2c6f5cidg6c3y492hqlyn5ma4b7ra2lchw7g2dxfvq8w1";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     patchShebangs .
     mkdir -p $out/share/themes
-    name= ./Install -d $out/share/themes
+    name= ./install.sh -d $out/share/themes
   '';
 
   meta = with stdenv.lib; {

From eeec6d732583f824d75901d97a2a734e7de7b3f0 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sat, 31 Aug 2019 22:13:53 +0000
Subject: [PATCH 579/794] pybind11: 2.2.4 -> 2.3.0

pikepdf wants a newer pybind11.
---
 pkgs/development/python-modules/pybind11/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index f49c50185db..1b89cb5ada7 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pybind11";
-  version = "2.2.4";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1kz1z2cg3q901q9spkdhksmcfiskaghzmbb9ivr5mva856yvnak4";
+    sha256 = "0923ngd2cvck3lhl7584y08n36pm6zqihfm1s69sbdc11xg936hr";
   };
 
   patches = [

From a1349065d6dbf86058233d94acbc1ac1a6b92da6 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sat, 31 Aug 2019 22:14:44 +0000
Subject: [PATCH 580/794] python3Packages.pikepdf: 1.1.0 -> 1.6.2

pikepdf's tests work with the nixpkgs versions of pytest, attrs, and
hypothesis. I skipped bumping these to avoid mass rebuilds.

This fixes #67850.
---
 pkgs/development/python-modules/pikepdf/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index c2662915b12..025b17d19ae 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -22,12 +22,12 @@
 
 buildPythonPackage rec {
   pname = "pikepdf";
-  version = "1.1.0";
+  version = "1.6.2";
   disabled = ! isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my";
+    sha256 = "1x1b55znr0j4fib69l2h0xq0qmbf2nbxwbwd4f7y8r4sqi20239z";
   };
 
   buildInputs = [
@@ -55,8 +55,11 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ defusedxml lxml ];
 
   postPatch = ''
-    substituteInPlace requirements/test.txt \
-       --replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5"
+    sed -i \
+      -e 's/^pytest .*/pytest/g' \
+      -e 's/^attrs .*/attrs/g' \
+      -e 's/^hypothesis .*/hypothesis/g' \
+      requirements/test.txt
   '';
 
   preBuild = ''
@@ -70,4 +73,3 @@ buildPythonPackage rec {
     maintainers = [ maintainers.kiwi ];
   };
 }
-

From 45dc8ced7cf47caa6e2ddf2b0a97d6b9bddc1e22 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 15:22:06 +0100
Subject: [PATCH 581/794] emacsPackages.elpaPackages.el-search: Unmark as
 broken

---
 pkgs/applications/editors/emacs-modes/elpa-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 5f0c863b586..70d559a3eca 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -38,7 +38,6 @@ self: let
     overrides = {
       # upstream issue: missing footer
       ebdb-i18n-chn = markBroken super.ebdb-i18n-chn;
-      el-search = markBroken super.el-search; # requires emacs-25
       iterators = markBroken super.iterators; # requires emacs-25
       midi-kbd = markBroken super.midi-kbd; # requires emacs-25
       rcirc-menu = markBroken super.rcirc-menu; # Missing file header

From 11829795b3f165c7f8bf3579a3dc499080d21579 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 15:22:31 +0100
Subject: [PATCH 582/794] emacsPackages.elpaPackages.stream: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/elpa-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 70d559a3eca..d4b3f12cdc5 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -41,7 +41,6 @@ self: let
       iterators = markBroken super.iterators; # requires emacs-25
       midi-kbd = markBroken super.midi-kbd; # requires emacs-25
       rcirc-menu = markBroken super.rcirc-menu; # Missing file header
-      stream = markBroken super.stream; # requires emacs-25
       cl-lib = null; # builtin
       tle = null; # builtin
       advice = null; # builtin

From eb54ab3798050586f06017047187664ea1fd68b5 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 15:23:16 +0100
Subject: [PATCH 583/794] emacsPackages.elpaPackages.midi-kbd: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/elpa-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index d4b3f12cdc5..07316f60d95 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -39,7 +39,6 @@ self: let
       # upstream issue: missing footer
       ebdb-i18n-chn = markBroken super.ebdb-i18n-chn;
       iterators = markBroken super.iterators; # requires emacs-25
-      midi-kbd = markBroken super.midi-kbd; # requires emacs-25
       rcirc-menu = markBroken super.rcirc-menu; # Missing file header
       cl-lib = null; # builtin
       tle = null; # builtin

From 1acdbbacb3d5ef0594d30eaf7246a4e77cd3249c Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 15:24:32 +0100
Subject: [PATCH 584/794] emacsPackages.elpaPackages.iterators: Unmark as
 broken

---
 pkgs/applications/editors/emacs-modes/elpa-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 07316f60d95..f4daf44e127 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -38,7 +38,6 @@ self: let
     overrides = {
       # upstream issue: missing footer
       ebdb-i18n-chn = markBroken super.ebdb-i18n-chn;
-      iterators = markBroken super.iterators; # requires emacs-25
       rcirc-menu = markBroken super.rcirc-menu; # Missing file header
       cl-lib = null; # builtin
       tle = null; # builtin

From 1c687eb4e4b097e1117d5c18d226f818da7647be Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 15:26:58 +0100
Subject: [PATCH 585/794] emacsPackages.elpaPackages.ebdb-i18n-chn: Unmark as
 broken

---
 pkgs/applications/editors/emacs-modes/elpa-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index f4daf44e127..a6bea779eae 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -36,8 +36,6 @@ self: let
     super = removeAttrs imported [ "dash" ];
 
     overrides = {
-      # upstream issue: missing footer
-      ebdb-i18n-chn = markBroken super.ebdb-i18n-chn;
       rcirc-menu = markBroken super.rcirc-menu; # Missing file header
       cl-lib = null; # builtin
       tle = null; # builtin

From 10852183ba6d992a8a2d5b89a3e8c6738b8a17b8 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:44:41 +0100
Subject: [PATCH 586/794] emacs-packages: Unmark bufshow as broken from melpa

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 12cc2c571d8..b98d3082017 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -42,9 +42,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           inherit (self.melpaPackages) powerline;
         };
 
-        # upstream issue: missing file header
-        bufshow = markBroken super.bufshow;
-
         # part of a larger package
         caml = dontConfigure super.caml;
 
@@ -317,6 +314,10 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
       };
 
       stable = shared // {
+
+        # upstream issue: missing file header
+        bufshow = markBroken super.bufshow;
+
         # part of a larger package
         # upstream issue: missing package version
         cmake-mode = markBroken (dontConfigure super.cmake-mode);

From 9823655e70838cceb4c95550e0d6e617920b4698 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:45:23 +0100
Subject: [PATCH 587/794] emacsPackages.elmine: Unmark as broken from melpa

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index b98d3082017..c44b59e79f2 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -61,9 +61,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           inherit (self.melpaPackages) easy-kill;
         };
 
-        # upstream issue: missing file header
-        elmine = markBroken super.elmine;
-
         elpy = super.elpy.overrideAttrs(old: {
           propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ];
         });
@@ -336,6 +333,8 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         # upstream issue: doesn't build
         eterm-256color = markBroken super.eterm-256color;
+        # upstream issue: missing file header
+        elmine = markBroken super.elmine;
 
         # upstream issue: missing dependency highlight
         evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;

From 7c7378246c38ccf9a24d0c4f743970fc43dbad6b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:45:57 +0100
Subject: [PATCH 588/794] emacsPackages.graphene: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index c44b59e79f2..d244470358e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -95,9 +95,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # Expects bash to be at /bin/bash
         flycheck-rtags = markBroken super.flycheck-rtags;
 
-        # build timeout
-        graphene = markBroken super.graphene;
-
         pdf-tools = super.pdf-tools.overrideAttrs(old: {
           nativeBuildInputs = [ external.pkgconfig ];
           buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];
@@ -348,8 +345,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing dependency
         fold-dwim-org = markBroken super.fold-dwim-org;
 
-        # build timeout
-        graphene = markBroken super.graphene;
 
         # Expects bash to be at /bin/bash
         helm-rtags = markBroken super.helm-rtags;

From c74e4a11168e09b69c3aba6ac261fc3feffee5d2 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:46:42 +0100
Subject: [PATCH 589/794] emacsPackages.ido-complete-space-or-hyphen: Unmark as
 broken from melpa

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index d244470358e..2bb7112f9cc 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -114,9 +114,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           propagatedUserEnvPkgs = [ external.hindent ];
         });
 
-        # upstream issue: missing file header
-        ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
-
         # upstream issue: missing file header
         initsplit = markBroken super.initsplit;
 
@@ -335,6 +332,8 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         # upstream issue: missing dependency highlight
         evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
+        # upstream issue: missing file header
+        ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
 
         # upstream issue: missing dependency highlight
         floobits  = markBroken super.floobits;

From 178ba4dd059633cd3383ad33894618b5fb67bcc7 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:47:08 +0100
Subject: [PATCH 590/794] emacsPackages.initsplit: Unmark as broken from melpa

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 2bb7112f9cc..c68b146101f 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -114,9 +114,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           propagatedUserEnvPkgs = [ external.hindent ];
         });
 
-        # upstream issue: missing file header
-        initsplit = markBroken super.initsplit;
-
         irony = super.irony.overrideAttrs (old: {
           cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
           NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
@@ -337,6 +334,8 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         # upstream issue: missing dependency highlight
         floobits  = markBroken super.floobits;
+        # upstream issue: missing file header
+        initsplit = markBroken super.initsplit;
 
         # missing OCaml
         flycheck-ocaml = markBroken super.flycheck-ocaml;

From 594b9a15b3037a6486529cf09403c10f3f89778f Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:47:34 +0100
Subject: [PATCH 591/794] emacsPackages.jsfmt: Unmark as broken from melpa
 stable

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index c68b146101f..9c27c4f8688 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -147,9 +147,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # Expects bash to be at /bin/bash
         ivy-rtags = markBroken super.ivy-rtags;
 
-        # upstream issue: missing file header
-        jsfmt = markBroken super.jsfmt;
-
         # upstream issue: missing file header
         maxframe = markBroken super.maxframe;
 
@@ -339,6 +336,8 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         # missing OCaml
         flycheck-ocaml = markBroken super.flycheck-ocaml;
+        # upstream issue: missing file header
+        jsfmt = markBroken super.jsfmt;
 
         # upstream issue: missing dependency
         fold-dwim-org = markBroken super.fold-dwim-org;

From 88f8e5a59d23a963fad8fb9b2b1a129d76b3c065 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:48:02 +0100
Subject: [PATCH 592/794] emacsPackages.maxframe: Unmark as broken from melpa

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 9c27c4f8688..74dc8107d1d 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -147,9 +147,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # Expects bash to be at /bin/bash
         ivy-rtags = markBroken super.ivy-rtags;
 
-        # upstream issue: missing file header
-        maxframe = markBroken super.maxframe;
-
         magit = super.magit.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
@@ -341,6 +338,8 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         # upstream issue: missing dependency
         fold-dwim-org = markBroken super.fold-dwim-org;
+        # upstream issue: missing file header
+        maxframe = markBroken super.maxframe;
 
 
         # Expects bash to be at /bin/bash

From 70c32e80b5db6d11b120d2f20dbe21dc1b0e6e93 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:48:26 +0100
Subject: [PATCH 593/794] emacsPackages.ocp-indent: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 74dc8107d1d..397c9104ef9 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -206,9 +206,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # part of a larger package
         notmuch = dontConfigure super.notmuch;
 
-        # missing OCaml
-        ocp-indent = markBroken super.ocp-indent;
-
         # upstream issue: missing file header
         qiita = markBroken super.qiita;
 

From 2418f00ca1125f3b21039db0acf673125101233d Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:48:53 +0100
Subject: [PATCH 594/794] emacsPackages.qiita: Unmark as broken from melpa

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 397c9104ef9..746bbdcf1bf 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -206,9 +206,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # part of a larger package
         notmuch = dontConfigure super.notmuch;
 
-        # upstream issue: missing file header
-        qiita = markBroken super.qiita;
-
         # upstream issue: missing file header
         speech-tagger = markBroken super.speech-tagger;
 
@@ -342,6 +339,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # Expects bash to be at /bin/bash
         helm-rtags = markBroken super.helm-rtags;
 
+        # upstream issue: missing file header
+        qiita = markBroken super.qiita;
+
         # upstream issue: missing file header
         link = markBroken super.link;
 

From a29ca8750e41c492686fa31f94acb105d5741cb5 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:49:24 +0100
Subject: [PATCH 595/794] emacsPackages.speech-tagger: Unmark as broken from
 melpa

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 746bbdcf1bf..6071e025f44 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -206,9 +206,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # part of a larger package
         notmuch = dontConfigure super.notmuch;
 
-        # upstream issue: missing file header
-        speech-tagger = markBroken super.speech-tagger;
-
         shm = super.shm.overrideAttrs (attrs: {
           propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
         });
@@ -342,6 +339,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         qiita = markBroken super.qiita;
 
+        # upstream issue: missing file header
+        speech-tagger = markBroken super.speech-tagger;
+
         # upstream issue: missing file header
         link = markBroken super.link;
 

From edcf30776243680ba4e7fcc8afe4aa8eef1c09db Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:49:46 +0100
Subject: [PATCH 596/794] emacsPackages.tawny-mode: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 6071e025f44..ba11bfcbea7 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -210,9 +210,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
         });
 
-        # upstream issue: missing file header
-        tawny-mode = markBroken super.tawny-mode;
-
         # Telega has a server portion for it's network protocol
         telega = super.telega.overrideAttrs(old: {
 

From d2bb61139c9ebcffba59e2a3f12e2c20842cea6a Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:50:11 +0100
Subject: [PATCH 597/794] emacsPackages.textmate: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index ba11bfcbea7..d0cc20d6133 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -228,9 +228,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         });
 
-        # upstream issue: missing file header
-        textmate = markBroken super.textmate;
-
         # missing OCaml
         utop = markBroken super.utop;
 
@@ -339,6 +336,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         speech-tagger = markBroken super.speech-tagger;
 
+        # upstream issue: missing file header
+        textmate = markBroken super.textmate;
+
         # upstream issue: missing file header
         link = markBroken super.link;
 

From 5d45d563bac8191587b4d97e4e052db82b43a7e1 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:50:30 +0100
Subject: [PATCH 598/794] emacsPackages.utop: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index d0cc20d6133..6b5eeb8f3f8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -228,9 +228,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         });
 
-        # missing OCaml
-        utop = markBroken super.utop;
-
         vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {
           nativeBuildInputs =
             (attrs.nativeBuildInputs or []) ++ [ external.git ];

From 7ace8446b6acb9a5a1437de7a679975b3de08fbd Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:50:54 +0100
Subject: [PATCH 599/794] emacsPackages.voca-builder: Unmark as broken from
 melpa

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 6b5eeb8f3f8..4efa915cdfa 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -233,9 +233,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
-        # upstream issue: missing file header
-        voca-builder = markBroken super.voca-builder;
-
         # upstream issue: missing file header
         window-numbering = markBroken super.window-numbering;
 
@@ -341,6 +338,8 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         # missing OCaml
         merlin = markBroken super.merlin;
+        # upstream issue: missing file header
+        voca-builder = markBroken super.voca-builder;
 
         # upstream issue: missing file header
         po-mode = markBroken super.po-mode;

From 18ce1d7d52dc75976282380c409646f5a34893ca Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:51:24 +0100
Subject: [PATCH 600/794] emacsPackages.window-numbering: Unmark as broken from
 melpa

---
 .../editors/emacs-modes/melpa-packages.nix           | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 4efa915cdfa..a1476875c93 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -233,9 +233,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
-        # upstream issue: missing file header
-        window-numbering = markBroken super.window-numbering;
-
         zmq = super.zmq.overrideAttrs(old: {
           stripDebugList = [ "share" ];
           preBuild = ''
@@ -336,22 +333,15 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         link = markBroken super.link;
 
-        # missing OCaml
-        merlin = markBroken super.merlin;
         # upstream issue: missing file header
         voca-builder = markBroken super.voca-builder;
 
         # upstream issue: missing file header
-        po-mode = markBroken super.po-mode;
+        window-numbering = markBroken super.window-numbering;
 
-        # upstream issue: truncated file
-        powershell = markBroken super.powershell;
       };
 
       unstable = shared // {
-        # upstream issue: mismatched filename
-        ack-menu = markBroken super.ack-menu;
-
         editorconfig = super.editorconfig.overrideAttrs (attrs: {
           propagatedUserEnvPkgs = [ external.editorconfig-core-c ];
         });

From b5941206ee5a1b8a84933658002d4e3e8911d16f Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:51:47 +0100
Subject: [PATCH 601/794] emacsPackages.cmake-mode: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index a1476875c93..ffca6f78bb9 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -278,7 +278,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         # part of a larger package
         # upstream issue: missing package version
-        cmake-mode = markBroken (dontConfigure super.cmake-mode);
+        cmake-mode = dontConfigure super.cmake-mode;
 
         # upstream issue: missing file header
         connection = markBroken super.connection;

From 7b32590aefaed60685eb051634755d922af2d9fa Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:52:03 +0100
Subject: [PATCH 602/794] emacsPackages.emr: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index ffca6f78bb9..ae0f490d3b9 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -289,9 +289,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # missing git
         egg = markBroken super.egg;
 
-        # upstream issue: missing dependency redshank
-        emr = markBroken super.emr;
-
         # upstream issue: doesn't build
         eterm-256color = markBroken super.eterm-256color;
         # upstream issue: missing file header

From 9bcc28325e76b7019813d1c73bae89b2389f2659 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:52:28 +0100
Subject: [PATCH 603/794] emacsPackages.eterm-256color: Unmark as broken from
 melpa

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index ae0f490d3b9..74cfce38755 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -289,8 +289,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # missing git
         egg = markBroken super.egg;
 
-        # upstream issue: doesn't build
-        eterm-256color = markBroken super.eterm-256color;
         # upstream issue: missing file header
         elmine = markBroken super.elmine;
 
@@ -314,6 +312,8 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         maxframe = markBroken super.maxframe;
 
+        # upstream issue: doesn't build
+        eterm-256color = markBroken super.eterm-256color;
 
         # Expects bash to be at /bin/bash
         helm-rtags = markBroken super.helm-rtags;

From 16c57cb76ba94bb959981f8e29385cb100031628 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:52:52 +0100
Subject: [PATCH 604/794] emacsPackages.evil-search-highlight-persist: Unmark
 as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 74cfce38755..bc9dcbdefc2 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -292,8 +292,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         elmine = markBroken super.elmine;
 
-        # upstream issue: missing dependency highlight
-        evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
         # upstream issue: missing file header
         ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
 

From cc2547d33d5450ff2a40b4b5693616bd82b402fb Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:53:05 +0100
Subject: [PATCH 605/794] emacsPackages.floobits: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index bc9dcbdefc2..d8466ce686d 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -295,8 +295,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
 
-        # upstream issue: missing dependency highlight
-        floobits  = markBroken super.floobits;
         # upstream issue: missing file header
         initsplit = markBroken super.initsplit;
 

From ea9f3bafcd17f48d5e6c8576db805df59f535cdc Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:53:25 +0100
Subject: [PATCH 606/794] emacsPackages.flycheck-ocaml: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index d8466ce686d..cab6e29fbc0 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -298,8 +298,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         initsplit = markBroken super.initsplit;
 
-        # missing OCaml
-        flycheck-ocaml = markBroken super.flycheck-ocaml;
         # upstream issue: missing file header
         jsfmt = markBroken super.jsfmt;
 

From c39104bcff195aad44787398af8b6dab77ecbf32 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:53:43 +0100
Subject: [PATCH 607/794] emacsPackages.fold-dwim-org: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index cab6e29fbc0..659c202662c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -301,8 +301,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         jsfmt = markBroken super.jsfmt;
 
-        # upstream issue: missing dependency
-        fold-dwim-org = markBroken super.fold-dwim-org;
         # upstream issue: missing file header
         maxframe = markBroken super.maxframe;
 

From a8715b4df783c9f6722da78f936b5701c78b47a1 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:53:57 +0100
Subject: [PATCH 608/794] emacsPackages.helm-lobsters: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 659c202662c..f5894a0cc35 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -352,9 +352,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
-        # upstream issue: mismatched filename
-        helm-lobsters = markBroken super.helm-lobsters;
-
         # Expects bash to be at /bin/bash
         helm-rtags = markBroken super.helm-rtags;
 

From e018f9cf409b4001925ebcd08be1f49142f2f670 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:54:10 +0100
Subject: [PATCH 609/794] emacsPackages.processing-snippets: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index f5894a0cc35..cbf862daa84 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -367,9 +367,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           HOME = "/tmp";
         });
 
-        # upstream issue: mismatched filename
-        processing-snippets = markBroken super.processing-snippets;
-
         racer = super.racer.overrideAttrs (attrs: {
           postPatch = attrs.postPatch or "" + ''
             substituteInPlace racer.el \

From d835da5ee9970616171b7e685a9ca0ecad0190c4 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 31 Aug 2019 23:54:24 +0100
Subject: [PATCH 610/794] emacsPackages.seoul256-theme: Unmark as broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index cbf862daa84..3ae494baf92 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -374,9 +374,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           '';
         });
 
-        # upstream issue: missing file footer
-        seoul256-theme = markBroken super.seoul256-theme;
-
         spaceline = super.spaceline.override {
           inherit (self.melpaPackages) powerline;
         };

From 10f5f8c5d8036f5eac629df7939ed5e6c1bcabbb Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 1 Sep 2019 00:27:56 +0200
Subject: [PATCH 611/794] google-compute-engine: patch shebangs in $out/bin,
 properly patch systemctl

---
 .../virtualization/google-compute-engine/default.nix  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 5abdcc23a74..d4c817b7ecb 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -22,13 +22,16 @@ buildPythonApplication rec {
     sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp";
   };
 
+  buildInputs = [ bash ];
+  propagatedBuildInputs = [ boto setuptools distro ];
+
+
   postPatch = ''
     for file in $(find google_compute_engine -type f); do
       substituteInPlace "$file" \
-        --replace /bin/systemctl "${systemd}/bin/systemctl" \
+        --replace /bin/systemctl "/run/current-system/sw/bin/systemctl" \
         --replace /bin/bash "${bashInteractive}/bin/bash" \
         --replace /sbin/hwclock "${utillinux}/bin/hwclock"
-
       # SELinux tool ???  /sbin/restorecon
     done
 
@@ -42,9 +45,9 @@ buildPythonApplication rec {
     # allows to install the package in `services.udev.packages` in NixOS
     mkdir -p $out/lib/udev/rules.d
     cp -r google_config/udev/*.rules $out/lib/udev/rules.d
-  '';
 
-  propagatedBuildInputs = [ boto setuptools distro ];
+    patchShebangs $out/bin/*
+  '';
 
   doCheck = false;
 

From d658dd4ce0bf1c9b0206b1cb737ea3bfb4fdd6dd Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 1 Sep 2019 00:28:28 +0200
Subject: [PATCH 612/794] google-compute-config.nix: add coreutils to
 google-instance-setup's $PATH

It executes bin/google_set_multiqueue which will execute basename
---
 nixos/modules/virtualisation/google-compute-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index 61bced59862..41fbf4702e8 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -73,7 +73,7 @@ in
     description = "Google Compute Engine Instance Setup";
     after = [ "network-online.target" "network.target" "rsyslog.service" ];
     before = [ "sshd.service" ];
-    path = with pkgs; [ ethtool openssh ];
+    path = with pkgs; [ coreutils ethtool openssh ];
     serviceConfig = {
       ExecStart = "${gce}/bin/google_instance_setup";
       StandardOutput="journal+console";

From cb8d815b5b96c1abe632e9b01926d4db0c79243a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 1 Sep 2019 02:24:38 +0200
Subject: [PATCH 613/794] linux/kernel: enable QoS and/or fair queueing

This allows to set queueing disciplines different than a simple fifo,
like fq_codel, which is the default in systemd since quite some time.

NET_SCHED is already set in the kernels x86_64_defconfig, but not on
arm/aarch64, so let's set it here.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index b392dc853d3..42230fe31ec 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -123,6 +123,7 @@ let
       IPV6_FOU_TUNNEL             = whenAtLeast "4.7" module;
       NET_CLS_BPF                 = whenAtLeast "4.4" module;
       NET_ACT_BPF                 = whenAtLeast "4.4" module;
+      NET_SCHED                   = yes;
       L2TP_V3                     = yes;
       L2TP_IP                     = module;
       L2TP_ETH                    = module;

From e95d4c734acf71813c33872c7f1a09bd13abd96d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 1 Sep 2019 02:55:28 +0200
Subject: [PATCH 614/794] google-compute-config.nix: use sysctl snippets from
 gce

We make them available at ${gce}/sysctl.d and add them to
environments.etc, like we do with the systemd ones.
---
 .../virtualisation/google-compute-config.nix  | 78 +------------------
 .../google-compute-engine/default.nix         |  4 +
 2 files changed, 5 insertions(+), 77 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index 41fbf4702e8..327324f2921 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -144,81 +144,5 @@ in
     wantedBy = [ "multi-user.target" ];
   };
 
-
-  # Settings taken from https://github.com/GoogleCloudPlatform/compute-image-packages/blob/master/google_config/sysctl/11-gce-network-security.conf
-  boot.kernel.sysctl = {
-    # Turn on SYN-flood protections.  Starting with 2.6.26, there is no loss
-    # of TCP functionality/features under normal conditions.  When flood
-    # protections kick in under high unanswered-SYN load, the system
-    # should remain more stable, with a trade off of some loss of TCP
-    # functionality/features (e.g. TCP Window scaling).
-    "net.ipv4.tcp_syncookies" = mkDefault "1";
-
-    # ignores ICMP redirects
-    "net.ipv4.conf.all.accept_redirects" = mkDefault "0";
-
-    # ignores ICMP redirects
-    "net.ipv4.conf.default.accept_redirects" = mkDefault "0";
-
-    # ignores ICMP redirects from non-GW hosts
-    "net.ipv4.conf.all.secure_redirects" = mkDefault "1";
-
-    # ignores ICMP redirects from non-GW hosts
-    "net.ipv4.conf.default.secure_redirects" = mkDefault "1";
-
-    # don't allow traffic between networks or act as a router
-    "net.ipv4.ip_forward" = mkDefault "0";
-
-    # don't allow traffic between networks or act as a router
-    "net.ipv4.conf.all.send_redirects" = mkDefault "0";
-
-    # don't allow traffic between networks or act as a router
-    "net.ipv4.conf.default.send_redirects" = mkDefault "0";
-
-    # strict reverse path filtering - IP spoofing protection
-    "net.ipv4.conf.all.rp_filter" = mkDefault "1";
-
-    # strict path filtering - IP spoofing protection
-    "net.ipv4.conf.default.rp_filter" = mkDefault "1";
-
-    # ignores ICMP broadcasts to avoid participating in Smurf attacks
-    "net.ipv4.icmp_echo_ignore_broadcasts" = mkDefault "1";
-
-    # ignores bad ICMP errors
-    "net.ipv4.icmp_ignore_bogus_error_responses" = mkDefault "1";
-
-    # logs spoofed, source-routed, and redirect packets
-    "net.ipv4.conf.all.log_martians" = mkDefault "1";
-
-    # log spoofed, source-routed, and redirect packets
-    "net.ipv4.conf.default.log_martians" = mkDefault "1";
-
-    # implements RFC 1337 fix
-    "net.ipv4.tcp_rfc1337" = mkDefault "1";
-
-    # randomizes addresses of mmap base, heap, stack and VDSO page
-    "kernel.randomize_va_space" = mkDefault "2";
-
-    # Reboot the machine soon after a kernel panic.
-    "kernel.panic" = mkDefault "10";
-
-    ## Not part of the original config
-
-    # provides protection from ToCToU races
-    "fs.protected_hardlinks" = mkDefault "1";
-
-    # provides protection from ToCToU races
-    "fs.protected_symlinks" = mkDefault "1";
-
-    # makes locating kernel addresses more difficult
-    "kernel.kptr_restrict" = mkDefault "1";
-
-    # set ptrace protections
-    "kernel.yama.ptrace_scope" = mkOverride 500 "1";
-
-    # set perf only available to root
-    "kernel.perf_event_paranoid" = mkDefault "2";
-
-  };
-
+  environment.etc."sysctl.d/11-gce-network-security.conf".source = "${gce}/sysctl.d/11-gce-network-security.conf";
 }
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index d4c817b7ecb..48255ca68a7 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -46,6 +46,10 @@ buildPythonApplication rec {
     mkdir -p $out/lib/udev/rules.d
     cp -r google_config/udev/*.rules $out/lib/udev/rules.d
 
+    # sysctl snippets will be used by google-compute-config.nix
+    mkdir -p $out/sysctl.d
+    cp google_config/sysctl/*.conf $out/sysctl.d
+
     patchShebangs $out/bin/*
   '';
 

From a93a14e31c3b7709c6abca7d8de172cadd93736a Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann.hodique@gmail.com>
Date: Sat, 31 Aug 2019 17:59:29 -0700
Subject: [PATCH 615/794] ghq: 0.10.2 -> 0.12.6

---
 .../git-and-tools/ghq/default.nix             |  4 +-
 .../git-and-tools/ghq/deps.nix                | 92 ++++---------------
 2 files changed, 21 insertions(+), 75 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index 3c0653529ce..b73825737df 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "ghq";
-  version = "0.10.2";
+  version = "0.12.6";
 
   goPackagePath = "github.com/motemen/ghq";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "motemen";
     repo = "ghq";
     rev = "v${version}";
-    sha256 = "1i7zmgv7760nrw8sayag90b8vvmbsiifgiqki5s3gs3ldnvlki5w";
+    sha256 = "14rm7fvphr7r9x0ys10vhzjwhfhhscgr574n1i1z4lzw551lrnp4";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
index be99aee64a5..dde1b19b4c3 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
@@ -1,12 +1,12 @@
 # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
 [
   {
-    goPackagePath = "github.com/blang/semver";
+    goPackagePath = "github.com/Songmu/gitconfig";
     fetch = {
       type = "git";
-      url = "https://github.com/blang/semver";
-      rev = "v3.5.1";
-      sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
+      url = "https://github.com/Songmu/gitconfig";
+      rev = "v0.0.2";
+      sha256 = "0w1xd1mzxzwh755l6lgpn6psjp959kvx89l39zhc8lag9jh7rc44";
     };
   }
   {
@@ -18,24 +18,6 @@
       sha256 = "18piv4zzcb8abbc7fllz9p6rd4zhsy1gc6iygym381caggmmgxgk";
     };
   }
-  {
-    goPackagePath = "github.com/fsnotify/fsnotify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fsnotify/fsnotify";
-      rev = "v1.4.7";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev = "v1.2.0";
-      sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
-    };
-  }
   {
     goPackagePath = "github.com/golangplus/bytes";
     fetch = {
@@ -63,15 +45,6 @@
       sha256 = "1g83sjvcavqbh92vyirc48mrqd18yfci08zya0hrgk840cr94czc";
     };
   }
-  {
-    goPackagePath = "github.com/hpcloud/tail";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hpcloud/tail";
-      rev = "v1.0.0";
-      sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
-    };
-  }
   {
     goPackagePath = "github.com/motemen/go-colorine";
     fetch = {
@@ -81,24 +54,6 @@
       sha256 = "1mdy6q0926s1frj027nlzlvm2qssmkpjis7ic3l2smajkzh07118";
     };
   }
-  {
-    goPackagePath = "github.com/onsi/ginkgo";
-    fetch = {
-      type = "git";
-      url = "https://github.com/onsi/ginkgo";
-      rev = "v1.6.0";
-      sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25";
-    };
-  }
-  {
-    goPackagePath = "github.com/onsi/gomega";
-    fetch = {
-      type = "git";
-      url = "https://github.com/onsi/gomega";
-      rev = "v1.5.0";
-      sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9";
-    };
-  }
   {
     goPackagePath = "github.com/urfave/cli";
     fetch = {
@@ -122,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "4829fb13d2c6";
-      sha256 = "05nwpw41d7xsdln5rj381n8j9dsbq5ng1wp52bxslqc4x0l5s9fj";
+      rev = "3ec191127204";
+      sha256 = "0zzhbkw3065dp1jscp7q8dxw3mkwj95ixnrr8j7c47skis0m11i3";
     };
   }
   {
@@ -131,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sync";
-      rev = "1d60e4601c6f";
-      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+      rev = "112230192c58";
+      sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
     };
   }
   {
@@ -153,6 +108,15 @@
       sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
     };
   }
+  {
+    goPackagePath = "golang.org/x/xerrors";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/xerrors";
+      rev = "3ee3066db522";
+      sha256 = "12xyaa116bq9zy25fwk7zzi83v8aab9lm91pqg0c3jrfkjdbr255";
+    };
+  }
   {
     goPackagePath = "gopkg.in/check.v1";
     fetch = {
@@ -162,31 +126,13 @@
       sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
     };
   }
-  {
-    goPackagePath = "gopkg.in/fsnotify.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/fsnotify.v1";
-      rev = "v1.4.7";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/tomb.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/tomb.v1";
-      rev = "dd632973f1e7";
-      sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
-    };
-  }
   {
     goPackagePath = "gopkg.in/yaml.v2";
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "v2.2.1";
-      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+      rev = "v2.2.2";
+      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
     };
   }
 ]

From d3de35967ae1dc22980807b3390e5e82dcac72dc Mon Sep 17 00:00:00 2001
From: Marti Serra <marti.serra.coscollano@gmail.com>
Date: Sat, 31 Aug 2019 10:18:12 +0200
Subject: [PATCH 616/794] crashplan, crashplan-small-business: remove pkg and
 module

---
 nixos/doc/manual/release-notes/rl-1909.xml    |   9 ++
 nixos/modules/module-list.nix                 |   2 -
 .../backup/crashplan-small-business.nix       |  73 -------------
 nixos/modules/services/backup/crashplan.nix   |  67 ------------
 .../backup/crashplan/CrashPlanDesktop.patch   |  12 --
 .../backup/crashplan/CrashPlanEngine.patch    |  37 -------
 .../crashplan/crashplan-small-business.nix    | 103 ------------------
 .../applications/backup/crashplan/default.nix |  81 --------------
 pkgs/top-level/all-packages.nix               |   3 -
 9 files changed, 9 insertions(+), 378 deletions(-)
 delete mode 100644 nixos/modules/services/backup/crashplan-small-business.nix
 delete mode 100644 nixos/modules/services/backup/crashplan.nix
 delete mode 100644 pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
 delete mode 100644 pkgs/applications/backup/crashplan/CrashPlanEngine.patch
 delete mode 100644 pkgs/applications/backup/crashplan/crashplan-small-business.nix
 delete mode 100644 pkgs/applications/backup/crashplan/default.nix

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 560b3198517..becc0a6e6ed 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -591,6 +591,15 @@
      The defaults from fontconfig are sufficient.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      The <literal>crashplan</literal> package and the
+      <literal>crashplan</literal> service have been removed from nixpkgs due to
+      crashplan shutting down the service, while the <literal>crashplansb</literal>
+      package and <literal>crashplan-small-business</literal> service have been
+      removed from nixpkgs due to lack of maintainer.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 22fd5d7609d..e8a868cf1c6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -214,8 +214,6 @@
   ./services/backup/bacula.nix
   ./services/backup/borgbackup.nix
   ./services/backup/duplicati.nix
-  ./services/backup/crashplan.nix
-  ./services/backup/crashplan-small-business.nix
   ./services/backup/duplicity.nix
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixos/modules/services/backup/crashplan-small-business.nix
deleted file mode 100644
index 790dafefe66..00000000000
--- a/nixos/modules/services/backup/crashplan-small-business.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  cfg = config.services.crashplansb;
-  crashplansb = pkgs.crashplansb.override { maxRam = cfg.maxRam; };
-in
-
-with lib;
-
-{
-  options = {
-    services.crashplansb = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Starts crashplan for small business background service.
-        '';
-      };
-      maxRam = mkOption {
-        default = "1024m";
-        example = "2G";
-        type = types.str;
-        description = ''
-          Maximum amount of ram that the crashplan engine should use.
-        '';
-      };
-      openPorts = mkOption {
-        description = "Open ports in the firewall for crashplan.";
-        default = true;
-        type = types.bool;
-      };
-      ports =  mkOption {
-        # https://support.code42.com/Administrator/6/Planning_and_installing/TCP_and_UDP_ports_used_by_the_Code42_platform
-        # used ports can also be checked in the desktop app console using the command connection.info
-        description = "which ports to open.";
-        default = [ 4242 4243 4244 4247 ];
-        type = types.listOf types.int;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ crashplansb ];
-    networking.firewall.allowedTCPPorts = mkIf cfg.openPorts cfg.ports;
-
-    systemd.services.crashplansb = {
-      description = "CrashPlan Backup Engine";
-
-      wantedBy = [ "multi-user.target" ];
-      after    = [ "network.target" "local-fs.target" ];
-
-      preStart = ''
-        install -d -m 755 ${crashplansb.vardir}
-        install -d -m 700 ${crashplansb.vardir}/conf
-        install -d -m 700 ${crashplansb.manifestdir}
-        install -d -m 700 ${crashplansb.vardir}/cache
-        install -d -m 700 ${crashplansb.vardir}/backupArchives
-        install -d -m 777 ${crashplansb.vardir}/log
-        cp -avn ${crashplansb}/conf.template/* ${crashplansb.vardir}/conf
-      '';
-
-      serviceConfig = {
-        Type = "forking";
-        EnvironmentFile = "${crashplansb}/bin/run.conf";
-        ExecStart = "${crashplansb}/bin/CrashPlanEngine start";
-        ExecStop = "${crashplansb}/bin/CrashPlanEngine stop";
-        PIDFile = "${crashplansb.vardir}/CrashPlanEngine.pid";
-        WorkingDirectory = crashplansb;
-      };
-    };
-  };
-}
diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix
deleted file mode 100644
index c540cc6e2ae..00000000000
--- a/nixos/modules/services/backup/crashplan.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  cfg = config.services.crashplan;
-  crashplan = pkgs.crashplan;
-in
-
-with lib;
-
-{
-  options = {
-    services.crashplan = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Starts crashplan background service.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ crashplan ];
-
-    systemd.services.crashplan = {
-      description = "CrashPlan Backup Engine";
-
-      wantedBy = [ "multi-user.target" ];
-      after    = [ "network.target" "local-fs.target" ];
-
-      preStart = ''
-        ensureDir() {
-          dir=$1
-          mode=$2
-
-          if ! test -e $dir; then
-            ${pkgs.coreutils}/bin/mkdir -m $mode -p $dir
-          elif [ "$(${pkgs.coreutils}/bin/stat -c %a $dir)" != "$mode" ]; then
-            ${pkgs.coreutils}/bin/chmod $mode $dir
-          fi
-        }
-
-        ensureDir ${crashplan.vardir} 755
-        ensureDir ${crashplan.vardir}/conf 700
-        ensureDir ${crashplan.manifestdir} 700
-        ensureDir ${crashplan.vardir}/cache 700
-        ensureDir ${crashplan.vardir}/backupArchives 700
-        ensureDir ${crashplan.vardir}/log 777
-        cp -avn ${crashplan}/conf.template/* ${crashplan.vardir}/conf
-        for x in app.asar bin install.vars lang lib libc42archive64.so libc52archive.so libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libleveldb64.so libleveldb.so libmd564.so libmd5.so share skin upgrade; do
-          rm -f ${crashplan.vardir}/$x;
-          ln -sf ${crashplan}/$x ${crashplan.vardir}/$x;
-        done
-      '';
-
-      serviceConfig = {
-        Type = "forking";
-        EnvironmentFile = "${crashplan}/bin/run.conf";
-        ExecStart = "${crashplan}/bin/CrashPlanEngine start";
-        ExecStop = "${crashplan}/bin/CrashPlanEngine stop";
-        PIDFile = "${crashplan.vardir}/CrashPlanEngine.pid";
-        WorkingDirectory = crashplan;
-      };
-    };
-  };
-}
diff --git a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
deleted file mode 100644
index 7fa68ba4a38..00000000000
--- a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./scripts/CrashPlanDesktop	2016-03-02 21:01:58.000000000 -0500
-+++ ./scripts/CrashPlanDesktop-1	2016-03-18 20:52:10.117686266 -0400
-@@ -11,7 +11,7 @@
- cd ${TARGETDIR}
- 
- if [ "_${VERSION_5_UI}" == "_true" ]; then
--	${TARGETDIR}/electron/crashplan > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
-+	${TARGETDIR}/electron/crashplan &
- else
--	${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
-+	${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop &
- fi
diff --git a/pkgs/applications/backup/crashplan/CrashPlanEngine.patch b/pkgs/applications/backup/crashplan/CrashPlanEngine.patch
deleted file mode 100644
index de2afe2da68..00000000000
--- a/pkgs/applications/backup/crashplan/CrashPlanEngine.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./scripts/CrashPlanEngine	2014-02-19 23:17:19.000000000 +0000
-+++ ./scripts/CrashPlanEngine.1	2014-07-24 17:36:37.330333581 +0100
-@@ -11,7 +11,7 @@
- 	
- 	cd $TARGETDIR
- 		
--	nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log & 
-+	nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log & 
- 	
- 	if [[ $! -gt 0 ]]; then
- 		echo $! > $PIDFILE
-@@ -26,7 +26,7 @@
- 
- 	echo "Using Ubuntu 9.04 startup"
- 	
--	start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log
-+	start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log
- 	
- 	# This test isn't as useful as one might like; start-stop-daemon can't accurately report the state of child processes when --background is used.
- 	# We use this mainly to report the specific error value returned by start-stop-daemon if something goes wrong, but be aware that a return value
-@@ -91,7 +91,6 @@
- DESC="CrashPlan Engine"
- NAME=CrashPlanEngine
- DAEMON=$TARGETDIR/lib/com.backup42.desktop.jar
--PIDFILE="$TARGETDIR/${NAME}.pid"
- 
- if [[ -f $TARGETDIR/install.vars ]]; then
- 	. $TARGETDIR/install.vars
-@@ -100,6 +99,8 @@
- 	exit 1
- fi
- 
-+PIDFILE="$VARDIR/${NAME}.pid"
-+
- if [[ ! -f $DAEMON ]]; then
- 	echo "Could not find JAR file $DAEMON"
- 	exit 0
diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
deleted file mode 100644
index 5db4badeb6c..00000000000
--- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
-  procps, which, gtk2, atk, glib, pango, gdk-pixbuf, cairo, freetype,
-  fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev,
-  libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
-  libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
-  maxRam ? "1024m" }:
-
-stdenv.mkDerivation rec {
-  version = "6.7.0";
-  rev = "1512021600670_4503";
-  pname = "CrashPlanSmb";
-  name = "${pname}_${version}_${rev}";
-
-  src = fetchurl {
-    url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz";
-    sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q";
-  };
-
-  nativeBuildInputs = [ makeWrapper cpio nodePackages.asar ];
-  buildInputs = [ getopt which ];
-
-  vardir = "/var/lib/crashplan";
-  manifestdir = "${vardir}/manifest";
-
-  postPatch = ''
-    # patch scripts/CrashPlanEngine
-    substituteInPlace scripts/CrashPlanEngine \
-      --replace /bin/ps ${procps}/bin/ps \
-      --replace awk ${gawk}/bin/awk \
-      --replace '`sed' '`${gnused}/bin/sed' \
-      --replace grep ${gnugrep}/bin/grep \
-      --replace TARGETDIR/log VARDIR/log \
-      --replace TARGETDIR/\''${NAME} VARDIR/\''${NAME} \
-      --replace \$TARGETDIR/bin/run.conf $out/bin/run.conf \
-      --replace \$VARDIR ${vardir}
-
-    # patch scripts/CrashPlanDesktop
-    substituteInPlace scripts/CrashPlanDesktop \
-      --replace awk ${gawk}/bin/awk \
-      --replace "\"\$SCRIPTDIR/..\"" "$out" \
-      --replace "\$(dirname \$SCRIPT)" "$out" \
-      --replace "\''${TARGETDIR}/log" ${vardir}/log \
-      --replace "\''${TARGETDIR}" "$out"
-  '';
-
-  installPhase = ''
-    mkdir $out
-    zcat -v ${pname}_${version}.cpi | (cd $out; cpio -i -d -v --no-preserve-owner)
-
-    install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop
-    install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine
-    install -D -m 644 scripts/run.conf $out/bin/run.conf
-    install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop
-
-    # unpack, patch and repack app.asar to stop electron from creating /usr/local/crashplan/log to store the ui logs.
-    asar e $out/app.asar $out/app.asar-unpacked
-    rm -v $out/app.asar
-    substituteInPlace $out/app.asar-unpacked/shared_modules/shell/platform_paths.js \
-      --replace "getLogFileParentPath();" "\"$vardir/log\";"
-    asar p $out/app.asar-unpacked $out/app.asar
-
-    mv -v $out/*.asar $out/electron/resources
-    chmod 755 "$out/electron/crashplan"
-
-    rm -r $out/log
-    mv -v $out/conf $out/conf.template
-    ln -s $vardir/log $out/log
-    ln -s $vardir/cache $out/cache
-    ln -s $vardir/conf $out/conf
-
-    substituteInPlace $out/bin/run.conf \
-      --replace "-Xmx1024m" "-Xmx${maxRam}"
-
-    echo "JAVACOMMON=${jre}/bin/java" > $out/install.vars
-    echo "APP_BASENAME=CrashPlan" >> $out/install.vars
-    echo "TARGETDIR=$out" >> $out/install.vars
-    echo "BINSDIR=$out/bin" >> $out/install.vars
-    echo "MANIFESTDIR=${manifestdir}" >> $out/install.vars
-    echo "VARDIR=${vardir}" >> $out/install.vars
-    echo "INITDIR=" >> $out/install.vars
-    echo "RUNLVLDIR=" >> $out/install.vars
-    echo "INSTALLDATE=" >> $out/install.vars
-
-  '';
-
-  postFixup = ''
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan
-    wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
-      stdenv.cc.cc.lib gtk2 atk glib pango gdk-pixbuf cairo freetype
-      fontconfig dbus gconf nss nspr alsaLib cups expat udev
-      libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
-      libXext libXfixes libXrender libXtst libXScrnSaver]}"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "An online backup solution";
-    homepage = http://www.crashplan.com/business/;
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ xvapx ];
-    broken = true; # 2018-12-06
-  };
-}
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
deleted file mode 100644
index 2c76891b3f9..00000000000
--- a/pkgs/applications/backup/crashplan/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, gtk2, glib, libXtst }:
-
-stdenv.mkDerivation rec {
-  version = "4.8.3";
-  rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time
-  name = "crashplan-${version}-r${rev}";
-
-  src = fetchurl {
-    url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
-    sha256 = "c25d87ec1d442a396b668547e39b70d66dcfe02250cc57a25916ebb42a407113";
-  };
-
-  meta = with stdenv.lib; {
-    description = "An online/offline backup solution";
-    homepage = http://www.crashplan.org;
-    license = licenses.unfree;
-    maintainers = with maintainers; [ sztupi domenkozar jerith666 ];
-  };
-
-  buildInputs = [ makeWrapper cpio ];
-
-  vardir = "/var/lib/crashplan";
-
-  manifestdir = "${vardir}/manifest";
-
-  patches = [ ./CrashPlanEngine.patch ./CrashPlanDesktop.patch ];
-
-  installPhase = ''
-    mkdir $out
-    zcat -v CrashPlan_${version}.cpi | (cd $out; cpio -i -d -v --no-preserve-owner)
-
-    # sed -i "s|<manifestPath>manifest</manifestPath>|<manifestPath>${manifestdir}</manifestPath>|g" $out/conf/default.service.xml
-
-    # Fix for encoding troubles (CrashPlan ticket 178827)
-    # Make sure the daemon is running using the same localization as
-    # the (installing) user
-    echo "" >> run.conf
-    echo "LC_ALL=en_US.UTF-8" >> run.conf
-
-    install -d -m 755 unpacked $out
-
-    install -D -m 644 run.conf $out/bin/run.conf
-    install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop
-    install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine
-    install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop
-
-    rm -r $out/log
-    mv -v $out/conf $out/conf.template
-    ln -s $vardir/log $out/log
-    ln -s $vardir/cache $out/cache
-    ln -s $vardir/backupArchives $out/backupArchives
-    ln -s $vardir/conf $out/conf
-
-    echo "JAVACOMMON=${jre}/bin/java" > $out/install.vars
-    echo "APP_BASENAME=CrashPlan" >> $out/install.vars
-    echo "TARGETDIR=${vardir}" >> $out/install.vars
-    echo "BINSDIR=$out/bin" >> $out/install.vars
-    echo "MANIFESTDIR=${manifestdir}" >> $out/install.vars
-    echo "VARDIR=${vardir}" >> $out/install.vars
-    echo "INITDIR=" >> $out/install.vars
-    echo "RUNLVLDIR=" >> $out/install.vars
-    echo "INSTALLDATE=" >> $out/install.vars
-  '';
-
-  postFixup = ''
-    for f in $out/bin/CrashPlanDesktop $out/bin/CrashPlanEngine; do
-      echo "substitutions in $f"
-      substituteInPlace $f --replace /bin/ps  ${procps}/bin/ps
-      substituteInPlace $f --replace awk      ${gawk}/bin/awk
-      substituteInPlace $f --replace sed      ${gnused}/bin/sed
-      substituteInPlace $f --replace grep     ${gnugrep}/bin/grep
-    done
-    
-    substituteInPlace $out/share/applications/CrashPlan.desktop \
-      --replace /usr/local  $out \
-      --replace crashplan/skin skin \
-      --replace bin/CrashPlanDesktop CrashPlanDesktop
-
-    wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ gtk2 glib libXtst ]}"
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3756ecb0a65..05caaeeab9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23639,9 +23639,6 @@ in
 
   cups-zj-58 =  callPackage ../misc/cups/drivers/zj-58 { };
 
-  crashplan = callPackage ../applications/backup/crashplan { };
-  crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { gconf = gnome2.GConf; };
-
   colort = callPackage ../applications/misc/colort { };
 
   terminal-parrot = callPackage ../applications/misc/terminal-parrot { };

From 6e0e7aba2093d631fd1013f9b0d4f0b0c0340bec Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann.hodique@gmail.com>
Date: Sat, 31 Aug 2019 18:33:57 -0700
Subject: [PATCH 617/794] cayley: 0.6.1 -> 0.7.5

---
 pkgs/servers/cayley/default.nix |   4 +-
 pkgs/servers/cayley/deps.nix    | 399 ++++++++++++++++++++++++--------
 2 files changed, 301 insertions(+), 102 deletions(-)

diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix
index f9532d48a11..c9a39b691e7 100644
--- a/pkgs/servers/cayley/default.nix
+++ b/pkgs/servers/cayley/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "cayley";
-  version = "0.6.1";
+  version = "0.7.5";
 
   goPackagePath = "github.com/cayleygraph/cayley";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "cayleygraph";
     repo = "cayley";
     rev = "v${version}";
-    sha256 = "1r0kw3y32bqm7g37svzrch2qj9n45p93xmsrf7dj1cg4wwkb65ry";
+    sha256 = "1zfxa9z6spi6xw028mvbc7c3g517gn82g77ywr6picl47fr2blnd";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix
index 1e6fadf9f4d..eb3dce827bd 100644
--- a/pkgs/servers/cayley/deps.nix
+++ b/pkgs/servers/cayley/deps.nix
@@ -1,272 +1,471 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
 [
   {
-    goPackagePath = "github.com/badgerodon/peg";
+    goPackagePath  = "github.com/badgerodon/peg";
     fetch = {
       type = "git";
       url = "https://github.com/badgerodon/peg";
-      rev = "9e5f7f4d07ca576562618c23e8abadda278b684f";
+      rev =  "9e5f7f4d07ca576562618c23e8abadda278b684f";
       sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11";
     };
   }
   {
-    goPackagePath = "github.com/boltdb/bolt";
+    goPackagePath  = "github.com/boltdb/bolt";
     fetch = {
       type = "git";
       url = "https://github.com/boltdb/bolt";
-      rev = "a705895fdad108f053eae7ee011ed94a0541ee13";
-      sha256 = "0ql67l2hmjhplkl80j9a49qlra4qx671il5rgn58afkvk20cgq2r";
+      rev =  "e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd";
+      sha256 = "1sjxzz88bw0y37mk3xvwb9j5v7bz3r80rwg79jml6liqk1arnl99";
     };
   }
   {
-    goPackagePath = "github.com/cznic/mathutil";
+    goPackagePath  = "github.com/cznic/mathutil";
     fetch = {
       type = "git";
       url = "https://github.com/cznic/mathutil";
-      rev = "f9551431b78e71ee24939a1e9d8f49f43898b5cd";
-      sha256 = "1158mlwzryyna1qslr9v88i0k8x6m8vs4rljnnwh04rmd63ksj75";
+      rev =  "1447ad269d64ca91aa8d7079baa40b6fc8b965e7";
+      sha256 = "1r9c20k2h65g38yxf3vd46nbayx1cz5w4q4yr1xfggcs0mmrb87i";
     };
   }
   {
-    goPackagePath = "github.com/davecgh/go-spew";
+    goPackagePath  = "github.com/davecgh/go-spew";
     fetch = {
       type = "git";
       url = "https://github.com/davecgh/go-spew";
-      rev = "2df174808ee097f90d259e432cc04442cf60be21";
-      sha256 = "0jghd5dmwqpcjbxij9yjj8sjzll9s65i2qnxd8rdzwh77xdsfm9g";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
     };
   }
   {
-    goPackagePath = "github.com/dlclark/regexp2";
+    goPackagePath  = "github.com/dennwc/graphql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dennwc/graphql";
+      rev =  "12cfed44bc5de083875506a36d30f9798f9bca47";
+      sha256 = "1rfsxjjsik5618y2741lcyw56a4d4l6r04sbj1igrvcck9bz0k6a";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dlclark/regexp2";
     fetch = {
       type = "git";
       url = "https://github.com/dlclark/regexp2";
-      rev = "4009c9dc49dd8906bfd4d479c255470d6a477ce5";
-      sha256 = "1r6f0q1jvn1lkwqlrmmg5d90p6zss8s64jyp91hp6i97vpahq8xz";
+      rev =  "902a5ce7a7812e2ba9f73b9d96c09d5136df39cd";
+      sha256 = "0ypmdayq50ilbmqa1wjq5nvs9igbxkzlc8phlknw244935wz3v15";
     };
   }
   {
-    goPackagePath = "github.com/dop251/goja";
+    goPackagePath  = "github.com/dop251/goja";
     fetch = {
       type = "git";
       url = "https://github.com/dop251/goja";
-      rev = "64f863c4eb0329df18ecd1dab1e03609556bfaca";
-      sha256 = "0smipfs7fja286nvlr7q4b8f815br0nia0k4xp8y5fvprrzrm64h";
+      rev =  "ef8c030e3c96c5054c2f10ef925e7041e0583c07";
+      sha256 = "15419apwdpbl0lgnl9xj9wyl05vpiz6jqgj8zbcyxhzy0wycj445";
     };
   }
   {
-    goPackagePath = "github.com/gogo/protobuf";
+    goPackagePath  = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev =  "4da3e2cfbabc9f751898f250b49f2439785783a1";
+      sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-kivik/couchdb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-kivik/couchdb";
+      rev =  "74d231fe43245e77840213724894264f0f61ffd3";
+      sha256 = "0ga6d6y44wg8ync73wcyc7q7r3sr5vdj5qkn3yqn9yn4p0k2w89i";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-kivik/kivik";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-kivik/kivik";
+      rev =  "2a1f6b9dd407886bc59c0c28faed28fbce3b0ece";
+      sha256 = "0fpa62mriyiyl5dh5kg8858bqrwiwscpbkg9np69lk302znxalij";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-kivik/pouchdb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-kivik/pouchdb";
+      rev =  "bbd1ab79be17c809842e193b1f84e924b6b599ba";
+      sha256 = "15kv6i94j73c8zzy5hnmf051d3i65wxc07hvass9lc4g5ad7f9vf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-sourcemap/sourcemap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sourcemap/sourcemap";
+      rev =  "b019cc30c1eaa584753491b0d8f8c1534bf1eb44";
+      sha256 = "03k44fdrnknba05f7cd58lq4rzk7jdpiqksmc0wxrdzwschrbgw8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev =  "147bd02c2c516cf9a8878cb75898ee8a9eea0228";
+      sha256 = "0s75nilz1jx0vgc69jgmys95lsq9j9nfdjcc8inc8mhzh3qpjb74";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gogo/protobuf";
     fetch = {
       type = "git";
       url = "https://github.com/gogo/protobuf";
-      rev = "50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61";
-      sha256 = "09cad9j98pdqh1sp191j92ng6lvw9la3k3v6m5mv38nwirpwzra1";
+      rev =  "30433562cfbf487fe1df7cd26c7bab168d2f14d0";
+      sha256 = "155iv0jqgh0d8cykghw3ifwk8pjyyq1w4gr9khhf78n01k6180hj";
     };
   }
   {
-    goPackagePath = "github.com/golang/glog";
+    goPackagePath  = "github.com/golang/glog";
     fetch = {
       type = "git";
       url = "https://github.com/golang/glog";
-      rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+      rev =  "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
       sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
     };
   }
   {
-    goPackagePath = "github.com/golang/protobuf";
+    goPackagePath  = "github.com/golang/protobuf";
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "888eb0692c857ec880338addf316bd662d5e630e";
-      sha256 = "1vhx2dwr71hma9z3dfb3l1yrkjlry0glwxknxzyp9ds51i6pjiq0";
+      rev =  "18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8";
+      sha256 = "0fbf8ymrcb23imkhlrlyq6i0x5w8gxzilljjsgd4hnvjgpgp3r4v";
     };
   }
   {
-    goPackagePath = "github.com/hashicorp/go-cleanhttp";
+    goPackagePath  = "github.com/golang/snappy";
     fetch = {
       type = "git";
-      url = "https://github.com/hashicorp/go-cleanhttp";
-      rev = "ad28ea4487f05916463e2423a55166280e8254b5";
-      sha256 = "0xw0qas3ixg8p2xh09hhc81km0mfn9lbnfgrdb309hzcwhmiyqjm";
+      url = "https://github.com/golang/snappy";
+      rev =  "553a641470496b2327abcac10b36396bd98e45c9";
+      sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk";
     };
   }
   {
-    goPackagePath = "github.com/julienschmidt/httprouter";
+    goPackagePath  = "github.com/gopherjs/gopherjs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gopherjs/gopherjs";
+      rev =  "558a9132744c22476178edf3126fd35a9754f565";
+      sha256 = "13mn0li83amgm4fgsm6l3shs2r4kjddr10xn0ydnr9ymg1y887vi";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gopherjs/jsbuiltin";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gopherjs/jsbuiltin";
+      rev =  "67703bfb044e3192fbcab025c3aeaeedafad1f2f";
+      sha256 = "1k0df0z9fiyzbr1g1736zdp238j9z82q3gwkk060h2n84rg4c7lh";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev =  "7fa7fff964d035e8a162cce3a164b3ad02ad651b";
+      sha256 = "0p3dyhpc0ajakcww3a45n750z2030xqhlswzf51d5rzid27681wp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/imdario/mergo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/imdario/mergo";
+      rev =  "0d4b488675fdec1dde48751b05ab530cf0b630e1";
+      sha256 = "071rram7aib70f3gk4ansgwns82w9i6m1px8mgc8x4rs9ana4qhf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jackc/pgx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jackc/pgx";
+      rev =  "606697ffdfe6603013560dbc171656de57b4f542";
+      sha256 = "0818yb2vjjwwmscdab7wnxbyiabvy544icdczdlr5kswbqq5h25m";
+    };
+  }
+  {
+    goPackagePath  = "github.com/julienschmidt/httprouter";
     fetch = {
       type = "git";
       url = "https://github.com/julienschmidt/httprouter";
-      rev = "b59a38004596b696aca7aa2adccfa68760864d86";
-      sha256 = "0j1w2fkcghyw3lcsc13lwf2zqar9xyni2g7fqp4aq8g08ii7paac";
+      rev =  "6f3f3919c8781ce5c0509c83fffc887a7830c938";
+      sha256 = "1hmqdpv2zywwglmnjnxfn27mkac81n3nqs1wandlpybsww4vn4kx";
     };
   }
   {
-    goPackagePath = "github.com/lib/pq";
+    goPackagePath  = "github.com/lib/pq";
     fetch = {
       type = "git";
       url = "https://github.com/lib/pq";
-      rev = "0dad96c0b94f8dee039aa40467f767467392a0af";
-      sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4";
+      rev =  "2704adc878c21e1329f46f6e56a1c387d788ff94";
+      sha256 = "160fmvi7bczxw3i3h5s821hv029ph5ld8x3c36b4cz2sr30wp110";
     };
   }
   {
-    goPackagePath = "github.com/linkeddata/gojsonld";
+    goPackagePath  = "github.com/linkeddata/gojsonld";
     fetch = {
       type = "git";
       url = "https://github.com/linkeddata/gojsonld";
-      rev = "a223ef39bb925d36d4c410d3e35b0e34e370cc31";
-      sha256 = "1i3vl7gbkq2xl2wyv0kszj0x32vp8jw1cf0ngpdqdhdvnbfi1w7i";
+      rev =  "4f5db6791326b8962ede4edbba693edcf20fd1ad";
+      sha256 = "11g1kygkn55whaf49q2bzxk0w8b3nhdhiaixsj2ik65j8bl9g2cq";
     };
   }
   {
-    goPackagePath = "github.com/pborman/uuid";
+    goPackagePath  = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev =  "51463bfca2576e06c62a8504b5c0f06d61312647";
+      sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev =  "cc8532a8e9a55ea36402aa21efdf403a60d34096";
+      sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pborman/uuid";
     fetch = {
       type = "git";
       url = "https://github.com/pborman/uuid";
-      rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4";
-      sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";
+      rev =  "1b00554d822231195d1babd97ff4a781231955c9";
+      sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan";
     };
   }
   {
-    goPackagePath = "github.com/peterh/liner";
+    goPackagePath  = "github.com/pelletier/go-buffruneio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-buffruneio";
+      rev =  "c37440a7cf42ac63b919c752ca73a85067e05992";
+      sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev =  "fe206efb84b2bc8e8cfafe6b4c1826622be969e3";
+      sha256 = "1dlabfpnlzvwf4i86idy8ilqpjsl8yqfgdv0nv5cccm8gkcans5w";
+    };
+  }
+  {
+    goPackagePath  = "github.com/peterh/liner";
     fetch = {
       type = "git";
       url = "https://github.com/peterh/liner";
-      rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced";
-      sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48";
+      rev =  "88609521dc4b6c858fd4c98b628147da928ce4ac";
+      sha256 = "0jacb2fqgiccb98v1875j5xvj01l1z2laga1kgr8lhd0nl22r96k";
     };
   }
   {
-    goPackagePath = "github.com/pmezard/go-difflib";
+    goPackagePath  = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev =  "e881fd58d78e04cf6d0de1217f8707c8cc2249bc";
+      sha256 = "0vfhj598jp6dzy4pbyjdrqxzb5kppw8ggvfh78g80nz11r34xnzs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
     fetch = {
       type = "git";
       url = "https://github.com/pmezard/go-difflib";
-      rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d";
+      rev =  "d8ed2627bdf02c080bf22230dbb337003b7aba2d";
       sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs";
     };
   }
   {
-    goPackagePath = "github.com/robertkrimen/otto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/robertkrimen/otto";
-      rev = "d1b4d8ef0e0e4b088c8328c95ca63ab9ebd8fc9d";
-      sha256 = "0i31p3paz3n7qi2v1g77lm3cx2hssgwgcfpar4qc2vj7m4766884";
-    };
-  }
-  {
-    goPackagePath = "github.com/russross/blackfriday";
+    goPackagePath  = "github.com/russross/blackfriday";
     fetch = {
       type = "git";
       url = "https://github.com/russross/blackfriday";
-      rev = "17bb7999de6cfb791d4f8986cc00b3309b370cdb";
-      sha256 = "1md0sjw69mj359cb4c8ghzllcbn2lnkvby1203wl0pf5wbyfvm5s";
+      rev =  "b253417e1cb644d645a0a3bb1fa5034c8030127c";
+      sha256 = "1knj8vabymhmkg12cj3hnpqf3b74wwrvqib12yczcvpi52xaqi20";
     };
   }
   {
-    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+    goPackagePath  = "github.com/shurcooL/sanitized_anchor_name";
     fetch = {
       type = "git";
       url = "https://github.com/shurcooL/sanitized_anchor_name";
-      rev = "8e87604bec3c645a4eeaee97dfec9f25811ff20d";
-      sha256 = "05b6yj23c3xx446kanhaj1l83av8676z7si8n1f4sqy2pp7s966v";
+      rev =  "79c90efaf01eddc01945af5bc1797859189b830b";
+      sha256 = "1dj8v91gv1ssw2j88gjzr1hw0n63qqxykjzfbvspyi529xn3ji3y";
     };
   }
   {
-    goPackagePath = "github.com/sirupsen/logrus";
+    goPackagePath  = "github.com/spf13/afero";
     fetch = {
       type = "git";
-      url = "https://github.com/sirupsen/logrus";
-      rev = "08a8a7c27e3d058a8989316a850daad1c10bf4ab";
-      sha256 = "1fbh1b42alvpbw87v0v2hanliaqp6fm4h9n7byk921mcv6dai8fl";
+      url = "https://github.com/spf13/afero";
+      rev =  "9be650865eab0c12963d8753212f4f9c66cdcf12";
+      sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34";
     };
   }
   {
-    goPackagePath = "github.com/stretchr/testify";
+    goPackagePath  = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev =  "acbeb36b902d72a7a4c18e8f3241075e7ab763e4";
+      sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev =  "7b1b6e8dc027253d45fc029bc269d1c019f83a34";
+      sha256 = "1nhnlpmbqq1ggix7jaxmzr8awk1zrrzag4vzq1p5q5l25d6kih35";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev =  "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66";
+      sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev =  "f1d95a35e132e8a1868023a08932b14f0b8b8fcb";
+      sha256 = "0fwvkyq36jvy2gid81031ll7qaj8jxr5g36fff7hhkp3hh4kz6zh";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev =  "0967fc9aceab2ce9da34061253ac10fb99bba5b2";
+      sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "f390dcf405f7b83c997eac1b06768bb9f44dec18";
-      sha256 = "1l3z0ggdcjspfmm6k9glmh52a9x50806k6yldxql73p4bpynsd9g";
+      rev =  "87b1dfb5b2fa649f52695dd9eae19abe404a4308";
+      sha256 = "1iyfxs3nxdn1fyfqv3gggxcxab66a3m6cmjkhqhcapxm3qvgbrlc";
     };
   }
   {
-    goPackagePath = "github.com/syndtr/goleveldb";
+    goPackagePath  = "github.com/syndtr/goleveldb";
     fetch = {
       type = "git";
       url = "https://github.com/syndtr/goleveldb";
-      rev = "4875955338b0a434238a31165cb87255ab6e9e4a";
-      sha256 = "0786j6kizrlskqz196ng4d13363d44whl849jcv1q07yab2nq40i";
+      rev =  "b89cc31ef7977104127d34c1bd31ebd1a9db2199";
+      sha256 = "0pbmssaw7fsgspv0jr3hsd1208qqxcvy4faks9hypqgl5gwday4p";
     };
   }
   {
-    goPackagePath = "github.com/syndtr/gosnappy";
+    goPackagePath  = "github.com/tylertreat/BoomFilters";
     fetch = {
       type = "git";
-      url = "https://github.com/syndtr/gosnappy";
-      rev = "156a073208e131d7d2e212cb749feae7c339e846";
-      sha256 = "08lf8smnp4imj5fkph9sbqzb4a5n191q9m6b2c5kamp19i9h2y6z";
+      url = "https://github.com/tylertreat/BoomFilters";
+      rev =  "37e169ae37ed529d93ecacb509c0dc80078478fc";
+      sha256 = "15wwdsxxvkgxbxv3v0ywnwjwndpmps49n3a49z7bzjl7r2nsm7qv";
     };
   }
   {
-    goPackagePath = "golang.org/x/net";
+    goPackagePath  = "golang.org/x/net";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "6a513affb38dc9788b449d59ffed099b8de18fa0";
-      sha256 = "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval";
+      rev =  "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344";
+      sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv";
     };
   }
   {
-    goPackagePath = "golang.org/x/sys";
+    goPackagePath  = "golang.org/x/sys";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8";
-      sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc";
+      rev =  "9ccfe848b9db8435a24c424abbc07a921adf1df5";
+      sha256 = "0wn3p7nrf9lx5svnya5mxy5b8cxqs2rp8lxc477szna313m1jhs4";
     };
   }
   {
-    goPackagePath = "golang.org/x/text";
+    goPackagePath  = "golang.org/x/text";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "5a42fa2464759cbb7ee0af9de00b54d69f09a29c";
-      sha256 = "0far6mb2ikwzr7icn0yqi9ygl8kv2wsaasyprbqb9qapr0dqjw0s";
+      rev =  "470f45bf29f4147d6fbd7dfd0a02a848e49f5bf4";
+      sha256 = "1yzh1qxwd0xkh0k04hwp7yii21i26b4ngxvm1g98qlji1g2wbjbc";
     };
   }
   {
-    goPackagePath = "google.golang.org/appengine";
+    goPackagePath  = "google.golang.org/appengine";
     fetch = {
       type = "git";
       url = "https://github.com/golang/appengine";
-      rev = "4f7eeb5305a4ba1966344836ba4af9996b7b4e05";
-      sha256 = "09pgvlk5ay3f0avi1bawpy8khi3rmkfl36l2yr3ryp8z12i9k2qj";
+      rev =  "170382fa85b10b94728989dfcf6cc818b335c952";
+      sha256 = "0dqx24qc7h53p16xnkwn2jpk3wjjlvv48akqk74vx31pr2nn0g56";
     };
   }
   {
-    goPackagePath = "gopkg.in/mgo.v2";
+    goPackagePath  = "gopkg.in/mgo.v2";
     fetch = {
       type = "git";
-      url = "https://gopkg.in/mgo.v2";
-      rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a";
-      sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj";
+      url = "https://github.com/go-mgo/mgo";
+      rev =  "3f83fa5005286a7fe593b055f0d7771a7dce4655";
+      sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7";
     };
   }
   {
-    goPackagePath = "github.com/go-sql-driver/mysql";
+    goPackagePath  = "gopkg.in/olivere/elastic.v5";
     fetch = {
       type = "git";
-      url = "https://github.com/go-sql-driver/mysql";
-      rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034";
-      sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5";
+      url = "https://github.com/olivere/elastic";
+      rev =  "79ff368708b3a2a9da641dc831d95fd0782bf4ef";
+      sha256 = "1lq8nhjnkf246nl5h40ldh1qz2yx73yaqfmsh9ddvkwn4173c7jj";
     };
   }
   {
-    goPackagePath = "github.com/dennwc/graphql";
+    goPackagePath  = "gopkg.in/yaml.v2";
     fetch = {
       type = "git";
-      url = "https://github.com/dennwc/graphql";
-      rev = "fd5c4aa13f2119414084f229600de0d73f174436";
-      sha256 = "11f9jwfc2j646732gkcjb332ih9fxh04j31zmhvqswx75gvk9wzs";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
+      sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
     };
   }
-]
+]
\ No newline at end of file

From 65b9a73a1a531846086846f042abec9bcd291ec9 Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann.hodique@gmail.com>
Date: Sat, 31 Aug 2019 19:15:52 -0700
Subject: [PATCH 618/794] dgraph: 0.8.2 -> 1.0.17

---
 pkgs/servers/dgraph/default.nix |  22 +-
 pkgs/servers/dgraph/deps.nix    | 978 +++++++++++++++++++++++++++++---
 2 files changed, 911 insertions(+), 89 deletions(-)

diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix
index 8e89b6f980f..489f2e297bb 100644
--- a/pkgs/servers/dgraph/default.nix
+++ b/pkgs/servers/dgraph/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "dgraph";
-  version = "0.8.2";
+  version = "1.0.17";
 
   goPackagePath = "github.com/dgraph-io/dgraph";
 
@@ -10,32 +10,26 @@ buildGoPackage rec {
     owner = "dgraph-io";
     repo = "dgraph";
     rev = "v${version}";
-    sha256 = "0zc5bda8m2srjbk0gy1nnm0bya8if0kmk1szqr1qv3xifdzmi4nf";
+    sha256 = "05z1xwbd76q49zyqahh9krvq78dgkzr22qc6srr4djds0l7y6x5i";
   };
 
-  extraOutputsToInstall = [ "dashboard" ];
+  # see licensing
+  buildFlags = [ "-tags oss" ];
 
   goDeps = ./deps.nix;
-  subPackages = [ "cmd/dgraph" "cmd/dgraphloader" "cmd/bulkloader"];
-
-  # let's move the dashboard to a different output, to prevent $bin from
-  # depending on $out
-  # TODO: provide a proper npm application for the dashboard.
-  postPatch = ''
-    mv dashboard/* $dashboard
-  '';
+  subPackages = [ "dgraph"];
 
   preBuild = ''
     export buildFlagsArray="-ldflags=\
-      -X github.com/dgraph-io/dgraph/x.dgraphVersion=${version} \
-      -X github.com/dgraph-io/dgraph/cmd/dgraph/main.uiDir=$dashboard/src/assets/"
+      -X github.com/dgraph-io/dgraph/x.dgraphVersion=${version}"
   '';
 
   meta = {
     homepage = "https://dgraph.io/";
     description = "Fast, Distributed Graph DB";
     maintainers = with stdenv.lib.maintainers; [ sigma ];
-    license = stdenv.lib.licenses.agpl3;
+    # Apache 2.0 because we use only build tag "oss"
+    license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/servers/dgraph/deps.nix b/pkgs/servers/dgraph/deps.nix
index 89e00e0d8cb..602233d635e 100644
--- a/pkgs/servers/dgraph/deps.nix
+++ b/pkgs/servers/dgraph/deps.nix
@@ -1,11 +1,47 @@
 [
+  {
+    goPackagePath = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev = "v0.34.0";
+      sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai";
+    };
+  }
+  {
+    goPackagePath = "contrib.go.opencensus.io/exporter/jaeger";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-ecosystem/opencensus-go-exporter-jaeger";
+      rev = "v0.1.0";
+      sha256 = "0dhf0fhjfk8m6zx7xys5mj51c8gxvlahi4y5fx8l7b7b56bh1rmy";
+    };
+  }
+  {
+    goPackagePath = "contrib.go.opencensus.io/exporter/prometheus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-ecosystem/opencensus-go-exporter-prometheus";
+      rev = "6bf73eaafbe9";
+      sha256 = "1509l1xcgp662j7rglmrs35innpbi2s0r14vj9ps6d55j42kifm0";
+    };
+  }
   {
     goPackagePath = "github.com/AndreasBriese/bbloom";
     fetch = {
       type = "git";
       url = "https://github.com/AndreasBriese/bbloom";
-      rev = "28f7e881ca57bc00e028f9ede9f0d9104cfeef5e";
-      sha256 = "03cqhqvdz8c9by5w5ls4kwnnwlm6b2kkslc6m120fanw1lgamfzp";
+      rev = "e2d15f34fcf9";
+      sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds";
+    };
+  }
+  {
+    goPackagePath = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev = "v0.3.1";
+      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
     };
   }
   {
@@ -13,26 +49,44 @@
     fetch = {
       type = "git";
       url = "https://github.com/MakeNowJust/heredoc";
-      rev = "1d91351acdc1cb2f2c995864674b754134b86ca7";
+      rev = "1d91351acdc1";
       sha256 = "0ia1r8ibqmx6zv3wmsvgkpqlhwk79z9l38nzp4gd4f1kcb46856x";
     };
   }
+  {
+    goPackagePath = "github.com/apache/thrift";
+    fetch = {
+      type = "git";
+      url = "https://github.com/apache/thrift";
+      rev = "v0.12.0";
+      sha256 = "0g2g61rs189nimg3631wxfwdx12dsdz70qvncczlyvn34pcj7yby";
+    };
+  }
+  {
+    goPackagePath = "github.com/armon/consul-api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/armon/consul-api";
+      rev = "eb2c6b5be1b6";
+      sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
+    };
+  }
   {
     goPackagePath = "github.com/beorn7/perks";
     fetch = {
       type = "git";
       url = "https://github.com/beorn7/perks";
-      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
-      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+      rev = "v1.0.0";
+      sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
     };
   }
   {
-    goPackagePath = "github.com/bkaradzic/go-lz4";
+    goPackagePath = "github.com/bgentry/speakeasy";
     fetch = {
       type = "git";
-      url = "https://github.com/bkaradzic/go-lz4";
-      rev = "7224d8d8f27ef618c0a95f1ae69dbb0488abc33a";
-      sha256 = "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb";
+      url = "https://github.com/bgentry/speakeasy";
+      rev = "v0.1.0";
+      sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
     };
   }
   {
@@ -40,17 +94,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/blevesearch/bleve";
-      rev = "a7ebb8480579777c6cd1c4750d2e6b5ff2b49bdd";
-      sha256 = "121jhd158slf4050kmghz25jrvv7gbsan31wr0nxyw9z32lyf6yx";
-    };
-  }
-  {
-    goPackagePath = "github.com/blevesearch/blevex";
-    fetch = {
-      type = "git";
-      url = "https://github.com/blevesearch/blevex";
-      rev = "507dcd576550f9f3260f11495ba2de4e96773a3e";
-      sha256 = "0i9azysvia99fjpx525qnc5rcgv45hfvl3zcs58gvgqyxpzpc78z";
+      rev = "e1f5e6cdcd76";
+      sha256 = "1b2iip9vz71lqvjmj8v21sisk0z2gdsjd5v9750v3q4a3ik3x8m2";
     };
   }
   {
@@ -58,7 +103,7 @@
     fetch = {
       type = "git";
       url = "https://github.com/blevesearch/go-porterstemmer";
-      rev = "23a2c8e5cf1f380f27722c6d2ae8896431dc7d0e";
+      rev = "v1.0.2";
       sha256 = "0rcfbrad79xd114h3dhy5d3zs3b5bcgqwm3h5ih1lk69zr9wi91d";
     };
   }
@@ -67,17 +112,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/blevesearch/segment";
-      rev = "762005e7a34fd909a84586299f1dd457371d36ee";
+      rev = "762005e7a34f";
       sha256 = "1nrm145sm0xlhqy3d12yipnb16ikjz9ykjcskmkgm7vjm47xkmfl";
     };
   }
   {
-    goPackagePath = "github.com/cockroachdb/cmux";
+    goPackagePath = "github.com/blevesearch/snowballstem";
     fetch = {
       type = "git";
-      url = "https://github.com/cockroachdb/cmux";
-      rev = "30d10be492927e2dcae0089c374c455d42414fcb";
-      sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx";
+      url = "https://github.com/blevesearch/snowballstem";
+      rev = "26b06a2c243d";
+      sha256 = "096wgbpb7qyx055451gam3zb26acaiazjmd58av7ykslmb7wa5gm";
+    };
+  }
+  {
+    goPackagePath = "github.com/client9/misspell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/client9/misspell";
+      rev = "v0.3.4";
+      sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
     };
   }
   {
@@ -85,7 +139,7 @@
     fetch = {
       type = "git";
       url = "https://github.com/codahale/hdrhistogram";
-      rev = "3a0bb77429bd3a61596f5e8a3172445844342120";
+      rev = "3a0bb77429bd";
       sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
     };
   }
@@ -94,8 +148,53 @@
     fetch = {
       type = "git";
       url = "https://github.com/coreos/etcd";
-      rev = "9d43462d174c664f5edf313dec0de31e1ef4ed47";
-      sha256 = "0qxqjxhhciaacag1jz2rlncmlgw861ig2yx993ylvfm30jvyj2cj";
+      rev = "v3.3.10";
+      sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-etcd";
+      rev = "v2.0.0";
+      sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-semver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-semver";
+      rev = "v0.2.0";
+      sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-systemd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-systemd";
+      rev = "39ca1b05acc7";
+      sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/pkg";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/pkg";
+      rev = "3ac0863d7acf";
+      sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l";
+    };
+  }
+  {
+    goPackagePath = "github.com/cpuguy83/go-md2man";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cpuguy83/go-md2man";
+      rev = "v1.0.10";
+      sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i";
     };
   }
   {
@@ -103,8 +202,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/davecgh/go-spew";
-      rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9";
-      sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93";
+      rev = "v1.1.1";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
     };
   }
   {
@@ -112,8 +211,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/dgraph-io/badger";
-      rev = "64df7f57d9ee20d7b28de4a3eea90bf8d7310a77";
-      sha256 = "1ikgzn2l62kb238n0wm6s95py5ypv71p09w7zyvzkjf34x675mzz";
+      rev = "v1.6.0";
+      sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgraph-io/dgo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgraph-io/dgo";
+      rev = "f8969c1ddf8f";
+      sha256 = "08ycdpxry15r9vgaqrqxcdbw8z216asqarhxq76smi5a82mr56qa";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev = "v3.2.0";
+      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
     };
   }
   {
@@ -121,8 +238,71 @@
     fetch = {
       type = "git";
       url = "https://github.com/dgryski/go-farm";
-      rev = "d1e51a4af19092715f4ce7d8257fe5bc8f8be727";
-      sha256 = "00iijjzdg8g6jbzhdbfw8s2rf0k25gxw4x7h7r6mkxcq18n69182";
+      rev = "6a90982ecee2";
+      sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix";
+    };
+  }
+  {
+    goPackagePath = "github.com/dustin/go-humanize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dustin/go-humanize";
+      rev = "v1.0.0";
+      sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
+    };
+  }
+  {
+    goPackagePath = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev = "v1.7.0";
+      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+    };
+  }
+  {
+    goPackagePath = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "v1.4.7";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath = "github.com/ghodss/yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ghodss/yaml";
+      rev = "25d852aebe32";
+      sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-ini/ini";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ini/ini";
+      rev = "v1.39.0";
+      sha256 = "0j7pyl5v7xfzkhsyz193iq56ilan69pp11g2n5jw1k4h4g8s4k9b";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-kit/kit";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-kit/kit";
+      rev = "v0.8.0";
+      sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-logfmt/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-logfmt/logfmt";
+      rev = "v0.4.0";
+      sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9";
     };
   }
   {
@@ -130,8 +310,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gogo/protobuf";
-      rev = "e57a569e1882958f6b188cb42231d6db87701f2a";
-      sha256 = "0r3jpmp6wp4xyrh1ikr8iqld3rg4r1yhv99zxw5zd7d2zprw9yfc";
+      rev = "v1.2.0";
+      sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0";
     };
   }
   {
@@ -139,17 +319,53 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/geo";
-      rev = "31fb0106dc4a947e5aaee1fe186e56447f839510";
+      rev = "31fb0106dc4a";
       sha256 = "00w4kwm98hrgr3ggfdk1h7qa5gp00z4s0j0iwgwd9rgadb59kb2c";
     };
   }
+  {
+    goPackagePath = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev = "23def4e6c14b";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/groupcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/groupcache";
+      rev = "02826c3e7903";
+      sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/mock";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/mock";
+      rev = "v1.1.1";
+      sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy";
+    };
+  }
   {
     goPackagePath = "github.com/golang/protobuf";
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef";
-      sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib";
+      rev = "v1.3.2";
+      sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/btree";
+      rev = "e89373fe6b4a";
+      sha256 = "0jlkjjlf8ilifgsb2bv0jfgl4cxl1bypx7a6pjkwz3xf6k8jd7mj";
     };
   }
   {
@@ -157,26 +373,305 @@
     fetch = {
       type = "git";
       url = "https://github.com/google/codesearch";
-      rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
+      rev = "v1.0.0";
       sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny";
     };
   }
+  {
+    goPackagePath = "github.com/google/go-cmp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-cmp";
+      rev = "v0.3.0";
+      sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/uuid";
+      rev = "v1.0.0";
+      sha256 = "1922bjrnx66692dm0rrc1ckmznsaqx920ww4jzsds3xzrwf15mqv";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "4201258b820c";
+      sha256 = "1kpdg3m46kp15ixl9ahhchhadyiblz0qpcxzylp8jhffc1rnxjb7";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/go-grpc-middleware";
+      rev = "f849b5445de4";
+      sha256 = "0hscypgj0nd1407jp6y4qrnrr0mrhc4wgxz9b3mj1cs3pkvi61vc";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
+      rev = "v1.2.0";
+      sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/grpc-gateway";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/grpc-gateway";
+      rev = "v1.4.1";
+      sha256 = "0lqpwwyhgw12iw2pfynb8wb06dqfj26rr55sh1v02nvrxbpzfp0a";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev = "v0.5.0";
+      sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "v1.0.0";
+      sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+    };
+  }
+  {
+    goPackagePath = "github.com/hpcloud/tail";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hpcloud/tail";
+      rev = "v1.0.0";
+      sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
+    };
+  }
+  {
+    goPackagePath = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev = "v1.0.0";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath = "github.com/jonboulle/clockwork";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jonboulle/clockwork";
+      rev = "v0.1.0";
+      sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
+    };
+  }
+  {
+    goPackagePath = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev = "v1.1.6";
+      sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
+    };
+  }
+  {
+    goPackagePath = "github.com/julienschmidt/httprouter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/julienschmidt/httprouter";
+      rev = "v1.2.0";
+      sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+    };
+  }
+  {
+    goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+    fetch = {
+      type = "git";
+      url = "https://github.com/konsorten/go-windows-terminal-sequences";
+      rev = "v1.0.1";
+      sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/logfmt";
+      rev = "b84e30acd515";
+      sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pty";
+      rev = "v1.0.0";
+      sha256 = "1c8xbp4d4fbmvml70nc7w3jii2fxv4q0141d2zmzi480d5h8xvrv";
+    };
+  }
+  {
+    goPackagePath = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev = "v1.8.0";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev = "v0.0.9";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "v0.0.4";
+      sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "v0.0.2";
+      sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
+    };
+  }
   {
     goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
     fetch = {
       type = "git";
       url = "https://github.com/matttproud/golang_protobuf_extensions";
-      rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+      rev = "v1.0.1";
       sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
     };
   }
+  {
+    goPackagePath = "github.com/minio/minio-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/minio/minio-go";
+      rev = "774475480ffe";
+      sha256 = "1rnzvij1cnqb3brwpyv79bdbaa1sgygyw1x84376fli2pj0n3572";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "v1.1.0";
+      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "v1.1.2";
+      sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
+    };
+  }
+  {
+    goPackagePath = "github.com/modern-go/concurrent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/concurrent";
+      rev = "bacd9c7ef1dd";
+      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+    };
+  }
+  {
+    goPackagePath = "github.com/modern-go/reflect2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/reflect2";
+      rev = "v1.0.1";
+      sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+    };
+  }
+  {
+    goPackagePath = "github.com/mwitkow/go-conntrack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mwitkow/go-conntrack";
+      rev = "cc309e4a2223";
+      sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+    };
+  }
+  {
+    goPackagePath = "github.com/olekukonko/tablewriter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/olekukonko/tablewriter";
+      rev = "a0225b3f23b5";
+      sha256 = "0bp9r6xzy6d3p7l2hjmvr25y3rp3p8c9xv1agkllkksm45ng6681";
+    };
+  }
+  {
+    goPackagePath = "github.com/onsi/ginkgo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/onsi/ginkgo";
+      rev = "v1.7.0";
+      sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
+    };
+  }
+  {
+    goPackagePath = "github.com/onsi/gomega";
+    fetch = {
+      type = "git";
+      url = "https://github.com/onsi/gomega";
+      rev = "v1.4.3";
+      sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
+    };
+  }
+  {
+    goPackagePath = "github.com/paulmach/go.geojson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/paulmach/go.geojson";
+      rev = "40612a87147b";
+      sha256 = "037j7apv0jljhvn6vk85nhy0ql862nxr5zbmi6a30qdfclrf2q4k";
+    };
+  }
+  {
+    goPackagePath = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev = "v1.2.0";
+      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+    };
+  }
   {
     goPackagePath = "github.com/pkg/errors";
     fetch = {
       type = "git";
       url = "https://github.com/pkg/errors";
-      rev = "17b591df37844cde689f4d5813e5cea0927d8dd2";
-      sha256 = "1f400f1682h1wdjknlh1ad95rbss09g0ia36a8w102bf2f1qfq8l";
+      rev = "v0.8.1";
+      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
     };
   }
   {
@@ -184,7 +679,7 @@
     fetch = {
       type = "git";
       url = "https://github.com/pkg/profile";
-      rev = "5b67d428864e92711fcbd2f8629456121a56d91f";
+      rev = "v1.2.1";
       sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr";
     };
   }
@@ -193,7 +688,7 @@
     fetch = {
       type = "git";
       url = "https://github.com/pmezard/go-difflib";
-      rev = "792786c7400a136282c1664665ae0a8db921c6c2";
+      rev = "v1.0.0";
       sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
     };
   }
@@ -202,8 +697,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_golang";
-      rev = "310ce84375bb84c5cbbf0d05069c92daa5673740";
-      sha256 = "11awb5bjkwqj7va3v7fgniwqkjqhmhjkp01rdvnv4xfp1laxwn7v";
+      rev = "v1.0.0";
+      sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6";
     };
   }
   {
@@ -211,8 +706,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_model";
-      rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
-      sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
+      rev = "fd36f4220a90";
+      sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
     };
   }
   {
@@ -220,8 +715,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/common";
-      rev = "0866df4b85a18d652b6965be022d007cdf076822";
-      sha256 = "0zw4rxs6zh9vgxz5wwhjnwa6mgac8jh7mb63viircgh08r889chp";
+      rev = "v0.6.0";
+      sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l";
     };
   }
   {
@@ -229,8 +724,98 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/procfs";
-      rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2";
-      sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np";
+      rev = "v0.0.2";
+      sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
+    };
+  }
+  {
+    goPackagePath = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev = "v1.5.2";
+      sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c";
+    };
+  }
+  {
+    goPackagePath = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev = "v1.2.0";
+      sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
+    };
+  }
+  {
+    goPackagePath = "github.com/soheilhy/cmux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/soheilhy/cmux";
+      rev = "v0.1.4";
+      sha256 = "1f736g68d9vwlyfb6g0fxkr0r875369xafk30cz8kaq5niaqwv0h";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev = "v1.1.2";
+      sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev = "v1.3.0";
+      sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "v0.0.5";
+      sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev = "v1.0.0";
+      sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "v1.0.3";
+      sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev = "v1.3.2";
+      sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev = "v0.1.1";
+      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
     };
   }
   {
@@ -238,17 +823,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "976c720a22c8eb4eb6a0b4348ad85ad12491a506";
-      sha256 = "0a2gxvqzacrj9k8h022zhr8fchhn9afc6a511m07j71dzw9g4y3m";
+      rev = "v1.3.0";
+      sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
     };
   }
   {
-    goPackagePath = "github.com/tebeka/snowball";
+    goPackagePath = "github.com/tmc/grpc-websocket-proxy";
     fetch = {
       type = "git";
-      url = "https://github.com/tebeka/snowball";
-      rev = "6b06bd306c4e4442a63e546752278920ae487934";
-      sha256 = "110akijkb55k5h7m6mra8fircvi4sxd5xq7lcjgyiqj96srq8v2k";
+      url = "https://github.com/tmc/grpc-websocket-proxy";
+      rev = "89b8d40f7ca8";
+      sha256 = "1bg6m0cycy5sww175zkbnhi9lvzb08iicc8xka8klrgaa9mc5nsk";
     };
   }
   {
@@ -256,17 +841,134 @@
     fetch = {
       type = "git";
       url = "https://github.com/twpayne/go-geom";
-      rev = "6753ad11e46b04e21b3f286b342e73a8c4be8216";
+      rev = "6753ad11e46b";
       sha256 = "0qyrdnp7j7lmj0qb0p7k45m757zvbwn78s1apiy46zfnb5415df1";
     };
   }
+  {
+    goPackagePath = "github.com/ugorji/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ugorji/go";
+      rev = "e444a5086c43";
+      sha256 = "1ri318sf41fdzhj186dg96pixvlhmk1255ymccc9zfayy3z6li3h";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "v1.20.0";
+      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+    };
+  }
+  {
+    goPackagePath = "github.com/willf/bitset";
+    fetch = {
+      type = "git";
+      url = "https://github.com/willf/bitset";
+      rev = "71fa2377963f";
+      sha256 = "092lpf2qm3zyvm35inam4b7y3kjpvpx7ylkgn31x6wbxfbamp37a";
+    };
+  }
+  {
+    goPackagePath = "github.com/xiang90/probing";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xiang90/probing";
+      rev = "43a291ad63a2";
+      sha256 = "1z22ms16j5j42775mf31isanwx2pwr1d8wqw8006dczjv36qnz5i";
+    };
+  }
+  {
+    goPackagePath = "github.com/xordataexchange/crypt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xordataexchange/crypt";
+      rev = "b2862e3d0a77";
+      sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
+    };
+  }
+  {
+    goPackagePath = "go.etcd.io/bbolt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/etcd-io/bbolt";
+      rev = "v1.3.2";
+      sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2";
+    };
+  }
+  {
+    goPackagePath = "go.etcd.io/etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/etcd-io/etcd";
+      rev = "a943ad0ee4c9";
+      sha256 = "1p0s383qw7rdcg2zs5ysk70dkjhpyyqn2qgqgbxdvrv5cjgna1hm";
+    };
+  }
+  {
+    goPackagePath = "go.opencensus.io";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-instrumentation/opencensus-go";
+      rev = "v0.21.0";
+      sha256 = "14s0a12xdzjvad0dgksgv8m3hh7nc585abvjkvyk6r67a29lxj6x";
+    };
+  }
+  {
+    goPackagePath = "go.uber.org/atomic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/atomic";
+      rev = "v1.3.2";
+      sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+    };
+  }
+  {
+    goPackagePath = "go.uber.org/multierr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/multierr";
+      rev = "v1.1.0";
+      sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
+    };
+  }
+  {
+    goPackagePath = "go.uber.org/zap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/zap";
+      rev = "v1.9.1";
+      sha256 = "19a1i6fipqj8w7h6qjmg1sfbg18yzzqsgfn0vmr55hkgc0y6nmny";
+    };
+  }
   {
     goPackagePath = "golang.org/x/crypto";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "22ddb68eccda408bbf17759ac18d3120ce0d4f3f";
-      sha256 = "07ks6qal02iz24vv54qyb90wmsg9vwqc14abf68rakprpy26qwsg";
+      rev = "c2843e01d9a2";
+      sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/exp";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/exp";
+      rev = "509febef88a4";
+      sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/lint";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/lint";
+      rev = "5614ed5bae6f";
+      sha256 = "0fzn0zjv0x92xvfdq3a0v9w5sgkhr7hxkfy9zaqi8i57807z8bnx";
     };
   }
   {
@@ -274,8 +976,26 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "d1e1b351919c6738fdeb9893d5c998b161464f0c";
-      sha256 = "0qzbfah03z992zyygfp7imjjas5np2gcar5aanx5y3av5g68ggjp";
+      rev = "da137c7871d7";
+      sha256 = "1qsiyr3irmb6ii06hivm9p2c7wqyxczms1a9v1ss5698yjr3fg47";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "e64efc72b421";
+      sha256 = "0djvwz2avx7knsjbl434vw1wqbrg53xp1kh599gfixn5icrggz4m";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "e225da77a7e6";
+      sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p";
     };
   }
   {
@@ -283,8 +1003,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "abf9c25f54453410d0c6668e519582a9e1115027";
-      sha256 = "0dmpqjfif2zg6776d366js60k21g81jvsr3jm9dc7fv7w3282al4";
+      rev = "04f50cda93cb";
+      sha256 = "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw";
     };
   }
   {
@@ -292,8 +1012,44 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a";
-      sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56";
+      rev = "v0.3.0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/time";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/time";
+      rev = "fbb02b2291d2";
+      sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "e65039ee4138";
+      sha256 = "0c094599cf70wdrms49a3879qkq122pqlp2av444gs2pvc8apdcx";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/api";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/google-api-go-client";
+      rev = "v0.3.2";
+      sha256 = "1x1nbsd3gjgmv833gpgq79m5d15p31k1dfn8gglkvjanjiin747j";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev = "v1.4.0";
+      sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn";
     };
   }
   {
@@ -301,8 +1057,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/google/go-genproto";
-      rev = "1e559d0a00eef8a9a43151db4665280bd8dd5886";
-      sha256 = "1dfm8zd9mif1aswks79wgyi7n818s5brbdnnrrlg79whfhaf20hd";
+      rev = "5fe7a883aa19";
+      sha256 = "0qjkwig0r42q0j2qv57s4ahsgmmp41dz3ih3rnaqg0619n5w7lbs";
     };
   }
   {
@@ -310,8 +1066,71 @@
     fetch = {
       type = "git";
       url = "https://github.com/grpc/grpc-go";
-      rev = "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3";
-      sha256 = "1li8rn2s4f8qc77npamlm2ijin44scb8vvd8c4cr0l7za2m89jfn";
+      rev = "v1.19.0";
+      sha256 = "1znqwpj7ix3dpzx4zch0q70sdl3z5lvbb7v3q4i8sf8kas3yv71v";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/airbrake/gobrake.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/airbrake/gobrake.v2";
+      rev = "v2.0.9";
+      sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev = "v2.2.6";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/check.v1";
+      rev = "20d25e280405";
+      sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/cheggaaa/pb.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/cheggaaa/pb.v1";
+      rev = "v1.0.25";
+      sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/fsnotify.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/fsnotify.v1";
+      rev = "v1.4.7";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2";
+      rev = "v2.1.2";
+      sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/tomb.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/tomb.v1";
+      rev = "dd632973f1e7";
+      sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
     };
   }
   {
@@ -319,8 +1138,17 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0";
-      sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam";
+      rev = "v2.2.2";
+      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+    };
+  }
+  {
+    goPackagePath = "honnef.co/go/tools";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dominikh/go-tools";
+      rev = "c2f93a96b099";
+      sha256 = "07lg29aiap80ca9f201jzng9vjr168cv3qmvjmbd7v5pmww9kmr8";
     };
   }
 ]

From 0e703ce075a47eece5215ce7a1ad60300bf22705 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 1 Sep 2019 02:22:58 +0000
Subject: [PATCH 619/794] chromium: 76.0.3809.100 -> 76.0.3809.132 (#67610)

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

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index f8e56937021..14799e9f96c 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11";
-    sha256bin64 = "0rbc0ld655szg42mqjdby8749d2jg34nlpp4cpq66qb4zi6vvb04";
-    version = "76.0.3809.87";
+    sha256 = "0m7xdpi1f2a33csd7bsp91g5klz0hmr83ksfwsd2fki3iipvfs4w";
+    sha256bin64 = "1b4cyf4v55sy52mxxl8d70abg5ck5k45jaqdjsjw7dvh3s2x4bwp";
+    version = "77.0.3865.42";
   };
   dev = {
-    sha256 = "15v25nwcdxqgw6n0ym7fz5qaq0a74p0wiwcq155xy6zvr3q8q1nw";
-    sha256bin64 = "1qawl0hsl6qpc10avli8raw4nzwcpmp6dyada5pga7i4k5jpsr95";
-    version = "77.0.3860.5";
+    sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k";
+    sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6";
+    version = "78.0.3887.7";
   };
   stable = {
-    sha256 = "0vfjfxsqf8jrmd7y08ln1lpbilwi150875zn2bawwdq87vd3mncc";
-    sha256bin64 = "1c5rlqgshv5295wg5cji12z2b38l6a81l94spmzr46h5z9nn1gqx";
-    version = "76.0.3809.100";
+    sha256 = "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm";
+    sha256bin64 = "0hdsla8i3q0zbczia64ghqsf420alcc31xdishx1sv48x3rlrxkk";
+    version = "76.0.3809.132";
   };
 }

From fee74012f203d4162260505b3cb79808b42e0378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Fri, 30 Aug 2019 01:46:27 +0200
Subject: [PATCH 620/794] nomace: use Qt mkDerivation

---
 pkgs/applications/graphics/nomacs/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index e4393726483..e955515d224 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -1,9 +1,8 @@
 { stdenv
+, mkDerivation
 , fetchFromGitHub
 , cmake
 , pkgconfig
-, wrapGAppsHook
-, gsettings-desktop-schemas
 
 , qtbase
 , qttools
@@ -38,8 +37,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [cmake
-                       pkgconfig
-                       wrapGAppsHook];
+                       pkgconfig];
 
   buildInputs = [qtbase
                  qttools
@@ -48,8 +46,7 @@ stdenv.mkDerivation rec {
                  opencv
                  libraw
                  libtiff
-                 quazip
-                 gsettings-desktop-schemas];
+                 quazip];
 
   cmakeFlags = ["-DENABLE_OPENCV=ON"
                 "-DENABLE_RAW=ON"

From 543b9048737dad37bee078d70957ce9ddce0b5dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Fri, 30 Aug 2019 01:47:38 +0200
Subject: [PATCH 621/794] nomacs: enable translations

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

diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index e955515d224..fbf595f1537 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
                 "-DENABLE_RAW=ON"
                 "-DENABLE_TIFF=ON"
                 "-DENABLE_QUAZIP=ON"
+                "-DENABLE_TRANSLATIONS=ON"
                 "-DUSE_SYSTEM_QUAZIP=ON"];
 
   meta = with stdenv.lib; {

From 60d53d16d9c3ad1a3dc058781dbec8644da73da2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 31 Aug 2019 20:26:19 -0700
Subject: [PATCH 622/794] babl: disable tests

the tests fail
https://github.com/NixOS/nixpkgs/pull/67416#issuecomment-526864719 so
we'll disable them for now and notify upstream
---
 pkgs/development/libraries/babl/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index d95797d5a5f..c4b1d36ce70 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
     lcms2
   ];
 
-  doCheck = !stdenv.isDarwin;
-
   meta = with stdenv.lib; {
     description = "Image pixel format conversion library";
     homepage = http://gegl.org/babl/;

From d3188e90a09b612aab59187a5a8d15c8bc9887a1 Mon Sep 17 00:00:00 2001
From: Sam Doshi <sam@metal-fish.co.uk>
Date: Sat, 31 Aug 2019 14:02:52 +0100
Subject: [PATCH 623/794] supercollider: Use qt5's own mkDerivation

---
 .../interpreters/supercollider/default.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 2cacb339d75..049dd9192d7 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, alsaLib
+{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, alsaLib
 , libjack2, libsndfile, fftw, curl, gcc
 , libXt, qtbase, qttools, qtwebengine
 , readline, qtwebsockets, useSCEL ? false, emacs
@@ -7,7 +7,7 @@
 let optional = stdenv.lib.optional;
 in
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "supercollider";
   version = "3.10.2";
 
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "stackprotector" ];
 
-  cmakeFlags = ''
-    -DSC_WII=OFF
-    -DSC_EL=${if useSCEL then "ON" else "OFF"}
-  '';
+  cmakeFlags = [
+    "-DSC_WII=OFF"
+    "-DSC_EL=${if useSCEL then "ON" else "OFF"}"
+  ];
 
   nativeBuildInputs = [ cmake pkgconfig qttools ];
 

From 1ac28e704ffb0354dd5c030d9c66f927f72923d5 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sat, 31 Aug 2019 23:40:47 +0000
Subject: [PATCH 624/794] diesel-cli: init at 1.4.0

Fixes #67797.
---
 .../tools/diesel-cli/allow-warnings.patch     |   88 +
 .../tools/diesel-cli/cargo-lock.patch         | 1589 +++++++++++++++++
 pkgs/development/tools/diesel-cli/default.nix |   77 +
 .../tools/diesel-cli/update-cargo-lock.sh     |   19 +
 pkgs/top-level/all-packages.nix               |    4 +
 5 files changed, 1777 insertions(+)
 create mode 100644 pkgs/development/tools/diesel-cli/allow-warnings.patch
 create mode 100644 pkgs/development/tools/diesel-cli/cargo-lock.patch
 create mode 100644 pkgs/development/tools/diesel-cli/default.nix
 create mode 100755 pkgs/development/tools/diesel-cli/update-cargo-lock.sh

diff --git a/pkgs/development/tools/diesel-cli/allow-warnings.patch b/pkgs/development/tools/diesel-cli/allow-warnings.patch
new file mode 100644
index 00000000000..342ac1baa10
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/allow-warnings.patch
@@ -0,0 +1,88 @@
+diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs
+index 4e743eb4..97c53ed8 100644
+--- a/diesel/src/lib.rs
++++ b/diesel/src/lib.rs
+@@ -131,7 +131,6 @@
+ #![cfg_attr(feature = "unstable", feature(specialization, try_from))]
+ // Built-in Lints
+ #![deny(
+-    warnings,
+     missing_debug_implementations,
+     missing_copy_implementations,
+     missing_docs
+diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs
+index 741ca003..cf93bb8f 100644
+--- a/diesel_cli/src/main.rs
++++ b/diesel_cli/src/main.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_copy_implementations)]
++#![deny(missing_copy_implementations)]
+ // Clippy lints
+ #![allow(clippy::option_map_unwrap_or_else, clippy::option_map_unwrap_or)]
+ #![warn(
+diff --git a/diesel_cli/tests/tests.rs b/diesel_cli/tests/tests.rs
+index 2edee846..c96917c4 100644
+--- a/diesel_cli/tests/tests.rs
++++ b/diesel_cli/tests/tests.rs
+@@ -1,5 +1,3 @@
+-#![deny(warnings)]
+-
+ extern crate chrono;
+ extern crate diesel;
+ #[macro_use]
+diff --git a/diesel_derives/src/lib.rs b/diesel_derives/src/lib.rs
+index 2c43b2a3..44dcf3f9 100644
+--- a/diesel_derives/src/lib.rs
++++ b/diesel_derives/src/lib.rs
+@@ -1,6 +1,6 @@
+ #![recursion_limit = "1024"]
+ // Built-in Lints
+-#![deny(warnings, missing_copy_implementations)]
++#![deny(missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+     clippy::needless_pass_by_value,
+diff --git a/diesel_derives/tests/tests.rs b/diesel_derives/tests/tests.rs
+index 636fea66..f86f3dcc 100644
+--- a/diesel_derives/tests/tests.rs
++++ b/diesel_derives/tests/tests.rs
+@@ -1,5 +1,3 @@
+-#![deny(warnings)]
+-
+ #[macro_use]
+ extern crate cfg_if;
+ #[macro_use]
+diff --git a/diesel_migrations/migrations_internals/src/lib.rs b/diesel_migrations/migrations_internals/src/lib.rs
+index 933e21a8..7c4d0222 100644
+--- a/diesel_migrations/migrations_internals/src/lib.rs
++++ b/diesel_migrations/migrations_internals/src/lib.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
++#![deny(missing_debug_implementations, missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+     clippy::option_map_unwrap_or_else,
+diff --git a/diesel_migrations/migrations_macros/src/lib.rs b/diesel_migrations/migrations_macros/src/lib.rs
+index 0a83234e..2f509c04 100644
+--- a/diesel_migrations/migrations_macros/src/lib.rs
++++ b/diesel_migrations/migrations_macros/src/lib.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
++#![deny(missing_debug_implementations, missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+     clippy::option_map_unwrap_or_else,
+diff --git a/diesel_migrations/src/lib.rs b/diesel_migrations/src/lib.rs
+index c85414e5..f025f237 100644
+--- a/diesel_migrations/src/lib.rs
++++ b/diesel_migrations/src/lib.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_copy_implementations)]
++#![deny(missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+     clippy::needless_pass_by_value,
diff --git a/pkgs/development/tools/diesel-cli/cargo-lock.patch b/pkgs/development/tools/diesel-cli/cargo-lock.patch
new file mode 100644
index 00000000000..26d583f9a11
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/cargo-lock.patch
@@ -0,0 +1,1589 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..f20a5bf
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,1583 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "advanced-blog-cli"
++version = "0.1.0"
++dependencies = [
++ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "aho-corasick"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "aho-corasick"
++version = "0.6.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_inserts"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_inserts_mysql"
++version = "0.1.0"
++dependencies = [
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_inserts_sqlite"
++version = "0.1.0"
++dependencies = [
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_updates"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ansi_term"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "assert_matches"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "atty"
++version = "0.2.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "autocfg"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "backtrace"
++version = "0.3.35"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "backtrace-sys"
++version = "0.1.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "barrel"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "base64"
++version = "0.9.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bcrypt"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bigdecimal"
++version = "0.0.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bitflags"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "bumpalo"
++version = "2.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "byteorder"
++version = "1.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "c2-chacha"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.41"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "cfg-if"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "chrono"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "clap"
++version = "2.33.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cloudabi"
++version = "0.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "derive-error-chain"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel"
++version = "1.4.0"
++dependencies = [
++ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel"
++version = "1.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_cli"
++version = "1.4.0"
++dependencies = [
++ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_1_mysql"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_1_pg"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_1_sqlite"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_2_mysql"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_2_pg"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_2_sqlite"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_3_mysql"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_3_pg"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_3_sqlite"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_derives"
++version = "1.4.0"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_derives"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "diesel_derives 1.4.0"
++
++[[package]]
++name = "diesel_infer_schema"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_migrations"
++version = "1.4.0"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_migrations"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "diesel_migrations 1.4.0"
++
++[[package]]
++name = "diesel_tests"
++version = "0.1.0"
++dependencies = [
++ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.0",
++ "diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "difference"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "dotenv"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "env_logger"
++version = "0.3.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "error-chain"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fuchsia-cprng"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "gcc"
++version = "0.3.55"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "getrandom"
++version = "0.1.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "idna"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "infer_schema_internals"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "infer_schema_macros"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ipnetwork"
++version = "0.13.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "js-sys"
++version = "0.3.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "kernel32-sys"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "libc"
++version = "0.2.62"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "libsqlite3-sys"
++version = "0.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lock_api"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lock_api"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "log"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "log"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "matches"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "memchr"
++version = "0.1.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "memchr"
++version = "2.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "migrations_internals"
++version = "1.4.0"
++dependencies = [
++ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "migrations_internals"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "migrations_internals 1.4.0"
++
++[[package]]
++name = "migrations_macros"
++version = "1.4.0"
++dependencies = [
++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "migrations_macros"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "migrations_macros 1.4.0"
++
++[[package]]
++name = "mysqlclient-sys"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-bigint"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-integer"
++version = "0.1.41"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "percent-encoding"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "pkg-config"
++version = "0.3.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "pq-sys"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "proc-macro2"
++version = "0.4.30"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quickcheck"
++version = "0.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quote"
++version = "0.3.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "quote"
++version = "0.6.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "r2d2"
++version = "0.8.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.3.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rand_core"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_isaac"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_jitter"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_os"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_pcg"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_xorshift"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rdrand"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.56"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "regex"
++version = "0.1.80"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "regex-syntax"
++version = "0.5.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "remove_dir_all"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rust-crypto"
++version = "0.2.36"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rustc-demangle"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rustc-serialize"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rustc_version"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ryu"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "safemem"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "scheduled-thread-pool"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "scopeguard"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde"
++version = "1.0.99"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.99"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.40"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "smallvec"
++version = "0.6.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "strsim"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "structopt"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "structopt-derive"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "syn"
++version = "0.11.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "syn"
++version = "0.15.44"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "syn"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "synom"
++version = "0.11.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tempdir"
++version = "0.3.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tempfile"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tempfile"
++version = "3.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread-id"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread_local"
++version = "0.2.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread_local"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "time"
++version = "0.1.42"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "toml"
++version = "0.4.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ucd-util"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-width"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "url"
++version = "1.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "utf8-ranges"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "utf8-ranges"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "uuid"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "uuid"
++version = "0.7.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "vcpkg"
++version = "0.2.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "vec_map"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "wasi"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "wasm-bindgen"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-backend"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-macro"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-macro-support"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-shared"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-build"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[metadata]
++"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
++"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++"checksum assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5"
++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
++"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
++"checksum backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "1371048253fa3bac6704bfd6bbfc922ee9bdcee8881330d40f308b81cc5adc55"
++"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b"
++"checksum barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f2016bcea86b2a1a807753dc2b6ba682fa24e14e50c7474f4b1a0330949c86fb"
++"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
++"checksum bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4a6f09cde06fb2cd52a77123c36bfd1e8e60cf13a8bac6ba8f451dabff4644c8"
++"checksum bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "679e21a6734fdfc63378aea80c2bf31e6ac8ced21ed33e1ee37f8f7bf33c2056"
++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
++"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"
++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
++"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
++"checksum cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff"
++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
++"checksum chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "27429a03ca54100bf6bdc726c09adc46a74187ac93f9ce96dc7aaa9594ebf707"
++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
++"checksum derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9ca9ade651388daad7c993f005d0d20c4f6fe78c1cdc93e95f161c6f5ede4a"
++"checksum diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d24935ba50c4a8dc375a0fd1f8a2ba6bdbdc4125713126a74b965d6a01a06d7"
++"checksum diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "62a27666098617d52c487a41f70de23d44a1dc1f3aa5877ceba2790fb1f1cab4"
++"checksum diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bea70d0798a3d8489e1d5493bb2111a1ab2da434191b9e9605f167c01a20680"
++"checksum diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c"
++"checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8"
++"checksum dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6f0e2bb24d163428d8031d3ebd2d2bd903ad933205a97d0f18c7c1aade380f3"
++"checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f"
++"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
++"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
++"checksum getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872"
++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
++"checksum infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90e390df38a4e5cb4337a76db5b736f239e08f3ab7e8e42a34548617f0113f64"
++"checksum infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07b667b471ef99645989ceea451be288b6e669eeb8951d3f0fbd310677588ac6"
++"checksum ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d1d8b990621b5b0806fac3dbf71d1833a4c0a9e25702d10bd8b2c629c7ae01c"
++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
++"checksum js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "1efc4f2a556c58e79c5500912e221dd826bec64ff4aabd8ce71ccef6da02d7d4"
++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
++"checksum libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd6457c70bbff456d9fe49deaba35ec47c3e598bf8d7950ff0575ceb7a8a6ad1"
++"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff"
++"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
++"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
++"checksum migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8089920229070f914b9ce9b07ef60e175b2b9bc2d35c3edd8bf4433604e863b9"
++"checksum migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1664412abf7db2b8a6d58be42a38b099780cc542b5b350383b805d88932833fe"
++"checksum mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7e9637d93448044078aaafea7419aed69d301b4a12bcc4aa0ae856eb169bef85"
++"checksum num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "57450397855d951f1a41305e54851b1a7b8f5d2e349543a02a2effe25459f718"
++"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
++"checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7"
++"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
++"checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c"
++"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
++"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af"
++"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
++"checksum pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda"
++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
++"checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95"
++"checksum quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "02c2411d418cea2364325b18a205664f9ef8252e06b2e911db97c0b0d98b1406"
++"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
++"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
++"checksum r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bc42ce75d9f4447fb2a04bbe1ed5d18dd949104572850ec19b164e274919f81b"
++"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
++"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
++"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c"
++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
++"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
++"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
++"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
++"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
++"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
++"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
++"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
++"checksum scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bd07742e081ff6c077f5f6b283f12f32b9e7cc765b316160d66289b74546fbb3"
++"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++"checksum serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f"
++"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425"
++"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
++"checksum structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "783cb22d520b177a3772e520d04a3c7970d51c3b647ba80739f99be01131b54f"
++"checksum structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4da119c9a7a1eccb7c6de0c1eb3f7ed1c11138624d092b3687222aeed8f1375c"
++"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
++"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
++"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
++"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
++"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
++"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0"
++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
++"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
++"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874"
++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
++"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
++"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
++"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
++"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
++"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363"
++"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"
++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
++"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7"
++"checksum wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "dcddca308b16cd93c2b67b126c688e5467e4ef2e28200dc7dfe4ae284f2faefc"
++"checksum wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "f805d9328b5fc7e5c6399960fd1889271b9b58ae17bdb2417472156cc9fafdd0"
++"checksum wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "3ff88201a482abfc63921621f6cb18eb1efd74f136b05e5841e7f8ca434539e9"
++"checksum wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "6a433d89ecdb9f77d46fcf00c8cf9f3467b7de9954d8710c175f61e2e245bb0e"
++"checksum wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "d41fc1bc3570cdf8d108c15e014045fd45a95bb5eb36605f96a90461fc34027d"
++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix
new file mode 100644
index 00000000000..f6a67b05114
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security
+, sqliteSupport ? true, sqlite
+, postgresqlSupport ? true, postgresql
+, mysqlSupport ? true, mysql, zlib, libiconv
+}:
+
+assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysqlSupport == true)
+  "support for at least one database must be enabled";
+
+let
+  inherit (stdenv.lib) optional optionals optionalString;
+  features = ''
+    ${optionalString sqliteSupport "sqlite"} \
+    ${optionalString postgresqlSupport "postgres"} \
+    ${optionalString mysqlSupport "mysql"} \
+  '';
+in
+
+rustPlatform.buildRustPackage rec {
+  pname = "diesel-cli";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "diesel-rs";
+    repo = "diesel";
+    rev = "v${version}";
+    sha256 = "0wp4hvpl9cf8hw1jyz3z476k5blrh6srfpv36dw10bj126rz9pvb";
+  };
+
+  patches = [
+    # Allow warnings to fix many instances of `error: trait objects without an explicit `dyn` are deprecated`
+    #
+    # Remove this after https://github.com/diesel-rs/diesel/commit/9004d1c3fa12aaee84986bd3d893002491373f8c
+    # is in a release.
+    ./allow-warnings.patch
+  ];
+
+  cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ];
+  cargoPatches = [ ./cargo-lock.patch ];
+  cargoSha256 = "0xlcskddhy7xsiwj54gmn1xlgkfxb4dwrys7rbamfz1h8aa6ixjx";
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ openssl ]
+    ++ optional stdenv.isDarwin Security
+    ++ optional (stdenv.isDarwin && mysqlSupport) libiconv
+    ++ optional sqliteSupport sqlite
+    ++ optional postgresqlSupport postgresql
+    ++ optionals mysqlSupport [ mysql zlib ];
+
+  # We must `cd diesel_cli`, we cannot use `--package diesel_cli` to build
+  # because --features fails to apply to the package:
+  # https://github.com/rust-lang/cargo/issues/5015
+  # https://github.com/rust-lang/cargo/issues/4753
+  preBuild = "cd diesel_cli";
+  postBuild = "cd ..";
+
+  checkPhase = optionalString sqliteSupport ''
+    (cd diesel_cli && cargo check --features sqlite)
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    $out/bin/diesel --version
+  '';
+
+  # Fix the build with mariadb, which otherwise shows "error adding symbols:
+  # DSO missing from command line" errors for libz and libssl.
+  NIX_LDFLAGS = lib.optional mysqlSupport "-lz -lssl -lcrypto";
+
+  meta = with lib; {
+    description = "Database tool for working with Rust projects that use Diesel";
+    homepage = https://github.com/diesel-rs/diesel/tree/master/diesel_cli;
+    license = with licenses; [ mit asl20 ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ivan ];
+  };
+}
diff --git a/pkgs/development/tools/diesel-cli/update-cargo-lock.sh b/pkgs/development/tools/diesel-cli/update-cargo-lock.sh
new file mode 100755
index 00000000000..bd2e033e687
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/update-cargo-lock.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# This updates cargo-lock.patch for the diesel version listed in default.nix.
+
+set -eu -o verbose
+
+here=$PWD
+version=$(cat default.nix | grep '^  version = "' | cut -d '"' -f 2)
+checkout=$(mktemp -d)
+git clone -b "v$version" --depth=1 https://github.com/diesel-rs/diesel "$checkout"
+cd "$checkout"
+
+rm -f rust-toolchain
+cargo generate-lockfile
+git add -f Cargo.lock
+git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
+
+cd "$here"
+rm -rf "$checkout"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61d003e4c03..8904730bf0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1483,6 +1483,10 @@ in
 
   dibbler = callPackage ../tools/networking/dibbler { };
 
+  diesel-cli = callPackage ../development/tools/diesel-cli {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   ding = callPackage ../applications/misc/ding {
     aspellDicts_de = aspellDicts.de;
     aspellDicts_en = aspellDicts.en;

From b31c7e527e1c1495e554ca453e129c310f6dd210 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 29 Aug 2019 04:16:34 +0200
Subject: [PATCH 625/794] nixos/fontconfig: Allow setting default emoji font
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In fontconfig’s 60-generic.conf, order of preference is estabilished for emoji
font family. Because fontconfig parses the config files in lexicographic order,
appending each <prefer> from <alias> element to the family’s prefer list
(to be prepended before the family) [1], our font family defaults stored
in 52-nixos-default-fonts.conf will take precedence. That is, of course, unless
the default „weak“ binding [2] is used. Emoji family binds strongly [3],
so we need to set binding to “same” for our <alias>es to be considered before
the ones from 60-generic.conf.

By default, we will set the option to all emoji fonts supported by fontconfig,
so that emoji works for user if they have at least one emoji font installed.
If they have multiple emoji fonts installed, we will use the fontconfig’s
order of preference [4].

[1]: https://github.com/bohoomil/fontconfig-ultimate/issues/51#issuecomment-64678322
[2]: https://www.freedesktop.org/software/fontconfig/fontconfig-user.html#AEN25
[3]: https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/cc8442dec85e9d416436d19eeae1783f2d3008f0
[4]: https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/c41c9220181b203d1cf1f6435f6e3735cb7c84ac
---
 nixos/modules/config/fonts/fontconfig.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index fe0b88cf4c2..bcb86f11ead 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -116,7 +116,7 @@ let
   defaultFontsConf =
     let genDefault = fonts: name:
       optionalString (fonts != []) ''
-        <alias>
+        <alias binding="same">
           <family>${name}</family>
           <prefer>
           ${concatStringsSep ""
@@ -139,6 +139,8 @@ let
 
       ${genDefault cfg.defaultFonts.monospace "monospace"}
 
+      ${genDefault cfg.defaultFonts.emoji "emoji"}
+
     </fontconfig>
   '';
 
@@ -344,6 +346,21 @@ in
               in case multiple languages must be supported.
             '';
           };
+
+          emoji = mkOption {
+            type = types.listOf types.str;
+            default = ["Noto Color Emoji"];
+            description = ''
+              System-wide default emoji font(s). Multiple fonts may be listed
+              in case a font does not support all emoji.
+
+              Note that fontconfig matches color emoji fonts preferentially,
+              so if you want to use a black and white font while having
+              a color font installed (eg. Noto Color Emoji installed alongside
+              Noto Emoji), fontconfig will still choose the color font even
+              when it is later in the list.
+            '';
+          };
         };
 
         hinting = {

From ee7c590b605d07394f0f65c603bf5cf169e6caad Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 29 Aug 2019 14:02:20 +0200
Subject: [PATCH 626/794] nixos.tests.fontconfig-default-fonts: init

Make sure the fonts.enableDefaultFonts option works.
---
 nixos/release-combined.nix               |  1 +
 nixos/tests/all-tests.nix                |  1 +
 nixos/tests/fontconfig-default-fonts.nix | 28 ++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 nixos/tests/fontconfig-default-fonts.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ffa087bb6f2..9e2109d88b5 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -68,6 +68,7 @@ in rec {
         nixos.tests.chromium.x86_64-linux or []
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
+        (all nixos.tests.fontconfig-default-fonts)
         (all nixos.tests.gnome3-xorg)
         (all nixos.tests.gnome3)
         (all nixos.tests.pantheon)
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 557ee78df7c..14dca7409c4 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -87,6 +87,7 @@ in
   flatpak = handleTest ./flatpak.nix {};
   flatpak-builder = handleTest ./flatpak-builder.nix {};
   fluentd = handleTest ./fluentd.nix {};
+  fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};
   fsck = handleTest ./fsck.nix {};
   fwupd = handleTestOn ["x86_64-linux"] ./fwupd.nix {}; # libsmbios is unsupported on aarch64
   gdk-pixbuf = handleTest ./gdk-pixbuf.nix {};
diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix
new file mode 100644
index 00000000000..1991cec9218
--- /dev/null
+++ b/nixos/tests/fontconfig-default-fonts.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ lib, ... }:
+{
+  name = "fontconfig-default-fonts";
+
+  machine = { config, pkgs, ... }: {
+    fonts.enableDefaultFonts = true; # Background fonts
+    fonts.fonts = with pkgs; [
+      noto-fonts-emoji
+      cantarell-fonts
+      twitter-color-emoji
+      source-code-pro
+      gentium
+    ];
+    fonts.fontconfig.defaultFonts = {
+      serif = [ "Gentium Plus" ];
+      sansSerif = [ "Cantarell" ];
+      monospace = [ "Source Code Pro" ];
+      emoji = [ "Twitter Color Emoji" ];
+    };
+  };
+
+  testScript = ''
+    $machine->succeed("fc-match serif | grep '\"Gentium Plus\"'");
+    $machine->succeed("fc-match sans-serif | grep '\"Cantarell\"'");
+    $machine->succeed("fc-match monospace | grep '\"Source Code Pro\"'");
+    $machine->succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'");
+  '';
+})

From eafe887671627f78d85e007f0eeaf4865be87105 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 29 Aug 2019 23:03:46 +0200
Subject: [PATCH 627/794] nixos/fonts.enableDefaultFonts: add Noto Emoji

These days, emoji are ubiqitous so we need to add emoji font.
---
 nixos/modules/config/fonts/fonts.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index 0dd01df9da7..abb806b601a 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -43,6 +43,7 @@ with lib;
         pkgs.xorg.fontmiscmisc
         pkgs.xorg.fontcursormisc
         pkgs.unifont
+        pkgs.noto-fonts-emoji
       ];
 
   };

From fcec3ff0dcb31dec83ee863273a8b0ee6261e386 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 30 Aug 2019 20:34:45 -0400
Subject: [PATCH 628/794] rl-1909: add note about default emoji font

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

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index e75543670e4..f831cfcdc57 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -600,6 +600,26 @@
       removed from nixpkgs due to lack of maintainer.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Using <option>fonts.enableDefaultFonts</option> adds a default emoji font <literal>noto-fonts-emoji</literal>.
+     <itemizedlist>
+      <para>Users of the following options will have this enabled by default:</para>
+      <listitem>
+       <para><option>services.xserver.enable</option></para>
+      </listitem>
+      <listitem>
+       <para><option>programs.sway.enable</option></para>
+      </listitem>
+      <listitem>
+       <para><option>programs.way-cooler.enable</option></para>
+      </listitem>
+      <listitem>
+       <para><option>services.xrdp.enable</option></para>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>

From 4b516028162818038cf1d6b6a008df5feab94e19 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Sun, 1 Sep 2019 00:32:43 -0600
Subject: [PATCH 629/794] intake: 0.4.4 -> 0.5.3 (#66412)

---
 .../python-modules/bokeh/default.nix          | 73 +++++++------------
 .../bokeh/hardcode-nodejs-npmjs-paths.patch   | 15 ++++
 .../python-modules/intake/default.nix         | 24 ++++--
 .../python-modules/panel/default.nix          |  9 +--
 .../python-modules/param/default.nix          |  4 +-
 5 files changed, 63 insertions(+), 62 deletions(-)
 create mode 100644 pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch

diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 158a3d31882..d5337122120 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -1,74 +1,55 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
-, isPyPy
-, mock
-, pytest
-, flask
-, jinja2
-, markupsafe
-, werkzeug
-, itsdangerous
-, dateutil
-, requests
-, six
-, pygments
-, pystache
-, markdown
-, pyyaml
-, pyzmq
-, tornado
-, colorama
-, isPy3k
 , futures
-, websocket_client
+, isPy3k
+, isPyPy
+, jinja2
+, lib
+, mock
 , numpy
-, pandas
-, greenlet
-, python
-, bkcharts
+, nodejs
 , pillow
+, pytest
+, python
+, python-dateutil
+, pyyaml
 , selenium
+, six
+, substituteAll
+, tornado
 }:
 
 buildPythonPackage rec {
   pname = "bokeh";
-  version = "1.0.4";
+  version = "1.3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ceeb6a75afc1b2de00c2b8b6da121dec3fb77031326897b80d4375a70e96aebf";
+    sha256 = "0m27j29jpi977y95k272xc24qkl5bkniy046cil116hrbgnppng2";
   };
 
-  disabled = isPyPy;
+  patches = [
+    (substituteAll {
+      src = ./hardcode-nodejs-npmjs-paths.patch;
+      node_bin = "${nodejs}/bin/node";
+      npm_bin = "${nodejs}/bin/npm";
+    })
+  ];
 
-  # Some test that uses tornado fails
-#   doCheck = false;
+  disabled = isPyPy;
 
   checkInputs = [ mock pytest pillow selenium ];
 
   propagatedBuildInputs = [
     pillow
-    flask
     jinja2
-    markupsafe
-    werkzeug
-    itsdangerous
-    dateutil
-    requests
+    python-dateutil
     six
-    pygments
-    pystache
-    markdown
     pyyaml
-    pyzmq
     tornado
-    colorama
-    bkcharts
+    numpy
   ]
-  ++ lib.optionals ( !isPy3k ) [ futures ]
-  ++ lib.optionals ( !isPy3k && !isPyPy ) [ websocket_client ]
-  ++ lib.optionals ( !isPyPy ) [ numpy pandas greenlet ];
+  ++ lib.optionals ( !isPy3k ) [ futures ];
 
   checkPhase = ''
     ${python.interpreter} -m unittest discover -s bokeh/tests
diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
new file mode 100644
index 00000000000..f8f33c0021f
--- /dev/null
+++ b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
@@ -0,0 +1,15 @@
+diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py
+index a752aad7d..8af05ff63 100644
+--- a/bokeh/util/compiler.py
++++ b/bokeh/util/compiler.py
+@@ -442,8 +442,8 @@ def _detect_nodejs():
+     raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version +
+                        '("conda install nodejs" or follow https://nodejs.org/en/download/)')
+ 
+-_nodejs = None
+-_npmjs = None
++_nodejs = "@node_bin@"
++_npmjs = "@npm_bin@"
+ 
+ def _nodejs_path():
+     global _nodejs
diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix
index c7f6e5c8219..f89b7ab1ce6 100644
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/pkgs/development/python-modules/intake/default.nix
@@ -4,28 +4,31 @@
 , appdirs
 , dask
 , holoviews
+, hvplot
 , jinja2
 , msgpack-numpy
 , msgpack-python
 , numpy
 , pandas
+, panel
 , python-snappy
 , requests
 , ruamel_yaml
 , six
 , tornado
 , pytest
-, isPy27
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "intake";
-  version = "0.4.4";
-  disabled = isPy27;
+  version = "0.5.3";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3fc1b7c2949c9b4200ecbbfdff17da126981a1d8d95ccb7b7bcca3e3dd849d5e";
+    sha256 = "1mbjr4xl4i523bg8k08s5986v2289fznd8cr3j3czn5adi8519j7";
   };
 
   checkInputs = [ pytest ];
@@ -33,11 +36,13 @@ buildPythonPackage rec {
     appdirs
     dask
     holoviews
+    hvplot
     jinja2
     msgpack-numpy
     msgpack-python
     numpy
     pandas
+    panel
     python-snappy
     requests
     ruamel_yaml
@@ -45,10 +50,15 @@ buildPythonPackage rec {
     tornado
   ];
 
+  postPatch = ''
+    # Is in setup_requires but not used in setup.py...
+    substituteInPlace setup.py --replace "'pytest-runner'" ""
+  '';
+
+  # test_discover requires driver_with_entrypoints-0.1.dist-info, which is not included in tarball
+  # test_filtered_compressed_cache requires calvert_uk_filter.tar.gz, which is not included in tarball
   checkPhase = ''
-    # test_filtered_compressed_cache requires calvert_uk_filter.tar.gz, which is not included in tarball
-    # test_which assumes python for executable name
-    PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest -k "not test_filtered_compressed_cache and not test_which"
+    PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest -k "not test_discover and not test_filtered_compressed_cache"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix
index fccd46c605d..4c88f0e1e4b 100644
--- a/pkgs/development/python-modules/panel/default.nix
+++ b/pkgs/development/python-modules/panel/default.nix
@@ -11,18 +11,13 @@
 
 buildPythonPackage rec {
   pname = "panel";
-  version = "0.4.0";
+  version = "0.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "21fc6729909dba4ba8c9a84b7fadd293322cc2594d15ac73b0f66a5ceffd1f98";
+    sha256 = "04w8jjlf7yz3k84xnacahczc9mmddqyp756rj3n8hclks9c1ww40";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "testpath<0.4" "testpath"
-  '';
-
   propagatedBuildInputs = [
     bokeh
     param
diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix
index 69a2e61e269..cb27fdb64e5 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/pkgs/development/python-modules/param/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "param";
-  version = "1.8.2";
+  version = "1.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "49927979d4f6c994bcd8f6f7f2b34e3a0a7f0d62404dca6bcae5acde0192bb01";
+    sha256 = "1dbnviszdq3d2k3dfwpimb0adf27yzwm4iyv42rk8xvd8c6p9gdi";
   };
 
   checkInputs = [ flake8 nose ];

From 19387a02a253b302c259dbce3b5b7791aa056f10 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sun, 1 Sep 2019 09:53:09 +0300
Subject: [PATCH 630/794] bat: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 205bc196811..267b820df07 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib
+{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, zlib
 , Security, libiconv
 }:
 
 rustPlatform.buildRustPackage rec {
   pname   = "bat";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0yyvlplskjvxb2cspqsvfsnahd5m0s83psrp777ng0wc0kr1adbw";
+    sha256 = "07qxghplqq8km4kp9zas2acw302a77y72x3ix1272kb1zxhw4as6";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "078n31c0isvxvna0s1m12xv4bkh15rb2nixfyg4c501mlkalb517";
+  cargoSha256 = "0j9wxv21a91yfvbbvgn5ms5zi1aipj1k2g42mfdvvw2vsdzqagxz";
 
-  nativeBuildInputs = [ cmake pkgconfig zlib ];
+  nativeBuildInputs = [ pkgconfig llvmPackages.libclang zlib ];
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
 
+  LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
+
   postInstall = ''
     install -m 444 -Dt $out/share/man/man1 doc/bat.1
     install -m 444 -Dt $out/share/fish/vendor_completions.d assets/completions/bat.fish

From fa49f7ce6bba804a65ed61d5f7b989dfc3e084e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 1 Sep 2019 09:04:11 +0200
Subject: [PATCH 631/794] nixos/redis: drop unnecessary dependencies from
 systemd unit

---
 nixos/modules/services/databases/redis.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index 37cc179023a..a11c8ff1275 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -232,7 +232,6 @@ in
     systemd.services.disable-transparent-huge-pages = {
       enable = config.services.redis.enable;
       description = "Disable Transparent Huge Pages (required by Redis)";
-      after = [ "sysinit.target" "local-fs.target" ];
       before = [ "redis.service" ];
       wantedBy = [ "redis.service" ];
       script = "echo never >/sys/kernel/mm/transparent_hugepage/enabled";

From cbd74442b7ad505633085e59edd18f177ae28411 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sun, 1 Sep 2019 15:05:56 +0800
Subject: [PATCH 632/794] youtube-dl: 2019.08.13 -> 2019.09.01

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

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

From c27dcde85acbbc0f0889fbd16173161131cad318 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 1 Sep 2019 10:08:09 +0200
Subject: [PATCH 633/794] pythonPackages.pytest-random-order: init at 1.0.4

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

diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix
new file mode 100644
index 00000000000..088f8702436
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-random-order/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "1.0.4";
+  pname = "pytest-random-order";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6b2159342a4c8c10855bc4fc6d65ee890fc614cb2b4ff688979b008a82a0ff52";
+  };
+
+  disabled = pythonOlder "3.5";
+
+  propagatedBuildInputs = [ pytest ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/jbasko/pytest-random-order";
+    description = "Randomise the order of tests with some control over the randomness";
+    license = licenses.mit;
+    maintainers = [ maintainers.prusnak ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7482ec7a9b2..ec002224e16 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2059,6 +2059,8 @@ in {
 
   pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
 
+  pytest-random-order = callPackage ../development/python-modules/pytest-random-order { };
+
   pytest-repeat = callPackage ../development/python-modules/pytest-repeat { };
 
   pytestrunner = callPackage ../development/python-modules/pytestrunner { };

From db131371efa84d0b7055536d9d5335c0a97e0af8 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 26 Aug 2019 22:50:16 +0200
Subject: [PATCH 634/794] minio-client: remove go 1.10 override

---
 pkgs/tools/networking/minio-client/default.nix | 7 +++----
 pkgs/top-level/all-packages.nix                | 4 +---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index ebd6e7c5799..3c8d1534684 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,7 +2,6 @@
 
 buildGoPackage rec {
   pname = "minio-client";
-
   version = "2019-01-30T19-57-22Z";
 
   src = fetchFromGitHub {
@@ -14,9 +13,9 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/minio/mc";
 
-  buildFlagsArray = [''-ldflags=
-    -X github.com/minio/mc/cmd.Version=${version}
-  ''];
+  preBuild = ''
+    buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}")
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/minio/mc;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c62a1822f24..23f7fe8dce0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4777,9 +4777,7 @@ in
 
   minetime = callPackage ../applications/office/minetime { };
 
-  minio-client = callPackage ../tools/networking/minio-client {
-    buildGoPackage = buildGo110Package;
-  };
+  minio-client = callPackage ../tools/networking/minio-client { };
 
   minissdpd = callPackage ../tools/networking/minissdpd { };
 

From 21fac085c7f20eabaa5676a6b472cef14af9b436 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.com>
Date: Sat, 31 Aug 2019 17:27:31 +0000
Subject: [PATCH 635/794] notmuch: 0.28.4 -> 0.29.1

Release notes at https://notmuchmail.org/news/release-0.29/ and
 https://notmuchmail.org/news/release-0.29.1/
---
 maintainers/maintainer-list.nix                        |  6 ++++++
 .../networking/mailreaders/notmuch/default.nix         | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 94ef79ee387..7298ed804bb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5095,6 +5095,12 @@
     githubId = 9568176;
     name = "Piotr Halama";
   };
+  puckipedia = {
+    email = "puck@puckipedia.com";
+    github = "puckipedia";
+    githubId = 488734;
+    name = "Puck Meerburg";
+  };
   puffnfresh = {
     email = "brian@brianmckenna.org";
     github = "puffnfresh";
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index f6e6a8d747e..7e3f4713284 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "0.28.4"; # not really, git
+  version = "0.29.1";
   pname = "notmuch";
 
   passthru = {
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "https://notmuchmail.org/releases/${pname}-${version}.tar.gz";
-    sha256 = "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds";
+    url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz";
+    sha256 = "0rg3rwghd3wivf3bmqcqpkkd5c779ld5hi363zjcw5fl6a7gqilq";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   in ''
     ln -s ${test-database} test/test-databases/database-v1.tar.xz
   '';
-  doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0");
+  doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3");
   checkTarget = "test";
   checkInputs = [
     which dtach openssl bash
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     description = "Mail indexer";
     homepage    = https://notmuchmail.org/;
     license     = licenses.gpl3;
-    maintainers = with maintainers; [ flokli the-kenny ];
+    maintainers = with maintainers; [ flokli puckipedia the-kenny ];
     platforms   = platforms.unix;
   };
 }

From abd8f6c045c72fe1e37e5c6cec93e04bb1d2f752 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.com>
Date: Sat, 31 Aug 2019 18:17:44 +0000
Subject: [PATCH 636/794] notmuch: remove gpg substituteInPlace

As of 0.29, notmuch no longer has the gpg_path config, and instead
 uses the gmime default, so the substitute can be safely dropped.
---
 .../networking/mailreaders/notmuch/default.nix            | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 7e3f4713284..e3b55b719ca 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -40,14 +40,6 @@ stdenv.mkDerivation rec {
     patchShebangs configure
     patchShebangs test/
 
-    for src in \
-      util/crypto.c \
-      notmuch-config.c
-    do
-      substituteInPlace "$src" \
-        --replace \"gpg\" \"${gnupg}/bin/gpg\"
-    done
-
     substituteInPlace lib/Makefile.local \
       --replace '-install_name $(libdir)' "-install_name $out/lib"
   '';

From bcc543135fc1a264f6199646b201222ed4aa94a3 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.com>
Date: Sat, 31 Aug 2019 18:20:48 +0000
Subject: [PATCH 637/794] notmuch: fix notmuch-emacs-mua

Before this patch, notmuch-emacs-mua would try to call emacs in PATH,
 which would obviously fail on systems with no emacs. This fixes that,
 while still keeping the capability to override your emacs' path.
---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index e3b55b719ca..01081ebfb3e 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -42,6 +42,10 @@ stdenv.mkDerivation rec {
 
     substituteInPlace lib/Makefile.local \
       --replace '-install_name $(libdir)' "-install_name $out/lib"
+
+    substituteInPlace emacs/notmuch-emacs-mua \
+      --replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
+      --replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient'
   '';
 
   configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" ];

From 3d5144a554b4097031dca7aa83edc8f53dd04f87 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Fri, 30 Aug 2019 00:30:30 +0300
Subject: [PATCH 638/794] electrum:  update for #65399

---
 pkgs/applications/misc/electrum/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 5233aaf8fcd..8940c8dfd22 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1
+{ stdenv, fetchurl, fetchFromGitHub, wrapQtAppsHook, python3, python3Packages, zbar, secp256k1
 , enableQt ? !stdenv.isDarwin
 
 
@@ -54,6 +54,8 @@ python3Packages.buildPythonApplication rec {
     cp -ar ${tests} $sourceRoot/electrum/tests
   '';
 
+  nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
+
   propagatedBuildInputs = with python3Packages; [
     aiorpcx
     aiohttp
@@ -102,6 +104,11 @@ python3Packages.buildPythonApplication rec {
                 "Exec=$out/bin/electrum %u" \
       --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
                 "Exec=$out/bin/electrum --testnet %u"
+
+  '';
+
+  postFixup = stdenv.lib.optionalString enableQt ''
+    wrapQtApp $out/bin/electrum
   '';
 
   checkInputs = with python3Packages; [ pytest ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22200239c9b..f7eee90370a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17894,7 +17894,7 @@ in
 
   electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };
 
-  electrum = callPackage ../applications/misc/electrum { };
+  electrum = libsForQt5.callPackage ../applications/misc/electrum { };
 
   electrum-dash = callPackage ../applications/misc/electrum/dash.nix { };
 

From 78d1b2d29e6c64e78d423ddb718fb4451d462309 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 1 Sep 2019 09:40:13 +0000
Subject: [PATCH 639/794] cargo-watch: enable for darwin

---
 pkgs/development/tools/rust/cargo-watch/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix                     | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix
index 3ffef315c31..5ea935babd1 100644
--- a/pkgs/development/tools/rust/cargo-watch/default.nix
+++ b/pkgs/development/tools/rust/cargo-watch/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-watch";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1c3h9il3y0swvcdrrqgh5r7di522i1cc8zk1kfmx97chy8bhsqvg";
 
+  buildInputs = lib.optional stdenv.isDarwin CoreServices;
+
   # `test with_cargo` tries to call cargo-watch as a cargo subcommand
   # (calling cargo-watch with command `cargo watch`)
   checkPhase = "PATH=target/debug:$PATH cargo test";
@@ -21,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     description = "A Cargo subcommand for watching over Cargo project's source";
     homepage = https://github.com/passcod/cargo-watch;
     license = licenses.cc0;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ xrelkd ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ xrelkd ivan ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c06d9aa50d4..c2e866dbfa7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8361,7 +8361,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
   cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };
-  cargo-watch = callPackage ../development/tools/rust/cargo-watch { };
+  cargo-watch = callPackage ../development/tools/rust/cargo-watch {
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+  };
   cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
   cargo-generate = callPackage ../development/tools/rust/cargo-generate {
     inherit (darwin.apple_sdk.frameworks) Security;

From 7786d0718ce064f54288969b1a3d5f1a0e5c9be6 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 1 Sep 2019 12:31:30 +0200
Subject: [PATCH 640/794] nixos/prometheus-exporters: fix user generation

---
 .../services/monitoring/prometheus/exporters.nix     | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 2ab8910ff9d..b69310c34ff 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -132,14 +132,10 @@ let
     in
     mkIf conf.enable {
       warnings = conf.warnings or [];
-      users.users = (mkIf (conf.user == "${name}-exporter" && !enableDynamicUser) {
-        "${name}-exporter" = {
-          description = ''
-            Prometheus ${name} exporter service user
-          '';
-          isSystemUser = true;
-          inherit (conf) group;
-        };
+      users.users."${name}-exporter" = (mkIf (conf.user == "${name}-exporter" && !enableDynamicUser) {
+        description = "Prometheus ${name} exporter service user";
+        isSystemUser = true;
+        inherit (conf) group;
       });
       users.groups = (mkIf (conf.group == "${name}-exporter" && !enableDynamicUser) {
         "${name}-exporter" = {};

From 3057b03c7ccab29ead64c14c53fc777a1d286821 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 1 Sep 2019 11:20:57 +0000
Subject: [PATCH 641/794] linux_latest-libre: fix build

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

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 5eb050cbdff..e4a4e40f370 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -4,8 +4,8 @@
 
     # Update this if linux_latest-libre fails to build.
     # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+'
-    rev = "16330";
-    sha256 = "1d7rsq2m6lp1784cgdg95aspgrnzxm6q9dxqalxja5cac8n6p11y";
+    rev = "16604";
+    sha256 = "0d2dh52zv073zr74ilspy0fy3ivys5pq32j7fljs4fwi2bcljf51";
   }
 , ...
 }:

From 8d9bfb53c1a6173d0776185781a5e8212c9162be Mon Sep 17 00:00:00 2001
From: Florian Engel <florianengel39@gmail.com>
Date: Sun, 1 Sep 2019 13:25:40 +0200
Subject: [PATCH 642/794] lolcat: 99.9.99 -> 100.0.0

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

diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock
index f6aa88bbdea..ed48cc5921b 100644
--- a/pkgs/tools/misc/lolcat/Gemfile.lock
+++ b/pkgs/tools/misc/lolcat/Gemfile.lock
@@ -1,13 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    lolcat (99.9.99)
+    lolcat (100.0.0)
       manpages (~> 0.6.1)
       optimist (~> 3.0.0)
-      paint (~> 2.0.0)
+      paint (~> 2.1.0)
     manpages (0.6.1)
     optimist (3.0.0)
-    paint (2.0.3)
+    paint (2.1.1)
 
 PLATFORMS
   ruby
diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix
index f21e5637993..2c2bc9cead1 100644
--- a/pkgs/tools/misc/lolcat/gemset.nix
+++ b/pkgs/tools/misc/lolcat/gemset.nix
@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0422869sf6hif1nrfzi8fwklnrdqj6hxxwg3403xvd9d50yndrn4";
+      sha256 = "0k1m2ihcprjq9jdmq2v3xlf27hqbpr2vjnnyfwp3z2zspzbl0nys";
       type = "gem";
     };
-    version = "99.9.99";
+    version = "100.0.0";
   };
   manpages = {
     groups = ["default"];
@@ -35,9 +35,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ldb269l3pzkihmsws19cr9h3l6naw8c2fqpav8ck3nllnyiv7r2";
+      sha256 = "0rrb2p2yk6ffhm0gz8ba431mf63kq7w27gwavxl7n8qd2splj4mh";
       type = "gem";
     };
-    version = "2.0.3";
+    version = "2.1.1";
   };
-}
+}
\ No newline at end of file

From a39eb9dda475c568f0c0f593c316bdbca2f913e2 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 1 Sep 2019 13:41:28 +0200
Subject: [PATCH 643/794] pythonPackages.trezor: fix typo (pyarg vs pyargs)

---
 pkgs/development/python-modules/trezor/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 47aa23ca114..9b7dc424ddc 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -26,9 +26,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic ];
 
-  # build requires UTF-8 locale
-  LANG = "en_US.UTF-8";
-
   checkInputs = [
     pytest
   ];
@@ -36,7 +33,7 @@ buildPythonPackage rec {
   # disable test_tx_api.py as it requires being online
   checkPhase = ''
     runHook preCheck
-    ${python.interpreter} -m pytest --pyarg trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py
+    ${python.interpreter} -m pytest --pyargs trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py
     runHook postCheck
   '';
 

From ff2fd6c4e5720c4ef0d549431397f813b769c6e9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 31 Aug 2019 20:08:49 +0200
Subject: [PATCH 644/794] nixos/redis: unbreak module

The redis module currently fails to start up, most likely due to running
a chown as non-root in preStart.

While at it, I hardcoded it to use systemd's StateDirectory and
DynamicUser to manage directory permissions, removed the unused
appendOnlyFilename option, and the pidFile option.

We properly tell redis now it's daemonized, and it'll use notify support
to signal readiness.
---
 nixos/doc/manual/release-notes/rl-1909.xml |  5 ++
 nixos/modules/rename.nix                   |  9 +++-
 nixos/modules/services/databases/redis.nix | 58 +++++-----------------
 3 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index f831cfcdc57..14fafabde8e 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -599,6 +599,11 @@
       package and <literal>crashplan-small-business</literal> service have been
       removed from nixpkgs due to lack of maintainer.
     </para>
+    <para>
+      The <link linkend="opt-services.redis.enable">redis module</link> was hardcoded to use the <literal>redis</literal> user,
+      <filename class="directory">/run/redis</filename> as runtime directory and
+      <filename class="directory">/var/lib/redis</filename> as state directory.
+    </para>
    </listitem>
    <listitem>
     <para>
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 1048c2af2ea..9e0ab60ca67 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -256,7 +256,7 @@ with lib;
 
     # binfmt
     (mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])
-    
+
     # ACME
     (mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
     (mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
@@ -285,6 +285,13 @@ with lib;
           throw "services.redshift.longitude is set to null, you can remove this"
           else builtins.fromJSON value))
 
+    # Redis
+    (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
+    (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
+    (mkRemovedOptionModule [ "services" "redis" "dbFilename" ] "The redis module now uses /var/lib/redis/dump.rdb as database dump location.")
+    (mkRemovedOptionModule [ "services" "redis" "appendOnlyFilename" ] "This option was never used.")
+    (mkRemovedOptionModule [ "services" "redis" "pidFile" ] "This option was removed.")
+
   ] ++ (forEach [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
                    "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
                    "snmpExporter" "unifiExporter" "varnishExporter" ]
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index a11c8ff1275..9c389d80a6d 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -8,17 +8,19 @@ let
   condOption = name: value: if value != null then "${name} ${toString value}" else "";
 
   redisConfig = pkgs.writeText "redis.conf" ''
-    pidfile ${cfg.pidFile}
     port ${toString cfg.port}
     ${condOption "bind" cfg.bind}
     ${condOption "unixsocket" cfg.unixSocket}
+    daemonize yes
+    supervised systemd
     loglevel ${cfg.logLevel}
     logfile ${cfg.logfile}
     syslog-enabled ${redisBool cfg.syslog}
+    pidfile /run/redis/redis.pid
     databases ${toString cfg.databases}
     ${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save}
-    dbfilename ${cfg.dbFilename}
-    dir ${toString cfg.dbpath}
+    dbfilename dump.rdb
+    dir /var/lib/redis
     ${if cfg.slaveOf != null then "slaveof ${cfg.slaveOf.ip} ${toString cfg.slaveOf.port}" else ""}
     ${condOption "masterauth" cfg.masterAuth}
     ${condOption "requirepass" cfg.requirePass}
@@ -55,18 +57,6 @@ in
         description = "Which Redis derivation to use.";
       };
 
-      user = mkOption {
-        type = types.str;
-        default = "redis";
-        description = "User account under which Redis runs.";
-      };
-
-      pidFile = mkOption {
-        type = types.path;
-        default = "/var/lib/redis/redis.pid";
-        description = "";
-      };
-
       port = mkOption {
         type = types.int;
         default = 6379;
@@ -100,7 +90,7 @@ in
         type = with types; nullOr path;
         default = null;
         description = "The path to the socket to bind to.";
-        example = "/run/redis.sock";
+        example = "/run/redis/redis.sock";
       };
 
       logLevel = mkOption {
@@ -136,18 +126,6 @@ in
         example = [ [900 1] [300 10] [60 10000] ];
       };
 
-      dbFilename = mkOption {
-        type = types.str;
-        default = "dump.rdb";
-        description = "The filename where to dump the DB.";
-      };
-
-      dbpath = mkOption {
-        type = types.path;
-        default = "/var/lib/redis";
-        description = "The DB will be written inside this directory, with the filename specified using the 'dbFilename' configuration.";
-      };
-
       slaveOf = mkOption {
         default = null; # { ip, port }
         description = "An attribute set with two attributes: ip and port to which this redis instance acts as a slave.";
@@ -175,12 +153,6 @@ in
         description = "By default data is only periodically persisted to disk, enable this option to use an append-only file for improved persistence.";
       };
 
-      appendOnlyFilename = mkOption {
-        type = types.str;
-        default = "appendonly.aof";
-        description = "Filename for the append-only file (stored inside of dbpath)";
-      };
-
       appendFsync = mkOption {
         type = types.str;
         default = "everysec"; # no, always, everysec
@@ -222,19 +194,15 @@ in
       allowedTCPPorts = [ cfg.port ];
     };
 
-    users.users.redis =
-      { name = cfg.user;
-        description = "Redis database user";
-      };
+    users.users.redis.description = "Redis database user";
 
     environment.systemPackages = [ cfg.package ];
 
     systemd.services.disable-transparent-huge-pages = {
-      enable = config.services.redis.enable;
       description = "Disable Transparent Huge Pages (required by Redis)";
       before = [ "redis.service" ];
       wantedBy = [ "redis.service" ];
-      script = "echo never >/sys/kernel/mm/transparent_hugepage/enabled";
+      script = "echo never > /sys/kernel/mm/transparent_hugepage/enabled";
       serviceConfig.Type = "oneshot";
     };
 
@@ -244,14 +212,12 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
 
-        preStart = ''
-          install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
-          chown -R ${cfg.user} ${cfg.dbpath}
-        '';
-
         serviceConfig = {
           ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}";
-          User = cfg.user;
+          RuntimeDirectory = "redis";
+          StateDirectory = "redis";
+          Type = "notify";
+          User = "redis";
         };
       };
 

From 8680f72c880fcf573b42e9203339653a9af411bc Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 1 Sep 2019 14:12:10 +0200
Subject: [PATCH 645/794] nixos/redis: add changelog for #67768

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

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 14fafabde8e..3bb5bd84e0c 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -603,6 +603,9 @@
       The <link linkend="opt-services.redis.enable">redis module</link> was hardcoded to use the <literal>redis</literal> user,
       <filename class="directory">/run/redis</filename> as runtime directory and
       <filename class="directory">/var/lib/redis</filename> as state directory.
+      Note that the NixOS module for Redis now disables kernel support for Transparent Huge Pages (THP),
+      because this features causes major performance problems for Redis,
+      e.g. (https://redis.io/topics/latency).
     </para>
    </listitem>
    <listitem>

From c00c4b1940afe842675e32b2e69c3b13f7035643 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 31 Aug 2019 20:17:33 +0200
Subject: [PATCH 646/794] nixos/redis: add test

---
 nixos/tests/all-tests.nix |  1 +
 nixos/tests/redis.nix     | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 nixos/tests/redis.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 14dca7409c4..8ee4dfbf13b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -234,6 +234,7 @@ in
   rabbitmq = handleTest ./rabbitmq.nix {};
   radarr = handleTest ./radarr.nix {};
   radicale = handleTest ./radicale.nix {};
+  redis = handleTest ./redis.nix {};
   redmine = handleTest ./redmine.nix {};
   roundcube = handleTest ./roundcube.nix {};
   rspamd = handleTest ./rspamd.nix {};
diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix
new file mode 100644
index 00000000000..325d93424dd
--- /dev/null
+++ b/nixos/tests/redis.nix
@@ -0,0 +1,26 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "redis";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ flokli ];
+  };
+
+  nodes = {
+    machine =
+      { pkgs, ... }:
+
+      {
+        services.redis.enable = true;
+        services.redis.unixSocket = "/run/redis/redis.sock";
+      };
+  };
+
+  testScript = ''
+    startAll;
+
+    $machine->waitForUnit("redis");
+    $machine->waitForOpenPort("6379");
+
+    $machine->succeed("redis-cli ping | grep PONG");
+    $machine->succeed("redis-cli -s /run/redis/redis.sock ping | grep PONG");
+  '';
+})

From 18a5d23b55d0b0d1bff6bfd971d471d3064011c2 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Mon, 5 Aug 2019 20:24:18 +0200
Subject: [PATCH 647/794] nixos/printers: declarative configuration

---
 nixos/doc/manual/release-notes/rl-1909.xml |  10 ++
 nixos/modules/hardware/printers.nix        | 135 ++++++++++++++++
 nixos/modules/module-list.nix              |   1 +
 nixos/tests/printing.nix                   | 177 +++++++++++----------
 4 files changed, 242 insertions(+), 81 deletions(-)
 create mode 100644 nixos/modules/hardware/printers.nix

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index f831cfcdc57..2b5ae929ece 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -77,7 +77,17 @@
      <literal>./programs/dwm-status.nix</literal>
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The new <varname>hardware.printers</varname> module allows to declaratively configure CUPS printers
+     via the <varname>ensurePrinters</varname> and
+     <varname>ensureDefaultPrinter</varname> options.
+     <varname>ensurePrinters</varname> will never delete existing printers,
+     but will make sure that the given printers are configured as declared.
+    </para>
+   </listitem>
   </itemizedlist>
+
  </section>
 
  <section xmlns="http://docbook.org/ns/docbook"
diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix
new file mode 100644
index 00000000000..12ee5516d4e
--- /dev/null
+++ b/nixos/modules/hardware/printers.nix
@@ -0,0 +1,135 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+  cfg = config.hardware.printers;
+  ppdOptionsString = options: optionalString (options != {})
+    (concatStringsSep " "
+      (mapAttrsToList (name: value: "-o '${name}'='${value}'") options)
+    );
+  ensurePrinter = p: ''
+    ${pkgs.cups}/bin/lpadmin -p '${p.name}' -E \
+      ${optionalString (p.location != null) "-L '${p.location}'"} \
+      ${optionalString (p.description != null) "-D '${p.description}'"} \
+      -v '${p.deviceUri}' \
+      -m '${p.model}' \
+      ${ppdOptionsString p.ppdOptions}
+  '';
+  ensureDefaultPrinter = name: ''
+    ${pkgs.cups}/bin/lpoptions -d '${name}'
+  '';
+
+  # "graph but not # or /" can't be implemented as regex alone due to missing lookahead support
+  noInvalidChars = str: all (c: c != "#" && c != "/") (stringToCharacters str);
+  printerName = (types.addCheck (types.strMatching "[[:graph:]]+") noInvalidChars)
+    // { description = "printable string without spaces, # and /"; };
+
+
+in {
+  options = {
+    hardware.printers = {
+      ensureDefaultPrinter = mkOption {
+        type = types.nullOr printerName;
+        default = null;
+        description = ''
+          Ensures the named printer is the default CUPS printer / printer queue.
+        '';
+      };
+      ensurePrinters = mkOption {
+        description = ''
+          Will regularly ensure that the given CUPS printers are configured as declared here.
+          If a printer's options are manually changed afterwards, they will be overwritten eventually.
+          This option will never delete any printer, even if removed from this list.
+          You can check existing printers with <command>lpstat -s</command>
+          and remove printers with <command>lpadmin -x &lt;printer-name&gt;</command>.
+          Printers not listed here can still be manually configured.
+        '';
+        default = [];
+        type = types.listOf (types.submodule {
+          options = {
+            name = mkOption {
+              type = printerName;
+              example = "BrotherHL_Workroom";
+              description = ''
+                Name of the printer / printer queue.
+                May contain any printable characters except "/", "#", and space.
+              '';
+            };
+            location = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              example = "Workroom";
+              description = ''
+                Optional human-readable location.
+              '';
+            };
+            description = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              example = "Brother HL-5140";
+              description = ''
+                Optional human-readable description.
+              '';
+            };
+            deviceUri = mkOption {
+              type = types.str;
+              example = [
+                "ipp://printserver.local/printers/BrotherHL_Workroom"
+                "usb://HP/DESKJET%20940C?serial=CN16E6C364BH"
+              ];
+              description = ''
+                How to reach the printer.
+                <command>lpinfo -v</command> shows a list of supported device URIs and schemes.
+              '';
+            };
+            model = mkOption {
+              type = types.str;
+              example = literalExample ''
+                gutenprint.''${lib.version.majorMinor (lib.getVersion pkgs.cups)}://brother-hl-5140/expert
+              '';
+              description = ''
+                Location of the ppd driver file for the printer.
+                <command>lpinfo -m</command> shows a list of supported models.
+              '';
+            };
+            ppdOptions = mkOption {
+              type = types.attrsOf types.str;
+              example = {
+                "PageSize" = "A4";
+                "Duplex" = "DuplexNoTumble";
+              };
+              default = {};
+              description = ''
+                Sets PPD options for the printer.
+                <command>lpoptions [-p printername] -l</command> shows suported PPD options for the given printer.
+              '';
+            };
+          };
+        });
+      };
+    };
+  };
+
+  config = mkIf (cfg.ensurePrinters != [] && config.services.printing.enable) {
+    systemd.services."ensure-printers" = let
+      cupsUnit = if config.services.printing.startWhenNeeded then "cups.socket" else "cups.service";
+    in {
+      description = "Ensure NixOS-configured CUPS printers";
+      wantedBy = [ "multi-user.target" ];
+      requires = [ cupsUnit ];
+      # in contrast to cups.socket, for cups.service, this is actually not enough,
+      # as the cups service reports its activation before clients can actually interact with it.
+      # Because of this, commands like `lpinfo -v` will report a bad file descriptor
+      # due to the missing UNIX socket without sufficient sleep time.
+      after = [ cupsUnit ];
+
+      serviceConfig = {
+        Type = "oneshot";
+      };
+
+       # sleep 10 is required to wait until cups.service is actually initialized and has created its UNIX socket file
+      script = (optionalString (!config.services.printing.startWhenNeeded) "sleep 10\n")
+        + (concatMapStringsSep "\n" ensurePrinter cfg.ensurePrinters)
+        + optionalString (cfg.ensureDefaultPrinter != null) (ensureDefaultPrinter cfg.ensureDefaultPrinter);
+    };
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c84ef3d6d9b..12fb67d279d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -59,6 +59,7 @@
   ./hardware/nitrokey.nix
   ./hardware/opengl.nix
   ./hardware/pcmcia.nix
+  ./hardware/printers.nix
   ./hardware/raid/hpsa.nix
   ./hardware/steam-hardware.nix
   ./hardware/usb-wwan.nix
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 74583ae5562..4d0df289cf7 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -1,99 +1,114 @@
 # Test printing via CUPS.
 
-import ./make-test.nix ({pkgs, ... }: {
+import ./make-test.nix ({pkgs, ... }:
+let
+  printingServer = startWhenNeeded: {
+    services.printing.enable = true;
+    services.printing.startWhenNeeded = startWhenNeeded;
+    services.printing.listenAddresses = [ "*:631" ];
+    services.printing.defaultShared = true;
+    services.printing.extraConf =
+      ''
+        <Location />
+          Order allow,deny
+          Allow from all
+        </Location>
+      '';
+    networking.firewall.allowedTCPPorts = [ 631 ];
+    # Add a HP Deskjet printer connected via USB to the server.
+    hardware.printers.ensurePrinters = [{
+      name = "DeskjetLocal";
+      deviceUri = "usb://foobar/printers/foobar";
+      model = "drv:///sample.drv/deskjet.ppd";
+    }];
+  };
+  printingClient = startWhenNeeded: {
+    services.printing.enable = true;
+    services.printing.startWhenNeeded = startWhenNeeded;
+    # Add printer to the client as well, via IPP.
+    hardware.printers.ensurePrinters = [{
+      name = "DeskjetRemote";
+      deviceUri = "ipp://${if startWhenNeeded then "socketActivatedServer" else "serviceServer"}/printers/DeskjetLocal";
+      model = "drv:///sample.drv/deskjet.ppd";
+    }];
+    hardware.printers.ensureDefaultPrinter = "DeskjetRemote";
+  };
+
+in
+
+{
   name = "printing";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ domenkozar eelco matthewbauer ];
   };
 
   nodes = {
+    socketActivatedServer = { ... }: (printingServer true);
+    serviceServer = { ... }: (printingServer false);
 
-    server =
-      { ... }:
-      { services.printing.enable = true;
-        services.printing.listenAddresses = [ "*:631" ];
-        services.printing.defaultShared = true;
-        services.printing.extraConf =
-          ''
-            <Location />
-              Order allow,deny
-              Allow from all
-            </Location>
-          '';
-        networking.firewall.allowedTCPPorts = [ 631 ];
-      };
-
-    client =
-      { ... }:
-      { services.printing.enable = true;
-      };
-
+    socketActivatedClient = { ... }: (printingClient true);
+    serviceClient = { ... }: (printingClient false);
   };
 
   testScript =
     ''
       startAll;
 
-      $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
-      # check local encrypted connections work without error
-      $client->succeed("lpstat -E -r") =~ /scheduler is running/ or die;
-      # Test that UNIX socket is used for connections.
-      $client->succeed("lpstat -H") =~ "/run/cups/cups.sock" or die;
-      # Test that HTTP server is available too.
-      $client->succeed("curl --fail http://localhost:631/");
-      $client->succeed("curl --fail http://server:631/");
-      $server->fail("curl --fail --connect-timeout 2  http://client:631/");
-
-      # Add a HP Deskjet printer connected via USB to the server.
-      $server->succeed("lpadmin -p DeskjetLocal -E -v usb://foobar/printers/foobar");
-
-      # Add it to the client as well via IPP.
-      $client->succeed("lpadmin -p DeskjetRemote -E -v ipp://server/printers/DeskjetLocal");
-      $client->succeed("lpadmin -d DeskjetRemote");
-
-      # Do some status checks.
-      $client->succeed("lpstat -a") =~ /DeskjetRemote accepting requests/ or die;
-      $client->succeed("lpstat -h server:631 -a") =~ /DeskjetLocal accepting requests/ or die;
-      $client->succeed("cupsdisable DeskjetRemote");
-      $client->succeed("lpq") =~ /DeskjetRemote is not ready.*no entries/s or die;
-      $client->succeed("cupsenable DeskjetRemote");
-      $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die;
-
-      # Test printing various file types.
-      foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
-                        "${pkgs.groff.doc}/share/doc/*/meref.ps",
-                        "${pkgs.cups.out}/share/doc/cups/images/cups.png",
-                        "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt")
-      {
-          $file =~ /([^\/]*)$/; my $fn = $1;
-
-          subtest "print $fn", sub {
-
-              # Print the file on the client.
-              $client->succeed("lp $file");
-              $client->sleep(10);
-              $client->succeed("lpq") =~ /active.*root.*$fn/ or die;
-
-              # Ensure that a raw PCL file appeared in the server's queue
-              # (showing that the right filters have been applied).  Of
-              # course, since there is no actual USB printer attached, the
-              # file will stay in the queue forever.
-              $server->waitForFile("/var/spool/cups/d*-001");
-              $server->sleep(10);
-              $server->succeed("lpq -a") =~ /$fn/ or die;
-
-              # Delete the job on the client.  It should disappear on the
-              # server as well.
-              $client->succeed("lprm");
-              $client->sleep(10);
-              $client->succeed("lpq -a") =~ /no entries/;
-              Machine::retry sub {
-                return 1 if $server->succeed("lpq -a") =~ /no entries/;
+      # Make sure that cups is up on both sides.
+      $serviceServer->waitForUnit("cups.service");
+      $serviceClient->waitForUnit("cups.service");
+      # wait until cups is fully initialized and ensure-printers has executed with 10s delay
+      $serviceClient->sleep(20);
+      $socketActivatedClient->waitUntilSucceeds("systemctl status ensure-printers | grep -q -E 'code=exited, status=0/SUCCESS'");
+      sub testPrinting {
+          my ($client, $server) = (@_);
+          my $clientHostname = $client->name();
+          my $serverHostname = $server->name();
+          $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
+          # Test that UNIX socket is used for connections.
+          $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
+          # Test that HTTP server is available too.
+          $client->succeed("curl --fail http://localhost:631/");
+          $client->succeed("curl --fail http://$serverHostname:631/");
+          $server->fail("curl --fail --connect-timeout 2  http://$clientHostname:631/");
+          # Do some status checks.
+          $client->succeed("lpstat -a") =~ /DeskjetRemote accepting requests/ or die;
+          $client->succeed("lpstat -h $serverHostname:631 -a") =~ /DeskjetLocal accepting requests/ or die;
+          $client->succeed("cupsdisable DeskjetRemote");
+          $client->succeed("lpq") =~ /DeskjetRemote is not ready.*no entries/s or die;
+          $client->succeed("cupsenable DeskjetRemote");
+          $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die;
+          # Test printing various file types.
+          foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
+                            "${pkgs.groff.doc}/share/doc/*/meref.ps",
+                            "${pkgs.cups.out}/share/doc/cups/images/cups.png",
+                            "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt")
+          {
+              $file =~ /([^\/]*)$/; my $fn = $1;
+              subtest "print $fn", sub {
+                  # Print the file on the client.
+                  $client->succeed("lp $file");
+                  $client->waitUntilSucceeds("lpq | grep -q -E 'active.*root.*$fn'");
+                  # Ensure that a raw PCL file appeared in the server's queue
+                  # (showing that the right filters have been applied).  Of
+                  # course, since there is no actual USB printer attached, the
+                  # file will stay in the queue forever.
+                  $server->waitForFile("/var/spool/cups/d*-001");
+                  $server->waitUntilSucceeds("lpq -a | grep -q -E '$fn'");
+                  # Delete the job on the client.  It should disappear on the
+                  # server as well.
+                  $client->succeed("lprm");
+                  $client->waitUntilSucceeds("lpq -a | grep -q -E 'no entries'");
+                  Machine::retry sub {
+                    return 1 if $server->succeed("lpq -a") =~ /no entries/;
+                  };
+                  # The queue is empty already, so this should be safe.
+                  # Otherwise, pairs of "c*"-"d*-001" files might persist.
+                  $server->execute("rm /var/spool/cups/*");
               };
-              # The queue is empty already, so this should be safe.
-              # Otherwise, pairs of "c*"-"d*-001" files might persist.
-              $server->execute("rm /var/spool/cups/*");
-          };
+          }
       }
-    '';
+      testPrinting($serviceClient, $serviceServer);
+      testPrinting($socketActivatedClient, $socketActivatedServer);
+  '';
 })

From c6b3ed4bfcf28622d450df66bcc5f9d019489b3f Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 1 Sep 2019 10:20:42 -0400
Subject: [PATCH 648/794] nixos/deluge: fix directory creation errors

---
 nixos/modules/services/torrent/deluge.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index 48ec4d692e2..d8810a4481b 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -173,7 +173,11 @@ in {
     # Provide a default set of `extraPackages`.
     services.deluge.extraPackages = with pkgs; [ unzip gnutar xz p7zip bzip2 ];
 
-    systemd.tmpfiles.rules = [ "d '${configDir}' 0770 ${cfg.user} ${cfg.group}" ]
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group}"
+      "d '${cfg.dataDir}/.config' 0770 ${cfg.user} ${cfg.group}"
+      "d '${cfg.dataDir}/.config/deluge' 0770 ${cfg.user} ${cfg.group}"
+    ]
     ++ optional (cfg.config ? "download_location")
       "d '${cfg.config.download_location}' 0770 ${cfg.user} ${cfg.group}"
     ++ optional (cfg.config ? "torrentfiles_location")
@@ -237,7 +241,6 @@ in {
         group = cfg.group;
         uid = config.ids.uids.deluge;
         home = cfg.dataDir;
-        createHome = true;
         description = "Deluge Daemon user";
       };
     };

From 9334ce105abe3b5fe7e1ace3341e637b97fd1e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sun, 1 Sep 2019 15:33:32 +0200
Subject: [PATCH 649/794] nomacs: really use Qt mkDerivation

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

diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index fbf595f1537..62fae518b92 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -15,7 +15,7 @@
 , quazip
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "nomacs";
   version = "3.12";
 

From f74070baf51a14ccd34cb6b4c475358f4ce0b634 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Fri, 30 Aug 2019 12:34:39 +0000
Subject: [PATCH 650/794] clightning: 0.7.1 -> 0.7.2.1

---
 pkgs/applications/blockchains/clightning.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix
index a8846431f1e..b20a6b3e8aa 100644
--- a/pkgs/applications/blockchains/clightning.nix
+++ b/pkgs/applications/blockchains/clightning.nix
@@ -4,17 +4,19 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "0.7.1";
+  version = "0.7.2.1";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    sha256 = "557be34410f27a8d55d9f31a40717a8f5e99829f2bd114c24e7ca1dd5f6b7d85";
+    sha256 = "3be716948efc1208b5e6a41e3034e4e4eecc5abbdac769fd1d999a104ac3a2ec";
   };
 
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which unzip ];
-  buildInputs = [ sqlite gmp zlib python3 ];
+  buildInputs =
+    let py3 = python3.withPackages (p: [ p.Mako ]);
+    in [ sqlite gmp zlib py3 ];
 
   makeFlags = [ "prefix=$(out) VERSION=v${version}" ];
 
@@ -23,7 +25,10 @@ stdenv.mkDerivation rec {
   '';
 
   postPatch = ''
-    patchShebangs tools/generate-wire.py
+    patchShebangs \
+      tools/generate-wire.py \
+      tools/update-mocks.sh \
+      tools/mockup.sh
   '';
 
   doCheck = false;

From cec822a7bb3e8b83faebbe6e4f194cd03c2322cb Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Sun, 1 Sep 2019 09:57:36 -0700
Subject: [PATCH 651/794] release-notes: add altcoins removal note

Release notes for #67687 (bc08b42da4dbdc1c66385bab7a2eae2935e055c0) [1]
Related issue: #25025 [2]

[1] https://github.com/NixOS/nixpkgs/issues/67687
[2] https://github.com/NixOS/nixpkgs/issues/25025

Suggested-by: @mmahut
Signed-off-by: William Casarin <jb55@jb55.com>
---
 nixos/doc/manual/release-notes/rl-1909.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 3bb5bd84e0c..a4419f1c8a1 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -628,6 +628,14 @@
      </itemizedlist>
     </para>
    </listitem>
+   <listitem>
+     <para>
+       The <literal>altcoins</literal> categorization of packages has
+       been removed. You now access these packages at the top level,
+       ie. <literal>nix-shell -p dogecoin</literal> instead of
+       <literal>nix-shell -p altcoins.dogecoin</literal>, etc.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>

From f74735c9d7e7b978827ff17b5f8cb375753dca0b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 1 Sep 2019 03:07:23 +0200
Subject: [PATCH 652/794] nixos: remove dependencies on local-fs.target

Since https://github.com/NixOS/nixpkgs/pull/61321, local-fs.target is
part of sysinit.target again, meaning units without
DefaultDependencies=no will automatically depend on it, and the manual
set dependencies can be dropped.
---
 .../services/computing/boinc/client.nix       |  2 +-
 .../services/desktops/profile-sync-daemon.nix |  2 +-
 .../services/hardware/triggerhappy.nix        |  1 -
 nixos/modules/services/misc/airsonic.nix      |  2 +-
 nixos/modules/services/misc/mediatomb.nix     |  2 +-
 nixos/modules/services/misc/mwlib.nix         |  5 ++---
 nixos/modules/services/misc/serviio.nix       | 16 +++++++-------
 nixos/modules/services/misc/subsonic.nix      |  2 +-
 .../services/network-filesystems/ceph.nix     | 22 +++++++++----------
 .../network-filesystems/glusterfs.nix         |  2 +-
 .../services/network-filesystems/ipfs.nix     |  7 +++---
 nixos/modules/services/networking/aria2.nix   |  2 +-
 .../services/networking/logmein-hamachi.nix   |  2 +-
 .../modules/services/networking/minidlna.nix  |  2 +-
 nixos/modules/services/networking/resilio.nix |  2 +-
 nixos/modules/services/scheduling/fcron.nix   |  1 -
 nixos/modules/services/security/tor.nix       |  1 -
 nixos/modules/services/security/usbguard.nix  |  2 +-
 nixos/modules/services/system/cgmanager.nix   |  1 -
 nixos/modules/services/system/cloud-init.nix  |  6 ++---
 .../modules/services/torrent/transmission.nix |  2 +-
 nixos/modules/services/x11/xserver.nix        |  2 +-
 nixos/modules/virtualisation/azure-agent.nix  |  1 -
 nixos/modules/virtualisation/azure-image.nix  |  1 -
 nixos/tests/hocker-fetchdocker/machine.nix    |  4 ++--
 25 files changed, 41 insertions(+), 51 deletions(-)

diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
index 7022751b3f0..a7edac02538 100644
--- a/nixos/modules/services/computing/boinc/client.nix
+++ b/nixos/modules/services/computing/boinc/client.nix
@@ -111,7 +111,7 @@ in
 
       systemd.services.boinc = {
         description = "BOINC Client";
-        after = ["network.target" "local-fs.target"];
+        after = ["network.target"];
         wantedBy = ["multi-user.target"];
         script = ''
           ${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag}
diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix
index e4e47cfbd43..a8ac22ac127 100644
--- a/nixos/modules/services/desktops/profile-sync-daemon.nix
+++ b/nixos/modules/services/desktops/profile-sync-daemon.nix
@@ -34,7 +34,7 @@ in {
           psd = {
             enable = true;
             description = "Profile Sync daemon";
-            wants = [ "psd-resync.service" "local-fs.target" ];
+            wants = [ "psd-resync.service" ];
             wantedBy = [ "default.target" ];
             path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
             unitConfig = {
diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix
index a500cb4fc36..f9f5234bdc3 100644
--- a/nixos/modules/services/hardware/triggerhappy.nix
+++ b/nixos/modules/services/hardware/triggerhappy.nix
@@ -102,7 +102,6 @@ in
 
     systemd.services.triggerhappy = {
       wantedBy = [ "multi-user.target" ];
-      after = [ "local-fs.target" ];
       description = "Global hotkey daemon";
       serviceConfig = {
         ExecStart = "${pkgs.triggerhappy}/bin/thd ${optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";
diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
index 4480445c1ea..f449ccaa8d2 100644
--- a/nixos/modules/services/misc/airsonic.nix
+++ b/nixos/modules/services/misc/airsonic.nix
@@ -105,7 +105,7 @@ in {
   config = mkIf cfg.enable {
     systemd.services.airsonic = {
       description = "Airsonic Media Server";
-      after = [ "local-fs.target" "network.target" ];
+      after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
       preStart = ''
diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix
index dbf12fd1da3..107fb57fe1c 100644
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixos/modules/services/misc/mediatomb.nix
@@ -259,7 +259,7 @@ in {
   config = mkIf cfg.enable {
     systemd.services.mediatomb = {
       description = "MediaTomb media Server";
-      after = [ "local-fs.target" "network.target" ];
+      after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.mediatomb ];
       serviceConfig.ExecStart = "${pkgs.mediatomb}/bin/mediatomb -p ${toString cfg.port} ${if cfg.interface!="" then "-e ${cfg.interface}" else ""} ${if cfg.customCfg then "" else "-c ${mtConf}"} -m ${cfg.dataDir}";
diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix
index a8edecff2a1..6b41b552a86 100644
--- a/nixos/modules/services/misc/mwlib.nix
+++ b/nixos/modules/services/misc/mwlib.nix
@@ -165,7 +165,7 @@ in
 
   }; # options.services
 
-  config = { 
+  config = {
 
     systemd.services.mwlib-nserve = mkIf cfg.nserve.enable
     {
@@ -191,7 +191,6 @@ in
       description = "mwlib job queue server";
 
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "local-fs.target" ];
 
       preStart = ''
         mkdir -pv '${cfg.qserve.datadir}'
@@ -218,7 +217,7 @@ in
       description = "mwlib worker";
 
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "local-fs.target" ];
+      after = [ "network.target" ];
 
       preStart = ''
         mkdir -pv '${cfg.nslave.cachedir}'
diff --git a/nixos/modules/services/misc/serviio.nix b/nixos/modules/services/misc/serviio.nix
index 8808f2d2193..9868192724b 100644
--- a/nixos/modules/services/misc/serviio.nix
+++ b/nixos/modules/services/misc/serviio.nix
@@ -10,7 +10,7 @@ let
     #!${pkgs.bash}/bin/sh
 
     SERVIIO_HOME=${pkgs.serviio}
-    
+
     # Setup the classpath
     SERVIIO_CLASS_PATH="$SERVIIO_HOME/lib/*:$SERVIIO_HOME/config"
 
@@ -21,13 +21,13 @@ let
     # Execute the JVM in the foreground
     exec ${pkgs.jre}/bin/java -Xmx512M -Xms20M -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@"
   '';
-  
+
 in {
 
   ###### interface
   options = {
     services.serviio = {
-      
+
       enable = mkOption {
         type = types.bool;
         default = false;
@@ -52,7 +52,7 @@ in {
   config = mkIf cfg.enable {
     systemd.services.serviio = {
       description = "Serviio Media Server";
-      after = [ "local-fs.target" "network.target" ];
+      after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.serviio ];
       serviceConfig = {
@@ -64,7 +64,7 @@ in {
     };
 
     users.users = [
-      { 
+      {
         name = "serviio";
         group = "serviio";
         home = cfg.dataDir;
@@ -75,16 +75,16 @@ in {
     ];
 
     users.groups = [
-      { name = "serviio";} 
+      { name = "serviio";}
     ];
 
     networking.firewall = {
-      allowedTCPPorts = [ 
+      allowedTCPPorts = [
         8895  # serve UPnP responses
         23423 # console
         23424 # mediabrowser
       ];
-      allowedUDPPorts = [ 
+      allowedUDPPorts = [
         1900 # UPnP service discovey
       ];
     };
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
index c1e1a7f40f0..152917d345c 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -105,7 +105,7 @@ let cfg = config.services.subsonic; in {
   config = mkIf cfg.enable {
     systemd.services.subsonic = {
       description = "Personal media streamer";
-      after = [ "local-fs.target" "network.target" ];
+      after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       script = ''
         ${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m \
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index 4e3bc839d40..54841861c08 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -9,7 +9,7 @@ let
   translateOption = replaceStrings upperChars (map (s: " ${s}") lowerChars);
   generateDaemonList = (daemonType: daemons: extraServiceConfig:
     mkMerge (
-      map (daemon: 
+      map (daemon:
         { "ceph-${daemonType}-${daemon}" = generateServiceFile daemonType daemon cfg.global.clusterName ceph extraServiceConfig; }
       ) daemons
     )
@@ -17,8 +17,8 @@ let
   generateServiceFile = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: {
     enable = true;
     description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}";
-    after = [ "network-online.target" "local-fs.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
-    wants = [ "network-online.target" "local-fs.target" "time-sync.target" ];
+    after = [ "network-online.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
+    wants = [ "network-online.target" "time-sync.target" ];
     partOf = [ "ceph-${daemonType}.target" ];
     wantedBy = [ "ceph-${daemonType}.target" ];
 
@@ -41,7 +41,7 @@ let
         daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}"
         if [ ! -d ''$daemonPath ]; then
           mkdir -m 755 -p ''$daemonPath
-          chown -R ceph:ceph ''$daemonPath 
+          chown -R ceph:ceph ''$daemonPath
         fi
       '';
     } // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; }
@@ -55,7 +55,7 @@ let
       };
     }
   );
-in 
+in
 {
   options.services.ceph = {
     # Ceph has a monolithic configuration file but different sections for
@@ -86,7 +86,7 @@ in
         type = with types; nullOr commas;
         default = null;
         example = ''
-          node0, node1, node2 
+          node0, node1, node2
         '';
         description = ''
           List of hosts that will be used as monitors at startup.
@@ -313,9 +313,9 @@ in
       }
     ];
 
-    warnings = optional (cfg.global.monInitialMembers == null) 
+    warnings = optional (cfg.global.monInitialMembers == null)
       ''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function'';
-    
+
     environment.etc."ceph/ceph.conf".text = let
       # Translate camelCaseOptions to the expected camel case option for ceph.conf
       translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global;
@@ -344,13 +344,13 @@ in
     };
 
     systemd.services = let
-      services = [] 
-        ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; }) 
+      services = []
+        ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; })
         ++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; })
         ++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; })
         ++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { })
         ++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; });
-      in 
+      in
         mkMerge services;
 
     systemd.targets = let
diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix
index 00875c6c4a1..d70092999f6 100644
--- a/nixos/modules/services/network-filesystems/glusterfs.nix
+++ b/nixos/modules/services/network-filesystems/glusterfs.nix
@@ -156,7 +156,7 @@ in
       wantedBy = [ "multi-user.target" ];
 
       requires = lib.optional cfg.useRpcbind "rpcbind.service";
-      after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";
+      after = [ "network.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";
 
       preStart = ''
         install -m 0755 -d /var/log/glusterfs
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index bbbfcf6a473..b6d881afd7b 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -236,7 +236,6 @@ in {
     systemd.services.ipfs-init = recursiveUpdate commonEnv {
       description = "IPFS Initializer";
 
-      after = [ "local-fs.target" ];
       before = [ "ipfs.service" "ipfs-offline.service" "ipfs-norouting.service" ];
 
       script = ''
@@ -263,21 +262,21 @@ in {
     systemd.services.ipfs = recursiveUpdate baseService {
       description = "IPFS Daemon";
       wantedBy = mkIf (cfg.defaultMode == "online") [ "multi-user.target" ];
-      after = [ "network.target" "local-fs.target" "ipfs-init.service" ];
+      after = [ "network.target" "ipfs-init.service" ];
       conflicts = [ "ipfs-offline.service" "ipfs-norouting.service"];
     };
 
     systemd.services.ipfs-offline = recursiveUpdate baseService {
       description = "IPFS Daemon (offline mode)";
       wantedBy = mkIf (cfg.defaultMode == "offline") [ "multi-user.target" ];
-      after = [ "local-fs.target" "ipfs-init.service" ];
+      after = [ "ipfs-init.service" ];
       conflicts = [ "ipfs.service" "ipfs-norouting.service"];
     };
 
     systemd.services.ipfs-norouting = recursiveUpdate baseService {
       description = "IPFS Daemon (no routing mode)";
       wantedBy = mkIf (cfg.defaultMode == "norouting") [ "multi-user.target" ];
-      after = [ "local-fs.target" "ipfs-init.service" ];
+      after = [ "ipfs-init.service" ];
       conflicts = [ "ipfs.service" "ipfs-offline.service"];
     };
 
diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix
index c5b146283de..156fef14479 100644
--- a/nixos/modules/services/networking/aria2.nix
+++ b/nixos/modules/services/networking/aria2.nix
@@ -109,7 +109,7 @@ in
 
     systemd.services.aria2 = {
       description = "aria2 Service";
-      after = [ "local-fs.target" "network.target" ];
+      after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''
         if [[ ! -e "${sessionFile}" ]]
diff --git a/nixos/modules/services/networking/logmein-hamachi.nix b/nixos/modules/services/networking/logmein-hamachi.nix
index 406626a8a34..11cbdda2f84 100644
--- a/nixos/modules/services/networking/logmein-hamachi.nix
+++ b/nixos/modules/services/networking/logmein-hamachi.nix
@@ -35,7 +35,7 @@ in
       description = "LogMeIn Hamachi Daemon";
 
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "local-fs.target" ];
+      after = [ "network.target" ];
 
       serviceConfig = {
         Type = "forking";
diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index ed0c1044a57..0947471adbc 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -96,7 +96,7 @@ in
       { description = "MiniDLNA Server";
 
         wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" "local-fs.target" ];
+        after = [ "network.target" ];
 
         serviceConfig =
           { User = "minidlna";
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index ee7f82ac7be..9b25aa57583 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -249,7 +249,7 @@ in
     systemd.services.resilio = with pkgs; {
       description = "Resilio Sync Service";
       wantedBy    = [ "multi-user.target" ];
-      after       = [ "network.target" "local-fs.target" ];
+      after       = [ "network.target" ];
       serviceConfig = {
         Restart   = "on-abort";
         UMask     = "0002";
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index f77b3bcd592..e43ca014e14 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -143,7 +143,6 @@ in
     };
     systemd.services.fcron = {
       description = "fcron daemon";
-      after = [ "local-fs.target" ];
       wantedBy = [ "multi-user.target" ];
 
       path = [ pkgs.fcron ];
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index abdc0cd78b4..ed862387cce 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -722,7 +722,6 @@ in
     systemd.services.tor-init =
       { description = "Tor Daemon Init";
         wantedBy = [ "tor.service" ];
-        after = [ "local-fs.target" ];
         script = ''
           install -m 0700 -o tor -g tor -d ${torDirectory} ${torDirectory}/onion
           install -m 0750 -o tor -g tor -d ${torRunDirectory}
diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix
index 20d5e3b28eb..4ced5acd9bd 100644
--- a/nixos/modules/services/security/usbguard.nix
+++ b/nixos/modules/services/security/usbguard.nix
@@ -195,7 +195,7 @@ in {
       description = "USBGuard daemon";
 
       wantedBy = [ "basic.target" ];
-      wants = [ "systemd-udevd.service" "local-fs.target" ];
+      wants = [ "systemd-udevd.service" ];
 
       # make sure an empty rule file and required directories exist
       preStart = ''
diff --git a/nixos/modules/services/system/cgmanager.nix b/nixos/modules/services/system/cgmanager.nix
index 59d3deced86..d3d57aa7692 100644
--- a/nixos/modules/services/system/cgmanager.nix
+++ b/nixos/modules/services/system/cgmanager.nix
@@ -14,7 +14,6 @@ in {
   config = mkIf cfg.enable {
     systemd.services.cgmanager = {
       wantedBy = [ "multi-user.target" ];
-      after = [ "local-fs.target" ];
       description = "Cgroup management daemon";
       restartIfChanged = false;
       serviceConfig = {
diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index 3ad555f78ef..15fe822aec6 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -112,8 +112,6 @@ in
     systemd.services.cloud-init-local =
       { description = "Initial cloud-init job (pre-networking)";
         wantedBy = [ "multi-user.target" ];
-        wants = [ "local-fs.target" ];
-        after = [ "local-fs.target" ];
         path = path;
         serviceConfig =
           { Type = "oneshot";
@@ -127,9 +125,9 @@ in
     systemd.services.cloud-init =
       { description = "Initial cloud-init job (metadata service crawler)";
         wantedBy = [ "multi-user.target" ];
-        wants = [ "local-fs.target" "network-online.target" "cloud-init-local.service"
+        wants = [ "network-online.target" "cloud-init-local.service"
                   "sshd.service" "sshd-keygen.service" ];
-        after = [ "local-fs.target" "network-online.target" "cloud-init-local.service" ];
+        after = [ "network-online.target" "cloud-init-local.service" ];
         before = [ "sshd.service" "sshd-keygen.service" ];
         requires = [ "network.target "];
         path = path;
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index a94a471361e..7409eb8cdcb 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -102,7 +102,7 @@ in
   config = mkIf cfg.enable {
     systemd.services.transmission = {
       description = "Transmission BitTorrent Service";
-      after = [ "local-fs.target" "network.target" ] ++ optional apparmor "apparmor.service";
+      after = [ "network.target" ] ++ optional apparmor "apparmor.service";
       requires = mkIf apparmor [ "apparmor.service" ];
       wantedBy = [ "multi-user.target" ];
 
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index c94a0643831..a8406544a72 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -659,7 +659,7 @@ in
     systemd.services.display-manager =
       { description = "X11 Server";
 
-        after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" "systemd-logind.service" ];
+        after = [ "systemd-udev-settle.service" "acpid.service" "systemd-logind.service" ];
         wants = [ "systemd-udev-settle.service" ];
 
         restartIfChanged = false;
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index 770cefbcd51..036b1036f92 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -166,7 +166,6 @@ in
 
       wantedBy = [ "sshd.service" "waagent.service" ];
       before = [ "sshd.service" "waagent.service" ];
-      after = [ "local-fs.target" ];
 
       path  = [ pkgs.coreutils ];
       script =
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index dd2108ccc37..e91dd72ff5d 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -26,7 +26,6 @@ in
 
       wantedBy = [ "sshd.service" "waagent.service" ];
       before = [ "sshd.service" "waagent.service" ];
-      after = [ "local-fs.target" ];
 
       path  = [ pkgs.coreutils ];
       script =
diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix
index 78343f0e02f..885adebe149 100644
--- a/nixos/tests/hocker-fetchdocker/machine.nix
+++ b/nixos/tests/hocker-fetchdocker/machine.nix
@@ -11,8 +11,8 @@
   systemd.services.docker-load-fetchdocker-image = {
     description = "Docker load hello-world-container";
     wantedBy    = [ "multi-user.target" ];
-    wants       = [ "docker.service" "local-fs.target" ];
-    after       = [ "docker.service" "local-fs.target" ];
+    wants       = [ "docker.service" ];
+    after       = [ "docker.service" ];
 
     script = ''
       ${pkgs.hello-world-container}/compositeImage.sh | ${pkgs.docker}/bin/docker load

From 9e5aa25c538e411ee857847275b63ee4137ac3c6 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 1 Sep 2019 12:57:21 -0400
Subject: [PATCH 653/794] sd-image: don't use installer.cloneConfig option that
 is not imported

This once again allows sd-image.nix to imported standalone to build SD images
of arbitrary NixOS systems.
---
 nixos/doc/manual/configuration/profiles/clone-config.xml      | 2 +-
 nixos/modules/installer/cd-dvd/sd-image-aarch64.nix           | 4 ++++
 .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix        | 4 ++++
 nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix       | 4 ++++
 nixos/modules/installer/cd-dvd/sd-image.nix                   | 4 ----
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml
index 21c4ea75d6d..04fa1643d0f 100644
--- a/nixos/doc/manual/configuration/profiles/clone-config.xml
+++ b/nixos/doc/manual/configuration/profiles/clone-config.xml
@@ -16,6 +16,6 @@
   On images where the installation media also becomes an installation target,
   copying over <literal>configuration.nix</literal> should be disabled by
   setting <literal>installer.cloneConfig</literal> to <literal>false</literal>.
-  This is already done in <literal>sd-image.nix</literal>.
+  For example, this is done in <literal>sd-image-aarch64.nix</literal>.
  </para>
 </section>
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index a9241870fa7..2d34406a032 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -59,4 +59,8 @@ in
       ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
     '';
   };
+
+  # the installation media is also the installation target,
+  # so we don't want to provide the installation configuration.nix.
+  installer.cloneConfig = false;
 }
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 dab09241531..651d1a36dc1 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -56,4 +56,8 @@ in
       ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
     '';
   };
+
+  # the installation media is also the installation target,
+  # so we don't want to provide the installation configuration.nix.
+  installer.cloneConfig = false;
 }
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index 8c9090471dc..2a131d9ce98 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -45,4 +45,8 @@ in
       ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
     '';
   };
+
+  # the installation media is also the installation target,
+  # so we don't want to provide the installation configuration.nix.
+  installer.cloneConfig = false;
 }
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 34b95478944..0a015044155 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -194,9 +194,5 @@ in
         rm -f /nix-path-registration
       fi
     '';
-
-    # the installation media is also the installation target,
-    # so we don't want to provide the installation configuration.nix.
-    installer.cloneConfig = false;
   };
 }

From 6619e9c47b4720ce00d6ded616f6f7d3ae4d327c Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 1 Sep 2019 19:16:05 +0100
Subject: [PATCH 654/794] emacs-packages: Fix melpa indentation

---
 .../editors/emacs-modes/melpa-packages.nix         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 3ae494baf92..37b2330cecb 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -189,13 +189,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
-      kubernetes = super.kubernetes.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
+        kubernetes = super.kubernetes.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
 
-      # upstream issue: missing file header
+        # upstream issue: missing file header
         mhc = super.mhc.override {
           inherit (self.melpaPackages) calfw;
         };
@@ -212,7 +212,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         # Telega has a server portion for it's network protocol
         telega = super.telega.overrideAttrs(old: {
-
           buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
 
           postBuild = ''
@@ -225,7 +224,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             mkdir -p $out/bin
             install -m755 -Dt $out/bin ./source/server/telega-server
           '';
-
         });
 
         vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {

From 3b632b78a23c2c0bf266cacdcf3eaf2450890dc7 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 1 Sep 2019 19:23:31 +0100
Subject: [PATCH 655/794] emacs-packages: Drop manually created `gn` package

---
 .../editors/emacs-modes/gn/default.nix        | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/gn/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/gn/default.nix b/pkgs/applications/editors/emacs-modes/gn/default.nix
deleted file mode 100644
index 39e7d1abf38..00000000000
--- a/pkgs/applications/editors/emacs-modes/gn/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation {
-  name = "gn-mode-2017-09-21";
-  src = fetchgit {
-    url = "https://chromium.googlesource.com/chromium/src/tools/gn";
-    rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36";
-    sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866";
-  };
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp/
-    cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/
-  '';
-}

From 15f70ea7ed88492b842dcc5f7e39cde7a9368fd1 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 1 Sep 2019 19:26:51 +0100
Subject: [PATCH 656/794] emacs-packages: Drop manually created coffee-mode

---
 .../editors/emacs-modes/coffee/default.nix    | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/coffee/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/coffee/default.nix b/pkgs/applications/editors/emacs-modes/coffee/default.nix
deleted file mode 100644
index 495b1aca4b5..00000000000
--- a/pkgs/applications/editors/emacs-modes/coffee/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "coffee-mode-0.4.1";
-
-  src = fetchgit {
-    url = "https://github.com/defunkt/coffee-mode.git";
-    rev = "c45c5f7a529363bc7aa57db0f3df26389fd233d8";
-    sha256 = "36a7792b5ffbcc5a580e8d5b2425494c60a8015cfde0e3f8a946a685da231ce2";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs --batch -f batch-byte-compile coffee-mode.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install coffee-mode.el coffee-mode.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Emacs major mode for CoffeeScript, unfancy JavaScript";
-    homepage = https://github.com/defunkt/coffee-mode;
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}

From 221ed5646758216322743fc2020003be925421c9 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 1 Sep 2019 19:33:16 +0100
Subject: [PATCH 657/794] emacs-packages.cua: Drop manually created package

It's included in emacs since version 22
---
 pkgs/applications/editors/emacs-modes/cua/builder.sh      | 4 ----
 pkgs/applications/editors/emacs-modes/cua/default.nix     | 8 --------
 pkgs/applications/editors/emacs-modes/manual-packages.nix | 1 -
 3 files changed, 13 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/cua/builder.sh
 delete mode 100644 pkgs/applications/editors/emacs-modes/cua/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/cua/builder.sh b/pkgs/applications/editors/emacs-modes/cua/builder.sh
deleted file mode 100644
index 6f7bb428c1a..00000000000
--- a/pkgs/applications/editors/emacs-modes/cua/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/emacs/site-lisp
-cp $src $out/emacs/site-lisp/cua.el
diff --git a/pkgs/applications/editors/emacs-modes/cua/default.nix b/pkgs/applications/editors/emacs-modes/cua/default.nix
deleted file mode 100644
index 0305be28ad6..00000000000
--- a/pkgs/applications/editors/emacs-modes/cua/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "cua-mode-2.10";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://tarballs.nixos.org/cua-mode-2.10.el;
-    sha256 = "01877xjbq0v9wrpcbnhvppdn9wxliwkkjg3dr6k795mjgslwhr1b";
-  };
-}
diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix
index 92c9f96ed70..eec786a3626 100644
--- a/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -149,7 +149,6 @@
   colorThemeSolarized = callPackage ./color-theme-solarized {
     colorTheme = self.color-theme;
   };
-  cua = callPackage ./cua { };
   emacsClangCompleteAsync = callPackage ./emacs-clang-complete-async { };
   emacsSessionManagement = callPackage ./session-management-for-emacs { };
   hsc3-mode = callPackage ./hsc3 { };

From b1bf3a811d6f44010a6588c71a5ed738bd04c0ad Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Wed, 10 Jul 2019 17:35:41 +0000
Subject: [PATCH 658/794] tacacs+: init 4.0.4.28

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

diff --git a/pkgs/servers/tacacs+/default.nix b/pkgs/servers/tacacs+/default.nix
new file mode 100644
index 00000000000..01d8affd1e8
--- /dev/null
+++ b/pkgs/servers/tacacs+/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, tcp_wrappers, flex, bison, perl }:
+
+stdenv.mkDerivation rec {
+  pname = "tacacs+";
+  version = "4.0.4.28";
+
+  src = fetchurl {
+    url = "ftp://ftp.shrubbery.net/pub/tac_plus/tacacs-F${version}.tar.gz";
+    sha256 = "17i18z3s58c8yy8jxp01q3hzz5nirs4cjxms18zzkli6ip4jszql";
+  };
+
+  nativeBuildInputs = [ flex bison ];
+  buildInputs = [ tcp_wrappers perl ];
+
+  meta = with stdenv.lib; {
+    description = "A protocol for authentication, authorization and accounting (AAA) services for routers and network devices";
+    homepage = "http://www.shrubbery.net/tac_plus/";
+    license = licenses.free;
+    maintainers = [ maintainers."0x4A6F" ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2408234e056..9f2eebbc531 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7823,6 +7823,8 @@ in
   psc-package = haskell.lib.justStaticExecutables
     (haskellPackages.callPackage ../development/compilers/purescript/psc-package { });
 
+  "tacacs+" = callPackage ../servers/tacacs+ { };
+
   tamarin-prover =
     (haskellPackages.callPackage ../applications/science/logic/tamarin-prover {
       # NOTE: do not use the haskell packages 'graphviz' and 'maude'

From 2c142705dfb9263f7f82e78a8370780835c679d1 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 1 Sep 2019 19:39:17 +0100
Subject: [PATCH 659/794] emacs-packages.emacsClangCompleteAsync: Drop manually
 created package

---
 .../emacs-clang-complete-async/default.nix    | 35 -------------------
 .../fix-build.patch                           | 10 ------
 .../editors/emacs-modes/melpa-packages.nix    |  9 ++++-
 3 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch

diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
deleted file mode 100644
index 23a9b3b1920..00000000000
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ clangStdenv, fetchgit, llvmPackages }:
-
-clangStdenv.mkDerivation {
-  name = "emacs-clang-complete-async-20130218";
-  src = fetchgit {
-    url = "git://github.com/Golevka/emacs-clang-complete-async.git";
-    rev = "f01488971ec8b5752780d130fb84de0c16a46f31";
-    sha256 = "01smjinrvx0w5z847a43fh2hyr6rrq1kaglfakbr6dcr313w89x9";
-  };
-
-  buildInputs = [ llvmPackages.llvm ];
-
-  patches = [ ./fix-build.patch ];
-
-  CFLAGS = "-I${llvmPackages.clang}/include";
-  LDFLAGS = "-L${llvmPackages.clang}/lib";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/emacs/site-lisp
-    install -m 755 clang-complete $out/bin
-    install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    homepage = https://github.com/Golevka/emacs-clang-complete-async;
-    description = "An emacs plugin to complete C and C++ code using libclang";
-    license = clangStdenv.lib.licenses.gpl3Plus;
-
-    # Fails with:
-    # ./src/completion.h:5:10: fatal error: 'clang-c/Index.h' file not found
-    # include <clang-c/Index.h>
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch
deleted file mode 100644
index 89de339a436..00000000000
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- old/src/completion.h	2014-11-16 16:58:16.625150124 +0100
-+++ new/src/completion.h	2014-11-16 16:58:28.020207508 +0100
-@@ -3,6 +3,7 @@
- 
- 
- #include <clang-c/Index.h>
-+#include <stdio.h>
- 
- 
- typedef struct __completion_Session_struct
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 37b2330cecb..8b83b556246 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -34,7 +34,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
     super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson));
 
     overrides = rec {
-      shared = {
+      shared = rec {
         # Expects bash to be at /bin/bash
         ac-rtags = markBroken super.ac-rtags;
 
@@ -42,6 +42,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           inherit (self.melpaPackages) powerline;
         };
 
+        auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs(old: {
+          buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ];
+          CFLAGS = "-I${external.llvmPackages.clang}/include";
+          LDFLAGS = "-L${external.llvmPackages.clang}/lib";
+        });
+        emacsClangCompleteAsync = auto-complete-clang-async;
+
         # part of a larger package
         caml = dontConfigure super.caml;
 

From 5d63bdb3b3cd971e142461cf0015dbe472fb3393 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 1 Sep 2019 19:46:20 +0100
Subject: [PATCH 660/794] emacs-packages.helm-words: 20150413 -> 20190917

---
 .../applications/editors/emacs-modes/helm-words/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/pkgs/applications/editors/emacs-modes/helm-words/default.nix
index b28d0ae24a3..c6e1c5a50f4 100644
--- a/pkgs/applications/editors/emacs-modes/helm-words/default.nix
+++ b/pkgs/applications/editors/emacs-modes/helm-words/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "helm-words-20150413";
+  name = "helm-words-20190917";
 
   src = fetchgit {
     url = "https://github.com/pronobis/helm-words.git";
-    rev = "637aa3a7e9cfd34e0127472c5b1f993a4da26185";
-    sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35";
+    rev = "e6387ece1940a06695b9d910de3d90252efb8d29";
+    sha256 = "1ly0mbzlgc26fqvf7rxpmy698g0cf9qldrwrx022ar6r68l1h7xf";
   };
 
   installPhase = ''

From 704e8c50235be34c2a761d48de42254b9764b00a Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 1 Sep 2019 19:55:43 +0100
Subject: [PATCH 661/794] emacs-packages.tramp: 2.3.0 -> 2.4.2

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

diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix
index b0cfe997908..3b746c293d8 100644
--- a/pkgs/applications/editors/emacs-modes/tramp/default.nix
+++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, emacs, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "tramp-2.3.0";
+  name = "tramp-2.4.2";
   src = fetchurl {
     url = "mirror://gnu/tramp/${name}.tar.gz";
-    sha256 = "1srwm24lwyf00w1661wbx03xg6j943dk05jhwnwdjf99m82cqbgi";
+    sha256 = "082nwvi99y0bvpl1yhn4yjc8a613jh1pdck253lxn062lkcxxw61";
   };
   buildInputs = [ emacs texinfo ];
   meta = {

From 80bda4933272f7e244dc9702f39d18433988cdd0 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 1 Sep 2019 19:58:28 +0100
Subject: [PATCH 662/794] emacs-packages: Drop remnants of manually created
 packages

---
 pkgs/applications/editors/emacs-modes/manual-packages.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix
index eec786a3626..582a8b5e71b 100644
--- a/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -130,8 +130,6 @@
 
   railgun = callPackage ./railgun { };
 
-  gn = callPackage ./gn { };
-
   structured-haskell-mode = self.shm;
 
   thingatpt-plus = callPackage ./thingatpt-plus { };
@@ -145,11 +143,9 @@
   # From old emacsPackages (pre emacsPackagesNg)
   cedet = callPackage ./cedet { };
   cedille = callPackage ./cedille { cedille = pkgs.cedille; };
-  coffee = callPackage ./coffee { };
   colorThemeSolarized = callPackage ./color-theme-solarized {
     colorTheme = self.color-theme;
   };
-  emacsClangCompleteAsync = callPackage ./emacs-clang-complete-async { };
   emacsSessionManagement = callPackage ./session-management-for-emacs { };
   hsc3-mode = callPackage ./hsc3 { };
   hol_light_mode = callPackage ./hol_light { };

From 89ff2c7b9dfb73428e5050787c36d445d44dae37 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 31 Aug 2019 14:05:47 +0100
Subject: [PATCH 663/794] yosys: 2019.08.22 -> 2019.09.01

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

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 467d4e3b49e..1535c7a7de6 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -8,14 +8,14 @@ with builtins;
 
 stdenv.mkDerivation rec {
   pname = "yosys";
-  version = "2019.08.21";
+  version = "2019.09.01";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "yosyshq";
       repo   = "yosys";
-      rev    = "fe1b2337fd7950e1d563be5b8ccbaa81688261e4";
-      sha256 = "0z7sngc2z081yyhzh8c2kchg48sp2333hn1wa94q5vsgnyzlqrdw";
+      rev    = "4aa505d1b254b3fbb66af2d95b396a8f077da9d0";
+      sha256 = "16rhwmn1z2ppaq3wycgq713krq48s80a6h57vgzjzj17hgncg7hs";
       name   = "yosys";
     })
 

From d1dfaa79e32962745ab6a492a4d80aeb90bc998f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 30 Aug 2019 21:02:40 +0100
Subject: [PATCH 664/794] symbiyosys: fix path to bash (again)

/usr/bin/env works on NixOS normally, but previously sby would fail if
used from inside the Nix sandbox.
---
 pkgs/applications/science/logic/symbiyosys/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 58674a4cacf..29eb8026366 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/sby \
       --replace "##yosys-sys-path##" \
                 "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
+    substituteInPlace $out/share/yosys/python3/sby_core.py \
+      --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"'
   '';
   meta = {
     description = "Tooling for Yosys-based verification flows";

From cd4cba3e88c7d04f8d88232c35c48575664bc679 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 30 Aug 2019 21:02:40 +0100
Subject: [PATCH 665/794] nextpnr: 2019.08.21 -> 2019.08.31

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

diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index c1e01ef7782..52673e61996 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, cmake
 , boost, python3, eigen
 , icestorm, trellis
+, llvmPackages
 
 , enableGui ? true
 , wrapQtAppsHook
@@ -12,13 +13,13 @@ let
 in
 with stdenv; mkDerivation rec {
   pname = "nextpnr";
-  version = "2019.08.21";
+  version = "2019.08.31";
 
   src = fetchFromGitHub {
     owner  = "yosyshq";
     repo   = "nextpnr";
-    rev    = "c192ba261d77ad7f0a744fb90b01e4a5b63938c4";
-    sha256 = "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf";
+    rev    = "c0b7379e8672b6263152d5e340e62f22179fdc8b";
+    sha256 = "174n962xiwyzy53cn192h9rq95h951k3xy6bs43p5ya592ai5mjh";
   };
 
   nativeBuildInputs
@@ -26,7 +27,8 @@ with stdenv; mkDerivation rec {
     ++ (lib.optional enableGui wrapQtAppsHook);
   buildInputs
      = [ boostPython python3 eigen ]
-    ++ (lib.optional enableGui qtbase);
+    ++ (lib.optional enableGui qtbase)
+    ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp);
 
   enableParallelBuilding = true;
   cmakeFlags =

From 321efae699032b4ce7d7a710b163a6114c3633fe Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 30 Aug 2019 21:44:30 +0100
Subject: [PATCH 666/794] python3Packages.nmigen{,-boards}: init at
 unstable-2019-08-{31,30}

---
 .../python-modules/nmigen-boards/default.nix  | 32 +++++++++
 .../python-modules/nmigen/default.nix         | 65 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 3 files changed, 101 insertions(+)
 create mode 100644 pkgs/development/python-modules/nmigen-boards/default.nix
 create mode 100644 pkgs/development/python-modules/nmigen/default.nix

diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix
new file mode 100644
index 00000000000..4151d08b60f
--- /dev/null
+++ b/pkgs/development/python-modules/nmigen-boards/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nmigen
+}:
+
+buildPythonPackage rec {
+  pname = "nmigen-boards";
+  version = "unstable-2019-08-30";
+  realVersion = lib.substring 0 7 src.rev;
+
+  src = fetchFromGitHub {
+    owner = "m-labs";
+    repo = "nmigen-boards";
+    rev = "3b80b3a3749ae8f123ff258a25e81bd21412aed4";
+    sha256 = "01qynxip8bq23jfjc5wjd97vxfvhld2zb8sxphwf0zixrmmyaspi";
+  };
+
+  propagatedBuildInputs = [ nmigen ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'versioneer.get_version()' '"${realVersion}"'
+  '';
+
+  meta = with lib; {
+    description = "Board and connector definitions for nMigen";
+    homepage = https://github.com/m-labs/nmigen-boards;
+    license = licenses.bsd0;
+    maintainers = with maintainers; [ emily ];
+  };
+}
diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix
new file mode 100644
index 00000000000..7375eda4327
--- /dev/null
+++ b/pkgs/development/python-modules/nmigen/default.nix
@@ -0,0 +1,65 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pyvcd
+, bitarray
+, jinja2
+
+# nmigen.{test,build} call out to these
+, yosys
+, symbiyosys
+, nextpnr ? null
+, icestorm ? null
+, trellis ? null
+
+# for tests
+, yices
+}:
+
+buildPythonPackage rec {
+  pname = "nmigen";
+  version = "unstable-2019-08-31";
+  realVersion = lib.substring 0 7 src.rev;
+
+  src = fetchFromGitHub {
+    owner = "m-labs";
+    repo = "nmigen";
+    rev = "2e206220462c67aa6ae97f7515a2191440fd61b3";
+    sha256 = "0y3w6vd493jqm9b8ppgwzs02v1al8w1n5gylljlsw70ci7fyk4qa";
+  };
+
+  disabled = pythonOlder "3.6";
+
+  propagatedBuildInputs = [ pyvcd bitarray jinja2 ];
+
+  checkInputs = [ yosys yices ];
+
+  postPatch = let
+    tool = pkg: name:
+      if pkg == null then {} else { "${name}" = "${pkg}/bin/${name}"; };
+
+    # Only FOSS toolchain supported out of the box, sorry!
+    toolchainOverrides =
+      tool yosys "yosys" //
+      tool symbiyosys "sby" //
+      tool nextpnr "nextpnr-ice40" //
+      tool nextpnr "nextpnr-ecp5" //
+      tool icestorm "icepack" //
+      tool trellis "ecppack";
+  in ''
+    substituteInPlace setup.py \
+      --replace 'versioneer.get_version()' '"${realVersion}"'
+
+    substituteInPlace nmigen/_toolchain.py \
+      --replace 'overrides = {}' \
+                'overrides = ${builtins.toJSON toolchainOverrides}'
+  '';
+
+  meta = with lib; {
+    description = "A refreshed Python toolbox for building complex digital hardware";
+    homepage = https://github.com/m-labs/nmigen;
+    license = licenses.bsd0;
+    maintainers = with maintainers; [ emily ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7482ec7a9b2..390d8e2d3d0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2578,6 +2578,10 @@ in {
 
   Nikola = callPackage ../development/python-modules/Nikola { };
 
+  nmigen = callPackage ../development/python-modules/nmigen { };
+
+  nmigen-boards = callPackage ../development/python-modules/nmigen-boards { };
+
   nxt-python = callPackage ../development/python-modules/nxt-python { };
 
   odfpy = callPackage ../development/python-modules/odfpy { };

From cb5b674b5868e74bef707281848ae65c0576f808 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 30 Aug 2019 21:45:56 +0100
Subject: [PATCH 667/794] {glasgow,libfx2}: init at 2018-{09-01,08-27}

---
 .../python-modules/fx2/default.nix            | 45 +++++++++++++
 .../python-modules/glasgow/default.nix        | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 pkgs/top-level/python-packages.nix            |  4 ++
 4 files changed, 119 insertions(+)
 create mode 100644 pkgs/development/python-modules/fx2/default.nix
 create mode 100644 pkgs/development/python-modules/glasgow/default.nix

diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix
new file mode 100644
index 00000000000..fa5edc1077c
--- /dev/null
+++ b/pkgs/development/python-modules/fx2/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, python
+, fetchFromGitHub
+, sdcc
+, libusb1
+, crcmod
+}:
+
+buildPythonPackage {
+  pname = "fx2";
+  version = "unstable-2019-08-27";
+
+  src = fetchFromGitHub {
+    owner = "whitequark";
+    repo = "libfx2";
+    rev = "dd1e42c7b46ff410dbb18beab46111bb5491400c";
+    sha256 = "0xvlmx6ym0ylrvnlqzf18d475wa0mfci7wkdbv30gl3hgdhsppjz";
+  };
+
+  nativeBuildInputs = [ sdcc ];
+
+  propagatedBuildInputs = [ libusb1 crcmod ];
+
+  preBuild = ''
+    cd software
+    ${python.pythonForBuild.interpreter} setup.py build_ext
+  '';
+
+  preInstall = ''
+    mkdir -p $out/share/libfx2
+    cp -R ../firmware/library/{.stamp,lib,include,fx2{rules,conf}.mk} \
+      $out/share/libfx2
+  '';
+
+  # installCheckPhase tries to run build_ext again and there are no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Chip support package for Cypress EZ-USB FX2 series microcontrollers";
+    homepage = https://github.com/whitequark/libfx2;
+    license = licenses.bsd0;
+    maintainers = with maintainers; [ emily ];
+  };
+}
diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix
new file mode 100644
index 00000000000..264a13aed5e
--- /dev/null
+++ b/pkgs/development/python-modules/glasgow/default.nix
@@ -0,0 +1,66 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, sdcc
+, nmigen
+, fx2
+, libusb1
+, aiohttp
+, pyvcd
+, bitarray
+, crcmod
+, yosys
+, icestorm
+, nextpnr
+}:
+
+buildPythonPackage rec {
+  pname = "glasgow";
+  version = "unstable-2019-08-31";
+  realVersion = lib.substring 0 7 src.rev;
+
+  src = fetchFromGitHub {
+    owner = "GlasgowEmbedded";
+    repo = "Glasgow";
+    rev = "21641a13c6a0daaf8618aff3c5bfffcb26ef6cca";
+    sha256 = "1dpm1jmm4fg8xf17s6h9g5sc09gq8b6xq955sv2x11nrbqf98l4v";
+  };
+
+  nativeBuildInputs = [ sdcc ];
+
+  propagatedBuildInputs = [
+    nmigen
+    fx2
+    libusb1
+    aiohttp
+    pyvcd
+    bitarray
+    crcmod
+  ];
+
+  postPatch = ''
+    substituteInPlace software/setup.py \
+      --replace 'versioneer.get_version()' '"${realVersion}"'
+  '';
+
+  preBuild = ''
+    make -C firmware LIBFX2=${fx2}/share/libfx2
+    cp firmware/glasgow.ihex software/glasgow
+    cd software
+  '';
+
+  # a couple failing tests and also installCheck tries to build_ext again
+  doInstallCheck = false;
+  doCheck = false;
+
+  checkPhase = ''
+    python -m unittest discover
+  '';
+
+  meta = with lib; {
+    description = "Software for Glasgow, a digital interface multitool";
+    homepage = https://github.com/GlasgowEmbedded/Glasgow;
+    license = licenses.bsd0;
+    maintainers = with maintainers; [ emily ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c35fa4aae25..6638473874f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -818,6 +818,8 @@ in
 
   ezstream = callPackage ../tools/audio/ezstream { };
 
+  libfx2 = with python3Packages; toPythonApplication fx2;
+
   fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
 
   genymotion = callPackage ../development/mobile/genymotion { };
@@ -842,6 +844,8 @@ in
 
   gitter = callPackage  ../applications/networking/instant-messengers/gitter { };
 
+  glasgow = with python3Packages; toPythonApplication glasgow;
+
   gucci = callPackage ../tools/text/gucci { };
 
   grc = callPackage ../tools/misc/grc { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 390d8e2d3d0..00b606ef734 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2338,6 +2338,8 @@ in {
 
   future-fstrings = callPackage ../development/python-modules/future-fstrings { };
 
+  fx2 = callPackage ../development/python-modules/fx2 { };
+
   gateone = callPackage ../development/python-modules/gateone { };
 
   # TODO: Remove after 19.03 is branched off:
@@ -2348,6 +2350,8 @@ in {
 
   GeoIP = callPackage ../development/python-modules/GeoIP { };
 
+  glasgow = callPackage ../development/python-modules/glasgow { };
+
   gmpy = callPackage ../development/python-modules/gmpy { };
 
   gmpy2 = callPackage ../development/python-modules/gmpy2 { };

From 5eb237659c4dea11ad9ca6d23a4235d20cce347c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 30 Aug 2019 21:45:56 +0100
Subject: [PATCH 668/794] pythonPackages.gcutil: remove per TODO

Pretty sure 19.03 has been branched off by now.
---
 pkgs/top-level/python-packages.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 00b606ef734..e0a8499e2a0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2342,12 +2342,6 @@ in {
 
   gateone = callPackage ../development/python-modules/gateone { };
 
-  # TODO: Remove after 19.03 is branched off:
-  gcutil = throw ''
-    pythonPackages.gcutil is deprecated and can be replaced with "gcloud
-    compute" from the package google-cloud-sdk.
-  '';
-
   GeoIP = callPackage ../development/python-modules/GeoIP { };
 
   glasgow = callPackage ../development/python-modules/glasgow { };

From 2450e41497c3b5eea3ab25100021934ed4fb4954 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 31 Aug 2019 15:04:42 +0100
Subject: [PATCH 669/794] trellis: 2019.08.09 -> 2019.09.01

---
 pkgs/development/tools/trellis/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix
index 1deb2c7a8fc..c98529484d5 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/pkgs/development/tools/trellis/default.nix
@@ -8,14 +8,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "trellis";
-  version = "2019.08.09";
+  version = "2019.09.01";
+  realVersion = with stdenv.lib; with builtins;
+    "1.0-53-g${substring 0 7 (elemAt srcs 0).rev}";
 
   srcs = [
     (fetchFromGitHub {
        owner  = "symbiflow";
        repo   = "prjtrellis";
-       rev    = "a67379179985bb12a611c75d975548cdf6e7d12e";
-       sha256 = "0vqwfsblf7ylz0jnnf532kap5s1d1zcvbavxmb6a4v32b9xfdv35";
+       rev    = "98871e0e2959bc8cb4de3c7ebe2b9eddc4efe00c";
+       sha256 = "1yq7ih2xvhfvdpijmbqjq6jcngl6710kiv66hkww5ih8j5dzsq5l";
        name   = "trellis";
      })
     (fetchFromGitHub {
@@ -32,6 +34,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake python3 ];
 
   preConfigure = with builtins; ''
+    substituteInPlace libtrellis/CMakeLists.txt \
+      --replace "git describe --tags" "echo ${realVersion}"
+
     rmdir database && ln -sfv ${elemAt srcs 1} ./database
 
     source environment.sh

From f9333358e12e4fae3d531d752970afd0e835a0ec Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 1 Sep 2019 18:47:05 +0100
Subject: [PATCH 670/794] sdcc: extend platforms

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

diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index 1a450af2b94..cdac400b1af 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     homepage = http://sdcc.sourceforge.net/;
     license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable;
     maintainers = with maintainers; [ bjornfor yorickvp ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From ea34c61c0f1e8541de506ce627816c02c066a3f8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 1 Sep 2019 14:24:00 -0500
Subject: [PATCH 671/794] nextpnr: restrict to Linux only

a5ac052dd310e3adf558b2960e4e206b22211020 changed the platforms for
nextpnr from 'linux' to 'all', but unfortunately nextpnr has not been
building anyway due to a missing OpenGL dependency.[1][2]

Restrict back to Linux for now. When a build fix happens, we can open it
up again.

  [1] https://hydra.nixos.org/build/99106360
  [1] https://hydra.nixos.org/eval/1538169

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/nextpnr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index 52673e61996..894ef8c45fa 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -61,7 +61,7 @@ with stdenv; mkDerivation rec {
     description = "Place and route tool for FPGAs";
     homepage    = https://github.com/yosyshq/nextpnr;
     license     = licenses.isc;
-    platforms   = platforms.all;
+    platforms   = platforms.linux;
     maintainers = with maintainers; [ thoughtpolice emily ];
   };
 }

From c3f2d66e31a6e7aca622fac5ffc1c5d567ad0669 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 1 Sep 2019 21:32:38 +0200
Subject: [PATCH 672/794] zsh-you-should-use: 1.1.0 -> 1.4.0

https://github.com/MichaelAquilina/zsh-you-should-use/blob/master/CHANGELOG.md#140
---
 pkgs/shells/zsh/zsh-you-should-use/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix
index c44483d3744..39e1cedc7d0 100644
--- a/pkgs/shells/zsh/zsh-you-should-use/default.nix
+++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zsh-you-should-use";
-  version = "1.1.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "MichaelAquilina";
     repo = pname;
     rev = version;
-    sha256 = "0fig5ralagi5jajk7gdm52jvwql17qk9cd6j98qsndvckb26a753";
+    sha256 = "1n0mcgahx40acqjj617k0rhqpzjqjaa9xfs4b1xrjp3qdy9s0ns0";
   };
 
   dontBuild = true;

From 0ad44f80ad1ba25f3a2128201446aa6bb58ddd07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 1 Sep 2019 17:00:36 -0300
Subject: [PATCH 673/794] materia-theme: 20190315 -> 20190831

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

diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix
index ccdd1067302..9e69d78933b 100644
--- a/pkgs/data/themes/materia-theme/default.nix
+++ b/pkgs/data/themes/materia-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "materia-theme";
-  version = "20190315";
+  version = "20190831";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1fpipwvwxjiriqhysqgx51rnax73hyd5jkyxhc2g3y73s5r2xq82";
+    sha256 = "19b2wyq38wj3id0an47jln1y3zp5ih3kbrgmfpjp6bbdrmfcyccf";
   };
 
   nativeBuildInputs = [ glib libxml2 bc ];

From 94387290a3f1d7b9bdb69fc3e5a2102db1831540 Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann.hodique@gmail.com>
Date: Sun, 1 Sep 2019 13:52:56 -0700
Subject: [PATCH 674/794] govc: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix
index 0d239547752..b53c211d379 100644
--- a/pkgs/tools/virtualization/govc/default.nix
+++ b/pkgs/tools/virtualization/govc/default.nix
@@ -2,7 +2,7 @@
   
 buildGoPackage rec {
   pname = "govc";
-  version = "0.20.0";
+  version = "0.21.0";
 
   goPackagePath = "github.com/vmware/govmomi";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "vmware";
     repo = "govmomi";
-    sha256 = "16pgjhlps21vk3cb5h2y0b6skq095rd8kl0618rwrz84chdnzahk";
+    sha256 = "0mig8w0szxqcii3gihrsm8n8hzziq9l6axc5z32nw9kiy9bi4130";
   };
 
   meta = {

From f140dfb161804871048c00f2c51485dd55b50efa Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 23 Aug 2019 16:22:49 +0100
Subject: [PATCH 675/794] nixos/desktop-managers/xterm: Disable by default

It's a confusing default for some display managers that will default
to it even when you have defined another display manager.
---
 nixos/doc/manual/release-notes/rl-1909.xml            | 6 ++++++
 nixos/modules/services/x11/desktop-managers/xterm.nix | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index a4419f1c8a1..1a23d8f919c 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -348,6 +348,12 @@
        What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
      </para>
    </listitem>
+   <listitem>
+     <para>
+       <option>services.xserver.desktopManager.xterm</option> is now disabled by default.
+       It was not useful except for debugging purposes and was confusingly set as default in some circumstances.
+     </para>
+   </listitem>
 
   </itemizedlist>
  </section>
diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index ea441fbbe71..93987bd1dfc 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -5,7 +5,6 @@ with lib;
 let
 
   cfg = config.services.xserver.desktopManager.xterm;
-  xserverEnabled = config.services.xserver.enable;
 
 in
 
@@ -14,7 +13,7 @@ in
 
     services.xserver.desktopManager.xterm.enable = mkOption {
       type = types.bool;
-      default = xserverEnabled;
+      default = false;
       defaultText = "config.services.xserver.enable";
       description = "Enable a xterm terminal as a desktop manager.";
     };

From f465a74943549aa1b74329f4eb4e11a042f658ee Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Sep 2019 16:20:00 -0500
Subject: [PATCH 676/794] postgresqlPackages.postgis: 2.5.2 -> 2.5.3

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

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 33d050497da..88090636ff2 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "postgis";
-  version = "2.5.2";
+  version = "2.5.3";
 
   outputs = [ "out" "doc" ];
 
   src = fetchurl {
     url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
-    sha256 = "0pnva72f2w4jcgnl1y7nw5rdly4ipx3hji4c9yc9s0hna1n2ijxn";
+    sha256 = "16jm9v9y25dhfwd4hvhnynj6k3ikjbr3z3dpn8py50gr82fjds3j";
   };
 
   buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]
@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Geographic Objects for PostgreSQL";
     homepage = https://postgis.net/;
+    changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS";
     license = licenses.gpl2;
     maintainers = [ maintainers.marcweber ];
     inherit (postgresql.meta) platforms;

From 15f38453c4d7e5460f65ea0ccca2c81aaacf0e1a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Sep 2019 16:20:00 -0500
Subject: [PATCH 677/794] postgresqlPackages.pg_cron: 1.1.4 -> 1.2.0

changelog: https://github.com/citusdata/pg_cron/releases/tag/v1.2.0
---
 pkgs/servers/sql/postgresql/ext/pg_cron.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index 15d67017189..1e5824d60d8 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "pg_cron";
-  version = "1.1.4";
+  version = "1.2.0";
 
   buildInputs = [ postgresql ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "citusdata";
     repo   = pname;
     rev    = "refs/tags/v${version}";
-    sha256 = "0wkqgrm3v999hjcc82h24jv1pib6f6bw8jsv83hgk6g3iv6xsjg9";
+    sha256 = "1hkrk6jxl20k2b0ngchblwkrzigl77jaq1gvininp4yhjdlgaks8";
   };
 
   installPhase = ''

From acced1a38138a6c1e2f81b1ea4a3e404c2d68cdd Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 30 Aug 2019 21:29:27 -0400
Subject: [PATCH 678/794] rl-1909: note gnome3 profile style options

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

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 560b3198517..e04d5842d6d 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -57,6 +57,23 @@
       and <option>services.xserver.desktopManager.xfce4-14</option> simultaneously or to downgrade from Xfce 4.14 after upgrading.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages
+      like games.
+      <itemizedlist>
+      <para>This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.</para>
+      <listitem><para><link linkend="opt-services.gnome3.core-os-services.enable"><literal>services.gnome3.core-os-services.enable</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.gnome3.core-shell.enable"><literal>services.gnome3.core-shell.enable</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.gnome3.core-utilities.enable"><literal>services.gnome3.core-utilities.enable</literal></link></para></listitem>
+      <listitem><para><link linkend="opt-services.gnome3.games.enable"><literal>services.gnome3.games.enable</literal></link></para></listitem>
+      </itemizedlist>
+      With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually
+      disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications.
+      <option>environment.gnome3.excludePackages</option> is now unguarded, it can exclude any package installed with <option>environment.systemPackages</option>
+      in the GNOME 3 module.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 266db0820ef4feda38192cd3b323d71133f0252c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 31 Aug 2019 01:14:08 -0400
Subject: [PATCH 679/794] rl-1909: note changes to gnome3 defaults

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

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index e04d5842d6d..ae08e52098d 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -74,6 +74,47 @@
       in the GNOME 3 module.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications
+     to match as close as possible to a default reference GNOME 3 experience.
+    </para>
+
+    <bridgehead>The following changes were enacted in <option>services.gnome3.core-utilities.enable</option></bridgehead>
+
+    <itemizedlist>
+     <title>Applications removed from defaults:</title>
+     <listitem><para><literal>accerciser</literal></para></listitem>
+     <listitem><para><literal>dconf-editor</literal></para></listitem>
+     <listitem><para><literal>evolution</literal></para></listitem>
+     <listitem><para><literal>gnome-documents</literal></para></listitem>
+     <listitem><para><literal>gnome-nettool</literal></para></listitem>
+     <listitem><para><literal>gnome-power-manager</literal></para></listitem>
+     <listitem><para><literal>gnome-todo</literal></para></listitem>
+     <listitem><para><literal>gnome-tweaks</literal></para></listitem>
+     <listitem><para><literal>gnome-usage</literal></para></listitem>
+     <listitem><para><literal>gucharmap</literal></para></listitem>
+     <listitem><para><literal>nautilus-sendto</literal></para></listitem>
+     <listitem><para><literal>vinagre</literal></para></listitem>
+    </itemizedlist>
+    <itemizedlist>
+     <title>Applications added to defaults:</title>
+     <listitem><para><literal>cheese</literal></para></listitem>
+     <listitem><para><literal>geary</literal></para></listitem>
+    </itemizedlist>
+
+    <bridgehead>The following changes were enacted in <option>services.gnome3.core-shell.enable</option></bridgehead>
+
+    <itemizedlist>
+     <title>Applications added to defaults:</title>
+     <listitem><para><literal>gnome-color-manager</literal></para></listitem>
+     <listitem><para><literal>orca</literal></para></listitem>
+    </itemizedlist>
+    <itemizedlist>
+     <title>Services enabled:</title>
+     <listitem><para><option>services.avahi.enable</option></para></listitem>
+    </itemizedlist>
+   </listitem>
   </itemizedlist>
  </section>
 

From 2c71ef9ad5e0663c6cba07f3aa25d4f894c1cf87 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Sep 2019 18:00:00 -0500
Subject: [PATCH 680/794] nfpm: 0.12.0 -> 0.13.0

Changelog: https://github.com/goreleaser/nfpm/releases/tag/v0.13.0
---
 pkgs/tools/package-management/nfpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index 5cbb207ec4f..b1f3c553bf1 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    sha256 = "090mxkmbfzi3mby18zhrr34fr6vzc7j0r2ss3rjr5lyfgilw1qwr";
+    sha256 = "0hfzk4hpk35j070hhpsjjpxhcrrddi6f1z070iypajcw96qz6lli";
   };
 
   modSha256 = "02nkqmljb528ppsr2dw2r3rc83j3qmys3a8v0a1z2b4sq2sv1v7w";

From b6895385001116d33b28bc5e730b6ad93f55ce48 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Sep 2019 18:00:00 -0500
Subject: [PATCH 681/794] sbcl: 1.5.3 -> 1.5.6

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index e5b36ad7890..e3d9ee98635 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sbcl";
-  version = "1.5.3";
+  version = "1.5.6";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
-    sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj";
+    sha256 = "10z43dc29p7s8dl3jixklhmzqfp7gcm3fccjdfd36qqhyfxqxx3a";
   };
 
   buildInputs = [texinfo];

From a88976d2222f357331de2a59206b7b4eadc9784f Mon Sep 17 00:00:00 2001
From: Dima <43349662+d-goldin@users.noreply.github.com>
Date: Mon, 2 Sep 2019 04:53:50 +0200
Subject: [PATCH 682/794] pythonPackages.uvloop: 0.12.2 -> 0.13.0 (#67735)

* As mentioned in https://github.com/NixOS/nixpkgs/issues/67492
the build was broken after an update of openssl versions.

* Fixes a flake8 unit-test case that requires a flake8 config
which is not shipped with the distribution.

* Fixes build on darwin.
---
 .../python-modules/uvloop/default.nix            | 16 +++++++++++++---
 pkgs/top-level/python-packages.nix               |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 9c3dae74a79..2093f4d7053 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -1,23 +1,33 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyopenssl
 , libuv
 , psutil
 , isPy27
+, CoreServices
+, ApplicationServices
 }:
 
 buildPythonPackage rec {
   pname = "uvloop";
-  version = "0.12.2";
+  version = "0.13.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c48692bf4587ce281d641087658eca275a5ad3b63c78297bbded96570ae9ce8f";
+    sha256 = "0blcnrd5vky2k1m1p1skx4516dr1jx76yyb0c6fi82si6mqd0b4l";
   };
 
-  buildInputs = [ libuv ];
+  buildInputs = [
+    libuv
+  ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
+
+  postPatch = ''
+    # Removing code linting tests, which we don't care about
+    rm tests/test_sourcecode.py
+  '';
 
   checkInputs = [ pyopenssl psutil ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e0a8499e2a0..88841e2935c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1239,7 +1239,9 @@ in {
 
   unifi = callPackage ../development/python-modules/unifi { };
 
-  uvloop = callPackage ../development/python-modules/uvloop { };
+  uvloop = callPackage ../development/python-modules/uvloop {
+    inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
+  };
 
   pyunifi = callPackage ../development/python-modules/pyunifi { };
 

From 363292b7c056823b9e711066c4312dde8fb4d98f Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Sun, 1 Sep 2019 23:00:49 -0400
Subject: [PATCH 683/794] fetchurlBoot: remove cycles introduced by openssl_1_1
 -> coreutils (#67784)

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96862f9ece8..d4a60b3af85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -293,6 +293,14 @@ in
       perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
       openssl = buildPackages.openssl.override {
         fetchurl = stdenv.fetchurlBoot;
+        coreutils = buildPackages.coreutils.override {
+          fetchurl = stdenv.fetchurlBoot;
+          inherit perl;
+          xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
+          gmp = null;
+          aclSupport = false;
+          attrSupport = false;
+        };
         inherit perl;
         buildPackages = { inherit perl; };
       };

From 5f07745f098da0f184f8738899f200728a339ea0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 2 Sep 2019 00:08:17 -0400
Subject: [PATCH 684/794] light-locker: wrapGAppsHook to nativeBuildInputs

---
 pkgs/misc/screensavers/light-locker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix
index 0b840448f2c..e3d3b109d1a 100644
--- a/pkgs/misc/screensavers/light-locker/default.nix
+++ b/pkgs/misc/screensavers/light-locker/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkgconfig
+    wrapGAppsHook
   ];
 
   buildInputs = [
@@ -45,7 +46,6 @@ stdenv.mkDerivation rec {
     libXext
     libXxf86vm
     systemd
-    wrapGAppsHook
   ];
 
   mesonFlags = [

From 896da41892351fa3a40f746ec5813c221a897dce Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 1 Sep 2019 23:30:06 -0400
Subject: [PATCH 685/794] onboard: cleanups

* workaround #56943
* fix xdg autostart installed to site-packages
* delete ubuntu icons
---
 pkgs/applications/misc/onboard/default.nix | 117 ++++++++++++---------
 1 file changed, 67 insertions(+), 50 deletions(-)

diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix
index de2f86e9f9a..79e3317e64d 100644
--- a/pkgs/applications/misc/onboard/default.nix
+++ b/pkgs/applications/misc/onboard/default.nix
@@ -29,14 +29,22 @@
 }:
 
 let
-  customHunspell = hunspellWithDicts [hunspellDicts.en-us];
+
+  customHunspell = hunspellWithDicts [
+    hunspellDicts.en-us
+  ];
+
   majorVersion = "1.4";
+
+in
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "onboard";
   version = "${majorVersion}.1";
-in python3.pkgs.buildPythonApplication rec {
-  name = "onboard-${version}";
+
   src = fetchurl {
-    url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${name}.tar.gz";
-    sha256 = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865";
+    url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz";
+    sha256 = "0r9q38ikmr4in4dwqd8m9gh9xjbgxnfxglnjbfcapw8ybfnf3jh1";
   };
 
   patches = [
@@ -48,9 +56,42 @@ in python3.pkgs.buildPythonApplication rec {
     ./hunspell-use-xdg-datadirs.patch
   ];
 
-  # For tests
-  LC_ALL = "en_US.UTF-8";
-  doCheck = false;
+  nativeBuildInputs = [
+    gobject-introspection
+    intltool
+    pkgconfig
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    bash
+    glib
+    gnome3.dconf
+    gsettings-desktop-schemas
+    gtk3
+    hunspell
+    isocodes
+    libcanberra-gtk3
+    libxkbcommon
+    mousetweaks
+    udev
+    xorg.libXtst
+    xorg.libxkbfile
+  ] ++ stdenv.lib.optional atspiSupport at-spi2-core;
+
+  propagatedBuildInputs = with python3.pkgs; [
+    dbus-python
+    distutils_extra
+    pyatspi
+    pycairo
+    pygobject3
+    systemd
+  ];
+
+  propagatedUserEnvPkgs = [
+    gnome3.dconf
+  ];
+
   checkInputs = [
     # for Onboard.SpellChecker.aspell_cmd doctests
     (aspellWithDicts (dicts: with dicts; [ en ]))
@@ -66,43 +107,10 @@ in python3.pkgs.buildPythonApplication rec {
     python3.pkgs.nose
   ];
 
-  propagatedBuildInputs = [
-    glib
-    python3
-    python3.pkgs.dbus-python
-    python3.pkgs.distutils_extra
-    python3.pkgs.pyatspi
-    python3.pkgs.pycairo
-    python3.pkgs.pygobject3
-    python3.pkgs.systemd
-  ];
+  # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
+  strictDeps = false;
 
-  buildInputs = [
-    bash
-    gnome3.dconf
-    gsettings-desktop-schemas
-    gtk3
-    hunspell
-    isocodes
-    libcanberra-gtk3
-    mousetweaks
-    udev
-    libxkbcommon
-    wrapGAppsHook
-    xorg.libXtst
-    xorg.libxkbfile
-  ] ++ stdenv.lib.optional atspiSupport at-spi2-core;
-
-  nativeBuildInputs = [
-    glibcLocales
-    gobject-introspection # populate GI_TYPELIB_PATH
-    intltool
-    pkgconfig
-  ];
-
-  propagatedUserEnvPkgs = [
-    gnome3.dconf
-  ];
+  doCheck = false;
 
   preBuild = ''
     # Unnecessary file, has been removed upstream
@@ -118,6 +126,9 @@ in python3.pkgs.buildPythonApplication rec {
 
     patchShebangs .
 
+    substituteInPlace setup.py \
+      --replace "/etc" "$out/etc"
+
     substituteInPlace  ./Onboard/LanguageSupport.py \
       --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \
       --replace "/usr/bin/yelp" "${yelp}/bin/yelp"
@@ -149,16 +160,22 @@ in python3.pkgs.buildPythonApplication rec {
       --replace '"killall",' '"${procps}/bin/pkill", "-x",'
   '';
 
-  postInstall = ''
-    cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override
+  installPhase = ''
+    ${python3.interpreter} setup.py install --prefix="$out"
 
+    cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override
     glib-compile-schemas $out/share/glib-2.0/schemas/
   '';
 
-  meta = {
+  # Remove ubuntu icons.
+  postFixup = ''
+    rm -rf  $out/share/icons/ubuntu-mono-*
+  '';
+
+  meta = with stdenv.lib; {
     homepage = https://launchpad.net/onboard;
-    description = "An onscreen keyboard useful for tablet PC users and for mobility impaired users.";
-    maintainers = with stdenv.lib.maintainers; [ johnramsden ];
-    license = stdenv.lib.licenses.gpl3;
+    description = "Onscreen keyboard useful for tablet PC users and for mobility impaired users";
+    maintainers = with maintainers; [ johnramsden ];
+    license = licenses.gpl3;
   };
 }

From 5c04758bf764dd797005f9369a881e7fc41844eb Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 1 Sep 2019 23:44:32 -0400
Subject: [PATCH 686/794] pantheon.elementary-session-settings: add onboard
 autostart

---
 .../desktop/elementary-session-settings/default.nix        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index c262fb37dbc..df12fba645f 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -7,6 +7,7 @@
 , gnome-session
 , wingpanel
 , orca
+, onboard
 , at-spi2-core
 , elementary-default-settings
 , writeShellScriptBin
@@ -85,9 +86,9 @@ stdenv.mkDerivation rec {
     cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list
 
     mkdir -p $out/etc/xdg/autostart
-    cp -av ${gnome-keyring}/etc/xdg/autostart/* $out/etc/xdg/autostart
-    cp -av ${orca}/etc/xdg/autostart/* $out/etc/xdg/autostart
-    cp -av ${at-spi2-core}/etc/xdg/autostart/* $out/etc/xdg/autostart
+    for package in ${gnome-keyring} ${orca} ${onboard} ${at-spi2-core}; do
+      cp -av $package/etc/xdg/autostart/* $out/etc/xdg/autostart
+    done
 
     cp "${dockitemAutostart}" $out/etc/xdg/autostart/default-elementary-dockitems.desktop
 

From 81a1bd6cfd6e7033870f319c332ffcab3585d955 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 1 Sep 2019 23:54:55 -0400
Subject: [PATCH 687/794] pantheon.switchboard-plug-a11y: hardcode path to
 onboard-settings

---
 .../apps/switchboard-plugs/a11y/default.nix         |  9 +++++++++
 .../apps/switchboard-plugs/a11y/fix-paths.patch     | 13 +++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index a03594b7b18..3b85b123fd0 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, substituteAll
 , fetchFromGitHub
 , pantheon
 , meson
@@ -9,6 +10,7 @@
 , granite
 , gtk3
 , switchboard
+, onboard
 }:
 
 stdenv.mkDerivation rec {
@@ -22,6 +24,13 @@ stdenv.mkDerivation rec {
     sha256 = "1wh46lrsliii5bbvfc4xnzgnii2v7sqxnbn43ylmyqppfv9mk1wd";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit onboard;
+    })
+  ];
+
   passthru = {
     updateScript = pantheon.updateScript {
       repoName = pname;
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch
new file mode 100644
index 00000000000..4d69390f39d
--- /dev/null
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Panes/Typing.vala b/src/Panes/Typing.vala
+index b4ae8b0..5b8fd7e 100644
+--- a/src/Panes/Typing.vala
++++ b/src/Panes/Typing.vala
+@@ -83,7 +83,7 @@ public class Accessibility.Panes.Typing : Categories.Pane {
+ 
+         onboard_settings_label.clicked.connect (() => {
+             try {
+-                var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE);
++                var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE);
+                 appinfo.launch (null, null);
+             } catch (Error e) {
+                 warning ("%s\n", e.message);

From b1326ffc81f0c28b5f54d0957d449e8f88ca028d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 2 Sep 2019 00:11:52 -0400
Subject: [PATCH 688/794] nixos/pantheon: add onboard

It's used as an on-screen keyboard.
Hopefully in future they can ship their native app [0]

[0]: https://github.com/elementary/keyboard
---
 nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 34ad969987a..5b82cb1f026 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -194,6 +194,7 @@ in
         gtk3.out
         hicolor-icon-theme
         lightlocker
+        onboard
         plank
         qgnomeplatform
         shared-mime-info

From 8ba94a8fe8eb8904f6a2ce4cdd114ea4741b57da Mon Sep 17 00:00:00 2001
From: Andreas Wiese <aw-nixos@meterriblecrew.net>
Date: Mon, 2 Sep 2019 06:47:19 +0200
Subject: [PATCH 689/794] grub2: 2.04-rc1 -> 2.04 (#67622)

---
 pkgs/tools/misc/grub/2.0x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index a176ef13fcc..7e30ffe0b28 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -31,7 +31,7 @@ let
   canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
   inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "2.04-rc1";
+  version = "2.04";
 
 in (
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.savannah.gnu.org/grub.git";
     rev = "${pname}-${version}";
-    sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0";
+    sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w";
   };
 
   patches = [

From 346f49596b36e62aeef7f899c101119931e373a8 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Sun, 1 Sep 2019 22:50:05 -0600
Subject: [PATCH 690/794] iosevka-bin: 2.2.1 -> 2.3.0

---
 pkgs/data/fonts/iosevka/bin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 0676d3c0e1f..dba89c473b3 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "2.2.1";
+  version = "2.3.0";
 in fetchzip rec {
   name = "iosevka-bin-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
   '';
 
-  sha256 = "0d5ys9k8adj9v1hpwbmjqshzpjlnyj81xwp0328vc5q8pvjcfly6";
+  sha256 = "0nry6zsmvcj44rijhbvrry84rh5hrixzb4n1mx9c27vvpy33a56w";
 
   meta = with stdenv.lib; {
     homepage = https://be5invis.github.io/Iosevka/;

From 10d0ab20ffec0ae4e73c8bc36914edf77ba3fab0 Mon Sep 17 00:00:00 2001
From: "Tristan Helmich (omniIT)" <tristan.helmich@omniit.de>
Date: Fri, 30 Aug 2019 08:35:49 +0000
Subject: [PATCH 691/794] pythonPackages.phonenumbers: 8.10.16 -> 8.10.17

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

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index b9c4a62f0de..6d2e8169eb7 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.10.16";
+  version = "8.10.17";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cfkyz991nbqsak3mdwybaxvzqbdcqivxnl84n8p4dyi5lk45v4b";
+    sha256 = "023rcv3qishd5n33gj22dzgq51kzpk41ckcmim96s1xvdbd2sxg9";
   };
 
   meta = {

From 446f8c851d599326373a2c910841d092ff8e68ae Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Fri, 23 Aug 2019 18:53:22 +0200
Subject: [PATCH 692/794] Add support for `js-unknown-ghcjs`

This adds enough logic to nixpkgs to support the `js-unknown-ghcjs` triple.
---
 lib/systems/examples.nix        | 12 +++++++++---
 lib/systems/inspect.nix         |  2 ++
 lib/systems/parse.nix           |  7 ++++++-
 pkgs/stdenv/cross/default.nix   |  2 ++
 pkgs/top-level/all-packages.nix |  1 +
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index ac1633a1a15..90068f566ed 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -119,7 +119,7 @@ rec {
     config = "aarch64-none-elf";
     libc = "newlib";
   };
-  
+
   aarch64be-embedded = {
     config = "aarch64_be-none-elf";
     libc = "newlib";
@@ -129,12 +129,12 @@ rec {
     config = "powerpc-none-eabi";
     libc = "newlib";
   };
-  
+
   ppcle-embedded = {
     config = "powerpcle-none-eabi";
     libc = "newlib";
   };
-  
+
   alpha-embedded = {
     config = "alpha-elf";
     libc = "newlib";
@@ -212,4 +212,10 @@ rec {
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
     platform = {};
   };
+
+  # Ghcjs
+  ghcjs = {
+    config = "js-unknown-ghcjs";
+    platform = {};
+  };
 }
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index e35e7b4a1ec..bf186126d4a 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -49,6 +49,8 @@ rec {
     isEfi          = map (family: { cpu.family = family; })
                        [ "x86" "arm" "aarch64" ];
 
+    isJavaScript = { cpu = cpuTypes.js; };
+    isGhcjs      = { kernel = kernels.ghcjs; };
     # Deprecated after 18.03
     isArm = isAarch32;
   };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 6947d41419e..a20b334311e 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -106,10 +106,12 @@ rec {
 
     wasm32   = { bits = 32; significantByte = littleEndian; family = "wasm"; };
     wasm64   = { bits = 64; significantByte = littleEndian; family = "wasm"; };
-    
+
     alpha    = { bits = 64; significantByte = littleEndian; family = "alpha"; };
 
     avr      = { bits = 8; family = "avr"; };
+
+    js       = { bits = 32; significantByte = littleEndian; family = "js"; };
   };
 
   ################################################################################
@@ -188,6 +190,7 @@ rec {
     openbsd = { execFormat = elf;     families = { inherit bsd; }; };
     solaris = { execFormat = elf;     families = { }; };
     windows = { execFormat = pe;      families = { }; };
+    ghcjs   = { execFormat = unknown; families = { }; };
   } // { # aliases
     # 'darwin' is the kernel for all of them. We choose macOS by default.
     darwin = kernels.macos;
@@ -299,6 +302,8 @@ rec {
         then { cpu = elemAt l 0; vendor = elemAt l 1;    kernel = elemAt l 2;                }
       else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
         then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; }
+      else if (elemAt l 2 == "ghcjs")
+        then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 2; }
       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)}
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index aafc0855dbe..1c211f890b0 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -54,6 +54,8 @@ in lib.init bootStages ++ [
              then buildPackages.darwin.iosSdkPkgs.clang
            else if crossSystem.useAndroidPrebuilt or false
              then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc
+           else if targetPlatform.isGhcjs
+             then null
            else buildPackages.gcc;
 
       extraNativeBuildInputs = old.extraNativeBuildInputs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 422cb99479a..1f6cbe68daa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9984,6 +9984,7 @@ in
     else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
     else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries
     else if name == "libSystem" then targetPackages.darwin.xcode
+    else if stdenv.targetPlatform.isGhcjs then null
     else throw "Unknown libc";
 
   libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;

From 3d8cf087068c4d2f011d06d11453e3dd966da321 Mon Sep 17 00:00:00 2001
From: John Ericson <git@JohnEricson.me>
Date: Mon, 2 Sep 2019 01:38:22 -0400
Subject: [PATCH 693/794] lib: Sort platform predicates

---
 lib/systems/inspect.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index bf186126d4a..b099ca0ad71 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -21,6 +21,7 @@ rec {
     isSparc        = { cpu = { family = "sparc"; }; };
     isWasm         = { cpu = { family = "wasm"; }; };
     isAvr          = { cpu = { family = "avr"; }; };
+    isJavaScript = { cpu = cpuTypes.js; };
 
     is32bit        = { cpu = { bits = 32; }; };
     is64bit        = { cpu = { bits = 64; }; };
@@ -41,6 +42,7 @@ rec {
     isWindows      = { kernel = kernels.windows; };
     isCygwin       = { kernel = kernels.windows; abi = abis.cygnus; };
     isMinGW        = { kernel = kernels.windows; abi = abis.gnu; };
+    isGhcjs      = { kernel = kernels.ghcjs; };
 
     isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
     isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
@@ -49,8 +51,6 @@ rec {
     isEfi          = map (family: { cpu.family = family; })
                        [ "x86" "arm" "aarch64" ];
 
-    isJavaScript = { cpu = cpuTypes.js; };
-    isGhcjs      = { kernel = kernels.ghcjs; };
     # Deprecated after 18.03
     isArm = isAarch32;
   };

From a77a2cfe4a61c8fda4108fb3670605f04246f857 Mon Sep 17 00:00:00 2001
From: John Ericson <git@JohnEricson.me>
Date: Mon, 2 Sep 2019 01:55:38 -0400
Subject: [PATCH 694/794] lib: Further clean up systems list

---
 lib/systems/inspect.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index b099ca0ad71..129c7a94d3d 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -12,7 +12,7 @@ rec {
     isx86_32       = { cpu = { family = "x86"; bits = 32; }; };
     isx86_64       = { cpu = { family = "x86"; bits = 64; }; };
     isPowerPC      = { cpu = cpuTypes.powerpc; };
-    isPower = { cpu = { family = "power"; }; };
+    isPower        = { cpu = { family = "power"; }; };
     isx86          = { cpu = { family = "x86"; }; };
     isAarch32      = { cpu = { family = "arm"; bits = 32; }; };
     isAarch64      = { cpu = { family = "arm"; bits = 64; }; };
@@ -21,7 +21,7 @@ rec {
     isSparc        = { cpu = { family = "sparc"; }; };
     isWasm         = { cpu = { family = "wasm"; }; };
     isAvr          = { cpu = { family = "avr"; }; };
-    isJavaScript = { cpu = cpuTypes.js; };
+    isJavaScript   = { cpu = cpuTypes.js; };
 
     is32bit        = { cpu = { bits = 32; }; };
     is64bit        = { cpu = { bits = 64; }; };
@@ -42,7 +42,7 @@ rec {
     isWindows      = { kernel = kernels.windows; };
     isCygwin       = { kernel = kernels.windows; abi = abis.cygnus; };
     isMinGW        = { kernel = kernels.windows; abi = abis.gnu; };
-    isGhcjs      = { kernel = kernels.ghcjs; };
+    isGhcjs        = { kernel = kernels.ghcjs; };
 
     isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
     isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];

From 8f9ad4a2b5d075f7b1fad0f069d18a9d1f4742b6 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Mon, 2 Sep 2019 00:13:16 -0700
Subject: [PATCH 695/794] pythonPackages.flask: 1.0.3 -> 1.0.4

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

diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index df39b2ea725..bc7962d4108 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -2,12 +2,12 @@
 , itsdangerous, click, werkzeug, jinja2, pytest }:
 
 buildPythonPackage rec {
-  version = "1.0.3";
+  version = "1.0.4";
   pname = "Flask";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ad7c6d841e64296b962296c2c2dabc6543752985727af86a975072dea984b6f3";
+    sha256 = "ed1330220a321138de53ec7c534c3d90cf2f7af938c7880fc3da13aa46bf870f";
   };
 
   checkInputs = [ pytest ];

From ddefb5f067f08d0846e82c60ac44a8791930be66 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nathan@myrtlesoftware.com>
Date: Mon, 15 Jul 2019 10:47:58 +0100
Subject: [PATCH 696/794] q-text-as-data: init at 1.7.1

---
 pkgs/tools/misc/q-text-as-data/default.nix | 35 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/misc/q-text-as-data/default.nix

diff --git a/pkgs/tools/misc/q-text-as-data/default.nix b/pkgs/tools/misc/q-text-as-data/default.nix
new file mode 100644
index 00000000000..dbd4a4c465c
--- /dev/null
+++ b/pkgs/tools/misc/q-text-as-data/default.nix
@@ -0,0 +1,35 @@
+{ stdenvNoCC, fetchFromGitHub, python2 }:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "q-text-as-data";
+  version = "1.7.1";
+
+  src = fetchFromGitHub {
+    owner = "harelba";
+    repo = "q";
+    rev = version;
+    sha256 = "021c2sd6qscz1ipwzzjf43pfd311dcay7yralksl25rs0r7h3li2";
+  };
+
+  buildInputs = [ python2 ];
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/q $out/bin
+    chmod +x $out/bin/q
+  '';
+
+  meta = with stdenvNoCC.lib; {
+    description = "Run SQL directly on CSV or TSV files";
+    longDescription = ''
+      q is a command line tool that allows direct execution of SQL-like queries on CSVs/TSVs (and any other tabular text files).
+
+      q treats ordinary files as database tables, and supports all SQL constructs, such as WHERE, GROUP BY, JOINs etc. It supports automatic column name and column type detection, and provides full support for multiple encodings.
+    '';
+    homepage = "http://harelba.github.io/q/";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.taneb ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cab1ae328b..6b574576b13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5715,6 +5715,8 @@ in
 
   ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { };
 
+  q-text-as-data = callPackage ../tools/misc/q-text-as-data { };
+
   qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { };
 
   qastools = libsForQt5.callPackage ../tools/audio/qastools { };

From 05393ca2170bf5db031372bdf2a714b006f9b2ca Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 2 Sep 2019 11:13:19 +0200
Subject: [PATCH 697/794] trivial-builders: add the applyPatches function

applyPatches applies a list of patches to a source directory.

For example to patch nixpkgs you can use:

  applyPatches {
    src = pkgs.path;
    patches = [
      (pkgs.fetchpatch {
        url = "https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch";
        sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr";
      })
    ];
  }
---
 pkgs/build-support/trivial-builders.nix | 33 +++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 0bfe14a8539..55df09121b4 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -381,4 +381,37 @@ rec {
   # Copy a list of paths to the Nix store.
   copyPathsToStore = builtins.map copyPathToStore;
 
+  /* Applies a list of patches to a source directory.
+   *
+   * Examples:
+   *
+   * # Patching nixpkgs:
+   * applyPatches {
+   *   src = pkgs.path;
+   *   patches = [
+   *     (pkgs.fetchpatch {
+   *       url = "https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch";
+   *       sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr";
+   *     })
+   *   ];
+   * }
+   */
+  applyPatches =
+    { src
+    , name ? (if builtins.typeOf src == "path"
+              then builtins.baseNameOf src
+              else
+                if builtins.isAttrs src && builtins.hasAttr "name" src
+                then src.name
+                else throw "applyPatches: please supply a `name` argument because a default name can only be computed when the `src` is a path or is an attribute set with a `name` attribute."
+             ) + "-patched"
+    , patches   ? []
+    , postPatch ? ""
+    }: stdenvNoCC.mkDerivation {
+      inherit name src patches postPatch;
+      preferLocalBuild = true;
+      allowSubstitutes = false;
+      phases = "unpackPhase patchPhase installPhase";
+      installPhase = "cp -R ./ $out";
+    };
 }

From afb4fbb9ce54b2cb162364b3215247119e5d65ca Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 11:11:00 +0200
Subject: [PATCH 698/794] enchant: format with nixpkgs-fmt

---
 pkgs/development/libraries/enchant/2.x.nix | 33 ++++++++++++++++++----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 3f46390c12b..3e37480403d 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -1,4 +1,12 @@
-{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell, unittest-cpp }:
+{ stdenv
+, fetchurl
+, aspell
+, pkgconfig
+, glib
+, hunspell
+, hspell
+, unittest-cpp
+}:
 
 stdenv.mkDerivation rec {
   pname = "enchant";
@@ -11,10 +19,25 @@ stdenv.mkDerivation rec {
     sha256 = "1p6a3qmrh8bjzds6x7rg9da0ir44gg804jzkf634h39wsa4vdmpm";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib hunspell ];
-  checkInputs = [ unittest-cpp ];
-  propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  buildInputs = [
+    glib
+    hunspell
+  ];
+
+  checkInputs = [
+    unittest-cpp
+  ];
+
+  # libtool puts these to .la files
+  propagatedBuildInputs = [
+    hspell
+    aspell
+  ];
 
   enableParallelBuilding = true;
 

From c1069b51ec9b6f44b9160e00b1cf81a21cc23bf1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 09:25:20 +0200
Subject: [PATCH 699/794] enchant: enable tests

We need to enable relocatability as per https://github.com/AbiWord/enchant/issues/219 for tests to work.
---
 pkgs/development/libraries/enchant/2.x.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 3e37480403d..185ab473979 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
     sha256 = "1p6a3qmrh8bjzds6x7rg9da0ir44gg804jzkf634h39wsa4vdmpm";
   };
 
-
   nativeBuildInputs = [
     pkgconfig
   ];
@@ -41,7 +40,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = false; # https://github.com/AbiWord/enchant/issues/219
+  doCheck = true;
+
+  configureFlags = [
+    "--enable-relocatable" # needed for tests
+  ];
 
   meta = with stdenv.lib; {
     description = "Generic spell checking library";

From eca6a1371f4fd91a70491820f50d42d06a73a8b7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 11:12:01 +0200
Subject: [PATCH 700/794] =?UTF-8?q?enchant:=202.2.4=20=E2=86=92=202.2.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/AbiWord/enchant/blob/v2.2.5/NEWS#L1-L4
---
 pkgs/development/libraries/enchant/2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 185ab473979..92e34145abd 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "enchant";
-  version = "2.2.4";
+  version = "2.2.5";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "1p6a3qmrh8bjzds6x7rg9da0ir44gg804jzkf634h39wsa4vdmpm";
+    sha256 = "0r41qjz3104h5raiwlw5ywwybafbxdjz12j1bnq3kq60jlr6d2pf";
   };
 
   nativeBuildInputs = [

From a41932865f54a6d8db33e5d50cab04e1ca6a331d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 11:07:45 +0200
Subject: [PATCH 701/794] libmypaint: format with nixpkgs-fmt

---
 .../libraries/libmypaint/default.nix          | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index cde4251e2c6..a3361997774 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -1,10 +1,18 @@
-{stdenv, autoconf, automake, fetchFromGitHub, fetchpatch, glib, intltool, json_c, libtool, pkgconfig}:
+{ stdenv
+, autoconf
+, automake
+, fetchFromGitHub
+, fetchpatch
+, glib
+, intltool
+, json_c
+, libtool
+, pkgconfig
+}:
 
-let
-  version = "1.3.0";
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "libmypaint";
-  inherit version;
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "mypaint";
@@ -21,11 +29,22 @@ in stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    intltool
+    libtool
+    pkgconfig
+  ];
 
-  buildInputs = [ glib ];
+  buildInputs = [
+    glib
+  ];
 
-  propagatedBuildInputs = [ json_c ]; # for libmypaint.pc
+  # for libmypaint.pc
+  propagatedBuildInputs = [
+    json_c
+  ];
 
   doCheck = true;
 

From c65ec9ed0649786c604d19c4229ce27dcad6f2b9 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 2 Sep 2019 13:11:25 +0200
Subject: [PATCH 702/794] grafana: 6.3.4 -> 6.3.5

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 557a4b4842d..615edeb81ec 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "grafana";
-  version = "6.3.4";
+  version = "6.3.5";
 
   goPackagePath = "github.com/grafana/grafana";
 
@@ -12,12 +12,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "06xbz6y1vmj44ppm2gbb71qiv8myd5ysygi3s06d6dia07ngw3v2";
+    sha256 = "0qimqdlxkvh31n730gp1wl1va0bza69bw90nyzrmfb34733pmni2";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "0lhfy3crwis6464icxq0h3hgxvk2dgk6w7k6z2mmaxqm0j15scc8";
+    sha256 = "1rw2ws610ba2vl5kv3yay8s69xkqzisrl6q27zxa5kj48khvy101";
   };
 
   postPatch = ''

From 4b5afe54dea9d76735ea5d591f60a2b46553a04b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= <feron.gabriel@gmail.com>
Date: Mon, 2 Sep 2019 13:39:40 +0200
Subject: [PATCH 703/794] Fix typo in customisation.nix

---
 lib/customisation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 1f5eb0d11e8..3be36fcd719 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -47,7 +47,7 @@ rec {
 
 
   /* `makeOverridable` takes a function from attribute set to attribute set and
-     injects `override` attibute which can be used to override arguments of
+     injects `override` attribute which can be used to override arguments of
      the function.
 
        nix-repl> x = {a, b}: { result = a + b; }

From cf4fa9f708a165ea1314bebc2a32d741dce2f039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <suhr@i2pmail.org>
Date: Mon, 2 Sep 2019 14:59:33 +0300
Subject: [PATCH 704/794] musescore: 3.0.5 ->  3.2.3

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

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 2e69c3cda7a..5368fcb6165 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -6,11 +6,11 @@
 
 mkDerivation rec {
   pname = "musescore";
-  version = "3.0.5";
+  version = "3.2.3";
 
   src = fetchzip {
-    url = "https://download.musescore.com/releases/MuseScore-${version}/MuseScore-${version}.zip";
-    sha256 = "1pbf6v0l3nixxr8k5igwhj09wnqvw92av6q6yjrbb3kyjh5br2d8";
+    url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.zip";
+    sha256 = "17mr0c8whw6vz86lp1j36rams4h8virc4z68fld0q3rpq6g05szs";
     stripRoot = false;
   };
 

From b97a20a5672be3f39a6a8716ee02b9186b0e6ffb Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Mon, 2 Sep 2019 14:32:41 +0200
Subject: [PATCH 705/794] nix-prefetch-github: 2.3 -> 2.3.1

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

diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix
index 3c5cbe2b492..10a6daaf53f 100644
--- a/pkgs/build-support/nix-prefetch-github/default.nix
+++ b/pkgs/build-support/nix-prefetch-github/default.nix
@@ -5,13 +5,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nix-prefetch-github";
-  version = "2.3";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "seppeljordan";
     repo = "nix-prefetch-github";
     rev = "v${version}";
-    sha256 = "0b2hgfyxhlqq6lyi5cr98dz6if5kl6b3kq67f2lzfkalydywl1dh";
+    sha256 = "13wvq13iiva97a16kahfpxar5ppb015nnbn7d4v9s9jyxdickc2c";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 8e5aae5a19436a8c3b95544527d8e61e6e6ce928 Mon Sep 17 00:00:00 2001
From: cfhammill <cfhammill@gmail.com>
Date: Mon, 2 Sep 2019 16:23:24 +0300
Subject: [PATCH 706/794] Fix broken builds for rgdal and sf R packages

Builds were failing to include PROJ, depending on proj.dev
appears to fix it.
---
 pkgs/development/r-modules/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index e813e550f6e..995f13853a2 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -308,7 +308,7 @@ let
     RcppGSL = [ pkgs.gsl_1 ];
     RcppZiggurat = [ pkgs.gsl_1 ];
     reprex = [ pkgs.which ];
-    rgdal = [ pkgs.proj pkgs.gdal ];
+    rgdal = [ pkgs.proj.dev pkgs.gdal ];
     rgeos = [ pkgs.geos ];
     rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ];
     rgl = [ pkgs.libGLU_combined pkgs.xlibsWrapper ];
@@ -420,7 +420,7 @@ let
     odbc = [ pkgs.pkgconfig ];
     openssl = [ pkgs.pkgconfig ];
     pdftools = [ pkgs.pkgconfig ];
-    sf = [ pkgs.pkgconfig ];
+    sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ];
     showtext = [ pkgs.pkgconfig ];
     spate = [ pkgs.pkgconfig ];
     stringi = [ pkgs.pkgconfig ];

From fab559102ee0040878424f71e34eedf6757ec1d0 Mon Sep 17 00:00:00 2001
From: Taito Horiuchi <taito.horiuchi@relexsolutions.com>
Date: Mon, 2 Sep 2019 16:52:15 +0300
Subject: [PATCH 707/794] pythonPackages.robotframework-sshlibrary: 3.3.0 ->
 3.4.0

---
 .../python-modules/robotframework-sshlibrary/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
index d0e5b13ddbe..b5ca464938b 100644
--- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
@@ -7,12 +7,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.3.0";
+  version = "3.4.0";
   pname = "robotframework-sshlibrary";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fc5b5db63cf63a937bd4ada1a8b7508ec8a75d9454fa75e6410cbe72fd718de9";
+    sha256 = "21fa0183776e6061366f517765db479aaa634b707f3dd9d90ef6972adae6a755";
   };
 
   # unit tests are impure

From 8d70f49cbd9311dd33e543cefb4279546f446325 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Aug 2019 19:05:01 +0000
Subject: [PATCH 708/794] ocamlPackages.lablgtk: 2.18.6 -> 2.18.8

Ensures compatibility with OCaml 4.08.
---
 pkgs/development/ocaml-modules/lablgtk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index e78dd91f00a..38ea45bc297 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -3,9 +3,9 @@
 let param =
   let check = stdenv.lib.versionAtLeast ocaml.version; in
   if check "4.06" then {
-    version = "2.18.6";
-    url = https://forge.ocamlcore.org/frs/download.php/1726/lablgtk-2.18.6.tar.gz;
-    sha256 = "1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d";
+    version = "2.18.8";
+    url = "https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/lablgtk-2.18.8.tar.gz";
+    sha256 = "1qsd9nv96fxddc8zayqiqxw9hcyf29axckqg100fm2brs2prpxci";
   } else if check "3.12" then {
     version = "2.18.5";
     url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz;

From 03d7679392a2017afedb044212cae82a440143a5 Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Mon, 2 Sep 2019 21:56:17 +0200
Subject: [PATCH 709/794] miller: 5.4.0 -> 5.5.0

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

diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix
index 9de7efa3a81..cd40b76b451 100644
--- a/pkgs/tools/text/miller/default.nix
+++ b/pkgs/tools/text/miller/default.nix
@@ -1,15 +1,13 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }:
+{ stdenv, fetchurl, autoreconfHook, flex, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "miller";
 
-  version = "5.4.0";
+  version = "5.5.0";
 
-  src = fetchFromGitHub {
-    owner = "johnkerl";
-    repo = "miller";
-    rev = "${version}";
-    sha256 = "0158by642frh9x6rrgqxwmk4766wb36kp0rrjg5swdbs9w3is3xg";
+  src = fetchurl {
+    url = "https://github.com/johnkerl/miller/releases/download/v${version}/mlr-${version}.tar.gz";
+    sha256 = "06pkmqfv325igpcyjcq6sqr1r6gab7a7qdfw6kw6a6kwksgk5f8d";
   };
 
   nativeBuildInputs = [ autoreconfHook flex libtool ];

From c9625fa9ac6fea4c5657f942e3d80bf6a7155cdc Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 2 Sep 2019 18:44:56 +0100
Subject: [PATCH 710/794] icestorm: 2019.08.15 -> 2019.08.31

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

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 2bac1540303..adcacde14cf 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "icestorm";
-  version = "2019.08.15";
+  version = "2019.08.31";
 
   pythonPkg = if usePyPy then pypy3 else python3;
   pythonInterp = pythonPkg.interpreter;
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner  = "cliffordwolf";
     repo   = "icestorm";
-    rev    = "95949315364f8d9b0c693386aefadf44b28e2cf6";
-    sha256 = "05q1vxlf9l5z9mam8jbv58jqj7nsd8v7ssy753sharpgzzgdc8a2";
+    rev    = "04f1eb78ed8fd50516aee50102675041a8fd40cd";
+    sha256 = "10jdiw4mw0afcjq7xl3xs8z733mlrx927x620vs2yz91p757jxbd";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d13e64641dfcfd57680ad34c2eb22cb6ac524bb0 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 2 Sep 2019 18:45:03 +0100
Subject: [PATCH 711/794] icestorm: use libftdi1 rather than libftdi

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

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index adcacde14cf..b3ce4f8f6a7 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, pkgconfig, libftdi
+, pkgconfig, libftdi1
 , python3, pypy3
 
 # PyPy yields large improvements in build time and runtime performance,
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ pythonPkg libftdi ];
+  buildInputs = [ pythonPkg libftdi1 ];
   makeFlags = [ "PREFIX=$(out)" ];
 
   enableParallelBuilding = true;

From 12ae04518b004adf949a43125954b99c05189e6f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 2 Sep 2019 18:49:12 +0100
Subject: [PATCH 712/794] nextpnr: (hopefully) fix build on Darwin

Fixes #67898, hopefully.
---
 pkgs/development/compilers/nextpnr/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index 894ef8c45fa..357f26cf314 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -6,6 +6,7 @@
 , enableGui ? true
 , wrapQtAppsHook
 , qtbase
+, OpenGL ? null
 }:
 
 let
@@ -41,7 +42,10 @@ with stdenv; mkDerivation rec {
       "-DSERIALIZE_CHIPDB=OFF"
       # use PyPy for icestorm if enabled
       "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}"
-    ] ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF");
+    ]
+    ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF")
+    ++ (lib.optional (enableGui && stdenv.isDarwin)
+        "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks");
 
   # Fix the version number. This is a bit stupid (and fragile) in practice
   # but works ok. We should probably make this overrideable upstream.
@@ -61,7 +65,7 @@ with stdenv; mkDerivation rec {
     description = "Place and route tool for FPGAs";
     homepage    = https://github.com/yosyshq/nextpnr;
     license     = licenses.isc;
-    platforms   = platforms.linux;
+    platforms   = platforms.all;
     maintainers = with maintainers; [ thoughtpolice emily ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b574576b13..b4a9c68c1fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8265,7 +8265,9 @@ in
 
   neko = callPackage ../development/compilers/neko { };
 
-  nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { };
+  nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr {
+    inherit (darwin.apple_sdk.frameworks) OpenGL;
+  };
 
   nasm = callPackage ../development/compilers/nasm { };
 

From 88e1eef45fe3d4341acd3b7a07be061ac7b2bb95 Mon Sep 17 00:00:00 2001
From: dkabot <1316469+dkabot@users.noreply.github.com>
Date: Mon, 2 Sep 2019 17:26:59 -0400
Subject: [PATCH 713/794] gnomeExtensions.dash-to-panel: 19 -> 23

---
 pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
index 30f9ad7d2ab..f7f189e23bd 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-dash-to-panel";
-  version = "19";
+  version = "23";
 
   src = fetchFromGitHub {
     owner = "home-sweet-gnome";
     repo = "dash-to-panel";
     rev = "v${version}";
-    sha256 = "0r26ph6zq87kvglydv00rf24mshz7l4r38zf9niyp3mxyzz6rwys";
+    sha256 = "12smkz3clcvgicr0pdc0fk6igf82nw4hzih1ywv9q43xkqh9w1i6";
   };
 
   buildInputs = [

From 185fd61631e1521225bdcf10da112450424db56c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler=20=28work=29?= <mil@nyantec.com>
Date: Mon, 2 Sep 2019 23:39:57 +0200
Subject: [PATCH 714/794] treewide: remove uses of doBuild and doConfigure

doBuild and doConfigure are not actually used by any builders, they were
probably added by mistake and just confuse people.
---
 pkgs/applications/audio/spotify/default.nix                    | 2 --
 pkgs/applications/networking/cluster/kubectl/default.nix       | 2 --
 pkgs/applications/science/electronics/eagle/eagle.nix          | 3 ---
 .../virtualization/virtualbox/guest-additions/default.nix      | 2 --
 pkgs/servers/unifi/default.nix                                 | 2 --
 pkgs/servers/xmpp/pyIRCt/default.nix                           | 1 -
 pkgs/servers/xmpp/pyMAILt/default.nix                          | 1 -
 pkgs/tools/admin/google-cloud-sdk/default.nix                  | 2 --
 pkgs/tools/text/shab/default.nix                               | 1 -
 9 files changed, 16 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 403075f9135..3f99e22a4cb 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -78,8 +78,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ squashfsTools makeWrapper ];
 
-  doConfigure = false;
-  doBuild = false;
   dontStrip = true;
   dontPatchELF = true;
 
diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix
index 40d42408679..fed40523a9b 100644
--- a/pkgs/applications/networking/cluster/kubectl/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl/default.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "man" ];
 
-  doBuild = false;
-
   installPhase = ''
     mkdir -p \
       "$out/bin" \
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index 3168fc19d05..2b28f2c06db 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -36,9 +36,6 @@ let
         qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine
       ];
 
-    doConfigure = false;
-    doBuild = false;
-
     installPhase = ''
       # Extract eagle tarball
       mkdir "$out"
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 5ff8a1650ba..c092f1be006 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -56,8 +56,6 @@ stdenv.mkDerivation {
     }
   '';
 
-  doConfigure = false;
-
   buildPhase = ''
     # Build kernel modules.
     cd src
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index eb7a072799d..660a7050e9c 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -19,8 +19,6 @@ let
       runHook postUnpack
     '';
 
-    doConfigure = false;
-
     installPhase = ''
       runHook preInstall
 
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
index f5bdfd9fe85..7db8ec3b604 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
     xmpppy pythonIRClib
   ];
 
-  /* doConfigure should be removed if not needed */
   # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
 
   installPhase = ''
diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix
index 719acfd3a66..0c85f322f48 100644
--- a/pkgs/servers/xmpp/pyMAILt/default.nix
+++ b/pkgs/servers/xmpp/pyMAILt/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
   pythonPath = [ xmpppy ];
   buildInputs = [ pythonPackages.wrapPython ];
 
-  /* doConfigure should be removed if not needed */
   installPhase = ''
     cd mail-transport
     mkdir -p $out/bin $out/share/${pname}-${version}
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index b35fe709f95..7c81e861ddb 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -36,8 +36,6 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ python makeWrapper ];
 
-  doBuild = false;
-
   patches = [
     ./gcloud-path.patch
   ];
diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/tools/text/shab/default.nix
index 73323c784fd..02d2d545122 100644
--- a/pkgs/tools/text/shab/default.nix
+++ b/pkgs/tools/text/shab/default.nix
@@ -19,7 +19,6 @@ let
       done
     '';
 
-    doBuild = false;
     doCheck = true;
     doInstallCheck = true;
 

From 70aa3807cfef35986040e4c2e65cf14b75661765 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 2 Sep 2019 21:34:36 +0300
Subject: [PATCH 715/794] qmmp: use qt5's mkDerivation

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

diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 03f6bb1b793..ef52c65b105 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, xlibsWrapper
+{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, xlibsWrapper
 , qtbase, qttools, qtmultimedia, qtx11extras
 # transports
 , curl, libmms
@@ -28,7 +28,7 @@
 # Qmmp installs working .desktop file(s) all by itself, so we don't need to
 # handle that.
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "qmmp-1.3.3";
 
   src = fetchurl {

From cc2deaf210f86f71cd4aeef37a4a3efb20b86af4 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 2 Sep 2019 21:41:14 +0300
Subject: [PATCH 716/794] dfilemanager: use qt5's mkDerivation

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

diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index 5df7c0b0672..1bfb6bbfeaf 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }:
+{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }:
 
 let
   version = "git-2016-01-10";
 in
-stdenv.mkDerivation {
+mkDerivation {
   pname = "dfilemanager";
   inherit version;
   src = fetchgit {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ cmake qtbase qttools file solid ];
 
-  cmakeFlags = "-DQT5BUILD=true";
+  cmakeFlags = [ "-DQT5BUILD=true" ];
 
   meta = {
     homepage = http://dfilemanager.sourceforge.net/;

From b85f48c3511386bd71e2939bb242cf9745cc9c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler=20=28work=29?= <mil@nyantec.com>
Date: Mon, 2 Sep 2019 23:57:33 +0200
Subject: [PATCH 717/794] unifi: remove unifiTesting

The testing branch is not updated anymore and all mentions have been
removed from the Ubiquiti website.
---
 pkgs/servers/unifi/default.nix  | 7 -------
 pkgs/top-level/all-packages.nix | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index eb7a072799d..834f169b475 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -54,11 +54,4 @@ in rec {
     version = "5.11.39";
     sha256 = "0v1gnvdazxa3bcbq8hl6796yw0mxzki2xn4s5im5k5ngmfmnswyj";
   };
-
-  # TODO: update as it is outdated
-  unifiTesting = generic {
-    version = "5.11.18";
-    suffix = "-996baf2ca5";
-    sha256 = "14yyfn39ix8bnn0cb6bn0ly6pqxg81lvy83y40bk0y8vxfg6maqc";
-  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccdb4e25cd9..443fab68846 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15253,8 +15253,7 @@ in
 
   inherit (callPackages ../servers/unifi { })
     unifiLTS
-    unifiStable
-    unifiTesting;
+    unifiStable;
   unifi = unifiStable;
 
   virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { };

From fbb69716b10104ddcef1764b48373ad401bd190f Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann.hodique@gmail.com>
Date: Mon, 2 Sep 2019 15:11:28 -0700
Subject: [PATCH 718/794] teleport: 4.0.2 -> 4.0.4

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

diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
index 121983e7031..3a83f1a08c2 100644
--- a/pkgs/servers/teleport/default.nix
+++ b/pkgs/servers/teleport/default.nix
@@ -3,14 +3,14 @@
 
 buildGoPackage rec {
   pname = "teleport";
-  version = "4.0.2";
+  version = "4.0.4";
 
   # This repo has a private submodule "e" which fetchgit cannot handle without failing.
   src = fetchFromGitHub {
     owner = "gravitational";
     repo = "teleport";
     rev = "v${version}";
-    sha256 = "0rnjw297pkkhpqisrs5ghgvzlklk7kbhrz7rhr91b5rx3lr9c1ny";
+    sha256 = "1ady9nh1mi1lb9a868w6ylncz2r6x7mk33ajiymn2frpcwk9m2l9";
   };
 
   goPackagePath = "github.com/gravitational/teleport";

From 0a29a2e37ce5c4fe361162a9bf46a4a14da7da1a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 3 Sep 2019 00:36:30 +0300
Subject: [PATCH 719/794] syncplay module: init

---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/networking/syncplay.nix  | 80 +++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 nixos/modules/services/networking/syncplay.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4bc37ed3f17..296c678124a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -698,6 +698,7 @@
   ./services/networking/supybot.nix
   ./services/networking/syncthing.nix
   ./services/networking/syncthing-relay.nix
+  ./services/networking/syncplay.nix
   ./services/networking/tcpcrypt.nix
   ./services/networking/teamspeak3.nix
   ./services/networking/tedicross.nix
diff --git a/nixos/modules/services/networking/syncplay.nix b/nixos/modules/services/networking/syncplay.nix
new file mode 100644
index 00000000000..e3147c10502
--- /dev/null
+++ b/nixos/modules/services/networking/syncplay.nix
@@ -0,0 +1,80 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.syncplay;
+
+  cmdArgs =
+    [ "--port" cfg.port ]
+    ++ optionals (cfg.salt != null) [ "--salt" cfg.salt ]
+    ++ optionals (cfg.certDir != null) [ "--tls" cfg.certDir ];
+
+in
+{
+  options = {
+    services.syncplay = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "If enabled, start the Syncplay server.";
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 8999;
+        description = ''
+          TCP port to bind to.
+        '';
+      };
+
+      salt = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Salt to allow room operator passwords generated by this server
+          instance to still work when the server is restarted.
+        '';
+      };
+
+      certDir = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          TLS certificates directory to use for encryption. See
+          <link xlink:href="https://github.com/Syncplay/syncplay/wiki/TLS-support"/>.
+        '';
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "nobody";
+        description = ''
+          User to use when running Syncplay.
+        '';
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "nogroup";
+        description = ''
+          Group to use when running Syncplay.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.syncplay = {
+      description = "Syncplay Service";
+      wantedBy    = [ "multi-user.target" ];
+      after       = [ "network-online.target "];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.syncplay}/bin/syncplay-server ${escapeShellArgs cmdArgs}";
+        User = cfg.user;
+        Group = cfg.group;
+      };
+    };
+  };
+}

From 36c72f3632e23e8cd155e16639660f33d4502c9f Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Tue, 3 Sep 2019 00:42:25 +0200
Subject: [PATCH 720/794] miller: back to fetchFromGitHub

---
 pkgs/tools/text/miller/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix
index cd40b76b451..d271490ca1c 100644
--- a/pkgs/tools/text/miller/default.nix
+++ b/pkgs/tools/text/miller/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, autoreconfHook, flex, libtool }:
+{ stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "miller";
 
   version = "5.5.0";
 
-  src = fetchurl {
-    url = "https://github.com/johnkerl/miller/releases/download/v${version}/mlr-${version}.tar.gz";
-    sha256 = "06pkmqfv325igpcyjcq6sqr1r6gab7a7qdfw6kw6a6kwksgk5f8d";
+  src = fetchFromGitHub {
+    owner = "johnkerl";
+    repo = "miller";
+    rev = "v${version}";
+    sha256 = "1zkh87vq0gqcx6z6yzf1rq30jmdgdpp0rx5f0vvl0zcn0hc2smpz";
   };
 
   nativeBuildInputs = [ autoreconfHook flex libtool ];

From 9cbb59f90ea90a5a94cfc0f0a70232c60e50ba30 Mon Sep 17 00:00:00 2001
From: dawidsowa <dawid_sowa@posteo.net>
Date: Tue, 3 Sep 2019 00:54:34 +0200
Subject: [PATCH 721/794] gallery-dl: 1.10.2 -> 1.10.3

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

diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index 6b57c74c123..169c5c11b8c 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gallery_dl";
-  version = "1.10.2";
+  version = "1.10.3";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "09q9l747vv6nrkscj08dv970qs6nm2azjcm015xf3bd5ab91l44r";
+    sha256 = "1ippn0zbjy69n178vh4wgyzy6723ynvj2w23mzqw7v2mzcvkhmdz";
   };
 
   doCheck = false;

From 51e71596f83617d7140c05f775b1523949d9817e Mon Sep 17 00:00:00 2001
From: dkabot <1316469+dkabot@users.noreply.github.com>
Date: Mon, 2 Sep 2019 16:20:44 -0400
Subject: [PATCH 722/794] gnomeExtensions.arc-menu: init at 31

---
 maintainers/maintainer-list.nix               |  6 ++++
 .../gnome-3/extensions/arc-menu/default.nix   | 33 +++++++++++++++++++
 .../extensions/arc-menu/fix_gmenu.patch       | 12 +++++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 52 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
 create mode 100644 pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7298ed804bb..ff88c717c25 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1633,6 +1633,12 @@
     githubId = 10913120;
     name = "Dje4321";
   };
+  dkabot = {
+    email = "dkabot@dkabot.com";
+    github = "dkabot";
+    githubId = 1316469;
+    name = "Naomi Morse";
+  };
   dmalikov = {
     email = "malikov.d.y@gmail.com";
     github = "dmalikov";
diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
new file mode 100644
index 00000000000..b38f0aeba91
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }:
+
+stdenv.mkDerivation rec {
+  pname = "gnome-shell-arc-menu";
+  version = "31";
+
+  src = fetchFromGitLab {
+    owner = "LinxGem33";
+    repo = "Arc-Menu";
+    rev = "v${version}-stable";
+    sha256 = "124jgdy6mw76nrkq3f0y7qkhdm39wg273zifdvwbgpvirwzxbia1";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./fix_gmenu.patch;
+      gmenu_path = "${gnome-menus}/lib/girepository-1.0";
+    })
+  ];
+
+  buildInputs = [
+    glib gettext
+  ];
+
+  makeFlags = [ "INSTALL_BASE=$(out)/share/gnome-shell/extensions" ];
+
+  meta = with stdenv.lib; {
+    description = "Gnome shell extension designed to replace the standard menu found in Gnome 3";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ dkabot ];
+    homepage = https://gitlab.com/LinxGem33/Arc-Menu;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch b/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch
new file mode 100644
index 00000000000..7f6b8489ea8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch
@@ -0,0 +1,12 @@
+--- a/extension.js
++++ b/extension.js
+@@ -29,6 +29,8 @@
+  * https://github.com/The-Panacea-Projects/Gnomenu
+  */
+ 
++
++imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@');
+ 
+ // Import Libraries
+ const Main = imports.ui.main;
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4a9c68c1fe..4eec048da27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22649,6 +22649,7 @@ in
 
   gnomeExtensions = recurseIntoAttrs {
     appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { };
+    arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { };
     battery-status = callPackage ../desktops/gnome-3/extensions/battery-status { };
     caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };
     clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { };

From 3da4caa8f870db5131ed0979b7e821e44152b293 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 31 Aug 2019 21:26:41 +0200
Subject: [PATCH 723/794] rofi: fix rofi-theme-selector by setting
 $XDG_DATA_DIRS

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

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 94381d4f6f9..eabf77f0e95 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl
+{ stdenv, lib, fetchurl, makeWrapper
 , autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
 , cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
 , bison, flex, librsvg, check
@@ -19,11 +19,16 @@ stdenv.mkDerivation rec {
     sed -i 's/~root/~nobody/g' test/helper-expand.c
   '';
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
   buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
     libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/rofi-theme-selector \
+      --prefix XDG_DATA_DIRS : $out/share
+  '';
+
   doCheck = false;
 
   meta = with lib; {

From 4017032055d066fa5c39506158b8d84bb9d3e8ca Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Sep 2019 20:00:00 -0500
Subject: [PATCH 724/794] syncthing: 1.2.1 -> 1.2.2

Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.2.2
---
 pkgs/applications/networking/syncthing/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 5b847163a2a..7bfe697105e 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,19 +3,19 @@
 let
   common = { stname, target, postInstall ? "" }:
     buildGoModule rec {
-      version = "1.2.1";
+      version = "1.2.2";
       name = "${stname}-${version}";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "0q1x6kd5kaij8mvs6yll2vqfzrbb31y5hpg6g5kjc8gngwv4rl6v";
+        sha256 = "0zkyjnjrla0vpvidwwr4z4kxc9cyjcfbjdzsr34xz7rw3jswswm9";
       };
 
       goPackagePath = "github.com/syncthing/syncthing";
 
-      modSha256 = "1daixrpdj97ck02853hwp8l158sja5a7a37h0gdbwb1lgf5hsn05";
+      modSha256 = "0pp2gjx227crggph924q7sg6ak8nyl8nlsffpmawq4zl1908lsrd";
 
       patches = [
         ./add-stcli-target.patch

From ef1441fa66efc4a71e2bca51bd41636152dbf884 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Sep 2019 20:37:25 -0500
Subject: [PATCH 725/794] clair: 2.0.8 -> 2.0.9

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

diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix
index a6d8a046907..25c14712094 100644
--- a/pkgs/tools/admin/clair/default.nix
+++ b/pkgs/tools/admin/clair/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "clair";
-  version = "2.0.8";
+  version = "2.0.9";
 
   goPackagePath = "github.com/coreos/clair";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "coreos";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1gwn533fdz8daz1db7w7g7mhls7d5a4vndn47blkpbx2yxdwdh62";
+    sha256 = "1lcrqka4daqqjagx2mbfzg3z8wxg669mw1lb450nrlc33ji2iwdm";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 9bd820c54265180398424ec64d64e37614e1c4ec Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Sep 2019 20:46:48 -0500
Subject: [PATCH 726/794] dive: 0.7.2 -> 0.8.0

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

diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix
index b599ccf1364..5ce57ee8055 100644
--- a/pkgs/development/tools/dive/default.nix
+++ b/pkgs/development/tools/dive/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dive";
-  version = "0.7.2";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "wagoodman";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0az9b800zwk5sd90s8ssg8amf0a4dl7nrglkirp51d8hh3rs6nzl";
+    sha256 = "1pyrdff5qqc0l3h4nssa9a7qnfqwy2p6ywc8nbwyc7wvzgdiczb8";
   };
 
-  modSha256 = "1rc9nqri66kgjpxqcgwllyd0qmk46gs3wmsfdj1w43p6ybnaf3qw";
+  modSha256 = "1fk9z7a6wghrs15pc28g5ri7rkbb1ifjb91rscwqsmh10r2wik4w";
 
   meta = with lib; {
     description = "A tool for exploring each layer in a docker image";

From 8605b470ba3f416ddc156c0a0f907598ce958716 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 12:57:33 +0200
Subject: [PATCH 727/794] gnome2.gvfs: drop

Not needed by anything and dropping it will allow us to clean up the expression.

Changed to an alias as that is what it was in the first place.
---
 pkgs/desktops/gnome-2/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 16828f08bc2..6cc6848b316 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -57,8 +57,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
 #### DESKTOP
 
-  gvfs = pkgs.gvfs.override { gnome = self; };
-
   # Removed from recent GNOME releases, but still required
   scrollkeeper = callPackage ./desktop/scrollkeeper { };
 
@@ -78,7 +76,10 @@ lib.makeScope pkgs.newScope (self: with self; {
     glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
 
     # Included for backwards compatibility
-    libsoup libwnck gtk-doc gnome-doc-utils rarian;
+    libsoup libwnck gtk-doc gnome-doc-utils rarian
+
+    gvfs # added 2019-09-03
+  ;
 
   gtk = pkgs.gtk2;
   gtkmm = pkgs.gtkmm2;

From ef19440dc5d873cea1e94781bf38d70d1e2d0e3f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 13:00:22 +0200
Subject: [PATCH 728/794] gvfs: only support GNOME 3, not GNOME 2

It will make the expression and calls nicer.
---
 pkgs/desktops/gnome-3/default.nix           | 2 +-
 pkgs/development/libraries/gvfs/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix             | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 1f16ff9d0b5..87bf2b7fe70 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -111,7 +111,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gucharmap = callPackage ./core/gucharmap { };
 
-  gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
+  gvfs = pkgs.gvfs.override { gnomeSupport = true; };
 
   eog = callPackage ./core/eog { };
 
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 60188d77962..941f2862c68 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, dbus
 , glib, libgudev, udisks2, libgcrypt, libcap, polkit
 , libgphoto2, avahi, libarchive, fuse, libcdio
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
-, gnomeSupport ? false, gnome, gcr, wrapGAppsHook
+, gnomeSupport ? false, gnome3, gcr, wrapGAppsHook
 , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
 , libsecret, libgdata, python3
 }:
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
     samba libmtp libcap polkit libimobiledevice libbluray
     libcdio-paranoia libnfs openssh
     # ToDo: a ligther version of libsoup to have FTP/HTTP support?
-  ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
+  ] ++ stdenv.lib.optionals gnomeSupport (with gnome3; [
     libsoup gcr
     glib-networking # TLS support
     gnome-online-accounts libsecret libgdata
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b574576b13..da920db65b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11265,9 +11265,7 @@ in
 
   gumbo = callPackage ../development/libraries/gumbo { };
 
-  gvfs = callPackage ../development/libraries/gvfs {
-    gnome = res.gnome3;
-  };
+  gvfs = callPackage ../development/libraries/gvfs { };
 
   gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };
 

From f5a54f388c6ccfb74880163527d1acfe2b30ef2f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 13:03:38 +0200
Subject: [PATCH 729/794] gvfs: format with nixpkgs-fmt

---
 pkgs/development/libraries/gvfs/default.nix | 97 ++++++++++++++++-----
 1 file changed, 76 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 941f2862c68..2e41f79b78c 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,20 +1,47 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, dbus
-, glib, libgudev, udisks2, libgcrypt, libcap, polkit
-, libgphoto2, avahi, libarchive, fuse, libcdio
-, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
-, gnomeSupport ? false, gnome3, gcr, wrapGAppsHook
-, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
-, libsecret, libgdata, python3
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, gettext
+, dbus
+, glib
+, libgudev
+, udisks2
+, libgcrypt
+, libcap
+, polkit
+, libgphoto2
+, avahi
+, libarchive
+, fuse
+, libcdio
+, libxml2
+, libxslt
+, docbook_xsl
+, docbook_xml_dtd_42
+, samba
+, libmtp
+, gnomeSupport ? false
+, gnome3
+, gcr
+, wrapGAppsHook
+, libimobiledevice
+, libbluray
+, libcdio-paranoia
+, libnfs
+, openssh
+, libsecret
+, libgdata
+, python3
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "gvfs";
   version = "1.40.2";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx";
   };
 
@@ -26,28 +53,56 @@ in stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    meson ninja python3
-    pkgconfig gettext wrapGAppsHook
-    libxml2 libxslt docbook_xsl docbook_xml_dtd_42
+    meson
+    ninja
+    python3
+    pkgconfig
+    gettext
+    wrapGAppsHook
+    libxml2
+    libxslt
+    docbook_xsl
+    docbook_xml_dtd_42
   ];
 
   buildInputs = [
-    glib libgudev udisks2 libgcrypt dbus
-    libgphoto2 avahi libarchive fuse libcdio
-    samba libmtp libcap polkit libimobiledevice libbluray
-    libcdio-paranoia libnfs openssh
+    glib
+    libgudev
+    udisks2
+    libgcrypt
+    dbus
+    libgphoto2
+    avahi
+    libarchive
+    fuse
+    libcdio
+    samba
+    libmtp
+    libcap
+    polkit
+    libimobiledevice
+    libbluray
+    libcdio-paranoia
+    libnfs
+    openssh
     # ToDo: a ligther version of libsoup to have FTP/HTTP support?
   ] ++ stdenv.lib.optionals gnomeSupport (with gnome3; [
-    libsoup gcr
+    libsoup
+    gcr
     glib-networking # TLS support
-    gnome-online-accounts libsecret libgdata
+    gnome-online-accounts
+    libsecret
+    libgdata
   ]);
 
   mesonFlags = [
     "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
     "-Dtmpfilesdir=no"
   ] ++ stdenv.lib.optionals (!gnomeSupport) [
-    "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
+    "-Dgcr=false"
+    "-Dgoa=false"
+    "-Dkeyring=false"
+    "-Dhttp=false"
     "-Dgoogle=false"
   ] ++ stdenv.lib.optionals (samba == null) [
     # Xfce don't want samba

From 6fabbe513b72cb87b552d292d1f0438ad65a4d56 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 13:06:06 +0200
Subject: [PATCH 730/794] gnome3.gvfs: fix eval with allowAliases = false

---
 pkgs/development/libraries/gvfs/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 2e41f79b78c..f622448b185 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -25,6 +25,7 @@
 , gnomeSupport ? false
 , gnome3
 , gcr
+, gnome-online-accounts
 , wrapGAppsHook
 , libimobiledevice
 , libbluray
@@ -85,15 +86,15 @@ stdenv.mkDerivation rec {
     libcdio-paranoia
     libnfs
     openssh
-    # ToDo: a ligther version of libsoup to have FTP/HTTP support?
-  ] ++ stdenv.lib.optionals gnomeSupport (with gnome3; [
-    libsoup
+    # TODO: a ligther version of libsoup to have FTP/HTTP support?
+  ] ++ stdenv.lib.optionals gnomeSupport [
+    gnome3.libsoup
     gcr
-    glib-networking # TLS support
+    gnome3.glib-networking # TLS support
     gnome-online-accounts
     libsecret
     libgdata
-  ]);
+  ];
 
   mesonFlags = [
     "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"

From fa03881954a0957522785dc5c52f45d07cdae87d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 13:53:11 +0200
Subject: [PATCH 731/794] gnome3.glib-networking: replace with alias

Since we moved gsettings-desktop-schemas to top-level, gnome3.glib-networking was the same as glib-networking.
We could try to make the top-level variant not depend on gsettings-desktop-schemas again but that is probably
pointless, as the dependency is rather small compared to things like libproxy. Instead, we will just drop
the package in gnome3 attr set and always rely on the top-level expression.
---
 nixos/modules/services/desktops/gnome3/glib-networking.nix | 6 +++---
 pkgs/desktops/gnome-3/default.nix                          | 5 +----
 pkgs/development/libraries/gvfs/default.nix                | 3 ++-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixos/modules/services/desktops/gnome3/glib-networking.nix
index 186668d7d38..fcd58509d6f 100644
--- a/nixos/modules/services/desktops/gnome3/glib-networking.nix
+++ b/nixos/modules/services/desktops/gnome3/glib-networking.nix
@@ -22,11 +22,11 @@ with lib;
 
   config = mkIf config.services.gnome3.glib-networking.enable {
 
-    services.dbus.packages = [ pkgs.gnome3.glib-networking ];
+    services.dbus.packages = [ pkgs.glib-networking ];
 
-    systemd.packages = [ pkgs.gnome3.glib-networking ];
+    systemd.packages = [ pkgs.glib-networking ];
 
-    environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" ];
+    environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ];
 
   };
 
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 87bf2b7fe70..21ecc7e64ee 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -53,10 +53,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gjs = callPackage ./core/gjs { };
 
-  glib-networking = pkgs.glib-networking.override {
-    inherit (pkgs) gsettings-desktop-schemas;
-  };
-
   gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
 
   gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
@@ -348,6 +344,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
   inherit (pkgs) gnome-video-effects; # added 2019-08-19
   inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23
+  inherit (pkgs) glib-networking; # added 2019-09-02
 
   defaultIconTheme = adwaita-icon-theme;
   gtk = gtk3;
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index f622448b185..8b3bc30a661 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -25,6 +25,7 @@
 , gnomeSupport ? false
 , gnome3
 , gcr
+, glib-networking
 , gnome-online-accounts
 , wrapGAppsHook
 , libimobiledevice
@@ -90,7 +91,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals gnomeSupport [
     gnome3.libsoup
     gcr
-    gnome3.glib-networking # TLS support
+    glib-networking # TLS support
     gnome-online-accounts
     libsecret
     libgdata

From 1bf7634ba204159e4c49ce5b93482d3118598d45 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Sep 2019 21:00:00 -0500
Subject: [PATCH 732/794] wtf: 0.20.0 -> 0.21.0

Changelog: https://github.com/wtfutil/wtf/releases/tag/v0.21.0
---
 pkgs/applications/misc/wtf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 52462d1c1f3..1b4c4ac6a34 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "wtf";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "wtfutil";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03k3x3fnxz23b75n5x8mlr6srr063q3dwq05wh55b4bgqsf7lgzd";
+    sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9";
   };
 
   modSha256 = "1nqnjpkrjbb75yfbzh3v3vc4xy5a2aqm9jr40hwq589a4l9p5pw2";

From b9329a88b936caf7697f8366be4b1554622e09e6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Sep 2019 22:00:00 -0500
Subject: [PATCH 733/794] devpi-server: 4.9.0 -> 5.1.0

---
 pkgs/development/tools/devpi-server/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index d883af1b068..d4215288267 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -1,20 +1,21 @@
- { stdenv, python3Packages, nginx }:
+{ stdenv, python3Packages, nginx }:
 
 python3Packages.buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "devpi-server";
-  version = "4.9.0";
+  version = "5.1.0";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0cx0nv1qqv8lg6p1v8dv5val0dxnc3229c15imibl9wrhrffjbg9";
+    sha256 = "254fceee846532a5fec4e6bf52a59eb8f236efc657678a542b5200da4bb3abbc";
   };
 
   propagatedBuildInputs = with python3Packages; [
+    py
     appdirs
     devpi-common
     execnet
     itsdangerous
+    repoze_lru
     passlib
     pluggy
     pyramid
@@ -24,13 +25,12 @@ python3Packages.buildPythonApplication rec {
 
   checkInputs = with python3Packages; [
     beautifulsoup4
-    mock
     nginx
     pytest
-    pytest-flakes
+    pytest-flake8
     pytestpep8
     webtest
-  ];
+  ] ++ stdenv.lib.optionals isPy27 [ mock ];
 
   # test_genconfig.py needs devpi-server on PATH
   checkPhase = ''

From ff392e81901cff60a894bf3ce4d716fb6e466519 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Aug 2019 19:30:03 +0000
Subject: [PATCH 734/794] ocamlPackages.ocplib-json-typed: 0.5 -> 0.7.1

---
 .../ocplib-json-typed/browser.nix              | 14 ++++++++++++++
 .../ocaml-modules/ocplib-json-typed/bson.nix   | 13 +++++++++++++
 .../ocplib-json-typed/default.nix              | 18 +++++++-----------
 pkgs/top-level/ocaml-packages.nix              |  4 ++++
 4 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
 create mode 100644 pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix

diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
new file mode 100644
index 00000000000..af3341e7e59
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
@@ -0,0 +1,14 @@
+{ buildDunePackage, ocplib-json-typed, js_of_ocaml }:
+
+buildDunePackage {
+  pname = "ocplib-json-typed-browser";
+  inherit (ocplib-json-typed) version src;
+
+  propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ];
+
+  meta = {
+    description = "A Json_repr interface over JavaScript's objects";
+    inherit (ocplib-json-typed.meta) homepage license maintainers;
+  };
+}
+
diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix
new file mode 100644
index 00000000000..350c31a3819
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix
@@ -0,0 +1,13 @@
+{ buildDunePackage, ocplib-json-typed, ocplib-endian }:
+
+buildDunePackage {
+  pname = "ocplib-json-typed-bson";
+  inherit (ocplib-json-typed) version src;
+
+  propagatedBuildInputs = [ ocplib-json-typed ocplib-endian ];
+
+  meta = {
+    description = "A Json_repr compatible implementation of the JSON compatible subset of BSON";
+    inherit (ocplib-json-typed.meta) homepage license maintainers;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
index cadb65bcbed..6a1b906d7f2 100644
--- a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocplib-endian, js_of_ocaml, uri }:
+{ lib, buildDunePackage, fetchFromGitHub, uri }:
 
-stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-ocplib-json-typed-${version}";
-	version = "0.5";
+buildDunePackage rec {
+	pname = "ocplib-json-typed";
+	version = "0.7.1";
 	src = fetchFromGitHub {
 		owner = "OCamlPro";
 		repo = "ocplib-json-typed";
 		rev = "v${version}";
-		sha256 = "02c600wm2wdpzb66pivxzwjhqa2dm7dqyfvw3mbvkv1g2jj7kn2q";
+		sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
 	};
 
-	buildInputs = [ ocaml findlib ocplib-endian js_of_ocaml ];
 	propagatedBuildInputs = [ uri ];
 
-	createFindlibDestdir = true;
-
 	meta = {
 		description = "A collection of type-aware JSON utilities for OCaml";
-		license = stdenv.lib.licenses.lgpl21;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		license = lib.licenses.lgpl21;
+		maintainers = [ lib.maintainers.vbgl ];
 		inherit (src.meta) homepage;
-		inherit (ocaml.meta) platforms;
 	};
 }
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9dbc36e8601..37203614744 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -553,6 +553,10 @@ let
 
     ocplib-json-typed = callPackage ../development/ocaml-modules/ocplib-json-typed { };
 
+    ocplib-json-typed-browser = callPackage ../development/ocaml-modules/ocplib-json-typed/browser.nix { };
+
+    ocplib-json-typed-bson = callPackage ../development/ocaml-modules/ocplib-json-typed/bson.nix { };
+
     ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };
 
     ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };

From 70efe840b48480a3427dfaa3edbf8349702423c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 1 Sep 2019 20:36:48 +0200
Subject: [PATCH 735/794] LTS Haskell 14.4

---
 .../configuration-hackage2nix.yaml            | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0a269acbdb6..0c7cdf3e9c7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 14.3
+  # LTS Haskell 14.4
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -176,7 +176,7 @@ default-package-overrides:
   - bencoding ==0.4.5.1
   - between ==0.11.0.0
   - bibtex ==0.1.0.6
-  - bifunctors ==5.5.4
+  - bifunctors ==5.5.5
   - bimap ==0.4.0
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
@@ -264,7 +264,7 @@ default-package-overrides:
   - c2hs ==0.28.6
   - Cabal ==2.4.1.0
   - cabal2spec ==2.2.2.1
-  - cabal-doctest ==1.0.6
+  - cabal-doctest ==1.0.7
   - cabal-file-th ==0.2.6
   - cache ==0.1.1.2
   - cacophony ==0.10.1
@@ -511,7 +511,7 @@ default-package-overrides:
   - dependent-sum-template ==0.0.0.6
   - deque ==0.4.2.3
   - deriveJsonNoPrefix ==0.1.0.1
-  - deriving-compat ==0.5.6
+  - deriving-compat ==0.5.7
   - derulo ==1.0.5
   - detour-via-sci ==1.0.0
   - dhall ==1.24.0
@@ -547,7 +547,7 @@ default-package-overrides:
   - dockerfile ==0.2.0
   - docopt ==0.7.0.5
   - doctemplates ==0.2.2.1
-  - doctest ==0.16.1
+  - doctest ==0.16.2
   - doctest-discover ==0.2.0.0
   - doctest-driver-gen ==0.3.0.1
   - doldol ==0.4.1.2
@@ -629,7 +629,7 @@ default-package-overrides:
   - exact-pi ==0.5.0.1
   - exceptional ==0.3.0.0
   - exception-mtl ==0.4.0.1
-  - exceptions ==0.10.2
+  - exceptions ==0.10.3
   - exception-transformers ==0.4.0.7
   - executable-hash ==0.2.0.4
   - executable-path ==0.0.3.1
@@ -709,7 +709,7 @@ default-package-overrides:
   - format-numbers ==0.1.0.0
   - formatting ==6.3.7
   - foundation ==0.0.24
-  - free ==5.1.1
+  - free ==5.1.2
   - freenect ==1.2.1
   - freer-simple ==1.2.1.0
   - freetype2 ==0.1.2
@@ -778,7 +778,7 @@ default-package-overrides:
   - ghc-prof ==1.4.1.5
   - ghc-syntax-highlighter ==0.0.4.0
   - ghc-tcplugins-extra ==0.3
-  - ghc-typelits-extra ==0.3
+  - ghc-typelits-extra ==0.3.1
   - ghc-typelits-knownnat ==0.6
   - ghc-typelits-natnormalise ==0.6.2
   - ghost-buster ==0.1.1.0
@@ -944,7 +944,7 @@ default-package-overrides:
   - hruby ==0.3.8
   - hsass ==0.8.0
   - hs-bibutils ==6.7.0.0
-  - hsc2hs ==0.68.4
+  - hsc2hs ==0.68.6
   - hschema ==0.0.1.1
   - hschema-aeson ==0.0.1.1
   - hschema-prettyprinter ==0.0.1.1
@@ -1037,7 +1037,7 @@ default-package-overrides:
   - hw-fingertree ==0.1.1.0
   - hw-fingertree-strict ==0.1.1.1
   - hw-hedgehog ==0.1.0.3
-  - hw-hspec-hedgehog ==0.1.0.7
+  - hw-hspec-hedgehog ==0.1.0.8
   - hw-int ==0.0.0.3
   - hw-ip ==2.3.4.1
   - hw-json ==1.0.0.2
@@ -1512,7 +1512,7 @@ default-package-overrides:
   - pandoc-markdown-ghci-filter ==0.1.0.0
   - pandoc-pyplot ==2.1.5.1
   - pandoc-types ==1.17.6
-  - pantry ==0.1.1.1
+  - pantry ==0.1.1.2
   - parallel ==3.2.2.0
   - parallel-io ==0.3.3
   - paripari ==0.6.0.0
@@ -1568,11 +1568,11 @@ default-package-overrides:
   - pg-harness-client ==0.6.0
   - pg-harness-server ==0.6.2
   - pgp-wordlist ==0.1.0.3
-  - pg-transact ==0.1.0.1
+  - pg-transact ==0.1.2.0
   - phantom-state ==0.2.1.2
   - pid1 ==0.1.2.0
   - pinboard ==0.10.1.4
-  - pipes ==4.3.11
+  - pipes ==4.3.12
   - pipes-aeson ==0.4.1.8
   - pipes-attoparsec ==0.5.1.5
   - pipes-binary ==0.4.2
@@ -1731,7 +1731,7 @@ default-package-overrides:
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
   - reanimate ==0.1.5.0
-  - reanimate-svg ==0.9.0.0
+  - reanimate-svg ==0.9.0.1
   - rebase ==1.3.1.1
   - record-dot-preprocessor ==0.2
   - record-hasfield ==1.0
@@ -1740,7 +1740,7 @@ default-package-overrides:
   - reducers ==3.12.3
   - refact ==0.3.0.2
   - references ==0.3.3.1
-  - reflection ==2.1.4
+  - reflection ==2.1.5
   - RefSerialize ==0.4.0
   - regex ==1.0.2.0
   - regex-applicative ==0.3.3.1
@@ -1785,7 +1785,7 @@ default-package-overrides:
   - rhine ==0.5.1.0
   - rhine-gloss ==0.5.1.0
   - rigel-viz ==0.2.0.0
-  - rio ==0.1.11.0
+  - rio ==0.1.12.0
   - rio-orphans ==0.1.1.0
   - rio-prettyprint ==0.1.0.0
   - roc-id ==0.1.0.0
@@ -1809,9 +1809,9 @@ default-package-overrides:
   - safe-json ==0.1.0
   - safe-money ==0.9
   - SafeSemaphore ==0.10.1
-  - salak ==0.3.5.1
-  - salak-toml ==0.3.5.1
-  - salak-yaml ==0.3.5.1
+  - salak ==0.3.5.3
+  - salak-toml ==0.3.5.3
+  - salak-yaml ==0.3.5.3
   - saltine ==0.1.0.2
   - salve ==1.0.6
   - sample-frame ==0.0.3
@@ -1843,7 +1843,7 @@ default-package-overrides:
   - selective ==0.3
   - semialign ==1
   - semigroupoid-extras ==5
-  - semigroupoids ==5.3.2
+  - semigroupoids ==5.3.3
   - semigroups ==0.18.5
   - semirings ==0.4.2
   - semiring-simple ==1.0.0.1
@@ -1879,6 +1879,7 @@ default-package-overrides:
   - servant-mock ==0.8.5
   - servant-multipart ==0.11.4
   - servant-pipes ==0.15
+  - servant-rawm ==0.3.1.0
   - servant-ruby ==0.9.0.0
   - servant-server ==0.16.2
   - servant-static-th ==0.2.2.0
@@ -1929,7 +1930,7 @@ default-package-overrides:
   - simplistic-generics ==0.1.0.0
   - since ==0.0.0
   - singleton-bool ==0.1.5
-  - singleton-nats ==0.4.2
+  - singleton-nats ==0.4.3
   - singletons ==2.5.1
   - siphash ==1.0.3
   - size-based ==0.1.2.0
@@ -1958,7 +1959,6 @@ default-package-overrides:
   - sox ==0.2.3.1
   - soxlib ==0.0.3.1
   - sparse-linear-algebra ==0.3.1
-  - sparse-tensor ==0.2.1
   - spatial-math ==0.5.0.1
   - special-values ==0.1.0.0
   - speculate ==0.3.5
@@ -2059,14 +2059,14 @@ default-package-overrides:
   - tagstream-conduit ==0.5.5.3
   - tao ==1.0.0
   - tao-example ==1.0.0
-  - tar ==0.5.1.0
+  - tar ==0.5.1.1
   - tar-conduit ==0.3.2
   - tardis ==0.4.1.0
   - tasty ==1.2.3
   - tasty-ant-xml ==1.1.6
   - tasty-dejafu ==2.0.0.1
   - tasty-discover ==4.2.1
-  - tasty-expected-failure ==0.11.1.1
+  - tasty-expected-failure ==0.11.1.2
   - tasty-golden ==2.3.2
   - tasty-hedgehog ==1.0.0.1
   - tasty-hspec ==1.1.5.1
@@ -2125,7 +2125,7 @@ default-package-overrides:
   - th-data-compat ==0.0.2.7
   - th-desugar ==1.9
   - these ==1.0.1
-  - th-expand-syns ==0.4.4.0
+  - th-expand-syns ==0.4.5.0
   - th-extras ==0.0.0.4
   - th-lift ==0.8.0.1
   - th-lift-instances ==0.1.14
@@ -2194,7 +2194,7 @@ default-package-overrides:
   - trivial-constraint ==0.6.0.0
   - true-name ==0.1.0.3
   - tsv2csv ==0.1.0.2
-  - ttl-hashtables ==1.3.1.0
+  - ttl-hashtables ==1.3.1.1
   - ttrie ==0.1.2.1
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
@@ -2420,17 +2420,17 @@ default-package-overrides:
   - xmonad-extras ==0.15.1
   - xss-sanitize ==0.3.6
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.11.1.1
+  - yaml ==0.11.1.2
   - yeshql ==4.1.0.1
   - yeshql-core ==4.1.0.2
   - yeshql-hdbc ==4.1.0.2
   - yesod ==1.6.0
   - yesod-alerts ==0.1.3.0
-  - yesod-auth ==1.6.7
+  - yesod-auth ==1.6.8
   - yesod-auth-hashdb ==1.7.1.1
-  - yesod-auth-oauth2 ==0.6.1.1
+  - yesod-auth-oauth2 ==0.6.1.2
   - yesod-bin ==1.6.0.3
-  - yesod-core ==1.6.15
+  - yesod-core ==1.6.16
   - yesod-csp ==0.2.5.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
@@ -2461,7 +2461,7 @@ default-package-overrides:
   - zip-archive ==0.4.1
   - zippers ==0.3
   - zip-stream ==0.2.0.1
-  - zlib ==0.6.2
+  - zlib ==0.6.2.1
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
   - zot ==0.0.3

From d00582b437924da25fa3699383b918985dbc7641 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2019 02:30:59 +0200
Subject: [PATCH 736/794] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.14.4-7-ga804c35 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/0e7fdc96ca41488fe701bd9d085b83ff5141b278.
---
 .../haskell-modules/hackage-packages.nix      | 1469 ++++++++---------
 1 file changed, 729 insertions(+), 740 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index eaa0f799f92..040094d5dca 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1946,8 +1946,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlastHTTP";
-       version = "1.4.0";
-       sha256 = "0gvgwjsqrbk42vmbsh47d8fiwbwhdbsk5mlqj99pfmqi8fddwdm3";
+       version = "1.4.1";
+       sha256 = "1h7bj9a6qfzwlclr39dvbcz4r8l8s7n53z6ir8wff5ssq2wvq4qd";
        libraryHaskellDepends = [
          base BiobaseBlast BiobaseFasta bytestring conduit either-unwrap
          HTTP http-conduit hxt mtl network transformers zip-archive
@@ -10598,6 +10598,8 @@ self: {
        pname = "HsYAML";
        version = "0.1.2.0";
        sha256 = "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54";
+       revision = "1";
+       editedCabalFile = "0j6qmmcz5yqh89hs2cq453maix50q61vl2h0ahj5lg02bygn42cf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -11409,8 +11411,8 @@ self: {
        pname = "JuicyPixels-scale-dct";
        version = "0.1.2";
        sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p";
-       revision = "2";
-       editedCabalFile = "0pp67ygrd3m6q8ry5229m1b2rhy401gb74368h09bqc6wa3g7ygv";
+       revision = "3";
+       editedCabalFile = "1dkmlrn4vncx6n1646q1z9gfvpbgk0blax1i8n16dl6y5j042xf1";
        libraryHaskellDepends = [
          base base-compat carray fft JuicyPixels
        ];
@@ -14261,8 +14263,8 @@ self: {
        pname = "OTP";
        version = "0.1.0.0";
        sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb";
-       revision = "1";
-       editedCabalFile = "1bcp6mixf0yxn6qmql3zhyshpa55mkrfnxdb1ma6gvbs7h28lnin";
+       revision = "2";
+       editedCabalFile = "012yi2pvjjlk6vri5zj8a7pipscsfc6rgkw7s5qldqmvvwvrk64s";
        libraryHaskellDepends = [
          base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
          time
@@ -14427,8 +14429,8 @@ self: {
        pname = "OneTuple";
        version = "0.2.2";
        sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq";
-       revision = "2";
-       editedCabalFile = "1ii7hpmxi794xywx89agnvinxgral1rfn5hfnanr4zw26nczhcv3";
+       revision = "3";
+       editedCabalFile = "0m3a9fj2h0v529q3i1kq1jfbdj68wxsmhq65hgx2rwjpgb8cqf0z";
        libraryHaskellDepends = [ base ];
        description = "Singleton Tuple";
        license = stdenv.lib.licenses.bsd3;
@@ -15501,20 +15503,20 @@ self: {
 
   "PrimitiveArray" = callPackage
     ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector
-     , containers, deepseq, DPutils, hashable, lens, log-domain, mtl
-     , OrderedBits, primitive, QuickCheck, smallcheck, tasty
-     , tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector
+     , containers, criterion, deepseq, DPutils, hashable, lens
+     , log-domain, mtl, OrderedBits, primitive, QuickCheck, smallcheck
+     , tasty, tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector
      , vector-binary-instances, vector-th-unbox
      }:
      mkDerivation {
        pname = "PrimitiveArray";
-       version = "0.9.1.1";
-       sha256 = "0q6i5754ysay2c4xs7m6hz69l35qd7irzxinmga431nvmbnqa21y";
+       version = "0.10.0.0";
+       sha256 = "0g9shj3zqk8rdp905di9i5g5bhga5msc7cs609fk3nkjm16ms0vi";
        libraryHaskellDepends = [
          aeson base binary bits cereal cereal-vector containers deepseq
          DPutils hashable lens log-domain mtl OrderedBits primitive
-         QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
-         tasty-th text vector vector-binary-instances vector-th-unbox
+         QuickCheck smallcheck text vector vector-binary-instances
+         vector-th-unbox
        ];
        testHaskellDepends = [
          aeson base binary bits cereal cereal-vector containers deepseq
@@ -15522,6 +15524,12 @@ self: {
          QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
          tasty-th text vector vector-binary-instances vector-th-unbox
        ];
+       benchmarkHaskellDepends = [
+         aeson base binary bits cereal cereal-vector containers criterion
+         deepseq DPutils hashable lens log-domain mtl OrderedBits primitive
+         QuickCheck smallcheck text vector vector-binary-instances
+         vector-th-unbox
+       ];
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15741,8 +15749,8 @@ self: {
      }:
      mkDerivation {
        pname = "PyF";
-       version = "0.8.0.1";
-       sha256 = "1bv57hi26nmrhcdr4hki62ycd0k5p0i0jdwcdcxi7vmhjavnyq08";
+       version = "0.8.0.2";
+       sha256 = "1i3axpca5myig7wwdy770k2jy85m4cfpvhxrrw41q31fyv67j98n";
        libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta megaparsec
          template-haskell text
@@ -16204,13 +16212,13 @@ self: {
      , ClustalParser, cmdargs, containers, directory, edit-distance
      , either-unwrap, filepath, hierarchical-clustering, HTTP
      , http-conduit, http-types, hxt, matrix, network, parsec, process
-     , pureMD5, random, split, Taxonomy, text, text-metrics, time
-     , transformers, vector, ViennaRNAParser
+     , pureMD5, random, silently, split, Taxonomy, text, text-metrics
+     , time, transformers, vector, ViennaRNAParser
      }:
      mkDerivation {
        pname = "RNAlien";
-       version = "1.6.0";
-       sha256 = "0pp9rim4k1gbc2dscqygi90c2721xc6q1fl2sqkfpafz30m022pq";
+       version = "1.7.0";
+       sha256 = "1yqf2i1q5s65i968ha4lhnn0njmgapb30sxwdq5rpf7wbw2f29by";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -16218,8 +16226,8 @@ self: {
          BlastHTTP bytestring cassava ClustalParser cmdargs containers
          directory edit-distance either-unwrap filepath
          hierarchical-clustering HTTP http-conduit http-types hxt matrix
-         network parsec process pureMD5 random Taxonomy text text-metrics
-         transformers vector ViennaRNAParser
+         network parsec process pureMD5 random silently Taxonomy text
+         text-metrics transformers vector ViennaRNAParser
        ];
        executableHaskellDepends = [
          base BiobaseFasta BiobaseTypes bytestring cassava cmdargs
@@ -20429,6 +20437,8 @@ self: {
        pname = "X";
        version = "0.3.0.0";
        sha256 = "0grjiznl8j44mq3m0jkhm9z7wcr4cywrnfmk92nk3g6ddhcyakkc";
+       revision = "1";
+       editedCabalFile = "1nbp0zci2sp07cr5j5xlh7gswcnj52z9dp6akh9xk4mzk3salxwq";
        libraryHaskellDepends = [
          base bytestring deepseq text text-short
        ];
@@ -24448,8 +24458,8 @@ self: {
        pname = "alex-tools";
        version = "0.4";
        sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi";
-       revision = "1";
-       editedCabalFile = "1dwr1w2zhbvwnjc65zzmwfmwb1yxxyyfrjypvqp3m7fpc7dg1nxg";
+       revision = "2";
+       editedCabalFile = "1hz7gdff15bxvx5jijgh6ih1m2v39nadfy2yjsb43c48p9hcn93z";
        libraryHaskellDepends = [ base deepseq template-haskell text ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
@@ -30685,8 +30695,8 @@ self: {
        pname = "argon2";
        version = "1.3.0.1";
        sha256 = "1v0clf78hykdyhv81z8v3kwp86hjgqh6b8a7wfbjv0fyy55bwxry";
-       revision = "1";
-       editedCabalFile = "1bqzf2cfpd03sl3wq9dnrcxaysbs116ib33ja0v8zi4szddm33jv";
+       revision = "2";
+       editedCabalFile = "0y1dg4dp3f40ghh2zcn1s4l19i8pjs0d1zpbghy4aaar4npiqxz7";
        libraryHaskellDepends = [ base bytestring deepseq text-short ];
        testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -30966,12 +30976,12 @@ self: {
        broken = true;
      }) {inherit (pkgs) arpack;};
 
-  "array_0_5_3_0" = callPackage
+  "array_0_5_4_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "array";
-       version = "0.5.3.0";
-       sha256 = "07pyr2x09n23rdxldqgbx12hlg9dk92q9p56bpcdw3r87ajc3m9z";
+       version = "0.5.4.0";
+       sha256 = "1ixqnwxd36l2j3873hwnfip17k2nzncbvsx7pnprqzv9z59mf4rv";
        libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -31596,8 +31606,8 @@ self: {
        pname = "asn1-data";
        version = "0.7.2";
        sha256 = "18dc4d71pvp5q6npxicqqj3fk6n39lm98450vvhgg4y9rc1rr6c3";
-       revision = "1";
-       editedCabalFile = "18qjn7asld26nlri6md4z3kmyvarvvg5wi7rwsg4ngrxw4gbqhqm";
+       revision = "2";
+       editedCabalFile = "0xnj367rxj21gnxq7d5qih54g0zwwyc6r6gaaijikhprppbvjjvy";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -31614,6 +31624,8 @@ self: {
        pname = "asn1-encoding";
        version = "0.9.5";
        sha256 = "0adgbamyq0mj1l1hdq4zyyllay714bac1wl0rih3fv1z6vykp1hy";
+       revision = "1";
+       editedCabalFile = "0vsw8rd6fxd87rx3jyh3bb96sjd7ag0mrlylhkcmgaps2ma8sw5b";
        libraryHaskellDepends = [ asn1-types base bytestring hourglass ];
        testHaskellDepends = [
          asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
@@ -32739,6 +32751,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attoparsec_0_13_2_3" = callPackage
+    ({ mkDerivation, array, base, bytestring, case-insensitive
+     , containers, criterion, deepseq, directory, filepath, ghc-prim
+     , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
+     , tasty, tasty-quickcheck, text, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "attoparsec";
+       version = "0.13.2.3";
+       sha256 = "1ngjn9h5n0vyki0m2jir4mg85875ysswy9hznpmj1r856mqwc6ix";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq scientific text
+         transformers
+       ];
+       testHaskellDepends = [
+         array base bytestring deepseq QuickCheck quickcheck-unicode
+         scientific tasty tasty-quickcheck text transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         array base bytestring case-insensitive containers criterion deepseq
+         directory filepath ghc-prim http-types parsec scientific text
+         transformers unordered-containers vector
+       ];
+       description = "Fast combinator parsing for bytestrings and text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "attoparsec-arff" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring }:
      mkDerivation {
@@ -35448,8 +35489,8 @@ self: {
        pname = "base-encoding";
        version = "0.1.0.0";
        sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si";
-       revision = "1";
-       editedCabalFile = "0miysladpqwm5qhphv23qhvambd7245n14qbkgvp664xj56y6df1";
+       revision = "2";
+       editedCabalFile = "0flfvs03zs7k04x7yhsc3jiw3zpnx7n3637jyy10flpqv90fy6sx";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring text
        ];
@@ -35786,6 +35827,8 @@ self: {
        pname = "basement";
        version = "0.0.11";
        sha256 = "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37";
+       revision = "2";
+       editedCabalFile = "1l95bzmn23cmx386hk3d3r0ykdaibh9rp489lcnba5g56kiy4hxg";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Foundation scrap box of array & string";
        license = stdenv.lib.licenses.bsd3;
@@ -37208,30 +37251,6 @@ self: {
      }) {};
 
   "bifunctors" = callPackage
-    ({ mkDerivation, base, base-orphans, comonad, containers, hspec
-     , hspec-discover, QuickCheck, tagged, template-haskell
-     , th-abstraction, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "bifunctors";
-       version = "5.5.4";
-       sha256 = "134vn71wd194175k2fcdvd0ak2bdmdbk6ql5lls4byff7zs2rmi9";
-       revision = "1";
-       editedCabalFile = "05qh2xh2j3w5f1q94wfgfp06z9c4fyrgm4cncy6y2lbb1ficsh3j";
-       libraryHaskellDepends = [
-         base base-orphans comonad containers tagged template-haskell
-         th-abstraction transformers
-       ];
-       testHaskellDepends = [
-         base hspec QuickCheck template-haskell transformers
-         transformers-compat
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Bifunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bifunctors_5_5_5" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, containers, hspec
      , hspec-discover, QuickCheck, tagged, template-haskell
      , th-abstraction, transformers, transformers-compat
@@ -37251,7 +37270,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bighugethesaurus" = callPackage
@@ -39248,8 +39266,6 @@ self: {
        ];
        description = "A small tool that clears qutebrowser cookies";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bisect-binary" = callPackage
@@ -42247,6 +42263,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "brick_0_49" = callPackage
+    ({ mkDerivation, base, bytestring, config-ini, containers
+     , contravariant, data-clist, deepseq, directory, dlist, filepath
+     , microlens, microlens-mtl, microlens-th, QuickCheck, stm
+     , template-haskell, text, text-zipper, transformers, unix, vector
+     , vty, word-wrap
+     }:
+     mkDerivation {
+       pname = "brick";
+       version = "0.49";
+       sha256 = "1jlxzizxgmdsjd0x146kcmp92x7gjn0vkj0lc5dplbgshlg5hfhd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring config-ini containers contravariant data-clist
+         deepseq directory dlist filepath microlens microlens-mtl
+         microlens-th stm template-haskell text text-zipper transformers
+         unix vector vty word-wrap
+       ];
+       testHaskellDepends = [
+         base containers microlens QuickCheck vector
+       ];
+       description = "A declarative terminal user interface library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "brick-dropdownmenu" = callPackage
     ({ mkDerivation, base, brick, containers, microlens, microlens-ghc
      , microlens-th, pointedlist, vector, vty
@@ -42675,6 +42718,8 @@ self: {
        pname = "brotli";
        version = "0.0.0.0";
        sha256 = "1l9qiw5cl0k1rcnqnj9pb7vgj1b06wckkk5i73nqr15ixgcjmr9j";
+       revision = "1";
+       editedCabalFile = "0fw26rv8i9zz4qyr32paz2y0psdppdaz427jp8mpbanwmg763024";
        libraryHaskellDepends = [ base bytestring transformers ];
        libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ];
        testHaskellDepends = [
@@ -44099,14 +44144,16 @@ self: {
      }) {};
 
   "bytestring-progress" = callPackage
-    ({ mkDerivation, base, bytestring, terminal-progress-bar, time }:
+    ({ mkDerivation, base, bytestring, terminal-progress-bar, text
+     , time
+     }:
      mkDerivation {
        pname = "bytestring-progress";
-       version = "1.2";
-       sha256 = "195vsqpmaycxi0k7kk1hasrklnblr3psllc288vkh77pbnfm3vqi";
+       version = "1.4";
+       sha256 = "140dn6zyc1ka8vjxwd6zzc3mwd651zrawcwk3d5ipfxrgddf9bws";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring terminal-progress-bar time
+         base bytestring terminal-progress-bar text time
        ];
        description = "A library for tracking the consumption of a lazy ByteString";
        license = stdenv.lib.licenses.bsd3;
@@ -44888,19 +44935,6 @@ self: {
      }) {};
 
   "cabal-doctest" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "cabal-doctest";
-       version = "1.0.6";
-       sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny";
-       revision = "2";
-       editedCabalFile = "1kbiwqm4fxrsdpcqijdq98h8wzmxydcvxd03f1z8dliqzyqsbd60";
-       libraryHaskellDepends = [ base Cabal directory filepath ];
-       description = "A Setup.hs helper for doctests running";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cabal-doctest_1_0_7" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "cabal-doctest";
@@ -44909,7 +44943,6 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "A Setup.hs helper for doctests running";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-file-th" = callPackage
@@ -46404,27 +46437,25 @@ self: {
 
   "camfort" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , directory, fgl, filepath, flint, fortran-src, GenericPretty
-     , ghc-prim, happy, hmatrix, hspec, hspec-discover, lattices, lens
-     , matrix, mmorph, mtl, optparse-applicative, parallel, pretty
-     , QuickCheck, sbv, silently, singletons, strict, syb, syz
-     , template-haskell, temporary, text, time, transformers, uniplate
-     , vector, verifiable-expressions, vinyl, writer-cps-morph
-     , writer-cps-mtl, writer-cps-transformers
+     , deepseq, directory, fgl, filepath, flint, fortran-src
+     , GenericPretty, ghc-prim, happy, hmatrix, hspec, hspec-discover
+     , lattices, lens, matrix, mmorph, mtl, optparse-applicative
+     , parallel, pipes, pretty, QuickCheck, sbv, silently, singletons
+     , strict, syb, syz, template-haskell, temporary, text, time
+     , transformers, uniplate, vector, verifiable-expressions, vinyl
      }:
      mkDerivation {
        pname = "camfort";
-       version = "0.906";
-       sha256 = "164zrga458nmlyxaaa9wa0x1vamrlf1w1jisnwp87khkw8622nyi";
+       version = "1.0";
+       sha256 = "1lgsn1jin57677j8xia7ga4pdvs0yrs9spdmm9rbncxcz5c3nf52";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base binary bytestring containers directory fgl filepath
-         fortran-src GenericPretty ghc-prim hmatrix lattices lens matrix
-         mmorph mtl parallel pretty sbv singletons strict syb syz
-         template-haskell text transformers uniplate vector
-         verifiable-expressions vinyl writer-cps-morph writer-cps-mtl
-         writer-cps-transformers
+         array base binary bytestring containers deepseq directory fgl
+         filepath fortran-src GenericPretty ghc-prim hmatrix lattices lens
+         matrix mmorph mtl parallel pipes pretty sbv singletons strict syb
+         syz template-haskell text transformers uniplate vector
+         verifiable-expressions vinyl
        ];
        librarySystemDepends = [ flint ];
        libraryToolDepends = [ alex happy ];
@@ -46493,8 +46524,8 @@ self: {
     ({ mkDerivation, arithmoi, array, base, containers, random }:
      mkDerivation {
        pname = "canon";
-       version = "0.1.1.2";
-       sha256 = "181c09kh76104b23hf52b049cc6clww1y9kffw1f0hnkxhds9n84";
+       version = "0.1.1.3";
+       sha256 = "1fc6vszr5j6iamjw07q2i1a96hsafx12zmqf3pr4aykan94vw6za";
        libraryHaskellDepends = [ arithmoi array base containers random ];
        description = "Arithmetic for Psychedelically Large Numbers";
        license = stdenv.lib.licenses.mit;
@@ -46522,6 +46553,8 @@ self: {
        pname = "canonical-json";
        version = "0.6.0.0";
        sha256 = "0lb847hvgkn49g6rvmavk14brvvpiy6q5fswk3cm9rc53hbq02zz";
+       revision = "1";
+       editedCabalFile = "18i3msxza5phvv5mz7gjqcygrm8rxd86pk2vqnsa715qrhsz88ch";
        libraryHaskellDepends = [
          base bytestring containers deepseq parsec pretty
        ];
@@ -47513,8 +47546,8 @@ self: {
        pname = "cassava";
        version = "0.5.1.0";
        sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n";
-       revision = "2";
-       editedCabalFile = "13mbhan3agzf8ki8hcac1xf50h9nbzx2b47zjqrch2050v6xa351";
+       revision = "3";
+       editedCabalFile = "0q9hwcn5jr5vs52n246qw8iw9jmc1d3dla071hhc0hdpck4igq6m";
        configureFlags = [ "-f-bytestring--lt-0_10_4" ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers deepseq hashable Only
@@ -47529,6 +47562,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cassava_0_5_2_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring, containers
+     , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances
+     , scientific, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, text-short, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cassava";
+       version = "0.5.2.0";
+       sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk";
+       configureFlags = [ "-f-bytestring--lt-0_10_4" ];
+       libraryHaskellDepends = [
+         array attoparsec base bytestring containers deepseq hashable Only
+         scientific text text-short transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring hashable HUnit QuickCheck
+         quickcheck-instances scientific test-framework test-framework-hunit
+         test-framework-quickcheck2 text unordered-containers vector
+       ];
+       description = "A CSV parsing and encoding library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cassava-conduit" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
      , conduit, containers, criterion, mtl, QuickCheck, text
@@ -48730,23 +48789,23 @@ self: {
   "cgrep" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, async, base
      , bytestring, cmdargs, containers, directory, dlist, either
-     , exceptions, filepath, ghc-prim, mtl, process, regex-base
+     , exceptions, extra, filepath, ghc-prim, mtl, process, regex-base
      , regex-pcre, regex-posix, safe, split, stm, stringsearch
      , transformers, unicode-show, unix-compat, unordered-containers
      , utf8-string, yaml
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.6.25";
-       sha256 = "0cary2b5jg8151n48a4vij32g68mrql791mhw43v44wvhlag8plw";
+       version = "6.6.30";
+       sha256 = "1ald0461mnd65g5czp3d8dzdvy8pmdxhzj35sghcnxi6qs18xp69";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson ansi-terminal array async base bytestring cmdargs containers
-         directory dlist either exceptions filepath ghc-prim mtl process
-         regex-base regex-pcre regex-posix safe split stm stringsearch
-         transformers unicode-show unix-compat unordered-containers
-         utf8-string yaml
+         directory dlist either exceptions extra filepath ghc-prim mtl
+         process regex-base regex-pcre regex-posix safe split stm
+         stringsearch transformers unicode-show unix-compat
+         unordered-containers utf8-string yaml
        ];
        description = "Command line tool";
        license = stdenv.lib.licenses.gpl2;
@@ -49361,6 +49420,8 @@ self: {
        pname = "chell";
        version = "0.5";
        sha256 = "1i845isfbk0yq852am9bqmxfpfkpnlha8nfidffsv4gw2p8gg6fg";
+       revision = "1";
+       editedCabalFile = "1q93wrw03ix4cmnkz3lzkixcvvizw6i2ia2zifdfak1dvxnblxk0";
        libraryHaskellDepends = [
          ansi-terminal base bytestring options patience random
          template-haskell text transformers
@@ -54623,8 +54684,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson";
-       version = "0.5.5.0";
-       sha256 = "1hmhnkfmdjm5q8lkvlyr7rzs1lfycnblz3q2y8aziy27j7pvnz6h";
+       version = "0.6.0.0";
+       sha256 = "0r15hc6kwg0dibxix2f5afg91qwc6fd5m9sijn0k0mq62f0ln7ki";
        libraryHaskellDepends = [
          aeson aeson-better-errors base composite-base containers
          contravariant generic-deriving hashable lens mmorph mtl profunctors
@@ -54649,8 +54710,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson-refined";
-       version = "0.5.5.0";
-       sha256 = "0mm0dbsxqw5m78jgdn6vnbck2icqkzgwqyc3c3ghyz46cymd7pjz";
+       version = "0.6.0.0";
+       sha256 = "1plhqx0k0xab8fkip6v96rqnrdjq02ph1gmrk4r5zq5x4gc7gpps";
        libraryHaskellDepends = [
          aeson-better-errors base composite-aeson mtl refined
        ];
@@ -54667,8 +54728,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-base";
-       version = "0.5.5.0";
-       sha256 = "0qlg979cwkdlfpcwh7r0qr9fjs525b3xly0invr358h2g1lgi0fm";
+       version = "0.6.0.0";
+       sha256 = "188za7x9069ah8sgf8laqwkg3yfzl7cm23iacbcnbw25jd7k6vy3";
        libraryHaskellDepends = [
          base exceptions lens monad-control mtl profunctors template-haskell
          text transformers transformers-base unliftio-core vinyl
@@ -54689,8 +54750,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-ekg";
-       version = "0.5.5.0";
-       sha256 = "0bawdcx21dd0szxnnxs2iinzz6h4w2phk7mfs26fxiqx3f375lm4";
+       version = "0.6.0.0";
+       sha256 = "065aah2jx6r8i8qgwfql90nc6avhrrhc3aq3zlrqimqwv4772pvj";
        libraryHaskellDepends = [
          base composite-base ekg-core lens text vinyl
        ];
@@ -54707,8 +54768,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-opaleye";
-       version = "0.5.5.0";
-       sha256 = "0s54g9c1lm3jrdj44cvzxgbfaf7l2fdq2yy25vhqdmww50h8q1cx";
+       version = "0.6.0.0";
+       sha256 = "13hpvk6wx7yiz7klay7da8lllvszddlixk9xxyc8w9kqq48b4k92";
        libraryHaskellDepends = [
          base bytestring composite-base lens opaleye postgresql-simple
          product-profunctors profunctors template-haskell text vinyl
@@ -54731,8 +54792,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-swagger";
-       version = "0.5.5.0";
-       sha256 = "1qisvrs93jnrrjyhzdn0xwq54jc1mc8avpzq41a39ak5xdslzf6a";
+       version = "0.6.0.0";
+       sha256 = "1m0a77imgrs55vmzvfx7hy74siwnxpcgjg7cawsmsnarkymb1c5c";
        libraryHaskellDepends = [
          base composite-base insert-ordered-containers lens swagger2
          template-haskell text vinyl
@@ -60330,8 +60391,8 @@ self: {
        pname = "cryptohash-md5";
        version = "0.11.100.1";
        sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi";
-       revision = "3";
-       editedCabalFile = "0ld224mdmw9mgzcl20q82rqkyl7d5vmi1iknsyymq58gcvcwdi2m";
+       revision = "4";
+       editedCabalFile = "0gzaibjkipijwj9m9l6wrhfk5s3kdvfbhdl7cl1373cjfs41v0m3";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring pureMD5 tasty tasty-hunit
@@ -60350,8 +60411,8 @@ self: {
        pname = "cryptohash-sha1";
        version = "0.11.100.1";
        sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w";
-       revision = "3";
-       editedCabalFile = "0i30cc85732v27baibdjy2kjjkdfv335ib5sk5ggwvsysvvvr66l";
+       revision = "4";
+       editedCabalFile = "0qb2wasfc4dpf6f9ahvhlv8njb3p3p9iwblg4032ssi95cg85718";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -60392,8 +60453,8 @@ self: {
        pname = "cryptohash-sha512";
        version = "0.11.100.1";
        sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h";
-       revision = "3";
-       editedCabalFile = "19m1fp0i7ba84aa72d5wf59c7j0p4yr1bc43in8pspgywhsr3lfl";
+       revision = "4";
+       editedCabalFile = "0iqs51a58w71j1zz3rn9kical63yvvqqqrc6971mh6wfscyi1gqr";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -66836,29 +66897,6 @@ self: {
      }) {};
 
   "deriving-compat" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, containers
-     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
-     , template-haskell, th-abstraction, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "deriving-compat";
-       version = "0.5.6";
-       sha256 = "1rsjq3s2m69x2h880r087qbiwp3173pwv2yihlb8aw7dmjybydmf";
-       libraryHaskellDepends = [
-         base containers ghc-boot-th ghc-prim template-haskell
-         th-abstraction transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base base-compat base-orphans hspec QuickCheck tagged
-         template-haskell transformers transformers-compat
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "deriving-compat_0_5_7" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, containers
      , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
      , template-haskell, th-abstraction, transformers
@@ -66879,7 +66917,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derp" = callPackage
@@ -71348,34 +71385,6 @@ self: {
      }) {};
 
   "doctest" = callPackage
-    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
-     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
-     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
-     }:
-     mkDerivation {
-       pname = "doctest";
-       version = "0.16.1";
-       sha256 = "1xnm1sbm9lpfxw5yav8qpqr85aap94k9df6n5kx70bp6h69qnrrq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         process syb transformers
-       ];
-       executableHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         process syb transformers
-       ];
-       testHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         hspec HUnit mockery process QuickCheck setenv silently
-         stringbuilder syb transformers
-       ];
-       description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "doctest_0_16_2" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
      , QuickCheck, setenv, silently, stringbuilder, syb, transformers
@@ -71401,7 +71410,6 @@ self: {
        ];
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover" = callPackage
@@ -73647,8 +73655,8 @@ self: {
      }:
      mkDerivation {
        pname = "dzen-dhall";
-       version = "1.0.0";
-       sha256 = "0im78kvjwanlbi097pyvvpj2isssf3iblqbbqsk2iccvdqjyqf5z";
+       version = "1.0.1";
+       sha256 = "16rkmiczdgknlq1f8m5n3ila8727z1db77g141sq5qqlgn7x37ww";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78831,27 +78839,6 @@ self: {
      }) {};
 
   "exceptions" = callPackage
-    ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "exceptions";
-       version = "0.10.2";
-       sha256 = "0ajiq47xd1paingr7kksh69v6d072zsppfr6cy1gzjh3zg5jr34i";
-       libraryHaskellDepends = [
-         base mtl stm template-haskell transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck stm template-haskell test-framework
-         test-framework-hunit test-framework-quickcheck2 transformers
-         transformers-compat
-       ];
-       description = "Extensible optionally-pure exceptions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "exceptions_0_10_3" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , transformers, transformers-compat
@@ -78870,7 +78857,6 @@ self: {
        ];
        description = "Extensible optionally-pure exceptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exchangerates" = callPackage
@@ -82406,6 +82392,8 @@ self: {
        pname = "filepath";
        version = "1.4.2.1";
        sha256 = "04jlcaaab4fvlkgpss2mfmr5ixnp1k8f8051nqf8avfg0qan6hqb";
+       revision = "1";
+       editedCabalFile = "1harx8x3g3badj3087c662sd15fk850jqzx0lz5h16zbsv438lqa";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Library for manipulating FilePaths in a cross platform way";
@@ -85499,18 +85487,18 @@ self: {
      }:
      mkDerivation {
        pname = "fortran-src";
-       version = "0.3.0";
-       sha256 = "03a1lk0c50v66jax2dya7qhjr3si2anp4yzx03vpf49am2kn2rxq";
+       version = "0.4.0";
+       sha256 = "1l66f9wcn5dp7i63wapzkx8bgiy22xrlxbfh3jbnhy7glhvk80ja";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base binary bytestring containers directory fgl filepath
-         GenericPretty mtl pretty text uniplate
+         array base binary bytestring containers deepseq directory fgl
+         filepath GenericPretty mtl pretty text uniplate
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [
-         array base binary bytestring containers directory fgl filepath
-         GenericPretty mtl pretty text uniplate
+         array base binary bytestring containers deepseq directory fgl
+         filepath GenericPretty mtl pretty text uniplate
        ];
        testHaskellDepends = [
          array base binary bytestring containers deepseq directory fgl
@@ -85947,23 +85935,6 @@ self: {
      }) {};
 
   "free" = callPackage
-    ({ mkDerivation, base, comonad, containers, distributive
-     , exceptions, mtl, profunctors, semigroupoids, template-haskell
-     , transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "free";
-       version = "5.1.1";
-       sha256 = "0f33n7x4z0mc733ck4gg6ljcinfmm946a20g5irv90g77c6jmmak";
-       libraryHaskellDepends = [
-         base comonad containers distributive exceptions mtl profunctors
-         semigroupoids template-haskell transformers transformers-base
-       ];
-       description = "Monads for free";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "free_5_1_2" = callPackage
     ({ mkDerivation, base, comonad, containers, distributive
      , exceptions, mtl, profunctors, semigroupoids, template-haskell
      , transformers, transformers-base
@@ -85978,7 +85949,6 @@ self: {
        ];
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-algebras" = callPackage
@@ -86813,6 +86783,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "frotate" = callPackage
+    ({ mkDerivation, base, doctest, optparse-applicative, time }:
+     mkDerivation {
+       pname = "frotate";
+       version = "0.1.1";
+       sha256 = "1j8xh4k5kkix1aq79vg2kpzqb30pnggs8c6ksf4lqd8nmvzy47vc";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base optparse-applicative time ];
+       testHaskellDepends = [ base doctest ];
+       description = "Advanced rotation of backups and other things";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "frown" = callPackage
     ({ mkDerivation, base, directory }:
      mkDerivation {
@@ -87128,12 +87112,12 @@ self: {
     ({ mkDerivation, base, mtl, parsec }:
      mkDerivation {
        pname = "ft-generator";
-       version = "1.0";
-       sha256 = "1kgh8w1ny0zsrbf53vqabkap6zp6fmq2hx35nxw2hcfw7b0pvavk";
+       version = "1.0.1";
+       sha256 = "17lckkrzil8lznkzswjinh88pp8nm8ijsi2bh31ayjfaqg0m229b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl parsec ];
-       description = "implementation accompanying a WFLP'19 submission";
+       description = "implementation accompanying a WFLP'19 paper";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -87612,8 +87596,8 @@ self: {
        pname = "functor-classes-compat";
        version = "1";
        sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg";
-       revision = "4";
-       editedCabalFile = "1531cmcfgcgry254dn5mx7h5l6nd4afxz6lhlcr0lbbm4y1v59mk";
+       revision = "5";
+       editedCabalFile = "0n823v0avzdwvmfm5fgw5gsmrlvd12pdx1clkislpd5yq4ffgjw7";
        libraryHaskellDepends = [
          base containers hashable unordered-containers vector
        ];
@@ -89332,8 +89316,8 @@ self: {
     ({ mkDerivation, base, HUnit, template-haskell, th-abstraction }:
      mkDerivation {
        pname = "generic-constraints";
-       version = "1.1.1";
-       sha256 = "0ifia4yw495ikkvjn70c386z3w40vyl2wracmcij025yc9bz4w9q";
+       version = "1.1.1.1";
+       sha256 = "1id341ih876qzq89cj6y3g87w4l3mfhv412l6czcs51r69s1770r";
        libraryHaskellDepends = [ base template-haskell th-abstraction ];
        testHaskellDepends = [ base HUnit ];
        description = "Constraints via Generic";
@@ -90798,14 +90782,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot_8_6_5" = callPackage
+  "ghc-boot_8_8_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, filepath
      , ghc-boot-th
      }:
      mkDerivation {
        pname = "ghc-boot";
-       version = "8.6.5";
-       sha256 = "1sxar25ji02a4yaz6s5hksf7b8pbl66vv9nb3bfc7fxq6gzj5n4b";
+       version = "8.8.1";
+       sha256 = "1f1701nkyn6cig2mh8wb5wn3vwddkfmfqz8lykh8k1sm76qx7yva";
        libraryHaskellDepends = [
          base binary bytestring directory filepath ghc-boot-th
        ];
@@ -90814,12 +90798,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot-th_8_6_5" = callPackage
+  "ghc-boot-th_8_8_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ghc-boot-th";
-       version = "8.6.5";
-       sha256 = "18gjvxp3668np9n3c5l65q03nlqhgfjhh9wizvifmk673g0cl7n9";
+       version = "8.8.1";
+       sha256 = "14aa5jb5wz1yz12l0ixbbwiqj2rg1vgyd2rlfgm2ixsrryans4cb";
        libraryHaskellDepends = [ base ];
        description = "Shared functionality between GHC and the `template-haskell` library";
        license = stdenv.lib.licenses.bsd3;
@@ -90843,8 +90827,8 @@ self: {
        pname = "ghc-compact";
        version = "0.1.0.0";
        sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h";
-       revision = "2";
-       editedCabalFile = "1i775sc8sb89gali1w7qxs7l6y8vawp1mdd564d5mz95sxj4757b";
+       revision = "3";
+       editedCabalFile = "09l51r0nk7vj6a9crz7q5sv4962mnq18xb6zkxfl6cnm28v85nsk";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        description = "In memory storage of deeply evaluated data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -90904,8 +90888,8 @@ self: {
     ({ mkDerivation, base, deepseq, ghc-heap-view }:
      mkDerivation {
        pname = "ghc-datasize";
-       version = "0.2.0";
-       sha256 = "0wmlryqsw4mhk85wnril0p14gx2y0wjmq9iv9jjy0wl6gw5ps1yh";
+       version = "0.2.1";
+       sha256 = "0qsh4m6vif07nd0r5lbwggqrlykmlnspdx1jwzzhz6mk1hcf914d";
        libraryHaskellDepends = [ base deepseq ghc-heap-view ];
        description = "Determine the size of data structures in GHC's memory";
        license = stdenv.lib.licenses.bsd3;
@@ -91082,6 +91066,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-exactprint_0_6_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, Diff, directory
+     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
+     , silently, syb
+     }:
+     mkDerivation {
+       pname = "ghc-exactprint";
+       version = "0.6.2";
+       sha256 = "1c36f7vjk3gapp761c7w1ncg9hyhx2kxwk51s0d9fvapi1bkxw9j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath free ghc ghc-boot
+         ghc-paths mtl syb
+       ];
+       testHaskellDepends = [
+         base bytestring containers Diff directory filemanip filepath ghc
+         ghc-boot ghc-paths HUnit mtl silently syb
+       ];
+       description = "ExactPrint for GHC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-gc-tune" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
@@ -91665,13 +91673,17 @@ self: {
      }) {};
 
   "ghc-source-gen" = callPackage
-    ({ mkDerivation, base, ghc, ghc-paths, tasty, tasty-hunit }:
+    ({ mkDerivation, base, ghc, ghc-paths, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
      mkDerivation {
        pname = "ghc-source-gen";
-       version = "0.1.0.0";
-       sha256 = "0sw62jjbd7h9i96hn0srl9m8p0qip6hnm1am6if7snqdm5b4ki3k";
+       version = "0.2.0.1";
+       sha256 = "1diz1vrhxx8ppj4jljzfwlrg059kdcz20ba635f7hq4kpp0blbjy";
        libraryHaskellDepends = [ base ghc ];
-       testHaskellDepends = [ base ghc ghc-paths tasty tasty-hunit ];
+       testHaskellDepends = [
+         base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
        description = "Constructs Haskell syntax trees for the GHC API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91789,27 +91801,6 @@ self: {
      }) {};
 
   "ghc-typelits-extra" = callPackage
-    ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
-     , tasty, tasty-hunit, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-extra";
-       version = "0.3";
-       sha256 = "1khkchxic6i3sg3g3dzdg8dsdgk86xy5j5lnh5n5hr7fpdm9ppj7";
-       libraryHaskellDepends = [
-         base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
-         ghc-typelits-natnormalise integer-gmp transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
-         tasty-hunit template-haskell
-       ];
-       description = "Additional type-level operations on GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-extra_0_3_1" = callPackage
     ({ mkDerivation, base, containers, ghc, ghc-prim
      , ghc-tcplugins-extra, ghc-typelits-knownnat
      , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
@@ -91830,7 +91821,6 @@ self: {
        ];
        description = "Additional type-level operations on GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
@@ -91862,6 +91852,8 @@ self: {
        pname = "ghc-typelits-knownnat";
        version = "0.7";
        sha256 = "00f8m3kmp572r8jr246m8r6lwzxmiqj4hml06w09l9n3lzvjwv7b";
+       revision = "1";
+       editedCabalFile = "1jgwa66dbhqsav7764cfcmzs3p0f3csbdjbrnbilhv1bpqyhz8sm";
        libraryHaskellDepends = [
          base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise
          template-haskell transformers
@@ -99956,8 +99948,8 @@ self: {
     ({ mkDerivation, base, containers, json, text }:
      mkDerivation {
        pname = "graphql-w-persistent";
-       version = "0.5.0.0";
-       sha256 = "12z4fws4vz88j8xj1xvzl8jv6s4i3vnca7xln2q4ssn23a025fcg";
+       version = "0.6.0.0";
+       sha256 = "03m247xmj8gvvjs4bgsc06daz9avklza7ngs575psaqmkpxd8ga3";
        libraryHaskellDepends = [ base containers json text ];
        description = "GraphQL interface middleware for (SQL) databases";
        license = stdenv.lib.licenses.isc;
@@ -100117,8 +100109,8 @@ self: {
      }:
      mkDerivation {
        pname = "gray-extended";
-       version = "1.5.7";
-       sha256 = "0j2lzy15jiykz9b6cqzh7xhpf1idwxp8illvy3r50g1g4hc8zvyp";
+       version = "1.5.8";
+       sha256 = "1vli6dc0wc1an6vfhchai6s8xrg8rfds2k07x2xszaqg7r2njc9k";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -100354,8 +100346,8 @@ self: {
      }:
      mkDerivation {
        pname = "grid";
-       version = "7.8.12";
-       sha256 = "1ax536wr6h8kcnmnnxyd7vcdkqbjlrhrx6jab526b3f2a88n5q6z";
+       version = "7.8.14";
+       sha256 = "11rnsl6bs6qpx90p8jzdigncv6m5wbn6sav8gb3mlbm40fpi3p93";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -100968,8 +100960,8 @@ self: {
      }:
      mkDerivation {
        pname = "gscholar-rss";
-       version = "0.2.2.0";
-       sha256 = "1h8zg9yyyckyp5irw9gcbzfysav67hn2rlrkwakyh3ghb1rnl71k";
+       version = "0.2.3.1";
+       sha256 = "0iqrh6h2r7xr9xqk9w7yg1hilghcs0pp5mqq3s2rwmk2drp255l3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -104036,14 +104028,14 @@ self: {
      , lrucache, mtl, network-uri, optparse-applicative, pandoc
      , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
      , resourcet, scientific, tagsoup, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, time-locale-compat
-     , unordered-containers, utillinux, vector, wai, wai-app-static
-     , warp, yaml
+     , tasty-quickcheck, template-haskell, text, time
+     , time-locale-compat, unordered-containers, utillinux, vector, wai
+     , wai-app-static, warp, yaml
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.12.5.2";
-       sha256 = "13dc8hj3xnnpyb395pbplwxb4pj4gzckdd8r5wcwg1ln0gd6w7d5";
+       version = "4.13.0.0";
+       sha256 = "1a7g79j7ai5l46nz205rl6zr3f57m5ngd46v60wll3dj6wkiaw6b";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -104052,7 +104044,7 @@ self: {
          cryptohash data-default deepseq directory file-embed filepath
          fsnotify http-conduit http-types lrucache mtl network-uri
          optparse-applicative pandoc pandoc-citeproc parsec process random
-         regex-tdfa resourcet scientific tagsoup text time
+         regex-tdfa resourcet scientific tagsoup template-haskell text time
          time-locale-compat unordered-containers vector wai wai-app-static
          warp yaml
        ];
@@ -104328,8 +104320,6 @@ self: {
        ];
        description = "Hakyll utilities to work with images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-ogmarkup" = callPackage
@@ -106312,6 +106302,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hasbolt_0_1_3_5" = callPackage
+    ({ mkDerivation, base, binary, bytestring, connection, containers
+     , data-binary-ieee754, data-default, hex, hspec, mtl, network
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hasbolt";
+       version = "0.1.3.5";
+       sha256 = "0qd5rh0jdwhkjcz5kg1bqwd5hpz5w9ph9k0vxaam1lnjjniw7zbj";
+       libraryHaskellDepends = [
+         base binary bytestring connection containers data-binary-ieee754
+         data-default mtl network text
+       ];
+       testHaskellDepends = [
+         base bytestring containers hex hspec QuickCheck text
+       ];
+       description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasbolt-extras" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers
      , data-default, free, hasbolt, lens, mtl, neat-interpolation
@@ -107068,6 +107079,8 @@ self: {
        pname = "haskeline";
        version = "0.7.5.0";
        sha256 = "1inyq7qwih0hnqlm6gy769vsxzjpvqx9ry390dmcvvql9520hrfj";
+       revision = "1";
+       editedCabalFile = "0i8fyhk7fvz2bxnh5xsmdw5rr7yywzc2wv115034q1g4sb018zrd";
        configureFlags = [ "-fterminfo" ];
        libraryHaskellDepends = [
          base bytestring containers directory filepath process stm terminfo
@@ -107292,21 +107305,24 @@ self: {
      }) {};
 
   "haskell-ci" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base-compat, bytestring
-     , Cabal, containers, deepseq, Diff, directory, filepath
-     , generic-lens, HsYAML, microlens, optparse-applicative, parsec
-     , pretty, ShellCheck, tasty, tasty-golden, text, transformers
+    ({ mkDerivation, aeson, ansi-terminal, base, base-compat
+     , bytestring, Cabal, containers, deepseq, Diff, directory
+     , exceptions, filepath, generic-lens, HsYAML, lattices, microlens
+     , mtl, optparse-applicative, parsec, pretty, process, ShellCheck
+     , tasty, tasty-golden, temporary, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "haskell-ci";
-       version = "0.2.1";
-       sha256 = "07h99vq4bmphrpi1ggm7h06ard7hyxkmsxypicghvv24cgzl3c70";
+       version = "0.4";
+       sha256 = "0paw5jczmcayda2pjgp10p983g8kbly33hpabdv37b5mkrair9d8";
        isLibrary = false;
        isExecutable = true;
        libraryHaskellDepends = [
-         base base-compat bytestring Cabal containers deepseq directory
-         filepath generic-lens HsYAML microlens optparse-applicative parsec
-         pretty ShellCheck text transformers
+         aeson base base-compat bytestring Cabal containers deepseq
+         directory exceptions filepath generic-lens HsYAML lattices
+         microlens mtl optparse-applicative parsec pretty process ShellCheck
+         temporary text transformers unordered-containers
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -107315,7 +107331,7 @@ self: {
        ];
        doHaddock = false;
        description = "Cabal package script generator for Travis-CI";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.gpl3Plus;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -114343,6 +114359,8 @@ self: {
        pname = "hex";
        version = "0.1.2";
        sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
+       revision = "1";
+       editedCabalFile = "0khmrdni6njr4wxgz15yz77l8ar4qm2jj6v0lvfnwqdms4s6i80y";
        libraryHaskellDepends = [ base bytestring ];
        description = "Convert strings into hexadecimal and back";
        license = stdenv.lib.licenses.bsd3;
@@ -117071,7 +117089,7 @@ self: {
   "hledger" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-compat-batteries
      , bytestring, cmdargs, containers, criterion, data-default, Decimal
-     , Diff, directory, easytest, filepath, hashable, haskeline
+     , Diff, directory, easytest, extra, filepath, hashable, haskeline
      , hledger-lib, html, lucid, math-functions, megaparsec, mtl
      , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
      , safe, shakespeare, split, tabular, temporary, terminfo
@@ -117081,38 +117099,39 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.14.2";
-       sha256 = "1si9zqparkdq77yji87lhcsrf11fr3gisqwsv82cabhrhc36x6l4";
+       version = "1.15";
+       sha256 = "0p9y9gvxj0iv0zzw921248mg8zj80c6hiba3syf11v6gkqlm4262";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
-         containers data-default Decimal Diff directory easytest filepath
-         hashable haskeline hledger-lib lucid math-functions megaparsec mtl
-         mtl-compat old-time parsec pretty-show process regex-tdfa safe
-         shakespeare split tabular temporary terminfo text time transformers
-         unordered-containers utf8-string utility-ht wizards
+         containers data-default Decimal Diff directory easytest extra
+         filepath hashable haskeline hledger-lib lucid math-functions
+         megaparsec mtl mtl-compat old-time parsec pretty-show process
+         regex-tdfa safe shakespeare split tabular temporary terminfo text
+         time timeit transformers unordered-containers utf8-string
+         utility-ht wizards
        ];
        executableHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
-         containers data-default Decimal directory easytest filepath
+         containers data-default Decimal directory easytest extra filepath
          haskeline hledger-lib math-functions megaparsec mtl mtl-compat
          old-time parsec pretty-show process regex-tdfa safe shakespeare
-         split tabular temporary terminfo text time transformers
+         split tabular temporary terminfo text time timeit transformers
          unordered-containers utf8-string utility-ht wizards
        ];
        testHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
-         containers data-default Decimal directory easytest filepath
+         containers data-default Decimal directory easytest extra filepath
          haskeline hledger-lib math-functions megaparsec mtl mtl-compat
          old-time parsec pretty-show process regex-tdfa safe shakespeare
          split tabular temporary terminfo test-framework
-         test-framework-hunit text time transformers unordered-containers
-         utf8-string utility-ht wizards
+         test-framework-hunit text time timeit transformers
+         unordered-containers utf8-string utility-ht wizards
        ];
        benchmarkHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
-         containers criterion data-default Decimal directory easytest
+         containers criterion data-default Decimal directory easytest extra
          filepath haskeline hledger-lib html math-functions megaparsec mtl
          mtl-compat old-time parsec pretty-show process regex-tdfa safe
          shakespeare split tabular temporary terminfo text time timeit
@@ -117284,31 +117303,33 @@ self: {
     ({ mkDerivation, ansi-terminal, array, base, base-compat-batteries
      , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec
      , cmdargs, containers, data-default, Decimal, deepseq, directory
-     , doctest, easytest, extra, file-embed, filepath, Glob, hashtables
-     , megaparsec, mtl, mtl-compat, old-time, parsec, parser-combinators
-     , pretty-show, regex-tdfa, safe, split, tabular, template-haskell
-     , text, time, transformers, uglymemo, utf8-string
+     , doctest, easytest, extra, fgl, file-embed, filepath, Glob
+     , hashtables, megaparsec, mtl, mtl-compat, old-time, parsec
+     , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular
+     , template-haskell, text, time, timeit, transformers, uglymemo
+     , utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.14.1";
-       sha256 = "1w6qp01cak6spnpldm01czlm6i5a2alw47w76875l2nagrc4rfp2";
+       version = "1.15";
+       sha256 = "03nz49d5fcma8clifv0r9m8v4mp80c10577xwlagmbkw9npxvs3n";
        libraryHaskellDepends = [
          ansi-terminal array base base-compat-batteries blaze-markup
          bytestring call-stack cassava cassava-megaparsec cmdargs containers
-         data-default Decimal deepseq directory easytest extra file-embed
-         filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec
-         parser-combinators pretty-show regex-tdfa safe split tabular
-         template-haskell text time transformers uglymemo utf8-string
+         data-default Decimal deepseq directory easytest extra fgl
+         file-embed filepath Glob hashtables megaparsec mtl mtl-compat
+         old-time parsec parser-combinators pretty-show regex-tdfa safe
+         split tabular template-haskell text time timeit transformers
+         uglymemo utf8-string
        ];
        testHaskellDepends = [
          ansi-terminal array base base-compat-batteries blaze-markup
          bytestring call-stack cassava cassava-megaparsec cmdargs containers
-         data-default Decimal deepseq directory doctest easytest extra
+         data-default Decimal deepseq directory doctest easytest extra fgl
          file-embed filepath Glob hashtables megaparsec mtl mtl-compat
          old-time parsec parser-combinators pretty-show regex-tdfa safe
-         split tabular template-haskell text time transformers uglymemo
-         utf8-string
+         split tabular template-haskell text time timeit transformers
+         uglymemo utf8-string
        ];
        description = "Core data types, parsers and functionality for the hledger accounting tools";
        license = stdenv.lib.licenses.gpl3;
@@ -117344,8 +117365,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.14.2";
-       sha256 = "0bhixvzxv7d0kwb4ppv3sc98wjkc58kna9f91202s63sbikahlcr";
+       version = "1.15";
+       sha256 = "047ssmix7pxq61hknd40z983aw8110zxzh6z2ick8xkhdsnw3s1q";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -117390,8 +117411,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.14.1";
-       sha256 = "0w59nr7mj0nx8z44cvhy1rhlj5rmx0wq4p5nfl4dycfmp7jwvsm1";
+       version = "1.15";
+       sha256 = "1m54m8v1fzlazrh9hhv4ff7jrg95d03i8wx360l1y731gry54zw3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120226,6 +120247,45 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hpack_0_32_0" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
+     , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
+     , hspec-discover, http-client, http-client-tls, http-types, HUnit
+     , infer-license, interpolate, mockery, pretty, QuickCheck
+     , scientific, template-haskell, temporary, text, transformers
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "hpack";
+       version = "0.32.0";
+       sha256 = "11qfqyhcwihmx1z9pg5fhza1ww8wapr04wzyx8sknwpxs3hacm4z";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob http-client http-client-tls
+         http-types infer-license pretty scientific text transformers
+         unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob http-client http-client-tls
+         http-types infer-license pretty scientific text transformers
+         unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob hspec http-client http-client-tls
+         http-types HUnit infer-license interpolate mockery pretty
+         QuickCheck scientific template-haskell temporary text transformers
+         unordered-containers vector yaml
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A modern format for Haskell packages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hpack-convert" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
      , Cabal, containers, deepseq, directory, filepath, Glob, hspec
@@ -120443,8 +120503,8 @@ self: {
        pname = "hpc";
        version = "0.6.0.3";
        sha256 = "1am2fcxg7d3j3kpyhz48wzbpg83dk2jmzhqm4yiib649alzcgnhn";
-       revision = "2";
-       editedCabalFile = "0ywki1w4kld0m3z8v1i287g6hcsjgmyq4nxx8b9jij721ad9b9w3";
+       revision = "3";
+       editedCabalFile = "06dbiaf0sangq3zdyr3x9wkvs2fgyas3ipqkfwfmycax6j17jgyy";
        libraryHaskellDepends = [
          base containers directory filepath time
        ];
@@ -122257,29 +122317,6 @@ self: {
      }) {};
 
   "hsc2hs" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, process
-     , tasty, tasty-hspec
-     }:
-     mkDerivation {
-       pname = "hsc2hs";
-       version = "0.68.4";
-       sha256 = "07qzyr1j76gxrrsds65vivm5cx33paxpifvxdlmkxprrm3s4z7z6";
-       revision = "2";
-       editedCabalFile = "178jimc9qwrjmiiz8f0kk7gv2jaf51vv1n40rp42ggmi8mvf0m4v";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [
-         base containers directory filepath process
-       ];
-       testHaskellDepends = [ base tasty tasty-hspec ];
-       description = "A preprocessor that helps with writing Haskell bindings to C code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hsc2hs_0_68_6" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, process
      , tasty, tasty-hspec
      }:
@@ -126350,6 +126387,8 @@ self: {
        pname = "http-api-data";
        version = "0.4.1";
        sha256 = "1ps4bvln43gz72dr9mc3c9n1rn38c4rz6m49vxzz9nz6jz1978rv";
+       revision = "1";
+       editedCabalFile = "0jhaj9qxw8a4gnvqi6i7lmn6vk8cmvc1mm1cp1saqz4whn13fgbs";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          attoparsec attoparsec-iso8601 base base-compat bytestring
@@ -126897,8 +126936,8 @@ self: {
        pname = "http-io-streams";
        version = "0.1.0.0";
        sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv";
-       revision = "1";
-       editedCabalFile = "10fcy17ny5qvabm98md9j8r7vfklgzxvg89iinna7wm4v6q6j5w5";
+       revision = "2";
+       editedCabalFile = "0l6afs6bhf5q73nmlmc37qi0anr1dlrz1x10m9ipfssnkb5hp25k";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring blaze-builder bytestring
          case-insensitive containers directory HsOpenSSL io-streams mtl
@@ -128606,14 +128645,12 @@ self: {
      }:
      mkDerivation {
        pname = "hw-hspec-hedgehog";
-       version = "0.1.0.7";
-       sha256 = "0445b5ycr622qjann2yyri8ghkhkw0vqaqn2rlar9wq2ni3b85rv";
-       revision = "1";
-       editedCabalFile = "0gcfhqasff8ij0xr5wq74blp90ldzgv992agadp63bs4ikg4rajm";
+       version = "0.1.0.8";
+       sha256 = "0c54mhzbmjfjvy5lyvr6xffrncqmbbr10lran2x9czbkhhbikrss";
        libraryHaskellDepends = [
          base call-stack hedgehog hspec HUnit transformers
        ];
-       testHaskellDepends = [ base hedgehog hspec ];
+       testHaskellDepends = [ base call-stack hedgehog hspec HUnit ];
        testToolDepends = [ hspec-discover ];
        description = "Interoperability between hspec and hedgehog";
        license = stdenv.lib.licenses.bsd3;
@@ -133770,8 +133807,8 @@ self: {
        pname = "int-cast";
        version = "0.2.0.0";
        sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0";
-       revision = "1";
-       editedCabalFile = "111pac97pcrp01zphf96crdx22fnq7ha2s27av0mqki5421rghpm";
+       revision = "2";
+       editedCabalFile = "1fhc91170q9q9k628wc3dqzdvxfjs97jzg5x7g0ndaqnh60l8cy5";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -137361,8 +137398,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "joint";
-       version = "0.1.0";
-       sha256 = "0hzbczwy1w1mw8c4lf52nm6ighjlpiyj91siy9fmqih4fv22a1p2";
+       version = "0.1.1";
+       sha256 = "1iq29qyi4ij7ffshvz1x9rpbrbpd4088nccdpjzpzgza73w4bqmp";
        libraryHaskellDepends = [ base ];
        description = "Trying to compose non-composable";
        license = stdenv.lib.licenses.bsd3;
@@ -143137,8 +143174,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-lua";
-       version = "0.11.0";
-       sha256 = "1b65bfjdx7287d65s2ki05yfps8k0w6jfq4avna4z37cqssa0z59";
+       version = "0.11.0.1";
+       sha256 = "0712xbijag03n61d80bnd9xw94fzywc76l8ya9ijv684ls0qymy2";
        libraryHaskellDepends = [
          alex-tools array base bytestring deepseq text
        ];
@@ -147715,24 +147752,22 @@ self: {
 
   "linnet" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-conversion
-     , case-insensitive, either, exceptions, hspec, http-types
-     , io-streams, mtl, QuickCheck, quickcheck-classes
-     , quickcheck-instances, text, transformers, uri-encode, wai, warp
+     , case-insensitive, either, exceptions, hspec, http-types, mtl
+     , QuickCheck, quickcheck-classes, quickcheck-instances, text
+     , transformers, uri-encode, wai, warp
      }:
      mkDerivation {
        pname = "linnet";
-       version = "0.1.0.1";
-       sha256 = "074np5a8xx25k88c82spmvmwiwcm993pvfbwfhjjkcqjqxwwgglf";
+       version = "0.2.0.0";
+       sha256 = "13k65016hm7shi3q5r47hx0s8bfpaypf0bknmwcvsrgsg5cyjz7q";
        libraryHaskellDepends = [
          base bytestring bytestring-conversion case-insensitive either
-         exceptions http-types io-streams mtl text transformers uri-encode
-         wai warp
+         exceptions http-types mtl text transformers uri-encode wai warp
        ];
        testHaskellDepends = [
          base bytestring bytestring-conversion case-insensitive either
-         exceptions hspec http-types io-streams mtl QuickCheck
-         quickcheck-classes quickcheck-instances text transformers
-         uri-encode wai warp
+         exceptions hspec http-types mtl QuickCheck quickcheck-classes
+         quickcheck-instances text transformers uri-encode wai warp
        ];
        description = "Lightweight library for building HTTP API";
        license = stdenv.lib.licenses.asl20;
@@ -147744,8 +147779,8 @@ self: {
      }:
      mkDerivation {
        pname = "linnet-aeson";
-       version = "0.1.0.1";
-       sha256 = "1syfi3ha3z2l1g8qdy5rpla6xafw6dqcwicgns1xy9q9d8jrcjs3";
+       version = "0.2.0.0";
+       sha256 = "118i6a9296sig9ldhblh8b3q8g9k55bgjxn33v8msz1sw1dw493k";
        libraryHaskellDepends = [ aeson base bytestring linnet ];
        testHaskellDepends = [
          aeson base bytestring hspec linnet QuickCheck quickcheck-classes
@@ -147755,6 +147790,26 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "linnet-conduit" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, hspec, http-types
+     , linnet, QuickCheck, quickcheck-classes, quickcheck-instances, wai
+     , warp
+     }:
+     mkDerivation {
+       pname = "linnet-conduit";
+       version = "0.2.0.0";
+       sha256 = "1q479v0abcrkfw6my2d5kcn6j8i4p9gkk3np5s5qkf097wyphh1r";
+       libraryHaskellDepends = [
+         base bytestring conduit http-types linnet wai warp
+       ];
+       testHaskellDepends = [
+         base bytestring conduit hspec http-types linnet QuickCheck
+         quickcheck-classes quickcheck-instances wai warp
+       ];
+       description = "Conduit-backed support for streaming in Linnet";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "linode" = callPackage
     ({ mkDerivation, aeson, async, base, binary, bytestring, containers
      , errors, lens, process, retry, safe, tasty, tasty-hunit
@@ -148430,8 +148485,8 @@ self: {
     ({ mkDerivation, base, doctest, mtl }:
      mkDerivation {
        pname = "list-transformer";
-       version = "1.0.4";
-       sha256 = "0zia1b2phk4skv39q2k481jsagz1syd6rkgfcdra15i2s5dhzvyp";
+       version = "1.0.5";
+       sha256 = "192yx9y0sp729dk9xaym1b6kyw9gv7n3fp1dvxw7z2w04s92l1k4";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest ];
        description = "List monad transformer";
@@ -155534,8 +155589,8 @@ self: {
        pname = "memory";
        version = "0.14.18";
        sha256 = "01rmq3vagxzjmm96qnfxk4f0516cn12bp5m8inn8h5r918bqsigm";
-       revision = "1";
-       editedCabalFile = "0h4d0avv8kv3my4rim79lcamv2dyibld7w6ianq46nhwgr0h2lzm";
+       revision = "2";
+       editedCabalFile = "1kwlgsjxh4ncvc6x9rps82bm55qyzn8lvzg49s4rbyc7vjjsbmx6";
        libraryHaskellDepends = [
          base basement bytestring deepseq ghc-prim
        ];
@@ -156169,8 +156224,8 @@ self: {
        pname = "microaeson";
        version = "0.1.0.0";
        sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz";
-       revision = "1";
-       editedCabalFile = "0pxgpmr0xv355rnpr8m7l07swbzsjbfiba3dxyz53bdjcc8ya9dq";
+       revision = "2";
+       editedCabalFile = "1n3jhbwic8c2pa6dcz36a6fgna4b854ml5d5n8qzzhjshb0v60ri";
        libraryHaskellDepends = [
          array base bytestring containers deepseq text
        ];
@@ -160736,8 +160791,8 @@ self: {
      }:
      mkDerivation {
        pname = "morpheus-graphql";
-       version = "0.2.1";
-       sha256 = "1qdd21mwxsn3yw9c0vxcsmx6ixp90lpy2ghk6ix2s06cs4d5s3h9";
+       version = "0.2.2";
+       sha256 = "1cgf6l6p97dfgj49gyygbd088smah3ichryrr8xvl1mr6pjclq5b";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -161527,8 +161582,8 @@ self: {
      }:
      mkDerivation {
        pname = "mssql-simple";
-       version = "0.5.0.0";
-       sha256 = "0k0j87h37hya42fv045z44p9issic0a0wswy75ymclizsbip1fl4";
+       version = "0.5.0.1";
+       sha256 = "174qqm4y38b4x0nc4kfrafr0cqcqshdxgxj2amn58m5zvclhn3fs";
        libraryHaskellDepends = [
          base binary bytestring hostname ms-tds mtl network template-haskell
          text time tls uuid-types
@@ -165092,8 +165147,8 @@ self: {
      }:
      mkDerivation {
        pname = "net-mqtt";
-       version = "0.2.4.1";
-       sha256 = "0s0drakh05ygwkvlcd8z0f5168hvk8qmvdq3mg2bk1p2fjd2hfb2";
+       version = "0.2.4.2";
+       sha256 = "1ygd0ncwzzy4i2m4n0ax02csyjdsn2y66amr9yilxn6x0yhbq9rj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165405,8 +165460,8 @@ self: {
        pname = "netrc";
        version = "0.2.0.0";
        sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls";
-       revision = "5";
-       editedCabalFile = "0v383hy7iw44xxnpdp2fla2dc8ivrhwgh2m303ps4z9fsw25cyka";
+       revision = "6";
+       editedCabalFile = "0mn0ar2xhjdsm50kmpw5ndvbyfmc30b3x0bx291d2ml7hqspnnsw";
        libraryHaskellDepends = [ base bytestring deepseq parsec ];
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
@@ -166343,8 +166398,8 @@ self: {
     ({ mkDerivation, base, network }:
      mkDerivation {
        pname = "network-run";
-       version = "0.1.0";
-       sha256 = "16n7d0vgzcp6qq3y2vs1wjlj81xdi3a1kyk9qncmj3h7djav3r5b";
+       version = "0.2.0";
+       sha256 = "1iabxk341yzsr28mpiam01wris20na4kbvbpxfzbcvlb1q2pjz5v";
        libraryHaskellDepends = [ base network ];
        description = "Simple network runner library";
        license = stdenv.lib.licenses.bsd3;
@@ -167585,6 +167640,26 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) nix;};
 
+  "nixfmt" = callPackage
+    ({ mkDerivation, base, cmdargs, directory, filepath, megaparsec
+     , parser-combinators, safe-exceptions, text, unix
+     }:
+     mkDerivation {
+       pname = "nixfmt";
+       version = "0.3.0";
+       sha256 = "0y9r7l2iwy6kqqli8bfcgrcr07pqvpaym895qn21d467ybcmgqih";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base megaparsec parser-combinators text
+       ];
+       executableHaskellDepends = [
+         base cmdargs directory filepath safe-exceptions text unix
+       ];
+       description = "An opinionated formatter for Nix";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "nixfromnpm" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring
      , classy-prelude, containers, curl, data-default, data-fix
@@ -173960,58 +174035,6 @@ self: {
      }) {};
 
   "pantry" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
-     , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
-     , containers, contravariant, cryptonite, cryptonite-conduit
-     , deepseq, digest, directory, exceptions, filelock, filepath
-     , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog
-     , hpack, hspec, http-client, http-client-tls, http-conduit
-     , http-download, http-types, integer-gmp, memory, mono-traversable
-     , mtl, network, network-uri, path, path-io, persistent
-     , persistent-sqlite, persistent-template, primitive, QuickCheck
-     , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
-     , safe, syb, tar-conduit, template-haskell, text, text-metrics
-     , th-lift, th-lift-instances, th-orphans, th-reify-many
-     , th-utilities, time, transformers, unix-compat, unliftio
-     , unordered-containers, vector, yaml, zip-archive
-     }:
-     mkDerivation {
-       pname = "pantry";
-       version = "0.1.1.1";
-       sha256 = "082p2shapgnv10qjm77bpn0y6p6582n38xcgirh2l8mhs1yqflyg";
-       libraryHaskellDepends = [
-         aeson ansi-terminal array base base-orphans base64-bytestring
-         bytestring Cabal conduit conduit-extra containers contravariant
-         cryptonite cryptonite-conduit deepseq digest directory filelock
-         filepath generic-deriving ghc-prim hackage-security hashable hpack
-         http-client http-client-tls http-conduit http-download http-types
-         integer-gmp memory mono-traversable mtl network network-uri path
-         path-io persistent persistent-sqlite persistent-template primitive
-         resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit
-         template-haskell text text-metrics th-lift th-lift-instances
-         th-orphans th-reify-many th-utilities time transformers unix-compat
-         unliftio unordered-containers vector yaml zip-archive
-       ];
-       testHaskellDepends = [
-         aeson ansi-terminal array base base-orphans base64-bytestring
-         bytestring Cabal conduit conduit-extra containers contravariant
-         cryptonite cryptonite-conduit deepseq digest directory exceptions
-         filelock filepath generic-deriving ghc-prim hackage-security
-         hashable hedgehog hpack hspec http-client http-client-tls
-         http-conduit http-download http-types integer-gmp memory
-         mono-traversable mtl network network-uri path path-io persistent
-         persistent-sqlite persistent-template primitive QuickCheck
-         raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb
-         tar-conduit template-haskell text text-metrics th-lift
-         th-lift-instances th-orphans th-reify-many th-utilities time
-         transformers unix-compat unliftio unordered-containers vector yaml
-         zip-archive
-       ];
-       description = "Content addressable Haskell package management";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pantry_0_1_1_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
      , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
      , containers, contravariant, cryptonite, cryptonite-conduit
@@ -174061,7 +174084,6 @@ self: {
        ];
        description = "Content addressable Haskell package management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pantry-tmp" = callPackage
@@ -174620,6 +174642,8 @@ self: {
        pname = "parallel";
        version = "3.2.2.0";
        sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p";
+       revision = "1";
+       editedCabalFile = "0a3kn7arck8f2gwm8cwfkplsw4q9v9j6ifbhj1l3bmclmkwcckcj";
        libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
@@ -178630,8 +178654,8 @@ self: {
      }:
      mkDerivation {
        pname = "pg-transact";
-       version = "0.1.0.1";
-       sha256 = "0zf9mfhpknaa0vggv60gpkfr0ak51n1xbw5lfqx8l8p1kqv3d0jr";
+       version = "0.1.2.0";
+       sha256 = "1xgma50c4pvvb9h2wksx8wl4sf0625ngbsb2c828xd0aqj171qmj";
        libraryHaskellDepends = [
          base bytestring exceptions monad-control postgresql-simple
          transformers
@@ -178647,6 +178671,30 @@ self: {
        broken = true;
      }) {};
 
+  "pg-transact_0_2_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, hspec
+     , hspec-discover, hspec-expectations-lifted, monad-control
+     , postgresql-simple, tmp-postgres, transformers
+     }:
+     mkDerivation {
+       pname = "pg-transact";
+       version = "0.2.0.0";
+       sha256 = "0g3willpc3msbgbrjq6q3zlc195c2cv8bnhc3g4ksnz7c85z3vhc";
+       libraryHaskellDepends = [
+         base bytestring exceptions monad-control postgresql-simple
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring exceptions hspec hspec-discover
+         hspec-expectations-lifted postgresql-simple tmp-postgres
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Another postgresql-simple transaction monad";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "pgdl" = callPackage
     ({ mkDerivation, base, binary, brick, bytestring, Cabal, conduit
      , conduit-extra, configurator, containers, directory
@@ -179657,29 +179705,6 @@ self: {
      }) {};
 
   "pipes" = callPackage
-    ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
-     , optparse-applicative, QuickCheck, semigroups, test-framework
-     , test-framework-quickcheck2, transformers, void
-     }:
-     mkDerivation {
-       pname = "pipes";
-       version = "4.3.11";
-       sha256 = "0h70djd6x306rci8zp356klqj6376xry6mkhyr12301adfhag8vv";
-       libraryHaskellDepends = [
-         base exceptions mmorph mtl semigroups transformers void
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck test-framework test-framework-quickcheck2
-         transformers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion mtl optparse-applicative transformers
-       ];
-       description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes_4_3_12" = callPackage
     ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
      , optparse-applicative, QuickCheck, semigroups, test-framework
      , test-framework-quickcheck2, transformers, void
@@ -179700,7 +179725,6 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-aeson" = callPackage
@@ -183260,12 +183284,12 @@ self: {
      }) {};
 
   "postgres-options" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "postgres-options";
-       version = "0.1.0.0";
-       sha256 = "17a2w4fb85mp9v1rghgkm0cvgzxvvahcvfi3vmlzrdqhlsm0si7c";
-       libraryHaskellDepends = [ base ];
+       version = "0.1.0.1";
+       sha256 = "0pysvgg2p032j5a9qdysbndy0a0fzm41zgv070cwqk199w1lh3h7";
+       libraryHaskellDepends = [ base bytestring ];
        description = "An Options type representing options for postgres connections";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -183692,20 +183716,20 @@ self: {
   "postgresql-simple-opts" = callPackage
     ({ mkDerivation, base, bytestring, data-default, either
      , generic-deriving, hspec, optparse-applicative, optparse-generic
-     , postgresql-simple, split, uri-bytestring
+     , postgres-options, postgresql-simple, split, uri-bytestring
      }:
      mkDerivation {
        pname = "postgresql-simple-opts";
-       version = "0.3.0.1";
-       sha256 = "19jhrz2lghiycb81dzzz5g2kwzaahn27q7diw6nn9qmcpwgw3rly";
+       version = "0.4.0.0";
+       sha256 = "0zrmqd25xni2d51jna2a52l3bmdn6lpx9mbjzllnf6zn6ckw4ja8";
        libraryHaskellDepends = [
          base bytestring data-default either generic-deriving
-         optparse-applicative optparse-generic postgresql-simple split
-         uri-bytestring
+         optparse-applicative optparse-generic postgres-options
+         postgresql-simple split uri-bytestring
        ];
        testHaskellDepends = [
          base bytestring data-default hspec optparse-applicative
-         postgresql-simple
+         postgres-options postgresql-simple
        ];
        description = "An optparse-applicative parser for postgresql-simple's connection options";
        license = stdenv.lib.licenses.bsd3;
@@ -193451,8 +193475,8 @@ self: {
      }:
      mkDerivation {
        pname = "reanimate-svg";
-       version = "0.9.0.0";
-       sha256 = "0x4d06vsxz3845w05d4qnfbmws2bc7vxpny8hiqbv1wwgjwig327";
+       version = "0.9.0.1";
+       sha256 = "0a4gp16zm1j6xi9algg4fkl53rxjzq38dvfjk0bzw6sm727rxvnf";
        libraryHaskellDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
@@ -193464,6 +193488,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reanimate-svg_0_9_0_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
+     , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
+     , transformers, vector, xml
+     }:
+     mkDerivation {
+       pname = "reanimate-svg";
+       version = "0.9.0.2";
+       sha256 = "1nlxdyvy4fzr21qm428112w7af9ziajg9vqiv73q45ijgc6icgc9";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers JuicyPixels lens linear mtl
+         scientific text transformers vector xml
+       ];
+       testHaskellDepends = [
+         attoparsec base hspec linear scientific svg-tree
+       ];
+       description = "SVG file loader and serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reason-export" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck
@@ -193854,8 +193899,8 @@ self: {
      }:
      mkDerivation {
        pname = "red-black-record";
-       version = "2.0.4.0";
-       sha256 = "1wcg8a3aql1jmnfl7q5gzjgxl4z6780zgp8w10v3g52ilcdq4myn";
+       version = "2.1.0.2";
+       sha256 = "0xfvvhdqnhialxf13xw894mpsf8xj8jig5zipqj1hh6galb0b164";
        libraryHaskellDepends = [ base sop-core ];
        testHaskellDepends = [
          aeson base bytestring doctest profunctors sop-core tasty
@@ -194326,19 +194371,6 @@ self: {
      }) {};
 
   "reflection" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "reflection";
-       version = "2.1.4";
-       sha256 = "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj";
-       revision = "1";
-       editedCabalFile = "05ibi4ivvh87d96xl09yh0day08p5www5vp568mvn2dp37rxyngc";
-       libraryHaskellDepends = [ base template-haskell ];
-       description = "Reifies arbitrary terms into types that can be reflected back into terms";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "reflection_2_1_5" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, QuickCheck
      , template-haskell
      }:
@@ -194351,7 +194383,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflection-extras" = callPackage
@@ -196716,13 +196747,18 @@ self: {
      }) {};
 
   "replace-megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }:
+    ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec
+     , text
+     }:
      mkDerivation {
        pname = "replace-megaparsec";
-       version = "1.0.1.0";
-       sha256 = "18aipcrmic0xgfjg1cia6zs7m5a9xq7srm1r713qxri9pm5ynqd6";
+       version = "1.1.0.0";
+       sha256 = "1m1f0pwz6glpkc3n00c8c9v6dmfriss117p168wmx7kfx4kz56zs";
        libraryHaskellDepends = [ base megaparsec ];
        testHaskellDepends = [ base bytestring Cabal megaparsec text ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion megaparsec text
+       ];
        description = "Stream editing with parsers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -198680,31 +198716,6 @@ self: {
      }) {};
 
   "rio" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
-     , process, QuickCheck, text, time, typed-process, unix, unliftio
-     , unliftio-core, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "rio";
-       version = "0.1.11.0";
-       sha256 = "17p3zr1fncwqc1rz181mfbxi9dlyd2cd8xcxhnxm3fgnq6i9cj4l";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq directory exceptions filepath
-         hashable microlens mtl primitive process text time typed-process
-         unix unliftio unliftio-core unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory exceptions filepath
-         hashable hspec microlens mtl primitive process QuickCheck text time
-         typed-process unix unliftio unliftio-core unordered-containers
-         vector
-       ];
-       description = "A standard library for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rio_0_1_12_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
      , process, QuickCheck, text, time, typed-process, unix, unliftio
@@ -198727,7 +198738,6 @@ self: {
        ];
        description = "A standard library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rio-orphans" = callPackage
@@ -199874,16 +199884,17 @@ self: {
 
   "rounded" = callPackage
     ({ mkDerivation, base, ghc-prim, gmp, hgmp, long-double, mpfr
-     , reflection, singletons
+     , reflection
      }:
      mkDerivation {
        pname = "rounded";
-       version = "0.1.0.1";
-       sha256 = "04abl192vq1xq7kf9fackcb17wjyxw4068fsks3pxm9dd4iymgls";
+       version = "1.0";
+       sha256 = "1vwy8sc457bxq3x8wzfsr5v01lp38ynwg8hp97likkckd13vkh7v";
        libraryHaskellDepends = [
-         base ghc-prim hgmp long-double reflection singletons
+         base ghc-prim hgmp long-double reflection
        ];
        librarySystemDepends = [ gmp mpfr ];
+       libraryPkgconfigDepends = [ mpfr ];
        testHaskellDepends = [ base long-double ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -201442,48 +201453,16 @@ self: {
   "salak" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion
      , data-default, directory, dlist, exceptions, filepath, hashable
-     , heaps, hspec, hspec-discover, megaparsec, menshen, mtl
-     , QuickCheck, random, scientific, text, time, unliftio-core
-     , unordered-containers
+     , heaps, hspec, hspec-discover, megaparsec, mtl, QuickCheck, random
+     , scientific, text, time, unliftio-core, unordered-containers
      }:
      mkDerivation {
        pname = "salak";
-       version = "0.3.5.1";
-       sha256 = "0g41h9a89cp24cm99q1lgiyz794szf85hinybbjz75s33a3lykgv";
+       version = "0.3.5.3";
+       sha256 = "0k6z2vjxg6za6rfhx1xgjdck7ainnsbhrvzav2ngwpvy8li5g02b";
        libraryHaskellDepends = [
          base bytestring containers data-default directory dlist exceptions
-         filepath hashable heaps megaparsec menshen mtl scientific text time
-         unliftio-core unordered-containers
-       ];
-       testHaskellDepends = [
-         base bytestring containers data-default directory dlist exceptions
-         filepath hashable heaps hspec megaparsec menshen mtl QuickCheck
-         random scientific text time unliftio-core unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion data-default directory dlist
-         exceptions filepath hashable heaps megaparsec menshen mtl
-         scientific text time unliftio-core unordered-containers
-       ];
-       description = "Configuration (re)Loader and Parser";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "salak_0_3_5_2" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion
-     , data-default, directory, dlist, exceptions, filepath, hashable
-     , heaps, hspec, hspec-discover, megaparsec, menshen, mtl
-     , QuickCheck, random, scientific, text, time, unliftio-core
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "salak";
-       version = "0.3.5.2";
-       sha256 = "1zz1dy3350amn9mbkmpysk4ykz8x40bmhrbbkbswrqf5kaa2d7xn";
-       libraryHaskellDepends = [
-         base bytestring containers data-default directory dlist exceptions
-         filepath hashable heaps megaparsec menshen mtl scientific text time
+         filepath hashable heaps megaparsec mtl scientific text time
          unliftio-core unordered-containers
        ];
        testHaskellDepends = [
@@ -201496,7 +201475,6 @@ self: {
        ];
        description = "Configuration (re)Loader and Parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salak-toml" = callPackage
@@ -201505,8 +201483,8 @@ self: {
      }:
      mkDerivation {
        pname = "salak-toml";
-       version = "0.3.5.1";
-       sha256 = "1clgsr1aqz2zfnsazhql6m125161yxbfp6q0lc4dllbvdhjygmrf";
+       version = "0.3.5.3";
+       sha256 = "18spk2m75inddz9k0pwg58cr61rfbw1fnki56nnq7jng0wii376y";
        libraryHaskellDepends = [
          base salak text time tomland unordered-containers
        ];
@@ -201529,8 +201507,8 @@ self: {
      }:
      mkDerivation {
        pname = "salak-yaml";
-       version = "0.3.5.1";
-       sha256 = "1qzpbv2g7ds3dbcfi90ncjrk66vm1kxdkkdx1i49jq9g2xcai9n6";
+       version = "0.3.5.3";
+       sha256 = "07wcwld58bdr8n5fdfq98x6c1xdr8rrx919y4f9y7abdnc4aj000";
        libraryHaskellDepends = [ base conduit libyaml salak text ];
        testHaskellDepends = [
          base conduit exceptions hspec libyaml mtl QuickCheck salak text
@@ -202216,6 +202194,35 @@ self: {
        broken = true;
      }) {inherit (pkgs) z3;};
 
+  "sbv_8_4" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, containers
+     , crackNum, deepseq, directory, doctest, filepath, generic-deriving
+     , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb
+     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+     , template-haskell, time, transformers, z3
+     }:
+     mkDerivation {
+       pname = "sbv";
+       version = "8.4";
+       sha256 = "0fv1l99zw29vsfgzym0qvb8qcy1jb7gkd1yj48vy1w0ayg9w01i0";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array async base containers crackNum deepseq directory filepath
+         generic-deriving ghc mtl pretty process QuickCheck random syb
+         template-haskell time transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers crackNum directory doctest filepath Glob
+         hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit
+         tasty-quickcheck template-haskell
+       ];
+       testSystemDepends = [ z3 ];
+       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {inherit (pkgs) z3;};
+
   "sbvPlugin" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , ghc-prim, mtl, process, sbv, tasty, tasty-golden
@@ -204631,29 +204638,6 @@ self: {
      }) {};
 
   "semigroupoids" = callPackage
-    ({ mkDerivation, base, base-orphans, bifunctors, Cabal
-     , cabal-doctest, comonad, containers, contravariant, distributive
-     , doctest, hashable, tagged, template-haskell, transformers
-     , transformers-compat, unordered-containers
-     }:
-     mkDerivation {
-       pname = "semigroupoids";
-       version = "5.3.2";
-       sha256 = "01cxdcflfzx674bhdclf6c7lwgjpbj5yqv8w1fi9dvipyhyj3a31";
-       revision = "1";
-       editedCabalFile = "1r88pi1bvc1w0nys810p3drra6na02zhbaf257dl4lyxl8iv5466";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base base-orphans bifunctors comonad containers contravariant
-         distributive hashable tagged template-haskell transformers
-         transformers-compat unordered-containers
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "Semigroupoids: Category sans id";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "semigroupoids_5_3_3" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, Cabal
      , cabal-doctest, comonad, containers, contravariant, distributive
      , doctest, hashable, tagged, template-haskell, transformers
@@ -204672,7 +204656,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroupoids-syntax" = callPackage
@@ -208224,6 +208207,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "set-cover_0_1" = callPackage
+    ({ mkDerivation, array, base, containers, enummapset, non-empty
+     , prelude-compat, psqueues, QuickCheck, random, semigroups, timeit
+     , transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "set-cover";
+       version = "0.1";
+       sha256 = "1yidgc1nbhbkxpchd96vzfgkk95hdwgpvd9ys2b4xw2m1zyzi1kb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers enummapset non-empty prelude-compat psqueues
+         semigroups transformers utility-ht
+       ];
+       testHaskellDepends = [
+         array base containers enummapset QuickCheck transformers utility-ht
+       ];
+       benchmarkHaskellDepends = [
+         array base containers enummapset QuickCheck random timeit
+         transformers utility-ht
+       ];
+       description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "set-extra" = callPackage
     ({ mkDerivation, base, containers, mtl, syb }:
      mkDerivation {
@@ -209755,6 +209765,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shelly_1_9_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
+     , HUnit, lifted-async, lifted-base, monad-control, mtl, process
+     , text, time, transformers, transformers-base, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "shelly";
+       version = "1.9.0";
+       sha256 = "1kma77gixhyciimh19p64h1ndbcrs9qhk8fgyv71iqh5q57zvday";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions filepath lifted-async lifted-base monad-control mtl
+         process text time transformers transformers-base unix unix-compat
+       ];
+       testHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions filepath hspec hspec-contrib HUnit lifted-async
+         lifted-base monad-control mtl process text time transformers
+         transformers-base unix unix-compat
+       ];
+       description = "shell-like (systems) programming in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shelly-extra" = callPackage
     ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
      , shelly, text
@@ -211661,17 +211699,6 @@ self: {
      }) {};
 
   "singleton-nats" = callPackage
-    ({ mkDerivation, base, singletons }:
-     mkDerivation {
-       pname = "singleton-nats";
-       version = "0.4.2";
-       sha256 = "1wcwks2acnql5ihkjn2543hgdnlw049z8av8x5dp5r552fq6k0cg";
-       libraryHaskellDepends = [ base singletons ];
-       description = "Unary natural numbers relying on the singletons infrastructure";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "singleton-nats_0_4_3" = callPackage
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "singleton-nats";
@@ -211680,7 +211707,6 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singleton-typelits" = callPackage
@@ -215334,6 +215360,8 @@ self: {
        pname = "socks";
        version = "0.6.0";
        sha256 = "10bkf2gw5l48j6g1i2slndcg4nzdqj8syrnbj21gjz6sms3zlqlp";
+       revision = "1";
+       editedCabalFile = "0a7p6gfcmxgrs3rx62qm7fi5hvn90r64px7wbqva4h6scrmywn50";
        libraryHaskellDepends = [
          base basement bytestring cereal network
        ];
@@ -216092,30 +216120,6 @@ self: {
      }) {};
 
   "sparse-tensor" = callPackage
-    ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers
-     , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise
-     , hmatrix, parallel, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, tf-random, zlib
-     }:
-     mkDerivation {
-       pname = "sparse-tensor";
-       version = "0.2.1";
-       sha256 = "10950cp07m1p011n3a14bka2rpfrmn20k0kjb1cvca7dnxn2iv2f";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         ad base bytestring cereal containers deepseq ghc-typelits-knownnat
-         ghc-typelits-natnormalise hmatrix parallel tf-random zlib
-       ];
-       testHaskellDepends = [
-         base hmatrix QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "typesafe tensor algebra library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "sparse-tensor_0_2_1_1" = callPackage
     ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers
      , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise
      , hmatrix, parallel, QuickCheck, tasty, tasty-hunit
@@ -219751,6 +219755,8 @@ self: {
        pname = "stm";
        version = "2.5.0.0";
        sha256 = "1illcj8zgzmpl91hzgk0j74ha436a379gw13siq4gifbcrf6iqsr";
+       revision = "1";
+       editedCabalFile = "189fxk75h7n27kw7ndyn8nkxm3117qdh1dpag1mcs487kxghff62";
        libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
@@ -226252,32 +226258,6 @@ self: {
      }) {};
 
   "tar" = callPackage
-    ({ mkDerivation, array, base, bytestring, bytestring-handle
-     , containers, criterion, deepseq, directory, filepath, QuickCheck
-     , tasty, tasty-quickcheck, time
-     }:
-     mkDerivation {
-       pname = "tar";
-       version = "0.5.1.0";
-       sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8";
-       revision = "1";
-       editedCabalFile = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq directory filepath time
-       ];
-       testHaskellDepends = [
-         array base bytestring bytestring-handle containers deepseq
-         directory filepath QuickCheck tasty tasty-quickcheck time
-       ];
-       benchmarkHaskellDepends = [
-         array base bytestring containers criterion deepseq directory
-         filepath time
-       ];
-       description = "Reading, writing and manipulating \".tar\" archive files.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tar_0_5_1_1" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-handle
      , containers, criterion, deepseq, directory, filepath, QuickCheck
      , tasty, tasty-quickcheck, time
@@ -226299,7 +226279,6 @@ self: {
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tar-conduit" = callPackage
@@ -226611,10 +226590,8 @@ self: {
     ({ mkDerivation, base, tagged, tasty }:
      mkDerivation {
        pname = "tasty-expected-failure";
-       version = "0.11.1.1";
-       sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji";
-       revision = "1";
-       editedCabalFile = "1b3fn7d3zwhhwm3gp8cmmsdcrvn9dhshd665xrx1mk6cmy4m8k16";
+       version = "0.11.1.2";
+       sha256 = "175gdk1mkslcwjxajkbl4zmaigzf8h4svzd7va5qb519y0dxk28n";
        libraryHaskellDepends = [ base tagged tasty ];
        description = "Mark tasty tests as failure expected";
        license = stdenv.lib.licenses.mit;
@@ -227687,12 +227664,12 @@ self: {
        broken = true;
      }) {};
 
-  "template-haskell_2_14_0_0" = callPackage
+  "template-haskell_2_15_0_0" = callPackage
     ({ mkDerivation, base, ghc-boot-th, pretty }:
      mkDerivation {
        pname = "template-haskell";
-       version = "2.14.0.0";
-       sha256 = "1y8l2g95mhd2j09bq05q2rj6rn2ni86yhf4kgha3y5qig7j8lyy9";
+       version = "2.15.0.0";
+       sha256 = "16p8szb5by7gyk5r5cnrdp3b613vp5wasqj8dz63my17l2lsp2wl";
        libraryHaskellDepends = [ base ghc-boot-th pretty ];
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -229945,6 +229922,8 @@ self: {
        pname = "text-short";
        version = "0.1.3";
        sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz";
+       revision = "1";
+       editedCabalFile = "0lb4papn54fbgjdqj4ladaf5q12dhlwkg5z2vc5qxlh35x82sw4a";
        libraryHaskellDepends = [
          base binary bytestring deepseq ghc-prim hashable text
        ];
@@ -230569,10 +230548,8 @@ self: {
     ({ mkDerivation, base, containers, syb, template-haskell }:
      mkDerivation {
        pname = "th-expand-syns";
-       version = "0.4.4.0";
-       sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc";
-       revision = "1";
-       editedCabalFile = "1zbdg3hrqv7rzlsrw4a2vjr3g4nzny32wvjcpxamlvx77b1jvsw9";
+       version = "0.4.5.0";
+       sha256 = "1p4wfyycan8zsp9wi7npx36qwbfsbcgdyxi3ii51scf69dkrx42y";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Expands type synonyms in Template Haskell ASTs";
@@ -231842,8 +231819,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal-vis";
-       version = "1.0.14";
-       sha256 = "1l924nqv8ljd9ljpy05r18j0rc5if3k5lvpifv2g8fn967gi0nfs";
+       version = "1.0.15";
+       sha256 = "0h198v3p1z8bmn993w54a7pm4s445lvf7683h23wydpnfckxv06h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -233356,6 +233333,30 @@ self: {
        broken = true;
      }) {};
 
+  "tmp-postgres_0_3_0_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, directory, hspec
+     , hspec-discover, mtl, network, port-utils, postgres-options
+     , postgresql-libpq, postgresql-simple, process, temporary, unix
+     }:
+     mkDerivation {
+       pname = "tmp-postgres";
+       version = "0.3.0.1";
+       sha256 = "1h0n3kd5wz4lhg2m4zkyd0vhynrpdvvwlrngyj62d27i1qk2livy";
+       libraryHaskellDepends = [
+         async base bytestring directory network port-utils postgres-options
+         postgresql-simple process temporary unix
+       ];
+       testHaskellDepends = [
+         base bytestring directory hspec hspec-discover mtl postgresql-libpq
+         postgresql-simple process temporary
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Start and stop a temporary postgres for testing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "tmpl" = callPackage
     ({ mkDerivation, base, bytestring, directory, template, text }:
      mkDerivation {
@@ -234103,6 +234104,8 @@ self: {
        pname = "topograph";
        version = "1";
        sha256 = "0vm7ja5f677lpphfmggx68h144k0fzj0n6r6ypf5474da405xad7";
+       revision = "1";
+       editedCabalFile = "0pgvjjzmlc947xb1jx1l3bjxz6p9ldm3zlqlm7wf0bcfrznfxgqc";
        libraryHaskellDepends = [
          base base-compat base-orphans containers vector
        ];
@@ -236350,8 +236353,8 @@ self: {
      }:
      mkDerivation {
        pname = "ttl-hashtables";
-       version = "1.3.1.0";
-       sha256 = "0ny9iynlhpaqvqip7i9n5as21mk0kzm6akbcy7xgkams8dv76k5h";
+       version = "1.3.1.1";
+       sha256 = "14ammgggkfmc4divr1zykjadad5fzgspjnzpjfdzj3vwm1rf5gwv";
        libraryHaskellDepends = [
          base clock containers data-default failable hashable hashtables mtl
          transformers
@@ -236643,6 +236646,22 @@ self: {
        broken = true;
      }) {};
 
+  "tuples" = callPackage
+    ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "tuples";
+       version = "0.1.0.0";
+       sha256 = "0kq12l0q7d9mdkmcp2sm7pjgfh00vqkhi0id32sny1lqcnavp415";
+       libraryHaskellDepends = [ base primitive ];
+       testHaskellDepends = [
+         base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck
+       ];
+       description = "Small monomorphic tuples";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tuples-homogenous-h98" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -236854,28 +236873,27 @@ self: {
      }) {};
 
   "tweet-hs" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
-     , bytestring, composition-prelude, containers, criterion
-     , data-default, directory, extra, hspec, htoml-megaparsec
-     , http-client, http-client-tls, http-types, megaparsec, microlens
-     , optparse-applicative, split, text, unordered-containers
+    ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base
+     , bytestring, composition-prelude, containers, criterion, directory
+     , extra, htoml-megaparsec, http-client, http-client-tls, http-types
+     , megaparsec, microlens, optparse-applicative, split, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.43";
-       sha256 = "10bxkllxiwm1xbvpz4wh1gd24qkz8y0b7z4ciwqk13jz5ha966x0";
+       version = "1.0.2.1";
+       sha256 = "0b277whd3jywb6w0gkaijmzadpwabmyxvxyg6fmsysq1kp3isrnm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint authenticate-oauth base bytestring
-         composition-prelude containers data-default extra htoml-megaparsec
-         http-client http-client-tls http-types megaparsec microlens split
-         text unordered-containers
+         ansi-wl-pprint authenticate-oauth base bytestring
+         composition-prelude containers extra htoml-megaparsec http-client
+         http-client-tls http-types megaparsec microlens split text
+         unordered-containers
        ];
        executableHaskellDepends = [
          base bytestring directory optparse-applicative
        ];
-       testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
        description = "Command-line tool for twitter";
        license = stdenv.lib.licenses.bsd3;
@@ -244245,6 +244263,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "viewprof_0_0_0_29" = callPackage
+    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
+     , scientific, text, vector, vector-algorithms, vty
+     }:
+     mkDerivation {
+       pname = "viewprof";
+       version = "0.0.0.29";
+       sha256 = "1cy1p1dq6blval791x01rpf1ihqawyj1shfgz46hmmfx1f5dlcdv";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick containers directory ghc-prof lens scientific text
+         vector vector-algorithms vty
+       ];
+       description = "Text-based interactive GHC .prof viewer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "views" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -253708,35 +253745,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
-     , mockery, mtl, raw-strings-qq, resourcet, scientific
-     , template-haskell, temporary, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "yaml";
-       version = "0.11.1.1";
-       sha256 = "0zshpjggz3agzvqwirywpz79q4wq43vsz0pw1iq4dhf4ajjrmzrp";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         filepath libyaml mtl resourcet scientific template-haskell text
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base-compat bytestring conduit containers
-         directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq
-         resourcet scientific template-haskell temporary text transformers
-         unordered-containers vector
-       ];
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yaml_0_11_1_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , conduit, containers, directory, filepath, hspec, HUnit, libyaml
      , mockery, mtl, raw-strings-qq, resourcet, scientific
@@ -253763,7 +253771,6 @@ self: {
        ];
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-combinators" = callPackage
@@ -254618,8 +254625,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth";
-       version = "1.6.7";
-       sha256 = "0p9c26ic45bmsjvfb7kam87ja2vbd4m7qm27znvfrn9wvijhjzp9";
+       version = "1.6.8";
+       sha256 = "0d2nrzrqymbbp5hfwp7c6k6gr0vn6ladq0dl7wgwrybfx8nqgf65";
        libraryHaskellDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup bytestring conduit
@@ -254938,8 +254945,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
-       version = "0.6.1.1";
-       sha256 = "19y5m94njn26vglnyrpzy59614dj7f7wbgnc354syr8qmdiliczp";
+       version = "0.6.1.2";
+       sha256 = "07jm60q1fbdk53ncirbi8clsimg28k9j12kaq0vx2apn2rlmdy2w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -255197,8 +255204,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.6.15";
-       sha256 = "0rzmx9cx2lzlmhjrbczdpzv6divwr0n6h3330rsdh15kn8wjkfr8";
+       version = "1.6.16";
+       sha256 = "02bzg0cyvb56hjmrcc0m6a0r7y4kq1cjqhkds542rh73w6dm6fpd";
        libraryHaskellDepends = [
          aeson auto-update base blaze-html blaze-markup bytestring
          case-insensitive cereal clientsession conduit conduit-extra
@@ -258469,23 +258476,6 @@ self: {
      }) {};
 
   "zlib" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, zlib
-     }:
-     mkDerivation {
-       pname = "zlib";
-       version = "0.6.2";
-       sha256 = "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d";
-       libraryHaskellDepends = [ base bytestring ];
-       librarySystemDepends = [ zlib ];
-       testHaskellDepends = [
-         base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Compression and decompression in the gzip and zlib formats";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) zlib;};
-
-  "zlib_0_6_2_1" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, zlib
      }:
@@ -258500,7 +258490,6 @@ self: {
        ];
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "zlib-bindings" = callPackage

From f1e3a6961ba661c219b6aaf0997c3c893e1f98ed Mon Sep 17 00:00:00 2001
From: Travis Whitaker <pi.boy.travis@gmail.com>
Date: Wed, 21 Aug 2019 19:38:03 -0700
Subject: [PATCH 737/794] Pass hoogle-local's buildCommand as a file.

This is necessary when a very large number of packages are included in the
package database. Without this change, setting up the build environment will
fail, since the environment will be too large.

This simply applies the technique mentioned in
https://github.com/NixOS/nixpkgs/issues/25057 to solve this problem.
---
 pkgs/development/haskell-modules/hoogle.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index c7fbab6ab88..0bb930a8bb3 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -57,11 +57,11 @@ stdenv.mkDerivation {
   name = "hoogle-local-0.1";
   buildInputs = [ghc hoogle];
 
-  phases = [ "buildPhase" ];
-
   inherit docPackages;
 
-  buildPhase = ''
+  passAsFile = ["buildCommand"];
+
+  buildCommand = ''
     ${lib.optionalString (packages != [] -> docPackages == [])
        ("echo WARNING: localHoogle package list empty, even though"
        + " the following were specified: "

From 94e51c360b4fa474b922d371c43a264379a42af2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2019 14:34:55 +0200
Subject: [PATCH 738/794] haskell-hpack: enable the test suite again

The issue we've had previously is fixed in the latest 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 f0e53b97266..de0a07447e4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1280,7 +1280,7 @@ self: super: {
   hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_0_20190723; };
 
   # https://github.com/sol/hpack/issues/366
-  hpack = dontCheck super.hpack;
+  hpack = self.hpack_0_32_0;
 
   # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7
   graphviz = dontCheck super.graphviz;

From 0f1fc1f27f701b4535bc860db5ae15179305285b Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 30 Aug 2019 19:02:17 +0300
Subject: [PATCH 739/794] haskellPackages.hakyll-images: unmark as broken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0c7cdf3e9c7..0bf1394cf55 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5378,7 +5378,6 @@ broken-packages:
   - hakyll-dir-list
   - hakyll-favicon
   - hakyll-filestore
-  - hakyll-images
   - hakyll-ogmarkup
   - hakyll-R
   - hakyll-sass

From 5464b428e28f3149162eead4031a99e2462f6e87 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 30 Aug 2019 18:53:11 +0200
Subject: [PATCH 740/794] haskellPackages.bisc: unmark as broken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0bf1394cf55..827a87a1a43 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3388,7 +3388,6 @@ broken-packages:
   - birch-beer
   - bird
   - BirdPP
-  - bisc
   - bisect-binary
   - bit-array
   - bit-stream

From d3dd6b5e94ed1d55bd582bc530d54c6568d86ff0 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sun, 1 Sep 2019 18:55:52 -0400
Subject: [PATCH 741/794] haskellPackages.servant-rawm: mark unbroken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 827a87a1a43..715fb297fae 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8803,7 +8803,6 @@ broken-packages:
   - servant-pushbullet-client
   - servant-py
   - servant-quickcheck
-  - servant-rawm
   - servant-reason
   - servant-reflex
   - servant-router

From a921f77d9ef2e402937c4f739a39b77b6a330a11 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sun, 1 Sep 2019 18:56:16 -0400
Subject: [PATCH 742/794] haskellPackages.servant-checked-exceptions: mark
 unbroken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 715fb297fae..93a401dff5a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8774,7 +8774,6 @@ broken-packages:
   - servant-auth-token-leveldb
   - servant-auth-token-persistent
   - servant-auth-token-rocksdb
-  - servant-checked-exceptions
   - servant-cli
   - servant-client-namedargs
   - servant-csharp

From 4f2edc2f5f6617af014c6529166fe9acdc1bb589 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Wed, 28 Aug 2019 17:06:35 -0400
Subject: [PATCH 743/794] haskell.packages.ghc881.haskell-src-exts: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 2209f570732..602d633ee6c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -112,7 +112,7 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/zlib-0.6.2.patch";
     sha256 = "13fy730z9ihyc9kw3qkh642mi0bdbd7bz01dksj1zz845pr9jjif";
   });
-  haskell-src-exts = appendPatch super.haskell-src-exts_1_21_0 (pkgs.fetchpatch {
+  haskell-src-exts = appendPatch super.haskell-src-exts (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch";
     sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3";
   });

From 9072dd16f67f299b970feedb3b36f206b53adadb Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Wed, 28 Aug 2019 16:39:39 -0400
Subject: [PATCH 744/794] ghc881: remove broken unordered-containers override

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 602d633ee6c..76edda22eaa 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -137,7 +137,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
     sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
   });
-  unordered-containers = self.unordered-containers_0_2_10_0;
   attoparsec = appendPatch super.attoparsec (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch";
     sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl";

From 2770597659bce2134d4044088de6f923a0e1b9a7 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Wed, 28 Aug 2019 17:18:40 -0400
Subject: [PATCH 745/794] haskell.packages.ghc881.th-abstraction: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 76edda22eaa..29289f052ac 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -104,10 +104,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
     sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
   });
-  th-abstraction = appendPatch (doJailbreak super.th-abstraction) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/th-abstraction-0.2.11.0.patch";
-    sha256 = "0czqfszfblz6bvsybcd1z5jijj79f9czqq6dn992wp2gibsbrgj3";
-  });
   zlib = appendPatch super.zlib (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/zlib-0.6.2.patch";
     sha256 = "13fy730z9ihyc9kw3qkh642mi0bdbd7bz01dksj1zz845pr9jjif";

From 383e3f5f43f29c90023ac1af69c1dede4daf842c Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Wed, 28 Aug 2019 17:20:02 -0400
Subject: [PATCH 746/794] haskell.packages.ghc881.th-lift: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 29289f052ac..2fd241c4183 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -59,7 +59,6 @@ self: super: {
   split = doJailbreak super.split;
   tasty-expected-failure = doJailbreak super.tasty-expected-failure;
   test-framework = doJailbreak super.test-framework;
-  th-lift = self.th-lift_0_8_0_1;
 
   # These packages don't work and need patching and/or an update.
   primitive = overrideSrc (doJailbreak super.primitive) {

From 93dd24aa6ab67e9c4dc7e65baf8386264c7fc7e6 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Wed, 28 Aug 2019 17:45:27 -0400
Subject: [PATCH 747/794] haskell.packages.ghc881.attoparsec: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 2fd241c4183..2894d758d3c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -132,7 +132,7 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
     sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
   });
-  attoparsec = appendPatch super.attoparsec (pkgs.fetchpatch {
+  attoparsec = appendPatch (doJailbreak super.attoparsec) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch";
     sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl";
   });

From c8aee770a0d9912b1cb0c7ae7753b9cf246d9172 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Wed, 28 Aug 2019 16:53:10 -0400
Subject: [PATCH 748/794] ghc881: fix happy build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 2894d758d3c..c3cf203a823 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -120,8 +120,8 @@ self: super: {
     sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
   });
   happy = appendPatch super.happy (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.9.patch";
-    sha256 = "1zmcb7dgcwivq2mddcy1f20djw2kds1m7ahwsa4xpbbwnijc6zjx";
+    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.11.patch";
+    sha256 = "16m659kxbq0s87ak2y1pqggfy67yfvcwc0zi3hcphf3v8735xhkk";
   });
   hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch";

From 02b965ed7de3208a5c3310b3be5e9f69e062ed43 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 13:38:39 -0400
Subject: [PATCH 749/794] haskell.packages.ghc881.dlist: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index c3cf203a823..fd402319d95 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -81,10 +81,6 @@ self: super: {
       sed -i -e 's/time < 1.9/time < 2/' tar.cabal
     '';
   });
-  dlist = appendPatch (doJailbreak super.dlist) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch";
-    sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc";
-  });
   vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
     sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";

From b747fdac9e11615c7c0342053bf00081c679db61 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 13:39:00 -0400
Subject: [PATCH 750/794] haskell.packages.ghc881.cabal-doctest: fix build

---
 .../haskell-modules/configuration-ghc-8.8.x.nix     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index fd402319d95..b7e33f4863b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -85,10 +85,15 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
     sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";
   });
-  cabal-doctest = appendPatch  (doJailbreak super.cabal-doctest) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cabal-doctest-1.0.6.patch";
-    sha256 = "0735mkxhv557pgnfvdjakkw9r85l5gy28grdwg929m26ghbf9s8j";
-  });
+  cabal-doctest = overrideSrc (doJailbreak super.cabal-doctest) {
+    version = "1.0.7";
+    src = pkgs.fetchFromGitHub {
+      owner = "phadej";
+      repo = "cabal-doctest";
+      rev = "5abe80fe4ef2eca337bad719d957a0fe1b571392";
+      sha256 = "08040fjkdlg7ll3jrc7xpbn0ca6y22zlvngnz1inh511f4wvq80d";
+    };
+  };
   regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
     sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";

From 1c474c5edcf4038ee57f828dc987c60ee4c488a2 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 13:39:16 -0400
Subject: [PATCH 751/794] haskell.packages.ghc881.polyparse: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index b7e33f4863b..0006bec4297 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -153,5 +153,8 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch";
     sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1";
   });
-
+  polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch {
+    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch";
+    sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
+  });
 }

From 2ffd53d5b9f16af6d8fda41553cd7d8d6dd1ae94 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 13:45:47 -0400
Subject: [PATCH 752/794] haskell.packages.ghc881.aeson: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 0006bec4297..8311b18dc21 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -137,10 +137,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch";
     sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl";
   });
-  aeson = appendPatch (dontCheck super.aeson) (pkgs.fetchpatch {   # the test suite breaks the compiler
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/aeson-1.4.3.0.patch";
-    sha256 = "1z6wmsmc682qs3y768r0zx493dxardwbsp0wdc4dsx83c0m5x66f";
-  });
   cassava = appendPatch super.cassava (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
     sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";

From c5c538942d10f05a376531a92ac14d4d130671ee Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 13:55:08 -0400
Subject: [PATCH 753/794] haskell.packages.ghc881.socks: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 8311b18dc21..9fc1cdf39f6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -145,6 +145,10 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
     sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
   });
+  socks = appendPatch super.socks (pkgs.fetchpatch {
+    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
+    sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
+  });
   lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch";
     sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1";

From 25ac083d251a0ab1150705ebcd627ae1b16b0345 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 14:01:37 -0400
Subject: [PATCH 754/794] haskell.packages.ghc881.foundation: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 9fc1cdf39f6..a6706c39ef8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -157,4 +157,5 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch";
     sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
   });
+  foundation = dontCheck super.foundation;
 }

From b466079cd675aa7452a5cf76e9fca4065d4eea15 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 15:00:30 -0400
Subject: [PATCH 755/794] haskell.packages.ghc881.memory: fix build

---
 .../haskell-modules/configuration-ghc-8.8.x.nix          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index a6706c39ef8..8aee7637614 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -158,4 +158,13 @@ self: super: {
     sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
   });
   foundation = dontCheck super.foundation;
+  memory = overrideCabal (appendPatch super.memory (pkgs.fetchpatch {
+    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.patch";
+    sha256 = "16ar8921s3bi31y1az9zgyg0iaxxc2wvvwqjnl11a17p03wi6b29";
+  })) (drv: {
+    editedCabalFile = null;
+    preConfigure = ''
+      cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.cabal"; sha256 = "1325wny0irnq51rz0f4xgkvm01p6n4z5jid2jgpkhjac8a2sdgwl";}} memory.cabal
+    '';
+  });
 }

From 5e91bfa80acea3dabca7034f8a517044965b6270 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 15:02:27 -0400
Subject: [PATCH 756/794] haskell.packages.ghc881.cabal-doctest: use
 super.cabal-doctest_1_0_7

---
 .../haskell-modules/configuration-ghc-8.8.x.nix        | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 8aee7637614..23390518b68 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -85,15 +85,7 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
     sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";
   });
-  cabal-doctest = overrideSrc (doJailbreak super.cabal-doctest) {
-    version = "1.0.7";
-    src = pkgs.fetchFromGitHub {
-      owner = "phadej";
-      repo = "cabal-doctest";
-      rev = "5abe80fe4ef2eca337bad719d957a0fe1b571392";
-      sha256 = "08040fjkdlg7ll3jrc7xpbn0ca6y22zlvngnz1inh511f4wvq80d";
-    };
-  };
+  cabal-doctest = super.cabal-doctest_1_0_7;
   regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
     sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";

From 5641a8da281baa02b2556d6138c9edf8e1d05a0f Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 17:42:46 -0400
Subject: [PATCH 757/794] haskell.packages.ghc881.yaml: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 23390518b68..241cc49a145 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -159,4 +159,5 @@ self: super: {
       cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.cabal"; sha256 = "1325wny0irnq51rz0f4xgkvm01p6n4z5jid2jgpkhjac8a2sdgwl";}} memory.cabal
     '';
   });
+  yaml = self.yaml_0_11_1_2;
 }

From dff789ddabd0d71ad6077abe085baa627f9cbe99 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 17:43:23 -0400
Subject: [PATCH 758/794] haskell.packages.ghc881.chell: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 241cc49a145..a91566e10a5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -159,5 +159,8 @@ self: super: {
       cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.cabal"; sha256 = "1325wny0irnq51rz0f4xgkvm01p6n4z5jid2jgpkhjac8a2sdgwl";}} memory.cabal
     '';
   });
+  chell = overrideCabal (doJailbreak super.chell) (_drv: {
+    broken = false;
+  });
   yaml = self.yaml_0_11_1_2;
 }

From 8c1e16bd5c54849280b60f14d3292fcb8250f4fb Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 17:51:03 -0400
Subject: [PATCH 759/794] haskell.packages.ghc881.system-fileio: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index a91566e10a5..d173c5e7bc7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -162,5 +162,6 @@ self: super: {
   chell = overrideCabal (doJailbreak super.chell) (_drv: {
     broken = false;
   });
+  system-fileio = doJailbreak super.system-fileio;
   yaml = self.yaml_0_11_1_2;
 }

From 548c363a0d11d1830e82f4c688ef485dbbb0b770 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 18:09:51 -0400
Subject: [PATCH 760/794] haskell.packages.ghc881.th-expand-syns: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index d173c5e7bc7..5d33fc22c72 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -162,6 +162,7 @@ self: super: {
   chell = overrideCabal (doJailbreak super.chell) (_drv: {
     broken = false;
   });
+  th-expand-syns = doJailbreak super.th-expand-syns;
   system-fileio = doJailbreak super.system-fileio;
   yaml = self.yaml_0_11_1_2;
 }

From 4d779b0e8ed7d2925c0a593a4e6071f7c6f66fc8 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 18:10:13 -0400
Subject: [PATCH 761/794] haskell.packages.ghc881.shelly: fix build

---
 .../haskell-modules/configuration-ghc-8.8.x.nix        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 5d33fc22c72..cdc963386f8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -163,6 +163,16 @@ self: super: {
     broken = false;
   });
   th-expand-syns = doJailbreak super.th-expand-syns;
+  shelly = overrideCabal (appendPatch (doJailbreak super.shelly) (pkgs.fetchpatch {
+    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.patch";
+    sha256 = "1kglbwrr4ra81v9x3bfsk5l6pyl0my2a1zkr3qjjx7acn0dfpgbc";
+  })) (drv: {
+    editedCabalFile = null;
+    preConfigure = ''
+      cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.cabal"; sha256 = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";}} shelly.cabal
+      sed -i -e 's/< 1.9,/< 2,/' shelly.cabal # bump time version
+    '';
+  });
   system-fileio = doJailbreak super.system-fileio;
   yaml = self.yaml_0_11_1_2;
 }

From e5d3c59fc449dcb7c040e3f9c32e9bb1d4060149 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 18:21:46 -0400
Subject: [PATCH 762/794] haskell.packages.ghc881.haskell-src-meta: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index cdc963386f8..711bc308114 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -175,4 +175,8 @@ self: super: {
   });
   system-fileio = doJailbreak super.system-fileio;
   yaml = self.yaml_0_11_1_2;
+  haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch";
+    sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc";
+  });
 }

From 7cb55e87427ffcb74aaf70396cf8474c80d964af Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 18:45:13 -0400
Subject: [PATCH 763/794] haskell.packages.ghc881.asn1-encoding: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 711bc308114..7c077523011 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -179,4 +179,8 @@ self: super: {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch";
     sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc";
   });
+  asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch";
+    sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
+  });
 }

From 67588cdd4b9ec6de1e5d4d594b4f3fdc3e54cb98 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Thu, 29 Aug 2019 18:48:29 -0400
Subject: [PATCH 764/794] haskell.packages.ghc881.tls: fix build

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 7c077523011..0eb9d67e18c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -183,4 +183,5 @@ self: super: {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch";
     sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
   });
+  tls = self.tls_1_5_1;
 }

From 5791d8e600e46f0f72c6dea3ffa1edfcdca3277f Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Mon, 2 Sep 2019 15:19:40 +0200
Subject: [PATCH 765/794] haskell-modules: update configuration-common.nix

---
 .../haskell-modules/configuration-common.nix  | 84 ++-----------------
 .../configuration-hackage2nix.yaml            |  3 -
 2 files changed, 7 insertions(+), 80 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index de0a07447e4..1fc8d68164b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -985,25 +985,17 @@ self: super: {
     '';
   });
 
-  # https://github.com/haskell-rewriting/term-rewriting/issues/11
-  term-rewriting = dontCheck (doJailbreak super.term-rewriting);
+  # https://github.com/haskell-rewriting/term-rewriting/pull/15
+  # remove on next hackage update
+  term-rewriting = doJailbreak super.term-rewriting;
 
-  # https://github.com/nick8325/twee/pull/1
-  twee-lib = dontHaddock super.twee-lib;
-
-  # Needs older hlint
-  hpio = dontCheck super.hpio;
-
-  # https://github.com/fpco/inline-c/issues/72
-  inline-c = dontCheck super.inline-c;
-
-  # https://github.com/GaloisInc/pure-zlib/issues/6
+  # https://github.com/GaloisInc/pure-zlib/pull/11
   pure-zlib = doJailbreak super.pure-zlib;
 
-  # https://github.com/strake/lenz-template.hs/issues/1
+  # https://github.com/strake/lenz-template.hs/pull/2
   lenz-template = doJailbreak super.lenz-template;
 
-  # https://github.com/haskell-hvr/resolv/issues/1
+  # https://github.com/haskell-hvr/resolv/pull/6
   resolv = dontCheck super.resolv;
   resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2;
 
@@ -1016,11 +1008,6 @@ self: super: {
     testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
     preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
   });
-  arbtt = overrideCabal super.arbtt (drv: {
-    preCheck = ''
-      for n in $PWD/dist/build/*; do PATH+=":$n"; done
-    '';
-  });
 
   # This package refers to the wrong library (itself in fact!)
   vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
@@ -1031,14 +1018,11 @@ self: super: {
   # };
 
   # https://github.com/dmwit/encoding/pull/3
-  encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;
+  encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch);
 
   # Work around overspecified constraint on github ==0.18.
   github-backup = doJailbreak super.github-backup;
 
-  # https://github.com/fpco/streaming-commons/issues/49
-  streaming-commons = dontCheck super.streaming-commons;
-
   # Test suite depends on old QuickCheck 2.10.x.
   cassava = dontCheck super.cassava;
 
@@ -1069,16 +1053,9 @@ self: super: {
       super.dhall-nix
   );
 
-  # https://github.com/well-typed/cborg/issues/174
-  cborg = doJailbreak super.cborg;
-  serialise = doJailbreak (dontCheck super.serialise);
-
   # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
   netrc = doJailbreak super.netrc;
 
-  # https://github.com/phadej/tree-diff/issues/19
-  tree-diff = doJailbreak super.tree-diff;
-
   # https://github.com/haskell-hvr/hgettext/issues/14
   hgettext = doJailbreak super.hgettext;
 
@@ -1089,23 +1066,6 @@ self: super: {
   haddock-library = doJailbreak (dontCheck super.haddock-library);
   # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
 
-  # haskell-names-0.9.4: Break out of “tasty >=0.12 && <1.2”
-  haskell-names = doJailbreak super.haskell-names;
-
-  # hdocs-0.5.3.1: Break out of “haddock-api ==2.21.*”
-  # cannot use doJailbreak due to https://github.com/peti/jailbreak-cabal/issues/7
-  hdocs = overrideCabal super.hdocs (drv: {
-    postPatch = ''
-      sed -i 's#haddock-api == 2\.21\.\*,#haddock-api == 2.22.*,#' hdocs.cabal
-    '';
-  });
-
-  # Break out of tasty >=0.10 && <1.2.
-  aeson-compat = doJailbreak super.aeson-compat;
-
-  # Break out of pretty-show >=1.6 && <1.9
-  hedgehog = doJailbreak super.hedgehog;
-
   # Generate shell completion.
   cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
   stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
@@ -1146,22 +1106,6 @@ self: super: {
   # Generate shell completions
   purescript = generateOptparseApplicativeCompletion "purs" super.purescript;
 
-  # https://github.com/adinapoli/mandrill/pull/52
-  mandrill = appendPatch super.mandrill (pkgs.fetchpatch {
-    url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;
-    sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
-  });
-
-  # https://github.com/Euterpea/Euterpea2/pull/22
-  Euterpea = overrideSrc super.Euterpea {
-    src = pkgs.fetchFromGitHub {
-      owner = "Euterpea";
-      repo = "Euterpea2";
-      rev = "6f49b790adfb8b65d95a758116c20098fb0cd34c";
-      sha256 = "0qz1svb96n42nmig16vyphwxas34hypgayvwc91ri7w7xd6yi1ba";
-    };
-  };
-
   # https://github.com/kcsongor/generic-lens/pull/65
   generic-lens = dontCheck super.generic-lens;
 
@@ -1186,7 +1130,6 @@ self: super: {
 
   # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
   tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
-  these = doJailbreak super.these; # until these >= 0.7.6
 
   uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch {
     url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch";
@@ -1198,13 +1141,6 @@ self: super: {
     testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
     });
 
-  # https://github.com/sighingnow/computations/pull/1
-  primesieve = appendPatch super.primesieve (pkgs.fetchpatch {
-    url = "https://github.com/sighingnow/computations/commit/1f96788367c879b999afe733e2fe28d919d17702.patch";
-    sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x";
-    stripLen = 1;
-    });
-
   # Fix for base >= 4.11
   scat = overrideCabal super.scat (drv: {
     patches = [(pkgs.fetchpatch {
@@ -1239,9 +1175,6 @@ self: super: {
   # Fix build with attr-2.4.48 (see #53716)
   xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
 
-  # Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65)
-  yesod-markdown = doJailbreak super.yesod-markdown;
-
   # These packages needs network 3.x, which is not in LTS-13.x.
   network-bsd_2_8_1_0 = super.network-bsd_2_8_1_0.override { network = self.network_3_0_1_1; };
   lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
@@ -1270,9 +1203,6 @@ self: super: {
   # https://github.com/pruvisto/heap/issues/11
   heap = dontCheck super.heap;
 
-  # https://github.com/hslua/tasty-lua/issues/1
-  tasty-lua = dontCheck super.tasty-lua;
-
   # Test suite won't link for no apparent reason.
   constraints-deriving = dontCheck super.constraints-deriving;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 93a401dff5a..8817b6558e0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4547,7 +4547,6 @@ broken-packages:
   - Empty
   - empty-monad
   - enchant
-  - encoding
   - encoding-io
   - engine-io-growler
   - engine-io-snap
@@ -4619,7 +4618,6 @@ broken-packages:
   - euler-tour-tree
   - euphoria
   - eurofxref
-  - Euterpea
   - eve
   - eve-cli
   - event
@@ -10204,7 +10202,6 @@ broken-packages:
   - xkcd
   - xleb
   - xlsior
-  - xlsx
   - xlsx-tabular
   - xlsx-templater
   - xml-catalog

From 6beccdcb8346598c39013c28a34fdd6d010492a8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Sep 2019 21:00:00 -0500
Subject: [PATCH 766/794] haskellPackages: unbreak cachix build

---
 pkgs/development/haskell-modules/configuration-common.nix  | 7 +++++++
 .../haskell-modules/configuration-hackage2nix.yaml         | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1fc8d68164b..7b173da2a91 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -77,6 +77,13 @@ self: super: {
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
   };
 
+  # compatibility with servant-0.16.2. Remove with the next release
+  cachix = appendPatch super.cachix (pkgs.fetchpatch {
+    url = "https://github.com/cachix/cachix/commit/051679a99cd56e2497c0f05310035b6649129a13.patch";
+    sha256 = "198n5byp9mfiymgzpvyd42l6vqy6hfy9kdi7svfx7mcwsy7sg7kp";
+    stripLen = 1;
+  });
+
   # Fix test trying to access /home directory
   shell-conduit = overrideCabal super.shell-conduit (drv: {
     postPatch = "sed -i s/home/tmp/ test/Spec.hs";
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8817b6558e0..c0f3ec25fe8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3592,8 +3592,6 @@ broken-packages:
   - cabin
   - cabocha
   - cached
-  - cachix
-  - cachix-api
   - cacophony
   - caffegraph
   - cairo-core

From de84b81ebf2feafab3385d8a8a8f01c9ede6b4e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Sep 2019 02:30:54 +0200
Subject: [PATCH 767/794] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.14.4-7-ga804c35 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/54f9c36e54e46aec6daeb06fafaa9414fcb0cd2f.
---
 .../haskell-modules/hackage-packages.nix      | 475 +++++++++++++++---
 1 file changed, 404 insertions(+), 71 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 040094d5dca..19295cc2752 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5372,8 +5372,6 @@ self: {
        ];
        description = "Library for computer music research and education";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EventSocket" = callPackage
@@ -32685,8 +32683,8 @@ self: {
        pname = "atto-lisp";
        version = "0.2.2.3";
        sha256 = "00a7w4jysx55y5xxmgm09akvhxxa3fs68wqn6mp789bvhvdk9khd";
-       revision = "1";
-       editedCabalFile = "0im8kc54hkfj578ck79j0ijc3iaigvx06pgj4sk8za26ryy7v46q";
+       revision = "2";
+       editedCabalFile = "065v6vllvwvm0zpkra7bl2hpz1lnhara13965p75pzdppv8ghd6w";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          deepseq text
@@ -33215,46 +33213,41 @@ self: {
      }) {};
 
   "aura" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, array
-     , async, aur, base, base-prelude, bytestring, compactable
-     , containers, directory, errors, filepath, freer-simple
-     , generic-lens, http-client, http-client-tls, http-types
-     , language-bash, megaparsec, microlens, microlens-ghc, mtl
-     , mwc-random, network-uri, non-empty-containers
+    ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, aur, base
+     , base-prelude, bytestring, compactable, containers, directory
+     , errors, filepath, fused-effects, generic-lens, http-client
+     , http-client-tls, http-types, language-bash, megaparsec, microlens
+     , microlens-ghc, mwc-random, network-uri, nonempty-containers
      , optparse-applicative, paths, pretty-simple, prettyprinter
-     , prettyprinter-ansi-terminal, semigroupoids, stm, tasty
-     , tasty-hunit, text, throttled, time, transformers, typed-process
-     , versions, witherable
+     , prettyprinter-ansi-terminal, scheduler, semigroupoids, stm, tasty
+     , tasty-hunit, text, these, time, transformers, typed-process
+     , unliftio, versions
      }:
      mkDerivation {
        pname = "aura";
-       version = "2.0.0";
-       sha256 = "1k53r44kxy7p23nsjbx12mvn7nkl8j3h9fzy4v3dxyqkd4jz0996";
-       revision = "1";
-       editedCabalFile = "1z73n5fcrp23hms0l6r45p1knqqlng8g4gfb44a4raqj7da823zj";
+       version = "2.0.2";
+       sha256 = "1r11dzyy7z759ch664cml6lywh7033s6qrv56mkn41kn91jrl3qy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty algebraic-graphs array async aur base
-         base-prelude bytestring compactable containers directory errors
-         filepath freer-simple generic-lens http-client http-types
-         language-bash megaparsec microlens microlens-ghc mtl mwc-random
-         network-uri non-empty-containers paths pretty-simple prettyprinter
-         prettyprinter-ansi-terminal semigroupoids stm text throttled time
-         transformers typed-process versions witherable
+         aeson aeson-pretty algebraic-graphs aur base base-prelude
+         bytestring compactable containers directory errors filepath
+         fused-effects generic-lens http-client http-types language-bash
+         megaparsec microlens microlens-ghc mwc-random network-uri
+         nonempty-containers paths prettyprinter prettyprinter-ansi-terminal
+         scheduler semigroupoids stm text these time transformers
+         typed-process unliftio versions
        ];
        executableHaskellDepends = [
-         base base-prelude bytestring containers errors freer-simple
-         http-client http-client-tls language-bash microlens
-         non-empty-containers optparse-applicative paths pretty-simple
-         prettyprinter prettyprinter-ansi-terminal text transformers
-         typed-process versions
+         base base-prelude bytestring containers errors fused-effects
+         http-client http-client-tls microlens nonempty-containers
+         optparse-applicative paths pretty-simple prettyprinter
+         prettyprinter-ansi-terminal text transformers typed-process
+         versions
        ];
        testHaskellDepends = [
-         base base-prelude bytestring containers errors freer-simple
-         http-client language-bash megaparsec microlens non-empty-containers
-         paths pretty-simple prettyprinter prettyprinter-ansi-terminal tasty
-         tasty-hunit text transformers typed-process versions
+         base base-prelude bytestring containers megaparsec microlens paths
+         tasty tasty-hunit text versions
        ];
        description = "A secure package manager for Arch Linux and the AUR, written in Haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -36820,6 +36813,8 @@ self: {
        pname = "bencode";
        version = "0.6.0.0";
        sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv";
+       revision = "1";
+       editedCabalFile = "0nvph7frmrra9k57v01saxgnhf1ma3m8qzwj1i53pswssfnj41mv";
        libraryHaskellDepends = [
          base binary bytestring containers parsec
        ];
@@ -45955,8 +45950,6 @@ self: {
        ];
        description = "Command line client for Nix binary cache hosting https://cachix.org";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cachix-api" = callPackage
@@ -45992,8 +45985,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Servant HTTP API specification for https://cachix.org";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cacophony" = callPackage
@@ -56249,8 +56240,8 @@ self: {
      }:
      mkDerivation {
        pname = "conferer";
-       version = "0.1.0.0";
-       sha256 = "0y62yj2cm7q9qwxl3jfdq16rza2mrjg60lchx4s0gbwiw959a83n";
+       version = "0.1.0.1";
+       sha256 = "1g5kyvy067lll181xqd1lxpzl5965yj847kh6z2r0wvq01i4k467";
        libraryHaskellDepends = [
          base bytestring containers directory text
        ];
@@ -56701,8 +56692,8 @@ self: {
        pname = "connection";
        version = "0.3.0";
        sha256 = "1f53bysp8zr8c8dhivrq2k9qmlwnk84d4c1s31sd62ws9yddcw34";
-       revision = "1";
-       editedCabalFile = "0cm421anscv6h4nvhkaqvi5s3lwkc0f34p6z8lzap4wyc4gv578k";
+       revision = "3";
+       editedCabalFile = "17l56sgrirlcfgi18svbkv9233yxd81ymyr3k8k712rzf5gi6rpi";
        libraryHaskellDepends = [
          base basement bytestring containers data-default-class network
          socks tls x509 x509-store x509-system x509-validation
@@ -56711,6 +56702,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "connection_0_3_1" = callPackage
+    ({ mkDerivation, base, basement, bytestring, containers
+     , data-default-class, network, socks, tls, x509, x509-store
+     , x509-system, x509-validation
+     }:
+     mkDerivation {
+       pname = "connection";
+       version = "0.3.1";
+       sha256 = "1nbmafhlg0wy4aa3p7amjddbamdz6avzrxn4py3lvhrjqn4raxax";
+       revision = "1";
+       editedCabalFile = "08f1n38zryd0jklyv3yillilp040zxfxha6jphrmf28haq2irnk5";
+       libraryHaskellDepends = [
+         base basement bytestring containers data-default-class network
+         socks tls x509 x509-store x509-system x509-validation
+       ];
+       description = "Simple and easy network connections API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "connection-pool" = callPackage
     ({ mkDerivation, base, between, data-default-class, monad-control
      , network, resource-pool, streaming-commons, time
@@ -70836,6 +70847,28 @@ self: {
        broken = true;
      }) {};
 
+  "dl-fedora_0_6" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , http-directory, http-types, optparse-applicative, regex-posix
+     , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs
+     }:
+     mkDerivation {
+       pname = "dl-fedora";
+       version = "0.6";
+       sha256 = "1kq9hhpgh24kfgf9b25zppmfbylcqx0scs96dp0nbyj3rp6yl8rh";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring directory filepath http-directory http-types
+         optparse-applicative regex-posix simple-cmd simple-cmd-args text
+         unix xdg-userdirs
+       ];
+       description = "Fedora image download tool";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "dlist" = callPackage
     ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
      mkDerivation {
@@ -71357,7 +71390,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "doctemplates_0_5" = callPackage
+  "doctemplates_0_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , doclayout, filepath, Glob, mtl, parsec, safe, scientific, tasty
      , tasty-golden, tasty-hunit, temporary, text, unordered-containers
@@ -71365,16 +71398,16 @@ self: {
      }:
      mkDerivation {
        pname = "doctemplates";
-       version = "0.5";
-       sha256 = "0xdma2j1bim31mvkqc6362rbmv193fyznd3y4ipdgd113zkj7hy6";
+       version = "0.6";
+       sha256 = "1bimvksijpz3czx0si9wwiigi4knc3d4i7rl6fssmz3z9qs6rhxg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers doclayout filepath mtl parsec safe scientific
          text unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring filepath Glob tasty tasty-golden tasty-hunit
-         temporary text
+         aeson base bytestring doclayout filepath Glob tasty tasty-golden
+         tasty-hunit temporary text
        ];
        benchmarkHaskellDepends = [
          aeson base containers criterion filepath mtl text
@@ -75970,6 +76003,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "emd_0_1_5_0" = callPackage
+    ({ mkDerivation, base, binary, containers, criterion
+     , data-default-class, deepseq, finite-typelits
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit
+     , mwc-random, pure-fft, transformers, typelits-witnesses, vector
+     , vector-sized
+     }:
+     mkDerivation {
+       pname = "emd";
+       version = "0.1.5.0";
+       sha256 = "113rm1jmlawjms693zsx9kq8rk8jwn7ch6d4l2bfas3fvy4via61";
+       libraryHaskellDepends = [
+         base binary containers data-default-class deepseq finite-typelits
+         ghc-typelits-knownnat ghc-typelits-natnormalise transformers
+         typelits-witnesses vector vector-sized
+       ];
+       testHaskellDepends = [ base containers HUnit ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ghc-typelits-knownnat mwc-random pure-fft
+         vector vector-sized
+       ];
+       description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "emgm" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck, syb }:
      mkDerivation {
@@ -76099,8 +76158,6 @@ self: {
        testHaskellDepends = [ base bytestring HUnit QuickCheck ];
        description = "A library for various character encodings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "encoding-io" = callPackage
@@ -87913,6 +87970,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fused-effects_0_5_0_1" = callPackage
+    ({ mkDerivation, base, deepseq, doctest, gauge, hspec
+     , inspection-testing, MonadRandom, QuickCheck, random, transformers
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "fused-effects";
+       version = "0.5.0.1";
+       sha256 = "0s6y34x29w31lzqlj7xf9sld9dmh3q1f0rl3zfmzd4kpp2ybc965";
+       libraryHaskellDepends = [
+         base deepseq MonadRandom random transformers unliftio-core
+       ];
+       testHaskellDepends = [
+         base doctest hspec inspection-testing QuickCheck transformers
+       ];
+       benchmarkHaskellDepends = [ base gauge ];
+       description = "A fast, flexible, fused effect system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fused-effects-exceptions" = callPackage
     ({ mkDerivation, base, fused-effects, safe-exceptions
      , unliftio-core
@@ -90664,6 +90742,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "getopt-generics_0_13_0_4" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, filepath
+     , generics-sop, hspec, QuickCheck, safe, silently, tagged
+     }:
+     mkDerivation {
+       pname = "getopt-generics";
+       version = "0.13.0.4";
+       sha256 = "1rszkcn1rg38wf35538ljk5bbqjc57y9sb3a0al7qxm82gy8yigr";
+       libraryHaskellDepends = [
+         base base-compat base-orphans generics-sop tagged
+       ];
+       testHaskellDepends = [
+         base base-compat base-orphans filepath generics-sop hspec
+         QuickCheck safe silently tagged
+       ];
+       description = "Create command line interfaces with ease";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "getopt-simple" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -90980,8 +91078,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-events";
-       version = "0.9.0";
-       sha256 = "004dfjqhqy0lpmadjmvz270ja6k2dmwbprnispdxmlg8rc5y3m10";
+       version = "0.9.1";
+       sha256 = "1phq4jxhm05xj42y7aqpjj43vj5mixi3hhf3h5c0dh1vmsz9w3z1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105711,22 +105809,20 @@ self: {
      , filepath, hslogger, html, HUnit, monad-control, mtl, network
      , network-uri, old-locale, parsec, process, semigroups, sendfile
      , syb, system-filepath, template-haskell, text, threads, time
-     , time-compat, transformers, transformers-base, transformers-compat
-     , unix, utf8-string, xhtml, zlib
+     , transformers, transformers-base, transformers-compat, unix
+     , utf8-string, xhtml, zlib
      }:
      mkDerivation {
        pname = "happstack-server";
-       version = "7.5.1.3";
-       sha256 = "0agxmrf2njd3whvgw4in0ixgss1qlmi6cdi9fglhs7nhykpkgllk";
-       revision = "1";
-       editedCabalFile = "15ira63nilqyq9ggl2jy5ip26aprw79sv5k1hp9n4wp9byhzzyjw";
+       version = "7.5.2";
+       sha256 = "1w5g5vf6jxb7fi3qg96x17y2i95mv5sbbzmjzy1m55qjqif568v1";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
          monad-control mtl network network-uri old-locale parsec process
          semigroups sendfile syb system-filepath template-haskell text
-         threads time time-compat transformers transformers-base
-         transformers-compat unix utf8-string xhtml zlib
+         threads time transformers transformers-base transformers-compat
+         unix utf8-string xhtml zlib
        ];
        testHaskellDepends = [
          base bytestring containers HUnit parsec zlib
@@ -108389,6 +108485,8 @@ self: {
        pname = "haskell-src-exts";
        version = "1.21.0";
        sha256 = "1wwzd6m5mm76fq7ql7k49b7ghg8ibq5qhqr3d8xs5psfha3w3nlm";
+       revision = "1";
+       editedCabalFile = "1mmjxh0vhf9pbx9jr1208bbrqj3k5qy6il4ypjmczh9zx2m65lyf";
        libraryHaskellDepends = [ array base ghc-prim pretty ];
        libraryToolDepends = [ happy ];
        testHaskellDepends = [
@@ -116814,8 +116912,8 @@ self: {
        pname = "hjsonpointer";
        version = "1.5.0";
        sha256 = "1bdr5jpc2vcx6bk724jmfz7nh3jgqwrmj4hab64h9pjdrl4vz00y";
-       revision = "2";
-       editedCabalFile = "1s43vdkl71msm8kppksn910prs40nwq4cz5klajr8apak77z4dzi";
+       revision = "3";
+       editedCabalFile = "1y9fhqb8kjgflsds8nkw7nr1b9ydyz5f3227b4k8b7ir97rzy5d0";
        libraryHaskellDepends = [
          aeson base hashable text unordered-containers vector
        ];
@@ -117099,8 +117197,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.15";
-       sha256 = "0p9y9gvxj0iv0zzw921248mg8zj80c6hiba3syf11v6gkqlm4262";
+       version = "1.15.1";
+       sha256 = "0rhq6dnss3n4b7ibq61amgalhjh89f51fn609dai2m3kf9xhign9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117311,8 +117409,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.15";
-       sha256 = "03nz49d5fcma8clifv0r9m8v4mp80c10577xwlagmbkw9npxvs3n";
+       version = "1.15.1";
+       sha256 = "1d3mwrbgk3iqayvi0gjx4hkbf72jwknh5igx1p07h32l1d89phbh";
        libraryHaskellDepends = [
          ansi-terminal array base base-compat-batteries blaze-markup
          bytestring call-stack cassava cassava-megaparsec cmdargs containers
@@ -126812,6 +126910,8 @@ self: {
        pname = "http-directory";
        version = "0.1.5";
        sha256 = "075crysy7avf97vlskwlk8813q2bnqw9p3q29c5yb2yhmykrpwyn";
+       revision = "1";
+       editedCabalFile = "0ynm88f9v3h5dlyf2kzydqwr2l90gwjysffr6gbnlyqw9x46pb04";
        libraryHaskellDepends = [
          base bytestring html-conduit http-client http-client-tls http-date
          http-types text time xml-conduit
@@ -128278,6 +128378,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hvega_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , filepath, tasty, tasty-golden, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hvega";
+       version = "0.4.0.0";
+       sha256 = "1clq31aq8vgvvc1mcrz4al3f7kfb6crs2nkc07n87xykmrcjkdyq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring containers filepath tasty
+         tasty-golden text
+       ];
+       description = "Create Vega-Lite visualizations (version 3) in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hvega-theme" = callPackage
     ({ mkDerivation, base, hvega, text }:
      mkDerivation {
@@ -133575,6 +133697,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inspection-testing_0_4_2_2" = callPackage
+    ({ mkDerivation, base, containers, ghc, mtl, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "inspection-testing";
+       version = "0.4.2.2";
+       sha256 = "1bppz99p6ix6hah8lbr9mapl2zxgmkg9i7h6hk8wq6zf54hwz3yp";
+       libraryHaskellDepends = [
+         base containers ghc mtl template-haskell transformers
+       ];
+       testHaskellDepends = [ base ];
+       description = "GHC plugin to do inspection testing";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inspector-wrecker" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , connection, data-default, http-client, http-client-tls
@@ -137790,6 +137929,8 @@ self: {
        pname = "json";
        version = "0.9.3";
        sha256 = "1z8s3mfg76p2flqqd2wqsi96l5bg8k8w8m58zlv81pw3k7h1vbwb";
+       revision = "2";
+       editedCabalFile = "0iqmwfq6s1fc8jj16yx2d7jpzf94scd1hc4yvz281zxj7kds2ms5";
        libraryHaskellDepends = [
          array base bytestring containers mtl parsec pretty syb text
        ];
@@ -151781,6 +151922,8 @@ self: {
        pname = "machines";
        version = "0.6.4";
        sha256 = "0s3pvdklanw6a41pyyqrplm3vid63dpy6vd6qhp86dnb4wp2ppkj";
+       revision = "2";
+       editedCabalFile = "1h0qq6kxv4kc0j0rmx7rhwhvfg1hc08r10q152km4p8kgshcwlig";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base comonad containers distributive mtl pointed
@@ -156338,6 +156481,8 @@ self: {
        pname = "microlens";
        version = "0.4.10";
        sha256 = "1v277yyy4p9q57xr2lfp6qs24agglfczmcabrapxrzci3jfshmcw";
+       revision = "1";
+       editedCabalFile = "1qh5ifbwh62v14ygg3fj22wqimylph17ykng70vqv5x2rkp630jq";
        libraryHaskellDepends = [ base ];
        description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
        license = stdenv.lib.licenses.bsd3;
@@ -171841,6 +171986,89 @@ self: {
        broken = true;
      }) {};
 
+  "optics" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, criterion
+     , inspection-testing, lens, mtl, optics-core, optics-extra
+     , optics-th, random, tasty, tasty-hunit, template-haskell
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "optics";
+       version = "0.1";
+       sha256 = "1xkccyshhzbf8c7v1vi7cw4k1a1gfgw9yl2wfma4q36bv96qq2lk";
+       libraryHaskellDepends = [
+         array base containers mtl optics-core optics-extra optics-th
+         transformers
+       ];
+       testHaskellDepends = [
+         base containers inspection-testing mtl optics-core random tasty
+         tasty-hunit template-haskell
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion lens transformers
+         unordered-containers vector
+       ];
+       description = "Optics as an abstract interface";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "optics-core" = callPackage
+    ({ mkDerivation, array, base, containers, transformers }:
+     mkDerivation {
+       pname = "optics-core";
+       version = "0.1";
+       sha256 = "0vyvvjlqps0sa03rxp0p2v9vjllff53adn3y6qfwrpc08kxwh7q1";
+       libraryHaskellDepends = [ array base containers transformers ];
+       description = "Optics as an abstract interface: core definitions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "optics-extra" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, hashable, mtl
+     , optics-core, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "optics-extra";
+       version = "0.1";
+       sha256 = "1z0blxm9gxbzqxxcm9bkj8jvf9apgn8abh0wdc4f220rs32c3v7g";
+       libraryHaskellDepends = [
+         array base bytestring containers hashable mtl optics-core text
+         transformers unordered-containers vector
+       ];
+       description = "Extra utilities and instances for optics-core";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "optics-th" = callPackage
+    ({ mkDerivation, base, containers, mtl, optics-core
+     , template-haskell, th-abstraction, transformers
+     }:
+     mkDerivation {
+       pname = "optics-th";
+       version = "0.1";
+       sha256 = "1fqaxp7divk2wj7mvnsyzclly99l895dss1ssk6dzfgdijjjipk6";
+       revision = "1";
+       editedCabalFile = "034563mm7rdck8xhwjpqig3kj9rzk91s292rwcargbgbpma5ailv";
+       libraryHaskellDepends = [
+         base containers mtl optics-core template-haskell th-abstraction
+         transformers
+       ];
+       testHaskellDepends = [ base optics-core ];
+       description = "Optics construction using TemplateHaskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "optics-vl" = callPackage
+    ({ mkDerivation, base, optics-core, profunctors }:
+     mkDerivation {
+       pname = "optics-vl";
+       version = "0.1";
+       sha256 = "03khw0aqv7wdlym5maasm1l20gj4y1jzci89y592hx3y07mzvapl";
+       libraryHaskellDepends = [ base optics-core profunctors ];
+       description = "Utilities for compatibility with van Laarhoven optics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "optima" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-data, base
      , optparse-applicative, rerebase, text, text-builder
@@ -192463,6 +192691,39 @@ self: {
        broken = true;
      }) {};
 
+  "rattletrap_9_0_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
+     , bytestring, containers, filepath, http-client, http-client-tls
+     , HUnit, scientific, template-haskell, temporary, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "rattletrap";
+       version = "9.0.2";
+       sha256 = "14dnnaii24c9vh4jvdymnnhrhvgwzfr6al4qcm4bj9wk55jgj71r";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base binary binary-bits bytestring containers
+         filepath http-client http-client-tls scientific template-haskell
+         text transformers
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base binary binary-bits bytestring containers
+         filepath http-client http-client-tls scientific template-haskell
+         text transformers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base binary binary-bits bytestring containers
+         filepath http-client http-client-tls HUnit scientific
+         template-haskell temporary text transformers
+       ];
+       description = "Parse and generate Rocket League replays";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "raven-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl
      , network, random, resourcet, text, time, unordered-containers
@@ -205965,8 +206226,6 @@ self: {
        ];
        description = "Checked exceptions for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-checked-exceptions-core" = callPackage
@@ -207125,8 +207384,35 @@ self: {
        ];
        description = "Embed a raw 'Application' in a Servant API";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-rawm_0_3_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, filepath, Glob
+     , hspec-wai, http-client, http-media, http-types, lens, resourcet
+     , servant, servant-client, servant-client-core, servant-docs
+     , servant-server, tasty, tasty-hspec, tasty-hunit, text
+     , transformers, wai, wai-app-static, warp
+     }:
+     mkDerivation {
+       pname = "servant-rawm";
+       version = "0.3.2.0";
+       sha256 = "013d89zmlmwwwhgyc57xbzsd4phz347if5y6iz93wrw4lbvc341d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring filepath http-client http-media http-types lens
+         resourcet servant-client servant-client-core servant-docs
+         servant-server wai wai-app-static
+       ];
+       testHaskellDepends = [
+         base bytestring doctest Glob hspec-wai http-client http-media
+         http-types servant servant-client servant-client-core
+         servant-server tasty tasty-hspec tasty-hunit text transformers wai
+         warp
+       ];
+       description = "Embed a raw 'Application' in a Servant API";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-reason" = callPackage
@@ -209210,6 +209496,32 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "shakespeare_2_0_21" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
+     , process, scientific, template-haskell, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "shakespeare";
+       version = "2.0.21";
+       sha256 = "1assgcinf9i9rm7mphqfymzvn7z1m2jjkm98z7l2pb76z53mcvgh";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim parsec process scientific template-haskell text
+         time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim hspec HUnit parsec process template-haskell
+         text time transformers
+       ];
+       description = "A toolkit for making compile-time interpolated templates";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "shakespeare-babel" = callPackage
     ({ mkDerivation, base, classy-prelude, data-default, directory
      , process, shakespeare, template-haskell
@@ -228292,8 +228604,8 @@ self: {
      }:
      mkDerivation {
        pname = "term-rewriting";
-       version = "0.4.0.1";
-       sha256 = "14mgpwhpfa0w5xgwsqa5nklagw6scs51cjwin7d34gx8bkvw9m13";
+       version = "0.4.0.2";
+       sha256 = "0k0aylm6vzcqghp5zw461p68zgzjzr6k4ki7d00zl471lmbdbs8n";
        libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl multiset parsec
          union-find-array
@@ -239224,6 +239536,8 @@ self: {
        pname = "unagi-chan";
        version = "0.4.1.2";
        sha256 = "1lnl5n4jnjmm4chp461glcwkrrw63rjz3fvprwxcy3lkpbkrqvgn";
+       revision = "1";
+       editedCabalFile = "09pqi867wskwgc5lpn197f895mbn1174ydgllvcppcsmrz2b6yr6";
        libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
        testHaskellDepends = [
          atomic-primops base containers ghc-prim primitive
@@ -243895,6 +244209,8 @@ self: {
        pname = "vector-th-unbox";
        version = "0.2.1.6";
        sha256 = "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy";
+       revision = "1";
+       editedCabalFile = "1bpxdliw7jmks1rkmb8hbr7hng3niz1pfc6n3s8ndj1acrksmfmv";
        libraryHaskellDepends = [ base template-haskell vector ];
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
@@ -244112,6 +244428,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "versions_3_5_1_1" = callPackage
+    ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable
+     , megaparsec, microlens, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "versions";
+       version = "3.5.1.1";
+       sha256 = "1cs004ixw6rp2zg9hyw4yf0n15rq3s1ns9yy18rr8sxmcsw6jb9g";
+       libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
+       testHaskellDepends = [
+         base base-prelude checkers megaparsec microlens QuickCheck tasty
+         tasty-hunit tasty-quickcheck text
+       ];
+       description = "Types and parsers for software version numbers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vflow-types" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ip, json-alt
      , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes
@@ -251804,8 +252139,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xlsx-tabular" = callPackage

From 79cfb44011f6a2a108e09112f5573aee56d02907 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Sep 2019 07:19:46 +0200
Subject: [PATCH 768/794] all-cabal-hashes: update to Hackage at
 2019-09-03T05:02:25Z

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 87c4afb986b..3500eaa6326 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/2b4df08d487f0821b932f92392b67fe12dc1d42c.tar.gz";
-  sha256 = "02d06fr2jr69za5751z25c3x3zspiwdmlhmdmxaj1g48v00gbfag";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/93bcfb09798da885d29304fa4dab1e234e3b728e.tar.gz";
+  sha256 = "1mv5kxqldakapzbmch2b88mynng268njq3dxbkmyzli8fwnllra2";
 }

From ca8558af6c0cecd5d3a470418bd56b728508a347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Stylianos=20Ramos?= <andre.stylianos@gmail.com>
Date: Tue, 3 Sep 2019 04:50:02 -0300
Subject: [PATCH 769/794] joker: 0.12.4 -> 0.12.7

---
 .../interpreters/joker/default.nix            | 20 ++++---------
 pkgs/development/interpreters/joker/deps.nix  | 29 -------------------
 2 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/development/interpreters/joker/deps.nix

diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 4ab9427934d..233900cadd0 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -1,27 +1,17 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "joker";
-  version = "0.12.4";
-
-  goPackagePath = "github.com/candid82/joker";
+  version = "0.12.7";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "candid82";
     repo = "joker";
-    sha256 = "1swi991khmyhxn6w6xsdqp1wbyx3qmd9d7yhpwvqasyxp8gg3szm";
+    sha256 = "0panmhrg1i158xbvqvq3s3217smbj7ynwlaiks18pmss36xx9dk4";
   };
 
-  preBuild = "go generate ./...";
-
-  postBuild = "rm go/bin/sum256dir";
-
-  dontInstallSrc = true;
-
-  excludedPackages = "gen"; # Do not install private generators.
-
-  goDeps = ./deps.nix;
+  modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/candid82/joker;
diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix
deleted file mode 100644
index 4eff988796b..00000000000
--- a/pkgs/development/interpreters/joker/deps.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/chzyer/readline";
-    fetch = {
-      type = "git";
-      url = "https://github.com/chzyer/readline";
-      rev = "6a4bc7b4feaeff8feb63f87d5fb2cf3e3610a559";
-      sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/profile";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/profile";
-      rev = "5b67d428864e92711fcbd2f8629456121a56d91f";
-      sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
-      sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
-    };
-  }
-]

From c4514dfbb78c212fc6b3bbe68e2564c0833c59f3 Mon Sep 17 00:00:00 2001
From: marius851000 <mariusdavid@laposte.net>
Date: Tue, 3 Sep 2019 10:09:25 +0200
Subject: [PATCH 770/794] wxhexeditor: fix compilation

---
 .../editors/wxhexeditor/default.nix           |  7 ++--
 .../wxhexeditor/missing-semicolon.patch       | 35 +++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/editors/wxhexeditor/missing-semicolon.patch

diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index c345e8a95d5..4725d8143b4 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "wxHexEditor-${version}";
+  pname = "wxHexEditor";
   version = "0.24";
 
   src = fetchFromGitHub {
@@ -26,11 +26,10 @@ stdenv.mkDerivation rec {
       url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch;
       sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj";
     })
+    ./missing-semicolon.patch
   ];
 
-  buildPhase = ''
-    make OPTFLAGS="-fopenmp"
-  '';
+  makeFlags = [ "OPTFLAGS=-fopenmp" ];
 
   meta = {
     description = "Hex Editor / Disk Editor for Huge Files or Devices";
diff --git a/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch b/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch
new file mode 100644
index 00000000000..75722c9c7c5
--- /dev/null
+++ b/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch
@@ -0,0 +1,35 @@
+diff --git a/src/HexDialogs.cpp b/src/HexDialogs.cpp
+index 091a6f9..12e6a78 100644
+--- a/src/HexDialogs.cpp
++++ b/src/HexDialogs.cpp
+@@ -420,7 +420,7 @@ void FindDialog::OnChar( wxKeyEvent& event ){
+ 	}
+
+ void FindDialog::EventHandler( wxCommandEvent& event ){
+-	WX_CLEAR_ARRAY(parent->HighlightArray )
++	WX_CLEAR_ARRAY(parent->HighlightArray );
+ 	parent->HighlightArray.Shrink();
+
+ 	if( event.GetId() == btnFind->GetId())
+diff --git a/src/HexEditorCtrl/HexEditorCtrl.cpp b/src/HexEditorCtrl/HexEditorCtrl.cpp
+index 7a3b0e2..f12097f 100644
+--- a/src/HexEditorCtrl/HexEditorCtrl.cpp
++++ b/src/HexEditorCtrl/HexEditorCtrl.cpp
+@@ -64,9 +64,9 @@ HexEditorCtrl::~HexEditorCtrl( void ){
+ 	Dynamic_Disconnector();
+ 	Clear();
+
+-	WX_CLEAR_ARRAY(MainTagArray)
+-	WX_CLEAR_ARRAY(HighlightArray)
+-   WX_CLEAR_ARRAY(CompareArray)
++	WX_CLEAR_ARRAY(MainTagArray);
++	WX_CLEAR_ARRAY(HighlightArray);
++   WX_CLEAR_ARRAY(CompareArray);
+
+    MainTagArray.Shrink();
+    HighlightArray.Shrink();
+@@ -1224,4 +1224,3 @@ void wxHugeScrollBar::OnOffsetScroll( wxScrollEvent& event ){
+ #endif
+ 	event.Skip();
+ 	}
+-

From e0850f8a94ce0ae937488e047e1c95701c8d1b73 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Thu, 29 Aug 2019 03:25:04 +0200
Subject: [PATCH 771/794] blueman: 2.0.8 -> 2.1.1

---
 pkgs/tools/bluetooth/blueman/default.nix | 26 ++++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index b28e50d54b0..60c96ca78ce 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,19 +1,21 @@
 { config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
-, obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp
-, hicolor-icon-theme, librsvg, wrapGAppsHook, gobject-introspection
+, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute
+, gnome3, librsvg, wrapGAppsHook, gobject-introspection
+, withNetworkManager ?
+    config.networking.networkmanager.enable or false, networkmanager
 , withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
 
 let
   pythonPackages = python3Packages;
-  binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];
+  binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp iproute ];
 
 in stdenv.mkDerivation rec {
   pname = "blueman";
-  version = "2.0.8";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0kkh6jppqcn3yf70vnny1l015kxrz3dxw4g774gl02lh9ixx1bq4";
+    sha256 = "1hyvc5x97j8b4kvwzh58zzlc454d0h0hk440zbg8f5as9qrv5spi";
   };
 
   nativeBuildInputs = [
@@ -21,19 +23,25 @@ in stdenv.mkDerivation rec {
     pythonPackages.wrapPython wrapGAppsHook
   ];
 
-  buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor-icon-theme ]
+  buildInputs = [ bluez gtk3 pythonPackages.python librsvg
+                  gnome3.adwaita-icon-theme iproute libappindicator ]
                 ++ pythonPath
-                ++ lib.optional withPulseAudio libpulseaudio;
+                ++ lib.optional withPulseAudio libpulseaudio
+                ++ lib.optional withNetworkManager networkmanager;
 
   postPatch = lib.optionalString withPulseAudio ''
     sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
   '';
 
-  pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ];
+  pythonPath = with pythonPackages; [ pygobject3 pycairo ];
 
   propagatedUserEnvPkgs = [ obex_data_server ];
 
-  configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];
+  configureFlags = [
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+    "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
+    (lib.enableFeature withPulseAudio "pulseaudio")
+  ];
 
   postFixup = ''
     makeWrapperArgs="--prefix PATH ':' ${binPath}"

From 1ced2702584da2f8dc558dea9861c3f75efea818 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Tue, 3 Sep 2019 10:26:37 +0200
Subject: [PATCH 772/794] blueman: add module for new systemd services

---
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/desktops/blueman.nix | 25 +++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 nixos/modules/services/desktops/blueman.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 296c678124a..d980dfde227 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -281,6 +281,7 @@
   ./services/databases/virtuoso.nix
   ./services/desktops/accountsservice.nix
   ./services/desktops/bamf.nix
+  ./services/desktops/blueman.nix
   ./services/desktops/deepin/deepin.nix
   ./services/desktops/dleyna-renderer.nix
   ./services/desktops/dleyna-server.nix
diff --git a/nixos/modules/services/desktops/blueman.nix b/nixos/modules/services/desktops/blueman.nix
new file mode 100644
index 00000000000..18ad610247e
--- /dev/null
+++ b/nixos/modules/services/desktops/blueman.nix
@@ -0,0 +1,25 @@
+# blueman service
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.blueman;
+in {
+  ###### interface
+  options = {
+    services.blueman = {
+      enable = mkEnableOption "blueman";
+    };
+  };
+
+  ###### implementation
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.blueman ];
+
+    services.dbus.packages = [ pkgs.blueman ];
+
+    systemd.packages = [ pkgs.blueman ];
+  };
+}

From 102fd204926e1a4ded5270f7c8dccd078e3dc1e1 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Tue, 3 Sep 2019 16:35:32 +0800
Subject: [PATCH 773/794] bat: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 267b820df07..449be0f017f 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -4,17 +4,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname   = "bat";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "07qxghplqq8km4kp9zas2acw302a77y72x3ix1272kb1zxhw4as6";
+    sha256 = "1cpa8dal4c27pnbmmrar4vqzcl4h0zf8x1zx1dlf0riavdg9n56y";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "0j9wxv21a91yfvbbvgn5ms5zi1aipj1k2g42mfdvvw2vsdzqagxz";
+  cargoSha256 = "0d7h0kn41w6wm4w63vjy2i7r19jkansfvfjn7vgh2gqh5m60kal2";
 
   nativeBuildInputs = [ pkgconfig llvmPackages.libclang zlib ];
 

From 0a7905ce74b18db34dfc2681bc9c8b1cc45a3911 Mon Sep 17 00:00:00 2001
From: Vladyslav Burzakovskyy <vladislav.burzakovskij@satoshilabs.com>
Date: Mon, 2 Sep 2019 15:19:07 +0200
Subject: [PATCH 774/794] pythonPackages.python-pipedrive: init at 0.4.0

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

diff --git a/pkgs/development/python-modules/python-pipedrive/default.nix b/pkgs/development/python-modules/python-pipedrive/default.nix
new file mode 100644
index 00000000000..e21f01d5cd6
--- /dev/null
+++ b/pkgs/development/python-modules/python-pipedrive/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+, httplib2
+}:
+
+buildPythonPackage rec {
+  pname = "python-pipedrive";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0f8qiyl82bpwxwjw2746vdvkps2010mvn1x9b6j6ppmifff2d4pl";
+  };
+
+  propagatedBuildInputs = [ httplib2 ];
+
+  doCheck = false; # Tests are not provided.
+
+  meta = with stdenv.lib; {
+    description = "Python library for interacting with the pipedrive.com API";
+    homepage = "https://github.com/jscott1989/python-pipedrive";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ mrmebelman ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 02c87e9e3cd..5ed71646d7a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4574,6 +4574,8 @@ in {
 
   python-markdown-math = callPackage ../development/python-modules/python-markdown-math { };
 
+  python-pipedrive = callPackage ../development/python-modules/python-pipedrive { };
+
   python-ptrace = callPackage ../development/python-modules/python-ptrace { };
 
   python-wifi = callPackage ../development/python-modules/python-wifi { };

From bdbc922b980fe8ed3b49020e17f75ad875f9ddcb Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 3 Sep 2019 10:46:18 +0200
Subject: [PATCH 775/794] prometheus-aws-s3-exporter: init at 0.3.0

---
 .../monitoring/prometheus/aws-s3-exporter.nix |  27 ++
 .../prometheus/aws-s3-exporter_deps.nix       | 336 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 3 files changed, 364 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix

diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
new file mode 100644
index 00000000000..21c469694c8
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "aws-s3-exporter";
+  version = "0.3.0";
+
+  goPackagePath = "github.com/ribbybibby/s3_exporter";
+
+  goDeps = ./aws-s3-exporter_deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "ribbybibby";
+    repo = "s3_exporter";
+    rev = "v${version}";
+    sha256 = "062qi4rfqkxwknncwcvx4g132bxhkn2bhbxi4l90wl93v6sdp9l2";
+  };
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Exports Prometheus metrics about S3 buckets and objects";
+    homepage = "https://github.com/ribbybibby/s3_exporter";
+    license = licenses.asl20;
+    maintainers = [ maintainers.mmahut ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix
new file mode 100644
index 00000000000..5ca160cb16f
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix
@@ -0,0 +1,336 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cf";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "v1.20.1";
+      sha256 = "0nhdkkcm11d2n2974kph6jjhddkp1fjbcpfgmalabc798gmqfg54";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "v1.0.0";
+      sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.1";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-kit/kit";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-kit/kit";
+      rev = "v0.8.0";
+      sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-logfmt/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-logfmt/logfmt";
+      rev = "v0.3.0";
+      sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-stack/stack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-stack/stack";
+      rev = "v1.8.0";
+      sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "v1.1.1";
+      sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "v1.3.1";
+      sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
+    };
+  }
+  {
+    goPackagePath = "github.com/jmespath/go-jmespath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmespath/go-jmespath";
+      rev = "c2b33e8439af";
+      sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
+    };
+  }
+  {
+    goPackagePath = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev = "v1.1.6";
+      sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
+    };
+  }
+  {
+    goPackagePath = "github.com/julienschmidt/httprouter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/julienschmidt/httprouter";
+      rev = "v1.2.0";
+      sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+    };
+  }
+  {
+    goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+    fetch = {
+      type = "git";
+      url = "https://github.com/konsorten/go-windows-terminal-sequences";
+      rev = "v1.0.2";
+      sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/logfmt";
+      rev = "b84e30acd515";
+      sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "v1.0.1";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath = "github.com/modern-go/concurrent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/concurrent";
+      rev = "bacd9c7ef1dd";
+      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+    };
+  }
+  {
+    goPackagePath = "github.com/modern-go/reflect2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/reflect2";
+      rev = "v1.0.1";
+      sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+    };
+  }
+  {
+    goPackagePath = "github.com/mwitkow/go-conntrack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mwitkow/go-conntrack";
+      rev = "cc309e4a2223";
+      sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "v0.8.0";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "v1.0.0";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "v0.9.4";
+      sha256 = "0s134fj4i7k6pxdmxwkdi7amb1882yq33spv15hg3pkpbd3h311p";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "fd36f4220a90";
+      sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "v0.4.1";
+      sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "v0.0.2";
+      sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
+    };
+  }
+  {
+    goPackagePath = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev = "v1.4.2";
+      sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev = "v0.1.1";
+      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "v1.3.0";
+      sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "c2843e01d9a2";
+      sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "d28f0bde5980";
+      sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "37e7f081c4d4";
+      sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "b47fdc937951";
+      sha256 = "17k4qwql2zizrxwjd0qv0gccwgyyv2axiha1vh5lrjfps1h5kli7";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "v0.3.2";
+      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "90fa682c2a6e";
+      sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev = "v2.2.6";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/check.v1";
+      rev = "20d25e280405";
+      sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "v2.2.1";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b86788060f6..52d50be25d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15046,6 +15046,7 @@ in
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
   prometheus = prometheus_1;
   prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
+  prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { };
   prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { };
   prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };

From 30853a61f58b0459d7dab02a51465fff5baa60a9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 11:59:27 +0200
Subject: [PATCH 776/794] =?UTF-8?q?libmypaint:=201.3.0=20=E2=86=92=201.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

http://mypaint.org/blog/2019/09/01/libmypaint-1.4.0-release/
---
 .../libraries/libmypaint/default.nix            | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index a3361997774..91e0b5ef072 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -2,39 +2,34 @@
 , autoconf
 , automake
 , fetchFromGitHub
-, fetchpatch
 , glib
 , intltool
 , json_c
 , libtool
 , pkgconfig
+, python2
 }:
 
 stdenv.mkDerivation rec {
   pname = "libmypaint";
-  version = "1.3.0";
+  version = "1.4.0";
+
+  outputs = [ "out" "dev" ];
 
   src = fetchFromGitHub {
     owner = "mypaint";
     repo = "libmypaint";
     rev = "v${version}";
-    sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc";
+    sha256 = "1ynm2g2wdb9zsymncndlgs6gpcbsa122n52d11161jrj5nrdliaq";
   };
 
-  patches = [
-    # build with automake 1.16
-    (fetchpatch {
-      url = https://github.com/mypaint/libmypaint/commit/40d9077a80be13942476f164bddfabe842ab2a45.patch;
-      sha256 = "1dclh7apgvr2bvzy9z3rgas3hk9pf2hpf5h52q94kmx8s4a47qpi";
-    })
-  ];
-
   nativeBuildInputs = [
     autoconf
     automake
     intltool
     libtool
     pkgconfig
+    python2
   ];
 
   buildInputs = [

From 3b7946d0aedd58e2883f5a14f9050f9aa030e90c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 3 Sep 2019 11:59:43 +0200
Subject: [PATCH 777/794] wallutils: 5.8.1 -> 5.8.2

---
 pkgs/tools/graphics/wallutils/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix
index ba1044e3bb4..1b578628caf 100644
--- a/pkgs/tools/graphics/wallutils/default.nix
+++ b/pkgs/tools/graphics/wallutils/default.nix
@@ -1,19 +1,19 @@
 { buildGoModule, fetchFromGitHub, lib
-, wayland, libX11, xbitmaps, libXcursor, libXmu
+, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm
 }:
 
 buildGoModule rec {
   pname = "wallutils";
-  version = "5.8.1";
+  version = "5.8.2";
 
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "wallutils";
     rev = version;
-    sha256 = "095pgvk4yp2l6xgl63qp61rr2dij51awndwrs5ha9vpdd1jqgvfi";
+    sha256 = "1ghvcxsy5prj8l38r4lg39imsqbwmvn1zmiv7004j6skmgpaaawh";
   };
 
-  modSha256 = "1kbggry1qrf0nkvysnaky2nl73l5f0bnc4wx0hfr6ifyagfjzy77";
+  modSha256 = "0siw1g3fsk1xjri9k1pb03filax8an5sfza5db52krh80g9xasah";
 
   patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ];
 
@@ -22,7 +22,7 @@ buildGoModule rec {
     sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go
   '';
 
-  buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu ];
+  buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm ];
 
   meta = with lib; {
     description = "Utilities for handling monitors, resolutions, and (timed) wallpapers";

From 585c9e2b10d2ae1fac38c66104aea59cfa8317c0 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Tue, 3 Sep 2019 12:45:39 +0200
Subject: [PATCH 778/794] python3Packages.cherrypy: fix tests after upgrade to
 pytest5

---
 .../python-modules/cherrypy/default.nix         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index 75152d39aeb..6941e1117bd 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -2,6 +2,7 @@
 , setuptools_scm
 , cheroot, portend, more-itertools, zc_lockfile, routes
 , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services
+, fetchpatch
 }:
 
 buildPythonPackage rec {
@@ -16,6 +17,22 @@ buildPythonPackage rec {
     sha256 = "1w3hpsg7q8shdmscmbqk00w90lcw3brary7wl1a56k5h7nx33pj8";
   };
 
+  # Remove patches once 96b34df and 14c12d2
+  # become part of a release - they're currently only present in master.
+  # ref: https://github.com/cherrypy/cherrypy/pull/1791
+  patches = [
+    (fetchpatch {
+      name = "pytest5-1.patch";
+      url = "https://github.com/cherrypy/cherrypy/commit/96b34dfea7853b0189bc0a3878b6ddff0d4e505c.patch";
+      sha256 = "0zy53mahffgkpd844118b42lsk5lkjmig70d60x1i46w6gnr61mi";
+    })
+    (fetchpatch {
+      name = "pytest5-2.patch";
+      url = "https://github.com/cherrypy/cherrypy/commit/14c12d2420a4b3765bb241250bd186e93b2f25eb.patch";
+      sha256 = "0ihcz7b5myn923rq5665b98pz52hnf6fcys2y2inf23r3i07scyz";
+    })
+  ];
+
   propagatedBuildInputs = [
     # required
     cheroot portend more-itertools zc_lockfile

From 67904dccbb0dfc01c9f8d242db6302cbdfcdb195 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Fri, 30 Aug 2019 17:05:26 +0200
Subject: [PATCH 779/794] bazel: 0.28.1 -> 0.29.0

- Upgraded dependencies
  - dependencies script upgraded to take into account new WORKSPACE
    rules
- Tests now depends on the `distdir`

Runtime bazel now also depends on the `distdir` setting which appears
in the global configuration file. This increases the bazel closure
size by 85 MO for stuffs which can normally be downloaded at runtime
by bazel. However, any invocation of `buildBazelPackage` (such as in
`bazel-watcher`) may fail in nix sandbox if theses files are not
available at runtime.

If this overhead is too important, we may later evolve to a finer
grained solution, where buildBazelPackage declares the list of
necessary dependencies.
---
 .../build-managers/bazel/bash-tools-test.nix  |   4 +-
 .../tools/build-managers/bazel/cpp-test.nix   |   2 +
 .../tools/build-managers/bazel/default.nix    |  37 ++--
 .../tools/build-managers/bazel/java-test.nix  |   2 +
 .../build-managers/bazel/protobuf-test.nix    |   2 +
 .../bazel/python-bin-path-test.nix            |   3 +-
 .../tools/build-managers/bazel/src-deps.json  | 162 ++++++++++++------
 .../build-managers/bazel/update-srcDeps.py    |   5 +
 8 files changed, 150 insertions(+), 67 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
index 898640a84fe..cd0c5f6c081 100644
--- a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
@@ -1,4 +1,4 @@
-{ writeText, bazel, runLocal, bazelTest }:
+{ writeText, bazel, runLocal, bazelTest, distDir }:
 
 # Tests that certain executables are available in bazel-executed bash shells.
 
@@ -35,7 +35,7 @@ let
     inherit workspaceDir;
 
     bazelScript = ''
-      ${bazel}/bin/bazel build :tool_usage
+      ${bazel}/bin/bazel build :tool_usage --distdir=${distDir}
       cp bazel-genfiles/output.txt $out
       echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK"
     '';
diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
index 2b59bd3c433..f4e03abdbc9 100644
--- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
@@ -8,6 +8,7 @@
 , runtimeShell
 , writeScript
 , writeText
+, distDir
 }:
 
 let
@@ -42,6 +43,7 @@ let
     bazelScript = ''
       ${bazel}/bin/bazel \
         build --verbose_failures \
+        --distdir=${distDir} \
           //...
     '';
   };
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 908fc35c688..e06965b6f09 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -22,11 +22,11 @@
 }:
 
 let
-  version = "0.28.1";
+  version = "0.29.0";
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "0503fax70w7h6v00mkrrrgf1m5n0vkjqs76lyg95alhzc4yldsic";
+    sha256 = "01cb6f2e808bd016cf0e217e12373c9efb808123e58b37885be8364458d3a40a";
   };
 
   # Update with `eval $(nix-build -A bazel.updater)`,
@@ -46,11 +46,15 @@ let
       srcs.io_bazel_rules_sass
       srcs.platforms
       (if stdenv.hostPlatform.isDarwin
-       then srcs.${"java_tools_javac11_darwin-v2.0.zip"}
-       else srcs.${"java_tools_javac11_linux-v2.0.zip"})
+       then srcs.${"java_tools_javac11_darwin-v4.0.zip"}
+       else srcs.${"java_tools_javac11_linux-v4.0.zip"})
       srcs.${"coverage_output_generator-v1.0.zip"}
       srcs.build_bazel_rules_nodejs
-      srcs.${"android_tools_pkg-0.7.tar.gz"}
+      srcs.${"android_tools_pkg-0.8.tar.gz"}
+      srcs.${"0.27.1.tar.gz"}
+      srcs.rules_pkg
+      srcs.rules_cc
+      srcs.rules_java
       ]);
 
   distDir = runCommand "bazel-deps" {} ''
@@ -102,7 +106,7 @@ let
   remote_java_tools = stdenv.mkDerivation {
     name = "remote_java_tools_${system}";
 
-    src = srcDepsSet."java_tools_javac11_${system}-v2.0.zip";
+    src = srcDepsSet."java_tools_javac11_${system}-v4.0.zip";
 
     nativeBuildInputs = [ autoPatchelfHook unzip ];
     buildInputs = [ gcc-unwrapped ];
@@ -218,18 +222,18 @@ stdenv.mkDerivation rec {
       };
 
     in {
-      bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; };
-      cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; };
-      java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; };
-      protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; };
-      pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; };
+      bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; };
+      cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
+      java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
+      protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; };
+      pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; };
 
-      bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
+      bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
 
-      cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; };
-      javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; };
-      protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
-      pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
+      cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
+      javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
+      protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
+      pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
 
       # downstream packages using buildBazelPackage
       # fixed-output hashes of the fetch phase need to be spot-checked manually
@@ -463,6 +467,7 @@ stdenv.mkDerivation rec {
     # the reference to .name
     mkdir $out/etc
     echo "build --override_repository=${remote_java_tools.name}=${remote_java_tools}" > $out/etc/bazelrc
+    echo "build --distdir=${distDir}" >> $out/etc/bazelrc
 
     # shell completion files
     mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix
index 5f780a795e3..30b957eb5e3 100644
--- a/pkgs/development/tools/build-managers/bazel/java-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/java-test.nix
@@ -9,6 +9,7 @@
 , runtimeShell
 , writeScript
 , writeText
+, distDir
 }:
 
 let
@@ -44,6 +45,7 @@ let
     bazelScript = ''
       ${bazel}/bin/bazel \
         run \
+        --distdir=${distDir} \
           --host_javabase='@local_jdk//:jdk' \
           --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
           --javabase='@local_jdk//:jdk' \
diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
index 90065be67bc..0784de4cfd3 100644
--- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
@@ -10,6 +10,7 @@
 , runtimeShell
 , writeScript
 , writeText
+, distDir
 }:
 
 let
@@ -141,6 +142,7 @@ let
     bazelScript = ''
       ${bazel}/bin/bazel \
         build \
+        --distdir=${distDir} \
           --host_javabase='@local_jdk//:jdk' \
           --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
           --javabase='@local_jdk//:jdk' \
diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
index ff921b395da..c02547c08e0 100644
--- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
@@ -1,4 +1,4 @@
-{ writeText, bazel, bazelTest, runLocal }:
+{ writeText, bazel, bazelTest, runLocal, distDir }:
 
 let
   WORKSPACE = writeText "WORKSPACE" ''
@@ -45,6 +45,7 @@ let
     bazelScript = ''
       ${bazel}/bin/bazel \
         run \
+      --distdir=${distDir} \
           //python:bin
     '';
   };
diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/pkgs/development/tools/build-managers/bazel/src-deps.json
index fc3fe13f580..f93794249ec 100644
--- a/pkgs/development/tools/build-managers/bazel/src-deps.json
+++ b/pkgs/development/tools/build-managers/bazel/src-deps.json
@@ -7,12 +7,28 @@
             "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip"
         ]
     },
-    "1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz": {
-        "name": "1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz",
-        "sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534",
+    "0.27.1.tar.gz": {
+        "name": "0.27.1.tar.gz",
+        "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330",
         "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz",
-            "https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz"
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz",
+            "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz"
+        ]
+    },
+    "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip": {
+        "name": "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip",
+        "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip",
+            "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip"
+        ]
+    },
+    "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz": {
+        "name": "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz",
+        "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz",
+            "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz"
         ]
     },
     "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": {
@@ -23,6 +39,14 @@
             "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip"
         ]
     },
+    "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": {
+        "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+        "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+            "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+        ]
+    },
     "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": {
         "name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz",
         "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898",
@@ -31,29 +55,28 @@
             "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"
         ]
     },
-    "android_tools_pkg-0.7.tar.gz": {
-        "name": "android_tools_pkg-0.7.tar.gz",
-        "sha256": "a8e48f2fdee2c34b31f45bd47ce050a75ac774f19e0a1f6694fa49fc11d88718",
+    "android_tools_pkg-0.8.tar.gz": {
+        "name": "android_tools_pkg-0.8.tar.gz",
+        "sha256": "a9eac6e1b27d5549edaaa724b20eb1cdae6253b84f44d5744c30372bd523cfcd",
         "urls": [
-            "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.7.tar.gz"
+            "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.8.tar.gz"
+        ]
+    },
+    "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz": {
+        "name": "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz",
+        "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz",
+            "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz"
         ]
     },
     "bazel_j2objc": {
         "name": "bazel_j2objc",
-        "sha256": "a36bac432d0dbd8c98249e484b2b69dd5720afa4abb58711a3c3def1c0bfa21d",
-        "strip_prefix": "j2objc-2.0.3",
+        "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b",
+        "strip_prefix": "j2objc-2.5",
         "urls": [
-            "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.0.3/j2objc-2.0.3.zip",
-            "https://github.com/google/j2objc/releases/download/2.0.3/j2objc-2.0.3.zip"
-        ]
-    },
-    "bazel_rbe_toolchains": {
-        "name": "bazel_rbe_toolchains",
-        "sha256": "e2b8644caa15235a488e831264e5dcb014e2cdf3b697319bc1e9d6b0fff0b4b9",
-        "strip_prefix": "bazel_rbe_toolchains-01529a65d21abdf71635ff0c2472043a567ecded",
-        "urls": [
-            "https://mirror.bazel.build/github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz",
-            "https://github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz"
+            "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip",
+            "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip"
         ]
     },
     "bazel_skylib": {
@@ -67,11 +90,11 @@
     },
     "bazel_toolchains": {
         "name": "bazel_toolchains",
-        "sha256": "67335b3563d9b67dc2550b8f27cc689b64fadac491e69ce78763d9ba894cc5cc",
-        "strip_prefix": "bazel-toolchains-cddc376d428ada2927ad359211c3e356bd9c9fbb",
+        "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330",
+        "strip_prefix": "bazel-toolchains-0.27.1",
         "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz",
-            "https://github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz"
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz",
+            "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz"
         ]
     },
     "build_bazel_rules_nodejs": {
@@ -135,46 +158,46 @@
     },
     "io_bazel_skydoc": {
         "name": "io_bazel_skydoc",
-        "sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534",
-        "strip_prefix": "skydoc-1ca560df1cf6e280f987af2f8d08a5edc7ac6b54",
+        "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829",
+        "strip_prefix": "skydoc-41c28e43dffbae39c52dd4b91932d1209e5a8893",
         "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz",
-            "https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz"
+            "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz",
+            "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz"
         ]
     },
-    "java_tools_javac11_darwin-v2.0.zip": {
-        "name": "java_tools_javac11_darwin-v2.0.zip",
-        "sha256": "0ceb0c9ff91256fe33508306bc9cd9e188dcca38df78e70839d426bdaef67a38",
+    "java_tools_javac11_darwin-v4.0.zip": {
+        "name": "java_tools_javac11_darwin-v4.0.zip",
+        "sha256": "fbf5bf22e9aab9c622e4c8c59314a1eef5ea09eafc5672b4f3250dc0b971bbcc",
         "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_darwin-v2.0.zip"
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_darwin-v4.0.zip"
         ]
     },
-    "java_tools_javac11_linux-v2.0.zip": {
-        "name": "java_tools_javac11_linux-v2.0.zip",
-        "sha256": "074d624fb34441df369afdfd454e75dba821d5d54932fcfee5ba598d17dc1b99",
+    "java_tools_javac11_linux-v4.0.zip": {
+        "name": "java_tools_javac11_linux-v4.0.zip",
+        "sha256": "96e223094a12c842a66db0bb7bb6866e88e26e678f045842911f9bd6b47161f5",
         "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_linux-v2.0.zip"
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_linux-v4.0.zip"
         ]
     },
-    "java_tools_javac11_windows-v2.0.zip": {
-        "name": "java_tools_javac11_windows-v2.0.zip",
-        "sha256": "2c3fc0ce7d30d60e26f4b8a36e2eadcf9e6a9d5a51b667d3d13b78db53b24251",
+    "java_tools_javac11_windows-v4.0.zip": {
+        "name": "java_tools_javac11_windows-v4.0.zip",
+        "sha256": "a1de51447b2ba2eab923d589ba6c72c289c16e6091e6a3bb3e67a05ef4ad200c",
         "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_windows-v2.0.zip"
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_windows-v4.0.zip"
         ]
     },
     "java_tools_langtools_javac10": {
         "name": "java_tools_langtools_javac10",
-        "sha256": "e379c71e051eb83e3fc9a08c9b404712707d8920ffcf1e8fd59c844965f0b0dd",
+        "sha256": "0e9c9ac5ef17869de3cb8c3497c4c0d31836ef7b63efe1690506f53783adb212",
         "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10.zip"
+            "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10_v2.zip"
         ]
     },
     "java_tools_langtools_javac11": {
         "name": "java_tools_langtools_javac11",
-        "sha256": "128a63f39d3f828a761f6afcfe3c6115279336a72ea77f60d7b3acf1841c9acb",
+        "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7",
         "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11.zip"
+            "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip"
         ]
     },
     "java_tools_langtools_javac12": {
@@ -186,9 +209,9 @@
     },
     "java_tools_langtools_javac9": {
         "name": "java_tools_langtools_javac9",
-        "sha256": "3b6bbc47256acf2f61883901e2d4e3f9b292f5fe154a6912b928805de24cb864",
+        "sha256": "d94befcfb325a9a62aebc2052e631fde2322b4df5c82a19ed260b38ba12a0ad1",
         "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9.zip"
+            "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9_v2.zip"
         ]
     },
     "jdk10-server-release-1804.tar.xz": {
@@ -346,6 +369,49 @@
             "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip"
         ]
     },
+    "rules_cc": {
+        "name": "rules_cc",
+        "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89",
+        "strip_prefix": "rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip",
+            "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip"
+        ]
+    },
+    "rules_java": {
+        "name": "rules_java",
+        "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
+        "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+            "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+        ]
+    },
+    "rules_pkg": {
+        "name": "rules_pkg",
+        "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz",
+            "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz"
+        ]
+    },
+    "rules_pkg-0.2.0.tar.gz": {
+        "name": "rules_pkg-0.2.0.tar.gz",
+        "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz",
+            "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz"
+        ]
+    },
+    "rules_proto": {
+        "name": "rules_proto",
+        "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d",
+        "strip_prefix": "rules_proto-b0cc14be5da05168b01db282fe93bdf17aa2b9f4",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz",
+            "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz"
+        ]
+    },
     "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": {
         "name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz",
         "sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5",
diff --git a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
index 7fd1e5e2b04..504a227b958 100755
--- a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
+++ b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
@@ -40,6 +40,11 @@ def rules_sass_dependencies(**kw): pass
 def node_repositories(**kw): pass
 def sass_repositories(**kw): pass
 def register_execution_platforms(*args): pass
+def rbe_autoconfig(*args, **kw): pass
+def rules_pkg_dependencies(*args, **kw): pass
+def winsdk_configure(*args, **kw): pass
+def register_local_rc_exe_toolchains(*args, **kw): pass
+def register_toolchains(*args, **kw): pass
 
 # execute the WORKSPACE like it was python code in this module,
 # using all the function stubs from above.

From 743a62673f4e00ae74b826643b1445371e0378fe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Sep 2019 14:36:08 +0200
Subject: [PATCH 780/794] ibus-engines.hangul: format with nixpkgs-fmt

---
 .../ibus-engines/ibus-hangul/default.nix      | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index 3b8b3489a1d..9d1c8c5cc1b 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -1,5 +1,11 @@
-{ stdenv, fetchurl, intltool, pkgconfig
-, gtk3, ibus, libhangul, python3
+{ stdenv
+, fetchurl
+, intltool
+, pkgconfig
+, gtk3
+, ibus
+, libhangul
+, python3
 }:
 
 stdenv.mkDerivation rec {
@@ -11,18 +17,27 @@ stdenv.mkDerivation rec {
     sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs";
   };
 
-  buildInputs = [ gtk3 ibus libhangul python3 ];
+  nativeBuildInputs = [
+    intltool
+    pkgconfig
+    python3.pkgs.wrapPython
+  ];
 
-  nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ];
+  buildInputs = [
+    gtk3
+    ibus
+    libhangul
+    python3
+  ];
 
   postFixup = "wrapPythonPrograms";
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
-    description  = "Ibus Hangul engine";
-    homepage     = https://github.com/choehwanjin/ibus-hangul;
-    license      = licenses.gpl2;
-    platforms    = platforms.linux;
-    maintainers  = with maintainers; [ ericsagnes ];
+    description = "Ibus Hangul engine";
+    homepage = https://github.com/choehwanjin/ibus-hangul;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ ericsagnes ];
+    platforms = platforms.linux;
   };
 }

From 7ddd49a86ef2b7f1c8d7ea5d3bec6f3b2926e5cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 3 Sep 2019 08:37:31 +0200
Subject: [PATCH 781/794] gnome3.mutter: fix segfault in
 dri_flush_front_buffer()

More details:

https://gitlab.gnome.org/GNOME/mutter/commit/56ddaaa3809240a357b5e19b5789d1aa49aaecc3
---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 61219ca4488..eab0b131ea9 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo
+{ fetchurl, fetchpatch, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
 , ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
 , gsettings-desktop-schemas, glib, gtk3, gnome-desktop
@@ -55,6 +55,13 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       inherit zenity;
     })
+    # Fix a segmentation fault in dri_flush_front_buffer() upon
+    # suspend/resume. This change should be removed when Mutter
+    # is updated to 3.34.
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff";
+      sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n";
+    })
   ];
 
   postPatch = ''

From 8c772a6183560bb8ad77f2d0715885456e17b9e5 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 3 Sep 2019 09:34:55 -0400
Subject: [PATCH 782/794] gnome3.mutter328: patches from gnome-3.28 branch

Changes:
https://gitlab.gnome.org/GNOME/mutter/compare/e3564242820684bd44c52808e6183e25147fd808...74e3126b77eb5f27c0ae3f53b0aff2d2eebc15af
---
 pkgs/desktops/gnome-3/core/mutter/3.28.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index 7e1f696c58d..cde0b9ec00b 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = pname;
-    rev = version;
-    sha256 = "0p8ky306dnm4alkncmsnd8r2awpsi37p0bzvkv313pgqw2hbwq9i";
+    rev = "74e3126b77eb5f27c0ae3f53b0aff2d2eebc15af"; # patches of tip from gnome-3-28 branch
+    sha256 = "0gw1n1w3i040w5mv30kkg7g8a59ymjlc5yaklip0ngg8xv76g0zi";
   };
 
   patches = [

From b73406d863bc666509766409693ef383f043a828 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Sep 2019 14:39:08 +0200
Subject: [PATCH 783/794] ibus-engines.hangul: fix ibus-setup-hangul

Closes: https://github.com/NixOS/nixpkgs/issues/27619
---
 .../ibus-engines/ibus-hangul/default.nix        | 17 ++++++++++++++---
 .../ibus-engines/ibus-hangul/fix-paths.patch    | 13 +++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index 9d1c8c5cc1b..0a38ccfa3bd 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -1,7 +1,9 @@
 { stdenv
 , fetchurl
+, substituteAll
 , intltool
 , pkgconfig
+, wrapGAppsHook
 , gtk3
 , ibus
 , libhangul
@@ -17,21 +19,30 @@ stdenv.mkDerivation rec {
     sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      libhangul = "${libhangul}/lib/libhangul.so.1";
+    })
+  ];
+
   nativeBuildInputs = [
     intltool
     pkgconfig
     python3.pkgs.wrapPython
+    wrapGAppsHook
   ];
 
   buildInputs = [
     gtk3
     ibus
     libhangul
-    python3
+    (python3.withPackages (pypkgs: with pypkgs; [
+      pygobject3
+      (toPythonModule ibus)
+    ]))
   ];
 
-  postFixup = "wrapPythonPrograms";
-
   meta = with stdenv.lib; {
     isIbusEngine = true;
     description = "Ibus Hangul engine";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch
new file mode 100644
index 00000000000..7487d074d55
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/setup/main.py b/setup/main.py
+index 8d581cd..2ac47b9 100644
+--- a/setup/main.py
++++ b/setup/main.py
+@@ -37,7 +37,7 @@
+ 
+ def get_hangul_keyboard_list():
+     from ctypes import CDLL, c_int, c_char_p
+-    libhangul = CDLL('libhangul.so.1')
++    libhangul = CDLL('@libhangul@')
+     libhangul.hangul_ic_get_n_keyboards.argtypes = []
+     libhangul.hangul_ic_get_n_keyboards.restype = c_int
+     libhangul.hangul_ic_get_keyboard_id.argtypes = [c_int]

From 739cdb368e08aeeb4ec482cb4b403ae3de74495a Mon Sep 17 00:00:00 2001
From: idontgetoutmuch <dominic@steinitz.org>
Date: Tue, 3 Sep 2019 15:34:45 +0100
Subject: [PATCH 784/794] Ensure blas produces pkg config files (#67629)

blas: produce pkgconfig file
---
 pkgs/development/libraries/science/math/blas/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index 9c412f93d13..a14ed4e6a30 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -44,6 +44,15 @@ stdenv.mkDerivation rec {
     install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}"
     ln -s libblas.so.${version} "$out/lib/libblas.so.3"
     ln -s libblas.so.${version} "$out/lib/libblas.so"
+    # Write pkgconfig alias.
+    # See also openblas/default.nix
+    mkdir $out/lib/pkgconfig
+    cat <<EOF > $out/lib/pkgconfig/blas.pc
+Name: blas
+Version: ${version}
+Description: blas provided by the BLAS package.
+Libs: -L$out/lib -lblas
+EOF
   '';
 
   preFixup = stdenv.lib.optionalString stdenv.isDarwin ''

From 69ab39c3b8db82dbc0fb309279eb665bb8c50ef4 Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Tue, 3 Sep 2019 17:13:29 +0200
Subject: [PATCH 785/794] maintainers: add jojosch

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ff88c717c25..abda812469c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3075,6 +3075,16 @@
     githubId = 8735102;
     name = "John Ramsden";
   };
+  jojosch = {
+    name = "Johannes Schleifenbaum";
+    email = "johannes@js-webcoding.de";
+    github = "jojosch";
+    githubId = 327488;
+    keys = [{
+      longkeyid = "ed25519/059093B1A278BCD0";
+      fingerprint = "7249 70E6 A661 D84E 8B47  678A 0590 93B1 A278 BCD0";
+    }];
+  };
   joko = {
     email = "ioannis.koutras@gmail.com";
     github = "jokogr";

From 06205d8154970361e75be1b37f0ed6f48d14c152 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Sep 2019 19:00:00 -0500
Subject: [PATCH 786/794] ruby_2_4: 2.4.5 -> 2.4.7

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

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index a7009097a60..f09db23faa8 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -214,10 +214,10 @@ in {
   };
 
   ruby_2_4 = generic {
-    version = rubyVersion "2" "4" "5" "";
+    version = rubyVersion "2" "4" "7" "";
     sha256 = {
-      src = "162izk7c72y73vmdgcbsh8kqihrbm65xvp53r1s139pzwqd78dv7";
-      git = "181za4h6bd2bkyzyknxc18i5gq0pnqag60ybc17p0ixw3q7pdj43";
+      src = "12cbyf7zai8mi3mxffm5ynq3mmkcbvs7kb1bbrs259m61irgqvnd";
+      git = "1dgch9xz4wdcncb6pf2dvijm10yk6mbw2wfdrj7d3wazrjzh305z";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 47d8397c966..d1a5d4c2d02 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -6,7 +6,7 @@ rec {
     "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.4.5" = ops useRailsExpress [
+  "2.4.7" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"

From 8cb7bb03fda7e8d6becc7f11d059e0026dec7cc2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Sep 2019 19:01:00 -0500
Subject: [PATCH 787/794] ruby_2_5: 2.5.5 -> 2.5.6

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

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index f09db23faa8..9091d247d65 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -222,10 +222,10 @@ in {
   };
 
   ruby_2_5 = generic {
-    version = rubyVersion "2" "5" "5" "";
+    version = rubyVersion "2" "5" "6" "";
     sha256 = {
-      src = "0k2in88jymqh727s88yjsv7wrqs2hdj9h2w9zh2bmrj0ygylba98";
-      git = "0l7b7xv48gvvlqs27gghfi645qvc1nwiz8ym4j8w100rzzzfy6zz";
+      src = "19xy6rf138ys4qycv0ibsycqwbjmf1j6iv9plw9cs81hcxnd0zhx";
+      git = "067gyy7149m6vk9dfyx22mghm2gbgy7snfa7df4ddrvr1pqffqmz";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index d1a5d4c2d02..429e5e210ed 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -11,7 +11,7 @@ rec {
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.5.5" = ops useRailsExpress [
+  "2.5.6" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"

From bd51778554e44dcae4edf9ef624d46b02443820f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Sep 2019 19:02:00 -0500
Subject: [PATCH 788/794] ruby_2_6: 2.6.3 -> 2.6.4

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

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 9091d247d65..02e76d5e127 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -230,10 +230,10 @@ in {
   };
 
   ruby_2_6 = generic {
-    version = rubyVersion "2" "6" "3" "";
+    version = rubyVersion "2" "6" "4" "";
     sha256 = {
-      src = "1yw23hmllxsc4b7zqndn5l4d9503gdik6rsf3lfdkf12bxwx6zsp";
-      git = "1h4k2kw0vr4jh2ra9l89i8lnddfh2qfw67y9cknjylf7kw2m1pmh";
+      src = "0dvrw4g2igvjclxk9bmb9pf6mzxwm22zqvqa0abkfnshfnxdihag";
+      git = "1h4z66amjykpzl6lxx6yad2yfpwnwix4sw19bd96jnwg248kviqf";
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 429e5e210ed..5bf59a96f74 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -16,7 +16,7 @@ rec {
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
   ];
-  "2.6.3" = ops useRailsExpress [
+  "2.6.4" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
     "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"

From 3a601cac5b47298e191eb228cb6505c099d5626b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Sep 2019 19:03:00 -0500
Subject: [PATCH 789/794] ruby: update RVM patchsets

---
 pkgs/development/interpreters/ruby/rvm-patchsets.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index 95b38fc8ebd..883987683b0 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -3,6 +3,6 @@
 fetchFromGitHub {
   owner  = "skaes";
   repo   = "rvm-patchsets";
-  rev    = "e6e12c2c32ff184e0409d8f9f2a870f2dfbd06a3";
-  sha256 = "0n71h2ip1k18icb3bcr1jz4161lh6vr6i3f7b45jswg77c4rrxcy";
+  rev    = "58f72dccc8bb4dc9b1035f6af903d21f2465367a";
+  sha256 = "00gbrhvnf05g6zmfim472ld0l1lp100dy4pi3lixm6ry9iw9m4ag";
 }

From d7bbcdf274eaa3de1f813f391b64626b2f87bc49 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Sep 2019 17:35:30 +0200
Subject: [PATCH 790/794] openshot-qt: fix title generator

@ferdnyc has kindly provided a patch for our Nix-specific permission
issue https://github.com/OpenShot/openshot-qt/issues/2972.

Fixes https://github.com/NixOS/nixpkgs/issues/32898.
Fixes https://github.com/NixOS/nixpkgs/issues/48591.
Related to https://github.com/NixOS/nixpkgs/issues/55683.
---
 pkgs/applications/video/openshot-qt/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 0b1d9e95115..1c5359e5f0c 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,7 +1,14 @@
-{ stdenv, mkDerivationWith, fetchFromGitHub
+{ stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch
 , doxygen, python3Packages, libopenshot
 , wrapGAppsHook, gtk3 }:
 
+let
+  fixPermissions = fetchpatch rec {
+    url = https://github.com/OpenShot/openshot-qt/pull/2973.patch;
+    sha256 = "037rh0p3k4sdzprlpyb73byjq3qhqk5zd0d4iin6bq602r8bbp0n";
+  };
+in
+
 mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "openshot-qt";
   version = "2.4.4";
@@ -13,6 +20,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     sha256 = "0mg63v36h7l8kv2sgf6x8c1n3ygddkqqwlciz7ccxpbm4x1idqba";
   };
 
+  patches = [ fixPermissions ];
+
   nativeBuildInputs = [ doxygen wrapGAppsHook ];
 
   buildInputs = [ gtk3 ];

From d977d48baf8c5efb5f135bf31ad99d20467a18e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Sat, 31 Aug 2019 17:22:49 +0200
Subject: [PATCH 791/794] coreboot-utils: init at 4.10

Build various tools from the coreboot tree with a generic builder for better
maintainability and provide a buildEnv with all of them, similar to other
distributions' coreboot-utils package.
---
 .../virtualization/cbfstool/default.nix       |  35 ------
 pkgs/tools/misc/cbmem/default.nix             |  28 -----
 pkgs/tools/misc/coreboot-utils/default.nix    | 104 ++++++++++++++++++
 pkgs/tools/misc/ifdtool/default.nix           |  28 -----
 pkgs/tools/misc/intelmetool/default.nix       |  32 ------
 pkgs/tools/misc/nvramtool/default.nix         |  34 ------
 pkgs/top-level/all-packages.nix               |  24 ++--
 7 files changed, 118 insertions(+), 167 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/cbfstool/default.nix
 delete mode 100644 pkgs/tools/misc/cbmem/default.nix
 create mode 100644 pkgs/tools/misc/coreboot-utils/default.nix
 delete mode 100644 pkgs/tools/misc/ifdtool/default.nix
 delete mode 100644 pkgs/tools/misc/intelmetool/default.nix
 delete mode 100644 pkgs/tools/misc/nvramtool/default.nix

diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix
deleted file mode 100644
index 9cdaec1c698..00000000000
--- a/pkgs/applications/virtualization/cbfstool/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, iasl, flex, bison }:
-
-stdenv.mkDerivation rec {
-  pname = "cbfstool";
-  version = "4.9";
-
-  src = fetchurl {
-    url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
-    sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij";
-  };
-
-  nativeBuildInputs = [ flex bison ];
-  buildInputs = [ iasl ];
-
-  buildPhase = ''
-    export LEX=${flex}/bin/flex
-    make -C util/cbfstool
-    '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp util/cbfstool/cbfstool $out/bin
-    cp util/cbfstool/fmaptool $out/bin
-    cp util/cbfstool/rmodtool $out/bin
-    '';
-
-  meta = with stdenv.lib; {
-    description = "Management utility for CBFS formatted ROM images";
-    homepage = https://www.coreboot.org;
-    license = licenses.gpl2;
-    maintainers = [ maintainers.tstrobel ];
-    platforms = platforms.linux;
-  };
-}
-
diff --git a/pkgs/tools/misc/cbmem/default.nix b/pkgs/tools/misc/cbmem/default.nix
deleted file mode 100644
index d2efea1c03a..00000000000
--- a/pkgs/tools/misc/cbmem/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "cbmem";
-  version = "4.9";
-
-  src = fetchurl {
-    url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
-    sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij";
-  };
-
-  buildPhase = ''
-    make -C util/cbmem
-  '';
-
-  installPhase = ''
-    install -Dm755 util/cbmem/cbmem $out/bin/cbmem
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Read coreboot timestamps and console logs";
-    homepage = "https://www.coreboot.org";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.petabyteboy ];
-    platforms = platforms.linux;
-  };
-}
-
diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix
new file mode 100644
index 00000000000..3f6988f1f65
--- /dev/null
+++ b/pkgs/tools/misc/coreboot-utils/default.nix
@@ -0,0 +1,104 @@
+{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
+
+let
+  version = "4.10";
+
+  meta = with stdenv.lib; {
+    description = "Various coreboot-related tools";
+    homepage = "https://www.coreboot.org";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.petabyteboy ];
+    platforms = platforms.linux;
+  };
+
+  generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation (rec {
+    inherit pname version meta;
+
+    src = fetchurl {
+      url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
+      sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa";
+    };
+
+    enableParallelBuilding = true;
+
+    postPatch = ''
+      cd ${path}
+    '';
+
+    makeFlags = [
+      "INSTALL=install"
+      "PREFIX=${placeholder "out"}"
+    ];
+  } // args);
+
+  utils = {
+    msrtool = generic {
+      pname = "msrtool";
+      meta.description = "Dump chipset-specific MSR registers";
+      buildInputs = [ pciutils zlib ];
+      preConfigure = "export INSTALL=install";
+    };
+    cbmem = generic {
+      pname = "cbmem";
+      meta.description = "Coreboot console log reader";
+    };
+    ifdtool = generic {
+      pname = "ifdtool";
+      meta.description = "Extract and dump Intel Firmware Descriptor information";
+    };
+    intelmetool = generic {
+      pname = "intelmetool";
+      meta.description = "Dump interesting things about Management Engine";
+      buildInputs = [ pciutils zlib ];
+    };
+    cbfstool = generic {
+      pname = "cbfstool";
+      meta.description = "Management utility for CBFS formatted ROM images";
+    };
+    nvramtool = generic {
+      pname = "nvramtool";
+      meta.description = "Read and write coreboot parameters and display information from the coreboot table in CMOS/NVRAM";
+    };
+    superiotool = generic {
+      pname = "superiotool";
+      meta.description = "User-space utility to detect Super I/O of a mainboard and provide detailed information about the register contents of the Super I/O";
+      buildInputs = [ pciutils zlib ];
+    };
+    ectool = generic {
+      pname = "ectool";
+      meta.description = "Dump the RAM of a laptop's Embedded/Environmental Controller (EC)";
+      meta.platforms = [ "x86_64-linux" "i686-linux" ];
+      preInstall = "mkdir -p $out/sbin";
+    };
+    inteltool = generic {
+      pname = "inteltool";
+      meta.description = "Provides information about Intel CPU/chipset hardware configuration (register contents, MSRs, etc)";
+      buildInputs = [ pciutils zlib ];
+    };
+    amdfwtool = generic {
+      pname = "amdfwtool";
+      meta.description = "Create AMD firmware combination";
+      installPhase = "install -Dm755 amdfwtool $out/bin/amdfwtool";
+    };
+    acpidump-all = generic {
+      pname = "acpidump-all";
+      path = "util/acpi";
+      meta.description = "Walk through all ACPI tables with their addresses";
+      nativeBuildInputs = [ makeWrapper ];
+      dontBuild = true;
+      installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all";
+      postFixup = let 
+        binPath = [ coreutils  acpica-tools iasl gnugrep  gnused  file ];
+      in "wrapProgram $out/bin/acpidump-all --set PATH ${stdenv.lib.makeBinPath binPath}";
+    };
+  };
+
+in utils // {
+  coreboot-utils = (buildEnv {
+    name = "coreboot-utils-${version}";
+    paths = stdenv.lib.attrValues utils;
+    postBuild = "rm -rf $out/sbin";
+  }) // {
+    inherit meta version;
+  };
+}
diff --git a/pkgs/tools/misc/ifdtool/default.nix b/pkgs/tools/misc/ifdtool/default.nix
deleted file mode 100644
index 7fe4ad86b8e..00000000000
--- a/pkgs/tools/misc/ifdtool/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "ifdtool";
-  version = "4.9";
-
-  src = fetchurl {
-    url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
-    sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij";
-  };
-
-  buildPhase = ''
-    make -C util/ifdtool
-    '';
-
-  installPhase = ''
-    install -Dm755 util/ifdtool/ifdtool $out/bin/ifdtool
-    '';
-
-  meta = with stdenv.lib; {
-    description = "Extract and dump Intel Firmware Descriptor information";
-    homepage = https://www.coreboot.org;
-    license = licenses.gpl2;
-    maintainers = [ maintainers.petabyteboy ];
-    platforms = platforms.linux;
-  };
-}
-
diff --git a/pkgs/tools/misc/intelmetool/default.nix b/pkgs/tools/misc/intelmetool/default.nix
deleted file mode 100644
index 87aa7df8d6d..00000000000
--- a/pkgs/tools/misc/intelmetool/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchgit, zlib, pciutils }:
-
-stdenv.mkDerivation rec {
-  pname = "intelmetool";
-  version = "4.8.1";
-
-  src = fetchgit {
-    url = "https://review.coreboot.org/coreboot.git";
-    rev = version;
-    sha256 = "1gjisy9b7vgzjvy1fwaqhq3589yd59kkylv7apjmg5r2b3dv4zvr";
-    fetchSubmodules = false;
-  };
-
-  buildInputs = [ zlib pciutils ];
-
-  buildPhase = ''
-    make -C util/intelmetool
-    '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp util/intelmetool/intelmetool $out/bin
-    '';
-
-  meta = with stdenv.lib; {
-    description = "Dump interesting things about Management Engine";
-    homepage = https://www.coreboot.org/Nvramtool;
-    license = licenses.gpl2;
-    maintainers = [ maintainers.gnidorah ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/misc/nvramtool/default.nix b/pkgs/tools/misc/nvramtool/default.nix
deleted file mode 100644
index ecff547e951..00000000000
--- a/pkgs/tools/misc/nvramtool/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, iasl, flex, bison }:
-
-stdenv.mkDerivation rec {
-  pname = "nvramtool";
-  version = "4.8.1";
-
-  src = fetchgit {
-    url = "http://review.coreboot.org/p/coreboot";
-    rev = "refs/tags/${version}";
-    sha256 = "0nrf840jg4fn38zcnz1r10w2yfpvrk1nvsrnbbgdbgkmpjxz0zw9";
-  };
-
-  nativeBuildInputs = [ flex bison ];
-  buildInputs = [ iasl ];
-
-  buildPhase = ''
-    export LEX=${flex}/bin/flex
-    make -C util/nvramtool
-    '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp util/nvramtool/nvramtool $out/bin
-    '';
-
-  meta = with stdenv.lib; {
-    description = "utility for reading/writing coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM";
-    homepage = https://www.coreboot.org/Nvramtool;
-    license = licenses.gpl2;
-    maintainers = [ maintainers.cryptix ];
-    platforms = platforms.linux;
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccdb4e25cd9..104475fd29a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1382,6 +1382,20 @@ in
 
   corebird = callPackage ../applications/networking/corebird { };
 
+  inherit (callPackage ../tools/misc/coreboot-utils { })
+    msrtool
+    cbmem
+    ifdtool
+    intelmetool
+    cbfstool
+    nvramtool
+    superiotool
+    ectool
+    inteltool
+    amdfwtool
+    acpidump-all
+    coreboot-utils;
+
   corosync = callPackage ../servers/corosync { };
 
   cowsay = callPackage ../tools/misc/cowsay { };
@@ -11353,8 +11367,6 @@ in
 
   ilmbase = callPackage ../development/libraries/ilmbase { };
 
-  intelmetool = callPackage ../tools/misc/intelmetool { };
-
   imlib = callPackage ../development/libraries/imlib {
     libpng = libpng12;
   };
@@ -14978,14 +14990,6 @@ in
 
   seabios = callPackage ../applications/virtualization/seabios { };
 
-  cbfstool = callPackage ../applications/virtualization/cbfstool { };
-
-  ifdtool = callPackage ../tools/misc/ifdtool { };
-
-  cbmem = callPackage ../tools/misc/cbmem { };
-
-  nvramtool = callPackage ../tools/misc/nvramtool { };
-
   vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
 
   pgbouncer = callPackage ../servers/sql/pgbouncer { };

From 5c0478a9ab1f1910d1296443b830782f56d22e90 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 2 Sep 2019 09:54:20 +0200
Subject: [PATCH 792/794] biber: fix currently broken tests

---
 pkgs/tools/typesetting/biber/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
index 6d26129f2c1..55349641ab6 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, perlPackages, shortenPerlShebang, texlive }:
+{ stdenv, fetchpatch, perlPackages, shortenPerlShebang, texlive }:
 
 let
   biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs);
@@ -10,6 +10,20 @@ perlPackages.buildPerlModule {
 
   src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
 
+  patches = stdenv.lib.optionals (stdenv.lib.versionAtLeast perlPackages.perl.version "5.30") [
+    (fetchpatch {
+      name = "biber-fix-tests.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/biber-fix-tests.patch?h=5d0fffd493550e28b2fb81ad114d62a7c9403812";
+      sha256 = "1ninf46bxf4hm0p5arqbxqyv8r98xdwab34vvp467q1v23kfbhya";
+    })
+
+    (fetchpatch {
+      name = "biber-fix-tests-2.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/biber-fix-tests-2.patch?h=5d0fffd493550e28b2fb81ad114d62a7c9403812";
+      sha256 = "1l8pk454kkm0szxrv9rv9m2a0llw1jm7ffhgpyg4zfiw246n62x0";
+    })
+  ];
+
   buildInputs = with perlPackages; [
     autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
     DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K

From 59e68d3b742a8972ccd496dce7fb9bd2dd8facbf Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 3 Sep 2019 12:38:57 -0400
Subject: [PATCH 793/794] treewide: don't use single quotes with placeholder

---
 pkgs/applications/display-managers/lightdm/default.nix    | 2 +-
 pkgs/applications/misc/gpscorrelate/default.nix           | 2 +-
 pkgs/applications/misc/kjv/default.nix                    | 2 +-
 pkgs/applications/misc/plank/default.nix                  | 4 ++--
 pkgs/applications/misc/web-media-controller/default.nix   | 6 +++---
 pkgs/applications/networking/dropbox/cli.nix              | 4 ++--
 pkgs/applications/science/electronics/fped/default.nix    | 2 +-
 .../git-and-tools/git-crypt/default.nix                   | 2 +-
 .../git-and-tools/git-subrepo/default.nix                 | 6 +++---
 pkgs/desktops/deepin/dbus-factory/default.nix             | 2 +-
 pkgs/desktops/deepin/deepin-anything/default.nix          | 2 +-
 pkgs/desktops/deepin/deepin-desktop-schemas/default.nix   | 4 ++--
 pkgs/desktops/deepin/deepin-gettext-tools/default.nix     | 2 +-
 pkgs/desktops/deepin/deepin-gtk-theme/default.nix         | 2 +-
 pkgs/desktops/deepin/deepin-icon-theme/default.nix        | 2 +-
 pkgs/desktops/deepin/deepin-sound-theme/default.nix       | 2 +-
 pkgs/desktops/deepin/go-dbus-factory/default.nix          | 2 +-
 pkgs/desktops/deepin/go-dbus-generator/default.nix        | 2 +-
 pkgs/desktops/deepin/go-gir-generator/default.nix         | 2 +-
 pkgs/desktops/deepin/qt5dxcb-plugin/default.nix           | 2 +-
 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix      | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-user-share/default.nix   | 4 ++--
 .../desktops/gnome-3/extensions/taskwhisperer/default.nix | 2 +-
 pkgs/desktops/gnome-3/misc/gnome-applets/default.nix      | 2 +-
 .../pantheon/apps/switchboard-plugs/a11y/default.nix      | 2 +-
 .../pantheon/apps/switchboard-plugs/about/default.nix     | 2 +-
 .../apps/switchboard-plugs/applications/default.nix       | 2 +-
 .../pantheon/apps/switchboard-plugs/bluetooth/default.nix | 2 +-
 .../pantheon/apps/switchboard-plugs/datetime/default.nix  | 2 +-
 .../pantheon/apps/switchboard-plugs/display/default.nix   | 2 +-
 .../pantheon/apps/switchboard-plugs/keyboard/default.nix  | 2 +-
 .../apps/switchboard-plugs/mouse-touchpad/default.nix     | 2 +-
 .../pantheon/apps/switchboard-plugs/network/default.nix   | 2 +-
 .../apps/switchboard-plugs/notifications/default.nix      | 2 +-
 .../apps/switchboard-plugs/pantheon-shell/default.nix     | 2 +-
 .../pantheon/apps/switchboard-plugs/power/default.nix     | 8 ++++----
 .../pantheon/apps/switchboard-plugs/printers/default.nix  | 2 +-
 .../apps/switchboard-plugs/security-privacy/default.nix   | 2 +-
 .../pantheon/apps/switchboard-plugs/sharing/default.nix   | 2 +-
 .../pantheon/apps/switchboard-plugs/sound/default.nix     | 2 +-
 .../wingpanel-indicators/applications-menu/default.nix    | 6 +++---
 .../desktop/wingpanel-indicators/bluetooth/default.nix    | 2 +-
 .../desktop/wingpanel-indicators/datetime/default.nix     | 2 +-
 .../desktop/wingpanel-indicators/keyboard/default.nix     | 2 +-
 .../desktop/wingpanel-indicators/network/default.nix      | 2 +-
 .../desktop/wingpanel-indicators/nightlight/default.nix   | 2 +-
 .../wingpanel-indicators/notifications/default.nix        | 2 +-
 .../desktop/wingpanel-indicators/power/default.nix        | 2 +-
 .../desktop/wingpanel-indicators/session/default.nix      | 2 +-
 .../desktop/wingpanel-indicators/sound/default.nix        | 2 +-
 pkgs/desktops/pantheon/services/contractor/default.nix    | 2 +-
 pkgs/desktops/surf-display/default.nix                    | 2 +-
 pkgs/desktops/xfce4-14/xfce4-session/default.nix          | 2 +-
 pkgs/development/libraries/accountsservice/default.nix    | 2 +-
 pkgs/development/libraries/bamf/default.nix               | 4 ++--
 pkgs/development/libraries/dee/default.nix                | 2 +-
 pkgs/development/libraries/gnome-menus/default.nix        | 4 ++--
 pkgs/development/libraries/graphene/default.nix           | 4 ++--
 pkgs/development/libraries/libaccounts-glib/default.nix   | 4 ++--
 pkgs/development/libraries/libdbusmenu/default.nix        | 4 ++--
 pkgs/development/libraries/libgdata/default.nix           | 4 ++--
 pkgs/development/libraries/libgpiod/default.nix           | 2 +-
 pkgs/development/libraries/libirecovery/default.nix       | 2 +-
 pkgs/development/libraries/libmbim/default.nix            | 2 +-
 pkgs/development/libraries/libqmi/default.nix             | 2 +-
 pkgs/development/libraries/libunity/default.nix           | 2 +-
 pkgs/development/libraries/tracker/default.nix            | 4 ++--
 pkgs/development/libraries/zeitgeist/default.nix          | 2 +-
 pkgs/os-specific/linux/upower/default.nix                 | 6 +++---
 pkgs/tools/audio/mp3cat/default.nix                       | 2 +-
 pkgs/tools/misc/most/default.nix                          | 2 +-
 pkgs/tools/networking/modem-manager/default.nix           | 6 +++---
 pkgs/tools/networking/ofono/default.nix                   | 4 ++--
 pkgs/tools/security/sequoia/default.nix                   | 2 +-
 74 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 61d65cb64b6..0bd1f5e90f1 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     ++ optional withQt5 "--enable-liblightdm-qt5";
 
   installFlags = [
-    "sysconfdir=${placeholder ''out''}/etc"
+    "sysconfdir=${placeholder "out"}/etc"
     "localstatedir=\${TMPDIR}"
   ];
 
diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index 5bcaccb43bc..d10507b1044 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = [
-    "prefix=${placeholder ''out''}"
+    "prefix=${placeholder "out"}"
     "GTK=3"
     "CC=cc"
     "CXX=c++"
diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix
index 79f0b8dc6df..7868e74d010 100644
--- a/pkgs/applications/misc/kjv/default.nix
+++ b/pkgs/applications/misc/kjv/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   patches = [ add-apocrypha add-install-target ];
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
index 10c8a03fa0a..dfc92e38f63 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/pkgs/applications/misc/plank/default.nix
@@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
 
   # fix paths
   makeFlags = [
-    "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/"
-    "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
+    "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
   ];
 
   # Make plank's application launcher hidden in Pantheon
diff --git a/pkgs/applications/misc/web-media-controller/default.nix b/pkgs/applications/misc/web-media-controller/default.nix
index 6ed2ff10aaa..e381af4f403 100644
--- a/pkgs/applications/misc/web-media-controller/default.nix
+++ b/pkgs/applications/misc/web-media-controller/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ glib pcre json-glib ];
   cmakeFlags = [
-    "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder ''out''}/etc/chromium/native-messaging-hosts"
-    "-DCHROME_MANIFEST_DESTINATION=${placeholder ''out''}/etc/opt/chrome/native-messaging-hosts"
-    "-DFIREFOX_MANIFEST_DESTINATION=${placeholder ''out''}/lib/mozilla/native-messaging-hosts"
+    "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder "out"}/etc/chromium/native-messaging-hosts"
+    "-DCHROME_MANIFEST_DESTINATION=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
+    "-DFIREFOX_MANIFEST_DESTINATION=${placeholder "out"}/lib/mozilla/native-messaging-hosts"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix
index 54ed0f2eea0..9b3b99708df 100644
--- a/pkgs/applications/networking/dropbox/cli.nix
+++ b/pkgs/applications/networking/dropbox/cli.nix
@@ -53,11 +53,11 @@ stdenv.mkDerivation {
   ];
 
   configureFlags = [
-    "--with-nautilus-extension-dir=${placeholder ''nautilusExtension''}/lib/nautilus/extensions-3.0"
+    "--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0"
   ];
 
   makeFlags = [
-    "EMBLEM_DIR=${placeholder ''nautilusExtension''}/share/nautilus-dropbox/emblems"
+    "EMBLEM_DIR=${placeholder "nautilusExtension"}/share/nautilus-dropbox/emblems"
   ];
 
   meta = {
diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix
index a3b2945ac3d..0d6f23e1edb 100644
--- a/pkgs/applications/science/electronics/fped/default.nix
+++ b/pkgs/applications/science/electronics/fped/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   # This uses '/bin/bash', '/usr/local' and 'lex' by default
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
     "LEX=flex"
     "RGBDEF=${netpbm}/share/netpbm/misc/rgb.txt"
   ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index abb09ff9a45..df0b1e78d27 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
     "ENABLE_MAN=yes"
     "DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl"
   ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
index 24a1e1ac937..b196d39b46f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
-    "INSTALL_LIB=${placeholder ''out''}/bin"
-    "INSTALL_MAN=${placeholder ''out''}/share/man/man1"
+    "PREFIX=${placeholder "out"}"
+    "INSTALL_LIB=${placeholder "out"}/bin"
+    "INSTALL_MAN=${placeholder "out"}/share/man/man1"
   ];
 
   patches = [
diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix
index 3a0695f3fb8..2511f05c4ea 100644
--- a/pkgs/desktops/deepin/dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dbus-factory/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     go-dbus-generator
   ];
 
-  makeFlags = [ "GOPATH=${placeholder ''out''}/share/go" ];
+  makeFlags = [ "GOPATH=${placeholder "out"}/share/go" ];
 
   postPatch = ''
     sed -i -e 's:/share/gocode:/share/go:' Makefile
diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix
index 619c66d9f5f..7c88102c5f3 100644
--- a/pkgs/desktops/deepin/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/deepin-anything/default.nix
@@ -30,7 +30,7 @@ mkDerivation rec {
 
   makeFlags = [
     "DEB_HOST_MULTIARCH="
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
index b6c20ef7129..4f2427e8237 100644
--- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     # fix default background url
     sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \
       overrides/common/com.deepin.wrap.gnome.desktop.override
-      
+
     fixPath ${deepin-wallpapers} /usr/share/backgrounds \
       overrides/common/com.deepin.wrap.gnome.desktop.override
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     #   /usr/share/desktop-directories
   '';
 
-  makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   doCheck = true;
   checkTarget = "test";
diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
index f4f4ae2971a..67fcc36bcef 100644
--- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
+++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     python3Packages.python
   ];
 
-  makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   postPatch = ''
     sed -e 's/sudo cp/cp/' -i src/generate_mo.py
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index 4c0643a7ce5..8e2469a2c78 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
-  makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
index 8ecb25f5a2e..e63a228d0cb 100644
--- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   buildTargets = "all hicolor-links";
   installTargets = "install-icons install-cursors";
-  installFlags = [ "PREFIX=${placeholder ''out''}" ];
+  installFlags = [ "PREFIX=${placeholder "out"}" ];
 
   postInstall = ''
     cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/
diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
index 398be55398b..e61e91fc87c 100644
--- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9";
   };
 
-  makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix
index 1d97991dffd..d302cc3417f 100644
--- a/pkgs/desktops/deepin/go-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f";
   };
 
-  makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   postPatch = ''
     sed -i -e 's:/share/gocode:/share/go:' Makefile
diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix
index 2c63fd5ebe6..12562976490 100644
--- a/pkgs/desktops/deepin/go-dbus-generator/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
     "GOCACHE=$(TMPDIR)/go-cache"
   ];
 
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
index 68504d756b1..2f431bd941b 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
     "GOCACHE=$(TMPDIR)/go-cache"
   ];
 
diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
index d76bed1b9b7..4d0240c426b 100644
--- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
+++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
   ];
 
   qmakeFlags = [
-    "INSTALL_PATH=${placeholder ''out''}/${qtbase.qtPluginPrefix}/platforms"
+    "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index 4148843d4ab..7817936bfda 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-pkcs11-config=${placeholder ''out''}/etc/pkcs11/" # installation directories
-    "--with-pkcs11-modules=${placeholder ''out''}/lib/pkcs11/"
+    "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories
+    "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/"
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 65f9fb0db80..2a425acb067 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-httpd=${apacheHttpd.out}/bin/httpd"
     "--with-modules-path=${apacheHttpd.dev}/modules"
-    "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user"
-    "--with-nautilusdir=${placeholder ''out''}/lib/nautilus/extensions-3.0"
+    "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
+    "--with-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
index 745541b7cf4..d5bc0bbc83d 100644
--- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   uuid = "taskwhisperer-extension@infinicode.de";
 
   makeFlags = [
-    "INSTALLBASE=${placeholder ''out''}/share/gnome-shell/extensions"
+    "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions"
   ];
 
   patches = [
diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index 7bb162b7b8b..25e1347f1c9 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
   doCheck = true;
 
   configureFlags = [
-    "--with-libpanel-applet-dir=${placeholder ''out''}/share/gnome-panel/applets"
+    "--with-libpanel-applet-dir=${placeholder "out"}/share/gnome-panel/applets"
   ];
 
   passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index 3b85b123fd0..7a79f72f1a2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Universal Access Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index bd6df460c04..3247aed4993 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     ./remove-update-button.patch
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard About Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index dca9cc662a2..ddb589c9e79 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Applications Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index d1663ad48cd..9f1c75b7b43 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Bluetooth Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index fb7ea18e88b..c0c7bbdec2e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     ./clock-format.patch
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Date & Time Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index c15abfd8cb8..76cfe61fc77 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Displays Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index ba753af7e20..8b82543a0e5 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Keyboard Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 00579c54525..7e572e2326b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Mouse & Touchpad Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 09d6da4f246..b3e4879fdae 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   ];
 
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Networking Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index e547f22fec1..a6112495469 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Notifications Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index b9fad17c2f7..6046a4d2125 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   '';
 
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Desktop Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 461ddcd3764..ea197643b95 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -64,10 +64,10 @@ stdenv.mkDerivation rec {
       --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas
   '';
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
-  PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/system-services";
-  PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder ''out''}/etc";
-  PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder ''out''}/share/polkit-1/actions";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
+  PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/system-services";
+  PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder "out"}/etc";
+  PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
 
   meta = with stdenv.lib; {
     description = "Switchboard Power Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index 5c303e04982..d1feaaf0ea4 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Printers Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index 19967c3bce0..04214054616 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     zeitgeist
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   patches = [
     ./hardcode-gsettings.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index b4aafb27006..87ae233916d 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Sharing Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index ed3518c764f..dee2f851e3f 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   meta = with stdenv.lib; {
     description = "Switchboard Sound Plug";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 9f40c0f9e58..ae138c9215c 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -70,11 +70,11 @@ stdenv.mkDerivation rec {
    ];
 
   mesonFlags = [
-    "--sysconfdir=${placeholder ''out''}/etc"
+    "--sysconfdir=${placeholder "out"}/etc"
   ];
 
-  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
 
   patches = [
     (substituteAll {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 7e73adcd7e9..36d1cf0e77a 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     wingpanel
   ];
 
-  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
 
   postPatch = ''
     chmod +x meson/post_install.py
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 1ab3c579e14..74408a4ed6d 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
 
   postPatch = ''
     chmod +x meson/post_install.py
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index 00a57cb9943..5431b982f54 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
 
   meta = with stdenv.lib; {
     description = "Keyboard Indicator for Wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index d5ce97df509..6ba19ebf77e 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     wingpanel
   ];
 
-  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
 
   meta = with stdenv.lib; {
     description = "Network Indicator for Wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index 0eab02bf8c8..0327d5e78e2 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     wingpanel
   ];
 
-  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
 
   meta = with stdenv.lib; {
     description = "Night Light Indicator for Wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index 78c901a2306..a4266a6f459 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     wingpanel
   ];
 
-  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
 
   meta = with stdenv.lib; {
     description = "Notifications Indicator for Wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index f63cca74a4d..9f9d4703060 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     wingpanel
   ];
 
-  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
 
   postPatch = ''
     chmod +x meson/post_install.py
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index b363cb5485a..f48638ff2b1 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     wingpanel
   ];
 
-  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
 
   meta = with stdenv.lib; {
     description = "Session Indicator for Wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index 6d0e791d1e4..038ab75094c 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     wingpanel
   ];
 
-  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+  PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
 
   postPatch = ''
     chmod +x meson/post_install.py
diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix
index 6401b96a2ea..b10e97f77d7 100644
--- a/pkgs/desktops/pantheon/services/contractor/default.nix
+++ b/pkgs/desktops/pantheon/services/contractor/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     libgee
   ];
 
-  PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/services";
+  PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services";
 
   meta = with stdenv.lib; {
     description = "A desktop-wide extension service used by elementary OS";
diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix
index f3554fe0b40..47b7e117206 100644
--- a/pkgs/desktops/surf-display/default.nix
+++ b/pkgs/desktops/surf-display/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
        --prefix PATH ':' ${stdenv.lib.makeBinPath buildInputs}
   '';
 
-  makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   meta = with stdenv.lib; {
     description = "Kiosk browser session manager based on the surf browser";
diff --git a/pkgs/desktops/xfce4-14/xfce4-session/default.nix b/pkgs/desktops/xfce4-14/xfce4-session/default.nix
index 070f40b52d5..3361f541dc5 100644
--- a/pkgs/desktops/xfce4-14/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-session/default.nix
@@ -9,7 +9,7 @@ mkXfceDerivation rec {
 
   buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];
 
-  configureFlags = [ "--with-xsession-prefix=${placeholder ''out''}" ];
+  configureFlags = [ "--with-xsession-prefix=${placeholder "out"}" ];
 
   # See https://github.com/NixOS/nixpkgs/issues/36468
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 8713663ecca..860ac3fde41 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dadmin_group=wheel"
     "-Dlocalstatedir=/var"
-    "-Dsystemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
+    "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index de436864eda..b1fb17b08fa 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
 
   # fix paths
   makeFlags = [
-    "INTROSPECTION_GIRDIR=${placeholder ''dev''}/share/gir-1.0/"
-    "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
+    "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
   ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index 04ecadadefa..093cc2bdf05 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-gtk-doc"
-    "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
+    "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix
index 501fe4d0849..f6ff3a2ea4a 100644
--- a/pkgs/development/libraries/gnome-menus/default.nix
+++ b/pkgs/development/libraries/gnome-menus/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   };
 
   makeFlags = [
-    "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/"
-    "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
+    "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
   ];
 
   nativeBuildInputs = [ pkgconfig gettext ];
diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix
index c439e763e73..0348135c7b2 100644
--- a/pkgs/development/libraries/graphene/default.nix
+++ b/pkgs/development/libraries/graphene/default.nix
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dgtk_doc=true"
-    "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share"
-    "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec"
+    "-Dinstalled_test_datadir=${placeholder "installedTests"}/share"
+    "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec"
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
index 7f9dbf3a21f..07e0a3500a7 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22
   patches = [ ./py-override.patch ];
 
-  nativeBuildInputs = [ 
+  nativeBuildInputs = [
     check
     docbook_xml_dtd_43
     docbook_xsl
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   LC_ALL = "en_US.UTF-8";
 
   mesonFlags = [
-    "-Dpy-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
+    "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix
index e064084f695..a7bfe7f17a2 100644
--- a/pkgs/development/libraries/libdbusmenu/default.nix
+++ b/pkgs/development/libraries/libdbusmenu/default.nix
@@ -49,9 +49,9 @@ stdenv.mkDerivation rec {
   doCheck = false; # generates shebangs in check phase, too lazy to fix
 
   installFlags = [
-    "sysconfdir=${placeholder ''out''}/etc"
+    "sysconfdir=${placeholder "out"}/etc"
     "localstatedir=\${TMPDIR}"
-    "typelibdir=${placeholder ''out''}/lib/girepository-1.0"
+    "typelibdir=${placeholder "out"}/lib/girepository-1.0"
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
index f61283aec4a..14fc7e64a0b 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -77,8 +77,8 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dgtk_doc=false"
-    "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec"
-    "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share"
+    "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec"
+    "-Dinstalled_test_datadir=${placeholder "installedTests"}/share"
     "-Dinstalled_tests=true"
   ];
 
diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
index 23f46ad2a0c..782c0a8857a 100644
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-tools=${if enable-tools then "yes" else "no"}"
     "--enable-bindings-cxx"
-    "--prefix=${placeholder ''out''}"
+    "--prefix=${placeholder "out"}"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix
index 32a2971b3e3..be05f120e13 100644
--- a/pkgs/development/libraries/libirecovery/default.nix
+++ b/pkgs/development/libraries/libirecovery/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   # as only the `idevicerestore` binary was tested so far (which worked
   # without further configuration).
   configureFlags = [
-    "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d"
+    "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
     ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""''
   ];
 
diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index 406b88ea8c1..7a7bd115328 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "man" ];
 
   configureFlags = [
-    "--with-udev-base-dir=${placeholder ''out''}/lib/udev"
+    "--with-udev-base-dir=${placeholder "out"}/lib/udev"
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index 8a239048390..930eafc9675 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   configureFlags = [
-    "--with-udev-base-dir=${placeholder ''out''}/lib/udev"
+    "--with-udev-base-dir=${placeholder "out"}/lib/udev"
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index a0ec3b74cc1..501bf9a3dc9 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-static"
-    "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
+    "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index 397184f798a..db4f620a740 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -30,8 +30,8 @@ in stdenv.mkDerivation rec {
   LC_ALL = "en_US.UTF-8";
 
   mesonFlags = [
-    "-Ddbus_services=${placeholder ''out''}/share/dbus-1/services"
-    "-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user"
+    "-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
+    "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user"
     # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
     "-Dfunctional_tests=false"
     "-Ddocs=true"
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index c5dc775d075..9e3b06453bf 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "NOCONFIGURE=1 ./autogen.sh";
 
-  configureFlags = [ "--with-session-bus-services-dir=${placeholder ''out''}/share/dbus-1/services" ];
+  configureFlags = [ "--with-session-bus-services-dir=${placeholder "out"}/share/dbus-1/services" ];
 
   nativeBuildInputs = [
     autoconf automake libtool pkgconfig gettext gobject-introspection vala python2Packages.python
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 14458356a79..6b0dc179d0f 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
   ]
   ++ stdenv.lib.optional useSystemd [
-    "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
-    "--with-systemdutildir=${placeholder ''out''}/lib/systemd"
-    "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d"
+    "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
+    "--with-systemdutildir=${placeholder "out"}/lib/systemd"
+    "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
   ]
   ;
 
diff --git a/pkgs/tools/audio/mp3cat/default.nix b/pkgs/tools/audio/mp3cat/default.nix
index 19f670793ba..acd11bc75e6 100644
--- a/pkgs/tools/audio/mp3cat/default.nix
+++ b/pkgs/tools/audio/mp3cat/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
   ];
 
   installTargets = [
diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix
index 6baaa38f1bb..7adac5ee2ee 100644
--- a/pkgs/tools/misc/most/default.nix
+++ b/pkgs/tools/misc/most/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "doc" ];
 
   makeFlags = [
-    "DOC_DIR=${placeholder ''doc''}/share/doc/most"
+    "DOC_DIR=${placeholder "doc"}/share/doc/most"
   ];
 
   preConfigure = ''
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index 6f0732b8cfd..b2644d0c2a4 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-polkit"
-    "--with-udev-base-dir=${placeholder ''out''}/lib/udev"
-    "--with-dbus-sys-dir=${placeholder ''out''}/etc/dbus-1/system.d"
-    "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
+    "--with-udev-base-dir=${placeholder "out"}/lib/udev"
+    "--with-dbus-sys-dir=${placeholder "out"}/etc/dbus-1/system.d"
+    "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--with-systemd-suspend-resume"
diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix
index 21d1f9ee067..27f4b9562b3 100644
--- a/pkgs/tools/networking/ofono/default.nix
+++ b/pkgs/tools/networking/ofono/default.nix
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-dbusconfdir=${placeholder ''out''}/share"
-    "--with-systemdunitdir=${placeholder ''out''}/lib/systemd/system"
+    "--with-dbusconfdir=${placeholder "out"}/share"
+    "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
     "--enable-external-ell"
   ];
 
diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix
index 5d9ffca6937..5848f7d92af 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/pkgs/tools/security/sequoia/default.nix
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
   ;
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
   ];
 
   buildFlags = [

From 1f49035aca52303abb2e09976baf36f297eb68a6 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@iohk.io>
Date: Sat, 18 May 2019 17:45:38 +0000
Subject: [PATCH 794/794] ruby.withPackages: init

Co-authored-by: Alyssa Ross <hi@alyssa.is>
---
 doc/languages-frameworks/ruby.section.md      |  365 +++
 maintainers/scripts/update-ruby-packages      |   13 +
 .../development/interpreters/ruby/default.nix |    8 +
 .../ruby-modules/gem-config/default.nix       |  107 +-
 .../ruby-modules/gem/gem-post-build.rb        |    2 +-
 .../ruby-modules/with-packages/Gemfile        |  159 +
 .../ruby-modules/with-packages/default.nix    |   75 +
 .../with-packages/require_exceptions.nix      |   84 +
 .../ruby-modules/with-packages/test.nix       |   48 +
 .../ruby-modules/with-packages/test.rb        |   76 +
 pkgs/top-level/all-packages.nix               |    5 +
 pkgs/top-level/ruby-packages.nix              | 2666 +++++++++++++++++
 12 files changed, 3581 insertions(+), 27 deletions(-)
 create mode 100644 doc/languages-frameworks/ruby.section.md
 create mode 100755 maintainers/scripts/update-ruby-packages
 create mode 100644 pkgs/development/ruby-modules/with-packages/Gemfile
 create mode 100644 pkgs/development/ruby-modules/with-packages/default.nix
 create mode 100644 pkgs/development/ruby-modules/with-packages/require_exceptions.nix
 create mode 100644 pkgs/development/ruby-modules/with-packages/test.nix
 create mode 100755 pkgs/development/ruby-modules/with-packages/test.rb
 create mode 100644 pkgs/top-level/ruby-packages.nix

diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md
new file mode 100644
index 00000000000..e4c4ffce043
--- /dev/null
+++ b/doc/languages-frameworks/ruby.section.md
@@ -0,0 +1,365 @@
+---
+title: Ruby
+author: Michael Fellinger
+date: 2019-05-23
+---
+
+# Ruby
+
+## User Guide
+
+### Using Ruby
+
+#### Overview
+
+Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby.
+The attribute `ruby` refers to the default Ruby interpreter, which is currently
+MRI 2.5. It's also possible to refer to specific versions, e.g. `ruby_2_6`, `jruby`, or `mruby`.
+
+In the nixpkgs tree, Ruby packages can be found throughout, depending on what
+they do, and are called from the main package set. Ruby gems, however are
+separate sets, and there's one default set for each interpreter (currently MRI
+only).
+
+There are two main approaches for using Ruby with gems.
+One is to use a specifically locked `Gemfile` for an application that has very strict dependencies.
+The other is to depend on the common gems, which we'll explain further down, and
+rely on them being updated regularly.
+
+The interpreters have common attributes, namely `gems`, and `withPackages`. So
+you can refer to `ruby.gems.nokogiri`, or `ruby_2_5.gems.nokogiri` to get the
+Nokogiri gem already compiled and ready to use.
+
+Since not all gems have executables like `nokogiri`, it's usually more
+convenient to use the `withPackages` function like this:
+`ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the
+Ruby in your environment will be able to find the gem and it can be used in your
+Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"`
+as usual.
+
+#### Temporary Ruby environment with `nix-shell`
+
+Rather than having a single Ruby environment shared by all Ruby
+development projects on a system, Nix allows you to create separate
+environments per project.  `nix-shell` gives you the possibility to
+temporarily load another environment akin to a combined `chruby` or
+`rvm` and `bundle exec`.
+
+There are two methods for loading a shell with Ruby packages. The first and
+recommended method is to create an environment with `ruby.withPackages` and load
+that.
+
+```shell
+nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])"
+```
+
+The other method, which is not recommended, is to create an environment and list
+all the packages directly.
+
+```shell
+nix-shell -p ruby.gems.nokogiri ruby.gems.pry
+```
+
+Again, it's possible to launch the interpreter from the shell. The Ruby
+interpreter has the attribute `gems` which contains all Ruby gems for that
+specific interpreter.
+
+##### Load environment from `.nix` expression
+
+As explained in the Nix manual, `nix-shell` can also load an expression from a
+`.nix` file. Say we want to have Ruby 2.5, `nokogori`, and `pry`. Consider a
+`shell.nix` file with:
+
+```nix
+with import <nixpkgs> {};
+ruby.withPackages (ps: with ps; [ nokogiri pry ])
+```
+
+What's happening here?
+
+1. We begin with importing the Nix Packages collections. `import <nixpkgs>`
+   imports the `<nixpkgs>` function, `{}` calls it and the `with` statement
+   brings all attributes of `nixpkgs` in the local scope. These attributes form
+   the main package set.
+2. Then we create a Ruby environment with the `withPackages` function.
+3. The `withPackages` function expects us to provide a function as an argument
+   that takes the set of all ruby gems and returns a list of packages to include
+   in the environment. Here, we select the packages `nokogiri` and `pry` from
+   the package set.
+
+##### Execute command with `--run`
+
+A convenient flag for `nix-shell` is `--run`. It executes a command in the
+`nix-shell`. We can e.g. directly open a `pry` REPL:
+
+```shell
+nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry"
+```
+
+Or immediately require `nokogiri` in pry:
+
+```shell
+nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry -rnokogiri"
+```
+
+Or run a script using this environment:
+
+```shell
+nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb"
+```
+
+##### Using `nix-shell` as shebang
+
+In fact, for the last case, there is a more convenient method. You can add a
+[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
+specifying which dependencies `nix-shell` needs. With the following shebang, you
+can just execute `./example.rb`, and it will run with all dependencies.
+
+```ruby
+#! /usr/bin/env nix-shell
+#! nix-shell -i ruby -p "ruby.withPackages (ps: with ps; [ nokogiri rest-client ])"
+
+require 'nokogiri'
+require 'rest-client'
+
+body = RestClient.get('http://example.com').body
+puts Nokogiri::HTML(body).at('h1').text
+```
+
+### Developing with Ruby
+
+#### Using an existing Gemfile
+
+In most cases, you'll already have a `Gemfile.lock` listing all your dependencies.
+This can be used to generate a `gemset.nix` which is used to fetch the gems and
+combine them into a single environment.
+The reason why you need to have a separate file for this, is that Nix requires
+you to have a checksum for each input to your build.
+Since the `Gemfile.lock` that `bundler` generates doesn't provide us with
+checksums, we have to first download each gem, calculate its SHA256, and store
+it in this separate file.
+
+So the steps from having just a `Gemfile` to a `gemset.nix` are:
+
+```shell
+bundle lock
+bundix
+```
+
+If you already have a `Gemfile.lock`, you can simply run `bundix` and it will
+work the same.
+
+To update the gems in your `Gemfile.lock`, you may use the `bundix -l` flag,
+which will create a new `Gemfile.lock` in case the `Gemfile` has a more recent
+time of modification.
+
+Once the `gemset.nix` is generated, it can be used in a
+`bundlerEnv` derivation. Here is an example you could use for your `shell.nix`:
+
+```nix
+# ...
+let
+  gems = bundlerEnv {
+    name = "gems-for-some-project";
+    gemdir = ./.;
+  };
+in mkShell { buildInputs = [ gems gems.wrappedRuby ]; }
+```
+
+With this file in your directory, you can run `nix-shell` to build and use the gems.
+The important parts here are `bundlerEnv` and `wrappedRuby`.
+
+The `bundlerEnv` is a wrapper over all the gems in your gemset. This means that
+all the `/lib` and `/bin` directories will be available, and the executables of
+all gems (even of indirect dependencies) will end up in your `$PATH`.
+The `wrappedRuby` provides you with all executables that come with Ruby itself,
+but wrapped so they can easily find the gems in your gemset.
+
+One common issue that you might have is that you have Ruby 2.6, but also
+`bundler` in your gemset. That leads to a conflict for `/bin/bundle` and
+`/bin/bundler`. You can resolve this by wrapping either your Ruby or your gems
+in a `lowPrio` call. So in order to give the `bundler` from your gemset
+priority, it would be used like this:
+
+```nix
+# ...
+mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; }
+```
+
+
+#### Gem-specific configurations and workarounds
+
+In some cases, especially if the gem has native extensions, you might need to
+modify the way the gem is built.
+
+This is done via a common configuration file that includes all of the
+workarounds for each gem.
+
+This file lives at `/pkgs/development/ruby-modules/gem-config/default.nix`,
+since it already contains a lot of entries, it should be pretty easy to add the
+modifications you need for your needs.
+
+In the meanwhile, or if the modification is for a private gem, you can also add
+the configuration to only your own environment.
+
+Two places that allow this modification are the `ruby` derivation, or `bundlerEnv`.
+
+Here's the `ruby` one:
+
+```nix
+{ pg_version ? "10", pkgs ? import <nixpkgs> { } }:
+let
+  myRuby = pkgs.ruby.override {
+    defaultGemConfig = pkgs.defaultGemConfig // {
+      pg = attrs: {
+        buildFlags =
+        [ "--with-pg-config=${pkgs."postgresql_${pg_version}"}/bin/pg_config" ];
+      };
+    };
+  };
+in myRuby.withPackages (ps: with ps; [ pg ])
+```
+
+And an example with `bundlerEnv`:
+
+```nix
+{ pg_version ? "10", pkgs ? import <nixpkgs> { } }:
+let
+  gems = pkgs.bundlerEnv {
+    name = "gems-for-some-project";
+    gemdir = ./.;
+    gemConfig = pkgs.defaultGemConfig // {
+      pg = attrs: {
+        buildFlags =
+        [ "--with-pg-config=${pkgs."postgresql_${pg_version}"}/bin/pg_config" ];
+      };
+    };
+  };
+in mkShell { buildInputs = [ gems gems.wrappedRuby ]; }
+```
+
+And finally via overlays:
+
+```nix
+{ pg_version ? "10" }:
+let
+  pkgs = import <nixpkgs> {
+    overlays = [
+      (self: super: {
+        defaultGemConfig = super.defaultGemConfig // {
+          pg = attrs: {
+            buildFlags = [
+              "--with-pg-config=${
+                pkgs."postgresql_${pg_version}"
+              }/bin/pg_config"
+            ];
+          };
+        };
+      })
+    ];
+  };
+in pkgs.ruby.withPackages (ps: with ps; [ pg ])
+```
+
+Then we can get whichever postgresql version we desire and the `pg` gem will
+always reference it correctly:
+
+```shell
+$ nix-shell --argstr pg_version 9_4 --run 'ruby -rpg -e "puts PG.library_version"'
+90421
+
+$ nix-shell --run 'ruby -rpg -e "puts PG.library_version"'
+100007
+```
+
+Of course for this use-case one could also use overlays since the configuration
+for `pg` depends on the `postgresql` alias, but for demonstration purposes this
+has to suffice.
+
+#### Adding a gem to the default gemset
+
+Now that you know how to get a working Ruby environment with Nix, it's time to
+go forward and start actually developing with Ruby.
+We will first have a look at how Ruby gems are packaged on Nix. Then, we will
+look at how you can use development mode with your code.
+
+All gems in the standard set are automatically generated from a single
+`Gemfile`. The dependency resolution is done with `bundler` and makes it more
+likely that all gems are compatible to each other.
+
+In order to add a new gem to nixpkgs, you can put it into the
+`/pkgs/development/ruby-modules/with-packages/Gemfile` and run
+`./maintainers/scripts/update-ruby-packages`.
+
+To test that it works, you can then try using the gem with:
+
+```shell
+NIX_PATH=nixpkgs=$PWD nix-shell -p "ruby.withPackages (ps: with ps; [ name-of-your-gem ])"
+```
+
+#### Packaging applications
+
+A common task is to add a ruby executable to nixpkgs, popular examples would be
+`chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp`
+function, that allows you to make a package that only exposes the listed
+executables, otherwise the package may cause conflicts through common paths like
+`bin/rake` or `bin/bundler` that aren't meant to be used.
+
+The absolute easiest way to do that is to write a
+`Gemfile` along these lines:
+
+```ruby
+source 'https://rubygems.org' do
+  gem 'mdl'
+end
+```
+
+If you want to package a specific version, you can use the standard Gemfile
+syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable
+version anyway, it's easier to update by simply running the `bundle lock` and
+`bundix` steps again.
+
+Now you can also also make a `default.nix` that looks like this:
+
+```nix
+{ lib, bundlerApp }:
+
+bundlerApp {
+  pname = "mdl";
+  gemdir = ./.;
+  exes = [ "mdl" ];
+}
+```
+
+All that's left to do is to generate the corresponding `Gemfile.lock` and
+`gemset.nix` as described above in the `Using an existing Gemfile` section.
+
+##### Packaging executables that require wrapping
+
+Sometimes your app will depend on other executables at runtime, and tries to
+find it through the `PATH` environment variable.
+
+In this case, you can provide a `postBuild` hook to `bundlerApp` that wraps the
+gem in another script that prefixes the `PATH`.
+
+Of course you could also make a custom `gemConfig` if you know exactly how to
+patch it, but it's usually much easier to maintain with a simple wrapper so the
+patch doesn't have to be adjusted for each version.
+
+Here's another example:
+
+```nix
+{ lib, bundlerApp, makeWrapper, git, gnutar, gzip }:
+
+bundlerApp {
+  pname = "r10k";
+  gemdir = ./.;
+  exes = [ "r10k" ];
+
+  buildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]}
+  '';
+}
+```
diff --git a/maintainers/scripts/update-ruby-packages b/maintainers/scripts/update-ruby-packages
new file mode 100755
index 00000000000..fef6b75ded0
--- /dev/null
+++ b/maintainers/scripts/update-ruby-packages
@@ -0,0 +1,13 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bundler bundix
+
+set -euf -o pipefail
+
+(
+  cd pkgs/development/ruby-modules/with-packages
+  rm -f gemset.nix Gemfile.lock
+  bundle lock
+  bundix
+  mv gemset.nix ../../../top-level/ruby-packages.nix
+  rm -f Gemfile.lock
+)
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 02e76d5e127..cfe76a2caa1 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -3,6 +3,7 @@
 , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
 , autoconf, libiconv, libobjc, libunwind, Foundation
 , buildEnv, bundler, bundix
+, makeWrapper, buildRubyGem, defaultGemConfig
 } @ args:
 
 let
@@ -44,6 +45,7 @@ let
       , autoreconfHook, bison, autoconf
       , buildEnv, bundler, bundix
       , libiconv, libobjc, libunwind, Foundation
+      , makeWrapper, buildRubyGem, defaultGemConfig
       }:
       stdenv.mkDerivation rec {
         pname = "ruby";
@@ -195,6 +197,12 @@ let
             ruby = self;
           };
 
+          inherit (import ../../ruby-modules/with-packages {
+            inherit lib stdenv makeWrapper buildRubyGem buildEnv;
+            gemConfig = defaultGemConfig;
+            ruby = self;
+          }) withPackages gems;
+
           # deprecated 2016-09-21
           majorVersion = ver.major;
           minorVersion = ver.minor;
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 4e9bd0538a9..7f6ca505fc1 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -19,13 +19,13 @@
 
 { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
-, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
+, pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
 , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
-, bison, flex, pango, python3, patchelf
-, libselinux ? null, libsepol ? null
+, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
+, bundler, libsass, libselinux ? null, libsepol ? null
 }@args:
 
 let
@@ -42,8 +42,9 @@ in
 
 {
   atk = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gtk2 pcre rake ];
+    dependencies = attrs.dependencies ++ [ "gobject-introspection" ];
+    nativeBuildInputs = [ rake bundler pkgconfig ];
+    propagatedBuildInputs = [ gobject-introspection wrapGAppsHook atk ];
   };
 
   bundler = attrs:
@@ -85,6 +86,38 @@ in
     buildInputs = [ protobuf ];
   };
 
+  cocoapods-acknowledgements = attrs: {
+    dependencies = attrs.dependencies ++ [ "cocoapods" ];
+  };
+
+  cocoapods-deploy = attrs: {
+    dependencies = [ "cocoapods" ];
+  };
+
+  cocoapods-disable-podfile-validations = attrs: {
+    dependencies = [ "cocoapods" ];
+  };
+
+  cocoapods-generate = attrs: {
+    dependencies = attrs.dependencies ++ [ "cocoapods" ];
+  };
+
+  cocoapods-git_url_rewriter = attrs: {
+    dependencies = [ "cocoapods" ];
+  };
+
+  cocoapods-keys = attrs: {
+    dependencies = attrs.dependencies ++ [ "cocoapods" ];
+  };
+
+  cocoapods-open = attrs: {
+    dependencies = [ "cocoapods" ];
+  };
+
+  cocoapods-try-release-fix = attrs: {
+    dependencies = [ "cocoapods" ];
+  };
+
   curb = attrs: {
     buildInputs = [ curl ];
   };
@@ -113,12 +146,13 @@ in
     '';
   };
 
-  fog-dnsimple = attrs: {
-    postInstall = ''
-      cd $(cat $out/nix-support/gem-meta/install-path)
-      rm {$out/bin,bin,../../bin}/{setup,console}
-    '';
-  };
+  fog-dnsimple = attrs:
+    lib.optionalAttrs (lib.versionOlder attrs.version "1.0.1") {
+      postInstall = ''
+        cd $(cat $out/nix-support/gem-meta/install-path)
+        rm {$out/bin,bin,../../bin}/{setup,console}
+      '';
+    };
 
   redis-rack = attrs: {
     dontBuild = false;
@@ -158,8 +192,8 @@ in
   };
 
   gdk_pixbuf2 = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ rake gdk-pixbuf ];
+    nativeBuildInputs = [ pkgconfig bundler rake ];
+    propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ];
   };
 
   gpgme = attrs: {
@@ -179,8 +213,14 @@ in
   };
 
   gtk2 = attrs: {
-    nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
-    buildInputs = [
+    nativeBuildInputs = [
+      binutils pkgconfig
+    ] ++ lib.optionals stdenv.isLinux [
+      utillinux libselinux libsepol
+    ];
+    propagatedBuildInputs = [
+      atk
+      gdk-pixbuf
       fribidi
       gobject-introspection
       gtk2
@@ -194,8 +234,8 @@ in
   };
 
   gobject-introspection = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gobject-introspection gtk2 pcre ];
+    nativeBuildInputs = [ pkgconfig pcre ];
+    propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ];
   };
 
   grpc = attrs: {
@@ -239,6 +279,10 @@ in
     buildFlags = [ "--with-system-v8=true" ];
   };
 
+  execjs = attrs: {
+    propagatedBuildInputs = [ v8 ];
+  };
+
   libxml-ruby = attrs: {
     buildFlags = [
       "--with-xml2-lib=${libxml2.out}/lib"
@@ -333,16 +377,15 @@ in
   };
 
   pango = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [
+    nativeBuildInputs = [
+      pkgconfig
       fribidi
-      gobject-introspection
-      gtk2
       harfbuzz
       pcre
       xorg.libpthreadstubs
       xorg.libXdmcp
     ];
+    propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gtk2 ];
   };
 
   patron = attrs: {
@@ -380,7 +423,12 @@ in
         "
       '';
     } else {
-      buildInputs = [ libsodium ];
+      dontBuild = false;
+      postPatch = ''
+        substituteInPlace lib/rbnacl/sodium.rb \
+          --replace 'ffi_lib ["sodium"' \
+                    'ffi_lib ["${libsodium}/lib/libsodium${stdenv.hostPlatform.extensions.sharedLibrary}"'
+      '';
     };
 
   re2 = attrs: {
@@ -439,6 +487,12 @@ in
 
   sassc = attrs: {
     nativeBuildInputs = [ rake ];
+    dontBuild = false;
+    SASS_LIBSASS_PATH = "${libsass}";
+    postPatch = ''
+      substituteInPlace lib/sassc/native.rb \
+        --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")'
+    '';
   };
 
   scrypt = attrs:
@@ -471,7 +525,7 @@ in
   sup = attrs: {
     dontBuild = false;
     # prevent sup from trying to dynamically install `xapian-ruby`.
-    nativeBuildInputs = [ rake ];
+    nativeBuildInputs = [ bundler rake ];
     postPatch = ''
       cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb
 
@@ -506,6 +560,7 @@ in
 
   tiny_tds = attrs: {
     nativeBuildInputs = [ pkgconfig openssl ];
+    buildInputs = [ freetds ];
   };
 
   therubyracer = attrs: {
@@ -541,13 +596,13 @@ in
   xapian-ruby = attrs: {
     # use the system xapian
     dontBuild = false;
-    nativeBuildInputs = [ rake pkgconfig ];
-    buildInputs = [ xapian_1_2_22 zlib ];
+    nativeBuildInputs = [ rake pkgconfig bundler ];
+    buildInputs = [ xapian zlib ];
     postPatch = ''
       cp ${./xapian-Rakefile} Rakefile
     '';
     preInstall = ''
-      export XAPIAN_CONFIG=${xapian_1_2_22}/bin/xapian-config
+      export XAPIAN_CONFIG=${xapian}/bin/xapian-config
     '';
   };
 
diff --git a/pkgs/development/ruby-modules/gem/gem-post-build.rb b/pkgs/development/ruby-modules/gem/gem-post-build.rb
index f0322b67f61..b754f945986 100644
--- a/pkgs/development/ruby-modules/gem/gem-post-build.rb
+++ b/pkgs/development/ruby-modules/gem/gem-post-build.rb
@@ -7,7 +7,7 @@ ruby = File.join(ENV["ruby"], "bin", RbConfig::CONFIG['ruby_install_name'])
 out = ENV["out"]
 bin_path = File.join(ENV["out"], "bin")
 gem_home = ENV["GEM_HOME"]
-gem_path = ENV["GEM_PATH"].split(File::PATH_SEPARATOR)
+gem_path = ENV["GEM_PATH"].split(File::PATH_SEPARATOR).uniq
 install_path = Dir.glob("#{gem_home}/gems/*").first
 gemspec_path = ARGV[0]
 
diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile
new file mode 100644
index 00000000000..0cd04f07b94
--- /dev/null
+++ b/pkgs/development/ruby-modules/with-packages/Gemfile
@@ -0,0 +1,159 @@
+source 'https://rubygems.org' do
+  gem 'addressable'
+  gem 'atk'
+  gem 'awesome_print'
+  gem 'bacon'
+  # gem 'bundler' already got a package for that
+  gem 'byebug'
+  gem 'cairo'
+  gem 'cairo-gobject'
+  gem 'camping'
+  # gem 'capybara-webkit' takes too long to build right now since webkit depends on ruby
+  gem 'charlock_holmes'
+  gem 'cld3'
+  gem 'cocoapods'
+  gem 'cocoapods-acknowledgements'
+  gem 'cocoapods-art'
+  gem 'cocoapods-bin'
+  gem 'cocoapods-browser'
+  gem 'cocoapods-bugsnag'
+  gem 'cocoapods-check'
+  gem 'cocoapods-clean'
+  gem 'cocoapods-clean_build_phases_scripts'
+  gem 'cocoapods-core'
+  gem 'cocoapods-coverage'
+  gem 'cocoapods-deintegrate'
+  gem 'cocoapods-dependencies'
+  gem 'cocoapods-deploy'
+  gem 'cocoapods-downloader'
+  gem 'cocoapods-expert-difficulty'
+  gem 'cocoapods-fix-react-native'
+  gem 'cocoapods-generate'
+  gem 'cocoapods-git_url_rewriter'
+  gem 'cocoapods-keys'
+  gem 'cocoapods-no-dev-schemes'
+  gem 'cocoapods-open'
+  gem 'cocoapods-packager'
+  gem 'cocoapods-playgrounds'
+  gem 'cocoapods-plugins'
+  gem 'cocoapods-prune-localizations'
+  gem 'cocoapods-rome'
+  gem 'cocoapods-search'
+  gem 'cocoapods-sorted-search'
+  gem 'cocoapods-static-swift-framework'
+  gem 'cocoapods-stats'
+  gem 'cocoapods-tdfire-binary'
+  gem 'cocoapods-testing'
+  gem 'cocoapods-trunk'
+  gem 'cocoapods-try'
+  gem 'cocoapods-try-release-fix'
+  gem 'cocoapods-update-if-you-dare'
+  gem 'cocoapods-whitelist'
+  gem 'cocoapods-wholemodule'
+  gem 'coderay'
+  gem 'concurrent-ruby'
+  gem 'curb'
+  gem 'curses'
+  gem 'daemons'
+  gem 'dep-selector-libgecode'
+  gem 'digest-sha3'
+  gem 'domain_name'
+  gem 'do_sqlite3'
+  gem 'ethon'
+  gem 'eventmachine'
+  gem 'excon'
+  gem 'faraday'
+  gem 'ffi'
+  gem 'ffi-rzmq-core'
+  gem 'fog-dnsimple'
+  gem 'gdk_pixbuf2'
+  gem 'gio2'
+  gem 'gitlab-markup'
+  gem 'glib2'
+  # gem 'gobject-introspection' fails on require
+  gem 'gpgme'
+  # gem 'grpc' fails to build
+  gem 'gtk2'
+  gem 'hashie'
+  gem 'highline'
+  gem 'hike'
+  gem 'hitimes'
+  gem 'hpricot'
+  gem 'httpclient'
+  gem 'http-cookie'
+  gem 'iconv'
+  gem 'idn-ruby'
+  gem 'jbuilder'
+  gem 'jekyll'
+  gem 'jmespath'
+  gem 'jwt'
+  gem 'libv8'
+  gem 'libxml-ruby'
+  gem 'magic'
+  gem 'markaby'
+  gem 'method_source'
+  gem 'mini_magick'
+  gem 'msgpack'
+  gem 'mysql2'
+  # gem 'mysql' deprecated
+  gem 'ncursesw'
+  gem 'netrc'
+  gem 'net-scp'
+  gem 'net-ssh'
+  gem 'nokogiri'
+  gem 'opus-ruby'
+  gem 'ovirt-engine-sdk'
+  gem 'pango'
+  gem 'patron'
+  gem 'pcaprub'
+  gem 'pg'
+  gem 'pry'
+  gem 'pry-byebug'
+  gem 'pry-doc'
+  gem 'public_suffix'
+  gem 'puma'
+  gem 'rails'
+  gem 'rainbow'
+  # gem 'rbczmq' deprecated
+  gem 'rbnacl'
+  gem 'rb-readline'
+  gem 're2'
+  gem 'redis'
+  gem 'redis-rack'
+  gem 'rest-client'
+  gem 'rmagick'
+  gem 'rpam2'
+  gem 'rspec'
+  gem 'rubocop'
+  gem 'rubocop-performance'
+  gem 'ruby-libvirt'
+  gem 'ruby-lxc'
+  gem 'ruby-progressbar'
+  gem 'ruby-terminfo'
+  gem 'ruby-vips'
+  gem 'rubyzip'
+  gem 'rugged'
+  gem 'sassc'
+  gem 'scrypt'
+  gem 'semian'
+  gem 'sequel'
+  gem 'sequel_pg'
+  gem 'simplecov'
+  gem 'sinatra'
+  gem 'slop'
+  gem 'snappy'
+  gem 'sqlite3'
+  gem 'taglib-ruby'
+  gem 'therubyracer'
+  gem 'thrift'
+  gem 'tilt'
+  gem 'tiny_tds'
+  gem 'treetop'
+  gem 'typhoeus'
+  gem 'tzinfo'
+  gem 'unf_ext'
+  gem 'uuid4r'
+  gem 'whois'
+  # gem 'xapian-ruby' doesn't contain ruby code
+  gem 'zookeeper'
+end
diff --git a/pkgs/development/ruby-modules/with-packages/default.nix b/pkgs/development/ruby-modules/with-packages/default.nix
new file mode 100644
index 00000000000..ac0a33f4561
--- /dev/null
+++ b/pkgs/development/ruby-modules/with-packages/default.nix
@@ -0,0 +1,75 @@
+{ stdenv, lib, buildEnv, buildRubyGem, ruby, gemConfig, makeWrapper }:
+
+/*
+Example usage:
+nix-shell -E "(import <nixpkgs> {}).ruby.withPackages (pkgs: with pkgs; [ pry nokogiri ])"
+
+You can also use this for writing ruby scripts that run anywhere that has nix
+using a nix-shell shebang:
+  #!/usr/bin/env nix-shell
+  #!nix-shell -i ruby -p "ruby.withPackages (pkgs: with pkgs; [ pry nokogiri ])"
+
+
+Run the following in the nixpkgs root directory to update the ruby-packages.nix:
+./maintainers/scripts/update-ruby-packages
+*/
+
+let
+  functions = import ../bundled-common/functions.nix { inherit lib gemConfig; };
+
+  buildGems = gemset:
+    let
+      realGemset = if builtins.isAttrs gemset then gemset else import gemset;
+      builtGems =
+        lib.mapAttrs (name: initialAttrs:
+          let
+            attrs = functions.applyGemConfigs ({ inherit ruby; gemName = name; } // initialAttrs);
+          in
+            buildRubyGem (functions.composeGemAttrs ruby builtGems name attrs)
+        ) realGemset;
+    in builtGems;
+
+  gems = buildGems (import ../../../top-level/ruby-packages.nix);
+
+  withPackages = selector:
+    let
+      selected = selector gems;
+
+      gemEnv = buildEnv {
+        name = "ruby-gems";
+        paths = selected;
+        pathsToLink = [ "/lib" "/bin" "/nix-support" ];
+      };
+
+      wrappedRuby = stdenv.mkDerivation {
+        name = "wrapped-${ruby.name}";
+        nativeBuildInputs = [ makeWrapper ];
+        buildCommand = ''
+          mkdir -p $out/bin
+          for i in ${ruby}/bin/*; do
+            makeWrapper "$i" $out/bin/$(basename "$i") --set GEM_PATH ${gemEnv}/${ruby.gemPath}
+          done
+        '';
+      };
+
+    in stdenv.mkDerivation {
+      name = "${ruby.name}-with-packages";
+      nativeBuildInputs = [ makeWrapper ];
+      buildInputs = [ selected ruby ];
+
+      unpackPhase = ":";
+
+      installPhase = ''
+        for i in ${ruby}/bin/* ${gemEnv}/bin/*; do
+          rm -f $out/bin/$(basename "$i")
+          makeWrapper "$i" $out/bin/$(basename "$i") --set GEM_PATH ${gemEnv}/${ruby.gemPath}
+        done
+      '';
+
+      passthru = {
+        inherit wrappedRuby;
+        gems = selected;
+      };
+    };
+
+in { inherit withPackages gems buildGems; }
diff --git a/pkgs/development/ruby-modules/with-packages/require_exceptions.nix b/pkgs/development/ruby-modules/with-packages/require_exceptions.nix
new file mode 100644
index 00000000000..e6ae3b5013f
--- /dev/null
+++ b/pkgs/development/ruby-modules/with-packages/require_exceptions.nix
@@ -0,0 +1,84 @@
+let
+  cocoapod-plugin = name: ''
+    require "cocoapods"
+    require "#{Gem::Specification.find_by_name(%(${name})).gem_dir}/lib/cocoapods_plugin"
+  '';
+in {
+  actioncable = [ "action_cable" ];
+  actionmailer = [ "action_mailer" ];
+  actionpack = [ "action_pack" ];
+  actionview = [ "action_view" ];
+  activejob = [ "active_job" ];
+  activemodel = [ "active_model" ];
+  activerecord = [ "active_record" ];
+  activestorage = [ "active_storage" ];
+  activesupport = [ "active_support" ];
+  atk = [ "atk" ];
+  CFPropertyList = [ "cfpropertylist" ];
+  cocoapods-acknowledgements = [ "cocoapods" "cocoapods_acknowledgements" ];
+  cocoapods-art = [ "cocoapods_art" ];
+  cocoapods-browser = [ "cocoapods" "cocoapods_plugin" ];
+  cocoapods-bugsnag = cocoapod-plugin "cocoapods-bugsnag";
+  cocoapods-clean = [ "cocoapods_clean" ];
+  cocoapods-coverage = [ "cocoapods_coverage" ];
+  cocoapods-deintegrate = [ ]; # used by cocoapods
+  cocoapods-dependencies = [ "cocoapods_dependencies" ];
+  cocoapods-deploy = cocoapod-plugin "cocoapods-deploy";
+  cocoapods-generate = cocoapod-plugin "cocoapods-generate";
+  cocoapods-git_url_rewriter = cocoapod-plugin "cocoapods-git_url_rewriter";
+  cocoapods-keys = []; # osx only cocoapod-plugin "cocoapods-keys";
+  cocoapods-open = [ "cocoapods" "cocoapods_plugin" ];
+  cocoapods-packager = [ "cocoapods_packager" ];
+  cocoapods-packager-pro = [ ]; # requires osx
+  cocoapods-plugins = [ "cocoapods_plugins" ];
+  cocoapods-sorted-search = [ ]; # requires osx
+  cocoapods-check = cocoapod-plugin "cocoapods-check";
+  cocoapods-disable-podfile-validations = cocoapod-plugin "cocoapods-disable-podfile-validations";
+  cocoapods-stats = [ "cocoapods_stats" ];
+  cocoapods-testing = [ "cocoapods_testing" ];
+  cocoapods-trunk = [ "cocoapods_trunk" ];
+  cocoapods-try = [ "cocoapods_try" ];
+  cocoapods-try-release-fix = cocoapod-plugin "cocoapods-try-release-fix";
+  digest-sha3 = [ "digest/sha3" ];
+  ffi-compiler = [ "ffi-compiler/loader" ];
+  fog-core = [ "fog/core" ];
+  fog-dnsimple = [ "fog/dnsimple" ];
+  fog-json = [ "fog/json" ];
+  forwardable-extended = [ "forwardable/extended" ];
+  gdk_pixbuf2 = [ "gdk_pixbuf2" ];
+  gitlab-markup = [ "github/markup" ];
+  gobject-introspection = [ "gobject-introspection" ];
+  gtk2 = [ ]; # requires display
+  idn-ruby = [ "idn" ];
+  jekyll-sass-converter = []; # tested through jekyll
+  libxml-ruby = [ "libxml" ];
+  multipart-post = [ "multipart_post" ];
+  unicode-display_width = [ "unicode/display_width" ];
+  nap = [ "rest" ];
+  net-scp = [ "net/scp" ];
+  net-ssh = [ "net/ssh" ];
+  nio4r = [ "nio" ];
+  osx_keychain = [ ]; # requires osx
+  ovirt-engine-sdk = [ "ovirtsdk4" ];
+  pango = [ "pango" ];
+  rack-test = [ "rack/test" ];
+  railties = [ "rails" ];
+  rspec-core = [ "rspec/core" ];
+  rspec-expectations = [ "rspec/expectations" ];
+  rspec-mocks = [ "rspec/mocks" ];
+  rspec-support = [ "rspec/support" ];
+  RubyInline = [ "inline" ];
+  ruby-libvirt = [ "libvirt" ];
+  ruby-lxc = [ "lxc" ];
+  ruby-macho = [ "macho" ];
+  ruby-terminfo = [ "terminfo" ];
+  rubyzip = [ "zip" ];
+  sequel_pg = [ "pg" "sequel" "sequel/adapters/postgresql" "sequel_pg" ];
+  simplecov-html = [ ]; # tested through simplecov
+  sinatra = [ "sinatra/base" ];
+  sprockets-rails = [ "sprockets/rails" ];
+  taglib-ruby = [ "taglib" ];
+  websocket-driver = [ "websocket/driver" ];
+  websocket-extensions = [ "websocket/extensions" ];
+  ZenTest = [ "zentest" ];
+}
diff --git a/pkgs/development/ruby-modules/with-packages/test.nix b/pkgs/development/ruby-modules/with-packages/test.nix
new file mode 100644
index 00000000000..92ded1004e3
--- /dev/null
+++ b/pkgs/development/ruby-modules/with-packages/test.nix
@@ -0,0 +1,48 @@
+# a generic test suite for all gems for all ruby versions.
+# use via nix-build.
+let
+  pkgs = import ../../../.. {};
+  lib = pkgs.lib;
+  stdenv = pkgs.stdenv;
+
+  rubyVersions = with pkgs; [
+    ruby_2_4
+    ruby_2_5
+    ruby_2_6
+  ];
+
+  gemTests =
+    (lib.mapAttrs
+      (name: gem: [ name ])
+      pkgs.ruby.gems) //
+    (import ./require_exceptions.nix);
+
+  tests = ruby:
+    lib.mapAttrs (name: gem:
+      let
+        test =
+          if builtins.isList gemTests."${name}"
+          then pkgs.writeText "${name}.rb" ''
+                puts "${name} GEM_HOME: #{ENV['GEM_HOME']}"
+                ${lib.concatStringsSep "\n" (map (n: "require '${n}'") gemTests."${name}")}
+              ''
+          else pkgs.writeText "${name}.rb" gemTests."${name}";
+
+        deps = ruby.withPackages (g: [ g."${name}" ]);
+      in stdenv.mkDerivation {
+        name = "test-gem-${ruby.name}-${name}";
+        buildInputs = [ deps ];
+        buildCommand = ''
+          INLINEDIR=$PWD ruby ${test}
+          touch $out
+        '';
+      }
+    ) ruby.gems;
+in
+  stdenv.mkDerivation {
+    name = "test-all-ruby-gems";
+    buildInputs = builtins.foldl' (sum: ruby: sum ++ ( builtins.attrValues (tests ruby) )) [] rubyVersions;
+    buildCommand = ''
+      touch $out
+    '';
+  }
diff --git a/pkgs/development/ruby-modules/with-packages/test.rb b/pkgs/development/ruby-modules/with-packages/test.rb
new file mode 100755
index 00000000000..760402d070c
--- /dev/null
+++ b/pkgs/development/ruby-modules/with-packages/test.rb
@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+
+# this is a quick and dirty test suite for easier analyzing of breakages in a
+# manual testing.
+# For automated testing use the test.nix
+
+require 'fileutils'
+
+class FakeGemfile
+  attr_reader :gems
+
+  def initialize
+    @gems = []
+  end
+
+  def source(_source, &block)
+    instance_exec(&block)
+  end
+
+  def gem(name)
+    @gems << name
+  end
+end
+
+gemfile = File.expand_path(File.join(__dir__, 'Gemfile'))
+packages = FakeGemfile.new.instance_eval(File.read(gemfile), gemfile)
+
+test_cases = packages.map { |pkg| [pkg, "require '#{pkg}'"] }.to_h
+
+test_cases.merge!(
+  'digest-sha3' => "require 'digest/sha3'",
+  'gitlab-markup' => "require 'github/markup'",
+  'idn-ruby' => "require 'idn'",
+  'net-scp' => "require 'net/scp'",
+  'taglib-ruby' => "require 'taglib'",
+  'net-ssh' => "require 'net/ssh'",
+  'ruby-libvirt' => "require 'libvirt'",
+  'ruby-lxc' => "require 'lxc'",
+  'rubyzip' => "require 'zip'",
+  'sinatra' => "require 'sinatra/base'",
+  'libxml-ruby' => "require 'libxml'",
+  'ruby-terminfo' => "require 'terminfo'",
+  'ovirt-engine-sdk' => "require 'ovirtsdk4'",
+  'fog-dnsimple' => "require 'fog/dnsimple'"
+)
+
+test_cases['sequel_pg'] = <<~TEST
+  require 'pg'
+  require 'sequel'
+  require 'sequel/adapters/postgresql'
+  require 'sequel_pg'
+TEST
+
+tmpdir = File.expand_path(File.join(__dir__, 'tests'))
+FileUtils.rm_rf(tmpdir)
+FileUtils.mkdir_p(tmpdir)
+
+failing = test_cases.reject do |name, test_case|
+  test_case = <<~SHELL
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i ruby -E "(import ../../../.. {}).ruby.withPackages (r: [ r.#{name} ] )"
+    #{test_case}
+  SHELL
+
+  file = File.join(tmpdir, "#{name}_test.rb")
+  File.write(file, test_case)
+  FileUtils.chmod('u=wrx', file)
+
+  system(file) && FileUtils.rm(file)
+end
+
+exit if failing.empty?
+
+puts "Following gems failed: #{failing.keys.join(' ')}"
+puts "tests for failing gems remain in #{tmpdir}"
+exit 1
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5045c8894f2..eccf4850ffe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8977,6 +8977,11 @@ in
 
   ruby = ruby_2_5;
 
+  rubyPackages_2_3 = recurseIntoAttrs ruby_2_3.gems;
+  rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems;
+  rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems;
+  rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems;
+
   mruby = callPackage ../development/compilers/mruby { };
 
   scsh = callPackage ../development/interpreters/scsh { };
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
new file mode 100644
index 00000000000..ed2321887a7
--- /dev/null
+++ b/pkgs/top-level/ruby-packages.nix
@@ -0,0 +1,2666 @@
+{
+  actionmailer = {
+    dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18wwlj4f7jffv3vxm80d2z36nwza95l5xfcqc401hvvrls4xzhsy";
+      type = "gem";
+    };
+    version = "4.2.11.1";
+  };
+  actionpack = {
+    dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh";
+      type = "gem";
+    };
+    version = "4.2.11.1";
+  };
+  actionview = {
+    dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p";
+      type = "gem";
+    };
+    version = "4.2.11.1";
+  };
+  activejob = {
+    dependencies = ["activesupport" "globalid"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jy1c1r6syjqpa0sh9f1p4iaxzvp6qg4n6zs774j9z27q7h407mj";
+      type = "gem";
+    };
+    version = "4.2.11.1";
+  };
+  activemodel = {
+    dependencies = ["activesupport" "builder"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33";
+      type = "gem";
+    };
+    version = "4.2.11.1";
+  };
+  activerecord = {
+    dependencies = ["activemodel" "activesupport" "arel"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p";
+      type = "gem";
+    };
+    version = "4.2.11.1";
+  };
+  activesupport = {
+    dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
+      type = "gem";
+    };
+    version = "4.2.11.1";
+  };
+  addressable = {
+    dependencies = ["public_suffix"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  arel = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4";
+      type = "gem";
+    };
+    version = "6.0.4";
+  };
+  ast = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  atk = {
+    dependencies = ["glib2"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0saginz71qy4k1hz3sffrjd6zcw54jsm61f7jks02fxys31ir865";
+      type = "gem";
+    };
+    version = "3.3.7";
+  };
+  atomos = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
+  awesome_print = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
+  bacon = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1f06gdj77bmwzc1k5iragl1595hbn67yc7sqvs56ca8plrr2vmai";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  builder = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
+      type = "gem";
+    };
+    version = "3.2.3";
+  };
+  byebug = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mmkls9n56l4gx2k0dnyianwz36z2zgpxli5bpsbr7jbw7hn2x6j";
+      type = "gem";
+    };
+    version = "11.0.1";
+  };
+  cairo = {
+    dependencies = ["native-package-installer" "pkg-config"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yvv2lcbsybzbw1nrmfivmln23da4rndrs3av6ymjh0x3ww5h7p8";
+      type = "gem";
+    };
+    version = "1.16.4";
+  };
+  cairo-gobject = {
+    dependencies = ["cairo" "glib2"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1380dvd5dbnhlvagb9z9cr62kh1knza7bcgr9msqshj55iqk4p0k";
+      type = "gem";
+    };
+    version = "3.3.7";
+  };
+  camping = {
+    dependencies = ["mab" "rack"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q2a5x97pgnld0b8yziblp9fqkjyib4gfwv9gcyynyhswqwsldpf";
+      type = "gem";
+    };
+    version = "2.1.532";
+  };
+  CFPropertyList = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8";
+      type = "gem";
+    };
+    version = "3.0.1";
+  };
+  charlock_holmes = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
+      type = "gem";
+    };
+    version = "0.7.6";
+  };
+  claide = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  clamp = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dka8f3hwzz7p558kiyyrdabljvwp71cbzk46akb3kvnvhcyjx89";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  cld3 = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06p4jgrr0zixqnflmg5dcrbmhlnmll85j7vxkrjmnng293cwvzgw";
+      type = "gem";
+    };
+    version = "3.2.4";
+  };
+  cocoapods = {
+    dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz";
+      type = "gem";
+    };
+    version = "1.7.5";
+  };
+  cocoapods-acknowledgements = {
+    dependencies = ["activesupport" "redcarpet"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07n638ijlc4y5vfzs5ykzhmwwsng7njb2nnwn4ravydqqxqgv13m";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
+  cocoapods-art = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gp7rib26diw4n5gs4dcb8sy0dga9xmdw0i2nwdqn1qm3qp7kbg5";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  cocoapods-bin = {
+    dependencies = ["cocoapods" "cocoapods-generate" "parallel"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03x5grabb8nyky0nq1h78vmlka66pkgdif0f6i6nhjfy96gpil87";
+      type = "gem";
+    };
+    version = "0.1.18";
+  };
+  cocoapods-browser = {
+    dependencies = ["cocoapods"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mq9mcw3xnf2nqkmcjg874sx422dbmfa99vhw31c9jb0cd4j3m9p";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
+  cocoapods-bugsnag = {
+    dependencies = ["cocoapods"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r34h66rqswsyhanx69qnhhr02xsqy2y1zp5265gl6m76nyqq5wa";
+      type = "gem";
+    };
+    version = "2.0.1";
+  };
+  cocoapods-check = {
+    dependencies = ["cocoapods"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17wb5xzhjvrqllsjqqbm00w8gnsrwcb6k7wsb36ykbcp0aiagvaf";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  cocoapods-clean = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16zy8xl94clblxivlcrw2jf3dnvmwlr6jni6kz74rnc8wj42sf1w";
+      type = "gem";
+    };
+    version = "0.0.1";
+  };
+  cocoapods-clean_build_phases_scripts = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b91sfsriizsr08m1vn9j4sf9sb8vgsyr6xjnw18bpy66bpwsqca";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  cocoapods-core = {
+    dependencies = ["activesupport" "fuzzy_match" "nap"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4";
+      type = "gem";
+    };
+    version = "1.7.5";
+  };
+  cocoapods-coverage = {
+    dependencies = ["cocoapods-testing" "slather"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04bzk1x67pqrmnmz3pdw107j5p9ncwfm7gdv8n4bk4r9nqxdv3wn";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  cocoapods-deintegrate = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  cocoapods-dependencies = {
+    dependencies = ["ruby-graphviz"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10ssv98af44698kp4w0wfdrc7x3ccf2w9dhcva6i7hwlffjvcsz3";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  cocoapods-deploy = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qnhl54z0dqyn0sk7rgn3vwmfax0yr3sk2r464h888d2qjxz6v7j";
+      type = "gem";
+    };
+    version = "0.0.12";
+  };
+  cocoapods-disable-podfile-validations = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fxrq0b1x5gr2gr9md6mkwgaj8519gf1sbyqs88yqphbigf5iy75";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  cocoapods-downloader = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
+  cocoapods-expert-difficulty = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19shjj4kj9rqg1a3pax568q0w9rkq8jcba2mycvq0szbv7bw6pgl";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  cocoapods-fix-react-native = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01aqxp4d5v8fjbg9f7a61h1b4fnmrqwhrng28ybd80p2z44s186a";
+      type = "gem";
+    };
+    version = "2019.03.19.11";
+  };
+  cocoapods-generate = {
+    dependencies = ["cocoapods-disable-podfile-validations"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hlczv5x4qz60daqb93cis2l5ps86cvx74rrl6qwggwz2hm76adr";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  cocoapods-git_url_rewriter = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cmyrj92d781pkq1b6qbvpmxvfx8k3l36cdqsi46w55icjm1jqbw";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  cocoapods-keys = {
+    dependencies = ["dotenv" "osx_keychain"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14jmfibzvhqxhvhphj3g83d70ya16p7s4i43wir48hnaxkaqrm85";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  cocoapods-no-dev-schemes = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14w8yqs3r6pg06zpv58mc9vzfxhp3ka4mfhnc2p7vmyhy4nmcdza";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  cocoapods-open = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1z9x1cqrz4zc6yd08clawi8gg7ip8vbhkh9lkrdkzw7i6lqyrp0j";
+      type = "gem";
+    };
+    version = "0.0.8";
+  };
+  cocoapods-packager = {
+    dependencies = ["cocoapods"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1083zv9pyqyqal6dk3kvfxdmylbll6078z5zw03m4j5jcz3m8nbm";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  cocoapods-packager-pro = {
+    dependencies = ["cocoapods"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sjnlnqrc3fvc33c3lg3h6y8n969isjswxg2jdc1kfc3x0cakawl";
+      type = "gem";
+    };
+    version = "1.5.4";
+  };
+  cocoapods-playgrounds = {
+    dependencies = ["cocoapods"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jsc489j6dh3mczzs880vc6jvzd8yjqrszmbbnkz9azndak3mhln";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
+  cocoapods-plugins = {
+    dependencies = ["nap"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16na82sfyc8801qs1n22nwq486s4j7yj6rj7fcp8cbxmj371fpbj";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  cocoapods-prune-localizations = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hvpl56rnblmdbj40sysvk56j5hx5kdpqry00raw2p184sb5k4cf";
+      type = "gem";
+    };
+    version = "0.3.1";
+  };
+  cocoapods-rome = {
+    dependencies = ["cocoapods" "fourflusher"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1z5z49m5aww7q301bn5dzb6fzq6lcj6fvqibpg5ys1r0c41lsj0l";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  cocoapods-search = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  cocoapods-sorted-search = {
+    dependencies = ["cocoapods" "hashie" "osx_keychain" "ruby-progressbar" "typhoeus"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1da86mjq4spfsx6xjk7qylvj5423ai9y39g9xxfl9r6h8i54dmpp";
+      type = "gem";
+    };
+    version = "0.2.4";
+  };
+  cocoapods-static-swift-framework = {
+    dependencies = ["cocoapods"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12hhh25bj5dyz6rwc5jgarlld35vmgn43qk5lq9kfrpcli2ynhp2";
+      type = "gem";
+    };
+    version = "0.5";
+  };
+  cocoapods-stats = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  cocoapods-tdfire-binary = {
+    dependencies = ["cocoapods" "cocoapods-bin" "cocoapods-packager-pro"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10idp7yr2zni6zhpj1pqkj4wkk5g48f5iizjb20i8minj52l64m0";
+      type = "gem";
+    };
+    version = "2.0.9";
+  };
+  cocoapods-testing = {
+    dependencies = ["xctasks"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0f7w4gxr45m42ca6fpbq38jfzii00xysz12vcc68myvi8x0krr5l";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  cocoapods-trunk = {
+    dependencies = ["nap" "netrc"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  cocoapods-try = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  cocoapods-try-release-fix = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a7hbc5j0p507cyd9a0rd2mf2d525ia3gcnx7bdspxqnhl0a43bf";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  cocoapods-update-if-you-dare = {
+    dependencies = ["colored2"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nqvywrbfxiagip2vl9kj71h39g4idq1lshkxl5bqh1hq57g4k9q";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  cocoapods-whitelist = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ln4kywj4bx32qyqvr0byi3g4fk8yj026n00xch782x0147f8lka";
+      type = "gem";
+    };
+    version = "0.0.11";
+  };
+  cocoapods-wholemodule = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03gr4r0aa9mrj8i27dd6l87jzq78sid3jbywmkazg3yrq6y38i21";
+      type = "gem";
+    };
+    version = "0.0.1";
+  };
+  coderay = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
+  colorator = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  colored2 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
+      type = "gem";
+    };
+    version = "3.1.2";
+  };
+  concurrent-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
+  crass = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  curb = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0s27g4nkdf8wipzyxx87nnw43ps8xqg30sqz86ay7dvmmpkd786k";
+      type = "gem";
+    };
+    version = "0.9.10";
+  };
+  curses = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkh62n5jbkfka8s5sgvhzzpsjkgsr9d3g7b8grhvy92yigkrr7z";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  daemons = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  data_objects = {
+    dependencies = ["addressable"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19fw1ckqc5f1wc4r72qrymy2k6cmd8azbxpn61ksbsjqhzc2bgqd";
+      type = "gem";
+    };
+    version = "0.10.17";
+  };
+  dep-selector-libgecode = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nff0nai8h8786xix92f3k5wjb51gqd9gkibmah2bvrcwyn9qiw5";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  diff-lcs = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
+      type = "gem";
+    };
+    version = "1.3";
+  };
+  digest-sha3 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "135a8r9nq10wlzbjm74dflls67y9iiwp04aj1089ablbmvbiiq41";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  do_sqlite3 = {
+    dependencies = ["data_objects"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gxz54qjgwg6a2mkqpai28m0i5swbyxpr4qmh9x1nwf20lysrgcf";
+      type = "gem";
+    };
+    version = "0.10.17";
+  };
+  docile = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
+  domain_name = {
+    dependencies = ["unf"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
+      type = "gem";
+    };
+    version = "0.5.20190701";
+  };
+  dotenv = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17hkd62ig9b0czv192kqdfq7gw0a8hgq07yclri6myc8y5lmfin5";
+      type = "gem";
+    };
+    version = "2.7.5";
+  };
+  em-websocket = {
+    dependencies = ["eventmachine" "http_parser.rb"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3";
+      type = "gem";
+    };
+    version = "0.5.1";
+  };
+  erubis = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  escape = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sa1xkfc9jvkwyw1jbz3jhkq0ms1zrvswi6mmfiwcisg5fp497z4";
+      type = "gem";
+    };
+    version = "0.0.4";
+  };
+  ethon = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9";
+      type = "gem";
+    };
+    version = "0.12.0";
+  };
+  eventmachine = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
+      type = "gem";
+    };
+    version = "1.2.7";
+  };
+  excon = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05qmrx7l8abpbvp0z01fdpc731c4k6akk67l424vdp5dywhachpr";
+      type = "gem";
+    };
+    version = "0.66.0";
+  };
+  faraday = {
+    dependencies = ["multipart-post"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
+      type = "gem";
+    };
+    version = "0.15.4";
+  };
+  ffi = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+      type = "gem";
+    };
+    version = "1.10.0";
+  };
+  ffi-compiler = {
+    dependencies = ["ffi" "rake"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  ffi-rzmq-core = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0amkbvljpjfnv0jpdmz71p1i3mqbhyrnhamjn566w0c01xd64hb5";
+      type = "gem";
+    };
+    version = "1.0.7";
+  };
+  fog-core = {
+    dependencies = ["builder" "excon" "formatador" "mime-types"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fsama04wlxhv537bm4b7rr4zzn0mvisy87m3qzv6f0mhlrq3zp8";
+      type = "gem";
+    };
+    version = "2.1.2";
+  };
+  fog-dnsimple = {
+    dependencies = ["fog-core" "fog-json"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lbzkc0w96a62ahjw0b7mfbqgg9x2jp7khg5hvpbgw0kfs5xza63";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  fog-json = {
+    dependencies = ["fog-core" "multi_json"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  formatador = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
+      type = "gem";
+    };
+    version = "0.2.5";
+  };
+  forwardable-extended = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v";
+      type = "gem";
+    };
+    version = "2.6.0";
+  };
+  fourflusher = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1afabh3g3gwj0ad53fs62waks815xcckf7pkci76l6vrghffcg8v";
+      type = "gem";
+    };
+    version = "2.3.1";
+  };
+  fuzzy_match = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19gw1ifsgfrv7xdi6n61658vffgm1867f4xdqfswb2b5h6alzpmm";
+      type = "gem";
+    };
+    version = "2.0.4";
+  };
+  gdk_pixbuf2 = {
+    dependencies = ["gio2"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bvw0xlq0nrvzv559d3kbihc8m3iv3q70cs6xan0n6dywxayizbf";
+      type = "gem";
+    };
+    version = "3.3.7";
+  };
+  gh_inspector = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
+  gio2 = {
+    dependencies = ["gobject-introspection"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cv617ad4bhd3qhi5m0638v0mf9kw32g7r89c754xsmmas921igc";
+      type = "gem";
+    };
+    version = "3.3.7";
+  };
+  gitlab-markup = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  glib2 = {
+    dependencies = ["native-package-installer" "pkg-config"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08cqwk8valxv4bls891f3ciqa258vbsfgqd3mymf62qdld8m9y3z";
+      type = "gem";
+    };
+    version = "3.3.7";
+  };
+  globalid = {
+    dependencies = ["activesupport"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  gobject-introspection = {
+    dependencies = ["glib2"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14kcf8079wmimzy78yysizsl44d6iaw2pp5xj70vdxg342r4a6k5";
+      type = "gem";
+    };
+    version = "3.3.7";
+  };
+  gpgme = {
+    dependencies = ["mini_portile2"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m";
+      type = "gem";
+    };
+    version = "2.0.18";
+  };
+  gtk2 = {
+    dependencies = ["atk" "gdk_pixbuf2" "pango"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hgb555j5pimy8pjpf20pzbmhpr1wx59phlwbwsq37zjv89wirva";
+      type = "gem";
+    };
+    version = "3.3.7";
+  };
+  hashie = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13bdzfp25c8k51ayzxqkbzag3wj5gc1jd8h7d985nsq6pn57g5xh";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  highline = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g0zpalfj8wvca86hcnirir5py2zyqrhkgdgv9f87fxkjaw815wr";
+      type = "gem";
+    };
+    version = "2.0.2";
+  };
+  hike = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hbhmchyhm1xf632cczmyg3fsbn7zly988q3fjpi8l3nb4cn40xj";
+      type = "gem";
+    };
+    version = "2.1.3";
+  };
+  hitimes = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1w2lkanmw9was9v6b90vhi23rigdq9nc1brrsdvxczxd3c39b36x";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  hpricot = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z";
+      type = "gem";
+    };
+    version = "0.8.6";
+  };
+  http-accept = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  http-cookie = {
+    dependencies = ["domain_name"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  "http_parser.rb" = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  httpclient = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
+      type = "gem";
+    };
+    version = "2.8.3";
+  };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+      type = "gem";
+    };
+    version = "0.9.5";
+  };
+  iconv = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00fppiz9ypy7xpc08xdk6glq842rbc69c7a1p0kmv195271i4yqv";
+      type = "gem";
+    };
+    version = "1.0.8";
+  };
+  idn-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  jaro_winkler = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf";
+      type = "gem";
+    };
+    version = "1.5.3";
+  };
+  jbuilder = {
+    dependencies = ["activesupport"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03adzsc2hfd0lvprm45s52bkxpnpnw8r9prcx8zx1aw2a8lzp9r7";
+      type = "gem";
+    };
+    version = "2.9.1";
+  };
+  jekyll = {
+    dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa";
+      type = "gem";
+    };
+    version = "4.0.0";
+  };
+  jekyll-sass-converter = {
+    dependencies = ["sassc"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fbc25p8vqyzmg8wpmgacqjkk3jhrr6kz9y45m43ygck74h2cad2";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  jekyll-watch = {
+    dependencies = ["listen"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qd7hy1kl87fl7l0frw5qbn22x7ayfzlv9a5ca1m59g0ym1ysi5w";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  jmespath = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  jwt = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01zg1vp3lyl3flyjdkrcc93ghf833qgfgh2p1biqfhkzz11r129c";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  kramdown = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  kramdown-parser-gfm = {
+    dependencies = ["kramdown"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  libv8 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0271i5sfma05gvhmrmxqb0jj667bl6m54yd49ay6yrdbh1g4wpl1";
+      type = "gem";
+    };
+    version = "3.16.14.19";
+  };
+  libxml-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r7m7zipkpam8ns4ys4qyh7yj3is3dy7ky6qwnw557pvpgx0aqrd";
+      type = "gem";
+    };
+    version = "3.1.0";
+  };
+  liquid = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by";
+      type = "gem";
+    };
+    version = "4.0.3";
+  };
+  listen = {
+    dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
+      type = "gem";
+    };
+    version = "3.1.5";
+  };
+  loofah = {
+    dependencies = ["crass" "nokogiri"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
+      type = "gem";
+    };
+    version = "2.2.3";
+  };
+  mab = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0manxbilpx0hdi19lhdsr4ncvbzgmwh279b64j8w60dg0p0i4b4j";
+      type = "gem";
+    };
+    version = "0.0.3";
+  };
+  magic = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18vkdq2748wxg0kr923fbhx92wikh2dwv2hp8xind57qs7gn26pr";
+      type = "gem";
+    };
+    version = "0.2.9";
+  };
+  mail = {
+    dependencies = ["mini_mime"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
+      type = "gem";
+    };
+    version = "2.7.1";
+  };
+  markaby = {
+    dependencies = ["builder"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1j4jc31ycydbkh5h3q6zwidzpavg3g5mbb5lqyaczd3jrq78rd7i";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  mercenary = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  method_source = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
+  mime-types = {
+    dependencies = ["mime-types-data"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
+      type = "gem";
+    };
+    version = "3.2.2";
+  };
+  mime-types-data = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
+      type = "gem";
+    };
+    version = "3.2019.0331";
+  };
+  mini_magick = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4";
+      type = "gem";
+    };
+    version = "4.9.5";
+  };
+  mini_mime = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  mini_portile2 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  minitest = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+      type = "gem";
+    };
+    version = "5.11.3";
+  };
+  molinillo = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6";
+      type = "gem";
+    };
+    version = "0.6.6";
+  };
+  msgpack = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  multi_json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+      type = "gem";
+    };
+    version = "1.13.1";
+  };
+  multipart-post = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
+      type = "gem";
+    };
+    version = "2.1.1";
+  };
+  mysql2 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1a2kdjgzwh1p2rkcmxaawy6ibi32b04wbdd5d4wr8i342pq76di4";
+      type = "gem";
+    };
+    version = "0.5.2";
+  };
+  nanaimo = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ajfyaqjw3dzykk612yw8sm21savfqy292hgps8h8l4lvxww1lz6";
+      type = "gem";
+    };
+    version = "0.2.6";
+  };
+  nap = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  native-package-installer = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03qrzhk807f98bdwy6c37acksyb5fnairdz4jpl7y3fifh7k7yfn";
+      type = "gem";
+    };
+    version = "1.0.7";
+  };
+  ncursesw = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nc14wls1yiigz593vw7580hb99lf4n485axapiz6sqpg1jnlhcr";
+      type = "gem";
+    };
+    version = "1.4.10";
+  };
+  net-scp = {
+    dependencies = ["net-ssh"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nkf3my587f0izqw0dl3zl24c3lnrw9y5xrq9vb0lhgymmgcav9g";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  net-ssh = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40";
+      type = "gem";
+    };
+    version = "5.2.0";
+  };
+  netrc = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
+  nio4r = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bi1r1xvlxpkghvmk1js88djlw7vi4ky6ildk8akn73hkf5phd2j";
+      type = "gem";
+    };
+    version = "2.5.1";
+  };
+  nokogiri = {
+    dependencies = ["mini_portile2"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
+      type = "gem";
+    };
+    version = "1.10.4";
+  };
+  opus-ruby = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lyf2a8f1w1jk0qrl8h0gsydfalbh19g5k2c6xlq8j1sfzb0ij4d";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  osx_keychain = {
+    dependencies = ["RubyInline"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10hr3lihq7s5fv18dp0g4mfncvapkcwcd6xnn5483ximyd7rhfx0";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  ovirt-engine-sdk = {
+    dependencies = ["json"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09lb0a9y4q7946jaf53li1v4cb6ksfb5bq5wb15yn8ja6wf9n427";
+      type = "gem";
+    };
+    version = "4.3.0";
+  };
+  pango = {
+    dependencies = ["cairo-gobject" "gobject-introspection"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03jdjphc5vk9a9rgvkfhz78dfyxi67a20c12h6pcd22r5xq8hzj0";
+      type = "gem";
+    };
+    version = "3.3.7";
+  };
+  parallel = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
+      type = "gem";
+    };
+    version = "1.17.0";
+  };
+  parser = {
+    dependencies = ["ast"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s1plz33jjd0wm0vlspl5hg1rcg772zm5ibbix9binpd03jrbb8c";
+      type = "gem";
+    };
+    version = "2.6.4.0";
+  };
+  pathutil = {
+    dependencies = ["forwardable-extended"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4";
+      type = "gem";
+    };
+    version = "0.16.2";
+  };
+  patron = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0523gddx88zql2mq6655k60gy2ac8vybpzkcf90lmd9nx7wl3fi9";
+      type = "gem";
+    };
+    version = "0.13.3";
+  };
+  pcaprub = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h4iarqdych6v4jm5s0ywkc01qspadz8sf6qn7pkqmszq4iqv67q";
+      type = "gem";
+    };
+    version = "0.13.0";
+  };
+  pg = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
+      type = "gem";
+    };
+    version = "1.1.4";
+  };
+  pkg-config = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mvs1hs8ry3s4fh8sd94zhpn2pdasdqwpf5nylgxnp8x3xa2dmnd";
+      type = "gem";
+    };
+    version = "1.3.8";
+  };
+  polyglot = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  pry = {
+    dependencies = ["coderay" "method_source"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
+      type = "gem";
+    };
+    version = "0.12.2";
+  };
+  pry-byebug = {
+    dependencies = ["byebug" "pry"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1aqz4gz8z44k6svpvcsfrqbigcpjd2kwvfm77yq3v8yzkhjrx0zi";
+      type = "gem";
+    };
+    version = "3.7.0";
+  };
+  pry-doc = {
+    dependencies = ["pry" "yard"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14lwb5dxfibcqbjygzvnf8ry0mayx48fk20qhg06214sll0sp0kv";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  public_suffix = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
+      type = "gem";
+    };
+    version = "4.0.1";
+  };
+  puma = {
+    dependencies = ["nio4r"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d8hnqdr2acrlw5rp1wlyz1lwarfc6my5h9m5a7b3259zc4y9f5q";
+      type = "gem";
+    };
+    version = "4.1.0";
+  };
+  rack = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
+      type = "gem";
+    };
+    version = "1.6.11";
+  };
+  rack-protection = {
+    dependencies = ["rack"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
+      type = "gem";
+    };
+    version = "1.5.5";
+  };
+  rack-test = {
+    dependencies = ["rack"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
+      type = "gem";
+    };
+    version = "0.6.3";
+  };
+  rails = {
+    dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ywvis59dd3v8qapi9ix6743zgk07l21x1cd6nb1ddpahxhm7dml";
+      type = "gem";
+    };
+    version = "4.2.11.1";
+  };
+  rails-deprecated_sanitizer = {
+    dependencies = ["activesupport"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  rails-dom-testing = {
+    dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6";
+      type = "gem";
+    };
+    version = "1.0.9";
+  };
+  rails-html-sanitizer = {
+    dependencies = ["loofah"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  railties = {
+    dependencies = ["actionpack" "activesupport" "rake" "thor"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m";
+      type = "gem";
+    };
+    version = "4.2.11.1";
+  };
+  rainbow = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  rake = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b";
+      type = "gem";
+    };
+    version = "10.5.0";
+  };
+  rb-fsevent = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
+      type = "gem";
+    };
+    version = "0.10.3";
+  };
+  rb-inotify = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  rb-readline = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14w79a121czmvk1s953qfzww30mqjb2zc0k9qhi0ivxxk3hxg6wy";
+      type = "gem";
+    };
+    version = "0.5.5";
+  };
+  rbnacl = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s559dxhwmd42n5va4m7h3v04s57a3nm8ff7p5g7hz030kiswyrc";
+      type = "gem";
+    };
+    version = "7.0.0";
+  };
+  re2 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00wf9k1hkv3z3nfkrnfyyfq9ah0l7k14awqys3h2hqz4c21pqd2i";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
+  redcarpet = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
+      type = "gem";
+    };
+    version = "3.5.0";
+  };
+  redis = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3";
+      type = "gem";
+    };
+    version = "4.1.2";
+  };
+  redis-rack = {
+    dependencies = ["rack" "redis-store"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03xgdmq4fh187aqlh8z05idbxrmgddcarlb8x1kw4wjfcsf5afqi";
+      type = "gem";
+    };
+    version = "2.0.5";
+  };
+  redis-store = {
+    dependencies = ["redis"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mrcnjgkbmx1zf569mly82agdizqayjvnp2k6055k1iy07in3j8b";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+  ref = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04p4pq4sikly7pvn30dc7v5x2m7fqbfwijci4z1y6a1ilwxzrjii";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  rest-client = {
+    dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  rmagick = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06ya2zpz2g3g4c90bmd1z11qkajls3srq5b7cswrjq8ima568ja0";
+      type = "gem";
+    };
+    version = "4.0.0";
+  };
+  rouge = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07j29vbgsi9v7kpx4lqpmh0hx59i420jig73dy46wx3id1i7vdqz";
+      type = "gem";
+    };
+    version = "3.10.0";
+  };
+  rpam2 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zvli3s4z1hf2l7gyfickm5i3afjrnycc3ihbiax6ji6arpbyf33";
+      type = "gem";
+    };
+    version = "4.0.2";
+  };
+  rspec = {
+    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3";
+      type = "gem";
+    };
+    version = "3.8.0";
+  };
+  rspec-core = {
+    dependencies = ["rspec-support"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0spjgmd3yx6q28q950r32bi0cs8h2si53zn6rq8s7n1i4zp4zwbf";
+      type = "gem";
+    };
+    version = "3.8.2";
+  };
+  rspec-expectations = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x3iddjjaramqb0yb51c79p2qajgi9wb5b59bzv25czddigyk49r";
+      type = "gem";
+    };
+    version = "3.8.4";
+  };
+  rspec-mocks = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12zplnsv4p6wvvxsk8xn6nm87a5qadxlkk497zlxfczd0jfawrni";
+      type = "gem";
+    };
+    version = "3.8.1";
+  };
+  rspec-support = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "139mbhfdr10flm2ffryvxkyqgqs1gjdclc1xhyh7i7njfqayxk7g";
+      type = "gem";
+    };
+    version = "3.8.2";
+  };
+  rubocop = {
+    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk";
+      type = "gem";
+    };
+    version = "0.74.0";
+  };
+  rubocop-performance = {
+    dependencies = ["rubocop"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ssizdnyai2hxdp6nd4b9hqyrc4gwhjlznhrdliz8wj4p8cvas44";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
+  ruby-graphviz = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jzbs0jhaz77azsc30gsfg89fy44vsr565jcj4axhc65n1fmhs90";
+      type = "gem";
+    };
+    version = "1.2.4";
+  };
+  ruby-libvirt = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0d754d6pgdqyq52pl9hp0x38q1vn3vf9nz4nm5gqdj5i4fw7pba6";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  ruby-lxc = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08pnghqp15fwylq6w2qh7x1ikkiq87irpy0z03n0gma4gdzzx2qa";
+      type = "gem";
+    };
+    version = "1.2.3";
+  };
+  ruby-macho = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  ruby-progressbar = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
+      type = "gem";
+    };
+    version = "1.10.1";
+  };
+  ruby-terminfo = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rl4ic5pzvrpgd42z0c1s2n3j39c9znksblxxvmhkzrc0ckyg2cm";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  ruby-vips = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12sd0ci3zayrzv1xd5qwa3p9z06ga4xzigpqyk3w52x5acngkld3";
+      type = "gem";
+    };
+    version = "2.0.14";
+  };
+  ruby_dep = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  RubyInline = {
+    dependencies = ["ZenTest"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q0384afhxcbm6yz74hzk0ypzf1ahgg1w94pnkhmag9dq0abqnr0";
+      type = "gem";
+    };
+    version = "3.12.4";
+  };
+  rubyzip = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
+      type = "gem";
+    };
+    version = "1.2.3";
+  };
+  rugged = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6";
+      type = "gem";
+    };
+    version = "0.28.3.1";
+  };
+  safe_yaml = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
+  sassc = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "178iflma5z4qk2lfzlxk8kh942skj45q6v6xwllkqng9xbjlyzkf";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  scrypt = {
+    dependencies = ["ffi-compiler"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ggwynnlgr3a4l5h4zg2w4xyfvqh86nsvmgxicxkc40igyrwqz73";
+      type = "gem";
+    };
+    version = "3.0.6";
+  };
+  semian = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1w4qv3mcz005lb3wrh55imh6551lhf0qpslb3xw3b6chf746s0rj";
+      type = "gem";
+    };
+    version = "0.8.9";
+  };
+  sequel = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r920jps2mpvz5ww9rzs3svprfjxz0vsy6dsa1cinsk3qizqbq7a";
+      type = "gem";
+    };
+    version = "5.24.0";
+  };
+  sequel_pg = {
+    dependencies = ["pg" "sequel"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y010rfdgpkw1yspqchjqdp7n8yahscyw98g3l2pw56nzbqipjb8";
+      type = "gem";
+    };
+    version = "1.12.2";
+  };
+  simplecov = {
+    dependencies = ["docile" "json" "simplecov-html"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dq0nkaxvbsnl70hkimy35g4yjfs3blx4s7nbpzbvgqx72hxgv5v";
+      type = "gem";
+    };
+    version = "0.17.0";
+  };
+  simplecov-html = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
+      type = "gem";
+    };
+    version = "0.10.2";
+  };
+  sinatra = {
+    dependencies = ["rack" "rack-protection" "tilt"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
+      type = "gem";
+    };
+    version = "1.4.8";
+  };
+  slather = {
+    dependencies = ["CFPropertyList" "activesupport" "clamp" "nokogiri" "xcodeproj"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v4wll10mwmynj2v2g71kgr1psck3qglhz2mnrw2n281v30jxyyn";
+      type = "gem";
+    };
+    version = "2.4.7";
+  };
+  slop = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hv64fpbdwyswqhnq8bia66vlsz72yjqm00lvlhh4dnjjivdjcy5";
+      type = "gem";
+    };
+    version = "4.7.0";
+  };
+  snappy = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00zzs25sm78zs3rifc02z54cp3f03r9dq5ilzykyq1ykvbv65vw4";
+      type = "gem";
+    };
+    version = "0.0.17";
+  };
+  sprockets = {
+    dependencies = ["concurrent-ruby" "rack"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
+      type = "gem";
+    };
+    version = "3.7.2";
+  };
+  sprockets-rails = {
+    dependencies = ["actionpack" "activesupport" "sprockets"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
+      type = "gem";
+    };
+    version = "3.2.1";
+  };
+  sqlite3 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v903nbcws3ifm6jnxrdfcpgl1qg2x3lbif16mhlbyfn0npzb494";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
+  taglib-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0r8g7zdncc6243d000jn0grc1n70rn9mx16vggy3q7c4wgsa37xi";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  terminal-table = {
+    dependencies = ["unicode-display_width"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
+  therubyracer = {
+    dependencies = ["libv8" "ref"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g95bzs2axjglyjyj6xvsywqgr80bnzlkw7mddxx1fdrak5wni2q";
+      type = "gem";
+    };
+    version = "0.12.3";
+  };
+  thor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+      type = "gem";
+    };
+    version = "0.20.3";
+  };
+  thread_safe = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  thrift = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
+      type = "gem";
+    };
+    version = "0.11.0.0";
+  };
+  tilt = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
+      type = "gem";
+    };
+    version = "2.0.9";
+  };
+  tiny_tds = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z2n1qwad86zkcmmq883bw8rgidjsqjphrbqf1mwyfi5y22jhxfp";
+      type = "gem";
+    };
+    version = "2.1.2";
+  };
+  treetop = {
+    dependencies = ["polyglot"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
+      type = "gem";
+    };
+    version = "1.6.10";
+  };
+  typhoeus = {
+    dependencies = ["ethon"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+      type = "gem";
+    };
+    version = "1.2.5";
+  };
+  unf = {
+    dependencies = ["unf_ext"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  unf_ext = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf";
+      type = "gem";
+    };
+    version = "0.0.7.6";
+  };
+  unicode-display_width = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+  uuid4r = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qlcxzn8pnql34pcdrkd20kdla3k6n2sspaxp3lwwx8a87jnzbc3";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  whois = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12dlqsynscin7f0wrhkya505s22i92w9n8padjvjbhylrnja7rwx";
+      type = "gem";
+    };
+    version = "4.1.0";
+  };
+  xcodeproj = {
+    dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8";
+      type = "gem";
+    };
+    version = "1.12.0";
+  };
+  xctasks = {
+    dependencies = ["nokogiri" "rake"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m01vnmdy9m4hn85ajji5v595faqsy8d3a0r646q79vphw1fikj1";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  yard = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny";
+      type = "gem";
+    };
+    version = "0.9.20";
+  };
+  ZenTest = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1h76ym6cx9b3an8hf1n5w85d1sj3anbvcs99vqw51vbamx84fyld";
+      type = "gem";
+    };
+    version = "4.11.2";
+  };
+  zookeeper = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1blww00r5za6vl46psaldxpllsxll78ms8rrs6qfwb1iaa8rla2d";
+      type = "gem";
+    };
+    version = "1.4.11";
+  };
+}
\ No newline at end of file