Merge branch 'staging' into staging-next

87 files changed, 168 insertions, 352 deletions

diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix
index a349a3f2fc0e..d78846922c6e 100644
--- a/pkgs/tools/misc/0x0/default.nix
+++ b/pkgs/tools/misc/0x0/default.nix
@@ -1,6 +1,6 @@
 { stdenv, xsel, curl, fetchFromGitLab, makeWrapper}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "0x0";
   version = "2018-06-24";
 
diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix
index 8b2a2a4b2150..c16e4aded0d0 100644
--- a/pkgs/tools/misc/argtable/default.nix
+++ b/pkgs/tools/misc/argtable/default.nix
@@ -1,7 +1,7 @@
 { stdenv 
 , fetchgit
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "argtable";
   version = "3.0.1";
 
diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix
index 79f72746f905..14ab790d9c76 100644
--- a/pkgs/tools/misc/bashplotlib/default.nix
+++ b/pkgs/tools/misc/bashplotlib/default.nix
@@ -1,6 +1,6 @@
 { stdenv, python3Packages, fetchFromGitHub }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
   pname = "bashplotlib";
   version = "2019-01-02";
 
diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 205bc196811b..267b820df073 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
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
index c7a9af4abd1a..c0339834b649 100644
--- a/pkgs/tools/misc/bibtex2html/default.nix
+++ b/pkgs/tools/misc/bibtex2html/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ocaml }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "bibtex2html";
   version = "1.99";
 
diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix
index 655fd44c0399..23bd7ed172c4 100644
--- a/pkgs/tools/misc/blsd/default.nix
+++ b/pkgs/tools/misc/blsd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }:
 
-buildGoPackage rec {
+buildGoPackage {
   pname = "blsd";
   version = "2017-07-27";
 
diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix
index 7391c271cd17..6b7a51e08f51 100644
--- a/pkgs/tools/misc/bmap-tools/default.nix
+++ b/pkgs/tools/misc/bmap-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "bmap-tools-${version}";
+  pname = "bmap-tools";
   version = "3.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix
index 2ba5499d7f77..c40ccad5e396 100644
--- a/pkgs/tools/misc/broadlink-cli/default.nix
+++ b/pkgs/tools/misc/broadlink-cli/default.nix
@@ -1,6 +1,6 @@
 { stdenv, python2Packages, fetchFromGitHub }:
 
-python2Packages.buildPythonApplication rec {
+python2Packages.buildPythonApplication {
   pname = "broadlink-cli";
   inherit (python2Packages.broadlink) version;
 
diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix
index 377297ee4799..e7134961c252 100644
--- a/pkgs/tools/misc/capture/default.nix
+++ b/pkgs/tools/misc/capture/default.nix
@@ -1,6 +1,6 @@
 { stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "capture-unstable";
   version = "2019-03-10";
 
diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix
index a1b1b4eac2d5..4d33d957b4d1 100644
--- a/pkgs/tools/misc/cht.sh/default.nix
+++ b/pkgs/tools/misc/cht.sh/default.nix
@@ -7,7 +7,7 @@
 , xsel
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "cht.sh";
   version = "unstable-2019-08-06";
 
diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix
index 1b3c5f169699..f3d7fbd81273 100644
--- a/pkgs/tools/misc/contacts/default.nix
+++ b/pkgs/tools/misc/contacts/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "1.1a-3";
   pname = "contacts";
 
diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix
index f35da52081bc..5792fa4121b4 100644
--- a/pkgs/tools/misc/cpuminer-multi/default.nix
+++ b/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -5,7 +5,7 @@ let
   rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4";
   date = "20160316";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix
index 7ca103062c11..f5291d0789e6 100644
--- a/pkgs/tools/misc/crudini/default.nix
+++ b/pkgs/tools/misc/crudini/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages, help2man }:
 
 python2Packages.buildPythonApplication rec {
-  name = "crudini-${version}";
+  pname = "crudini";
   version = "0.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix
index ab52d73ac27b..72687f4bfa48 100644
--- a/pkgs/tools/misc/dbus-map/default.nix
+++ b/pkgs/tools/misc/dbus-map/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "dbus-map";
   version = "2015-05-28";
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index ef00c753d3aa..591cd5fe0408 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "diskus-${version}";
+  pname = "diskus";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index b9a66ba95d9f..4dffae557a4e 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "dust-${version}";
+  pname = "dust";
   version = "0.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix
index 10fb4cd89bd9..df2e25c7ea33 100644
--- a/pkgs/tools/misc/dvtm/dvtm.nix
+++ b/pkgs/tools/misc/dvtm/dvtm.nix
@@ -1,5 +1,5 @@
 { stdenv, ncurses, customConfig ? null, name, src, patches ? [] }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
 
   inherit name src patches;
 
diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/pkgs/tools/misc/dylibbundler/default.nix
index c88e29bb4553..6bb9924ddd09 100644
--- a/pkgs/tools/misc/dylibbundler/default.nix
+++ b/pkgs/tools/misc/dylibbundler/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "dylibbundler";
 
   src  = fetchFromGitHub {
diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix
index bcd3ec6d8f7f..11a46f620c0a 100644
--- a/pkgs/tools/misc/edid-decode/default.nix
+++ b/pkgs/tools/misc/edid-decode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 let
   version = "2018-12-06";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "edid-decode-unstable";
   inherit version;
 
diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix
index 160c3982cc15..6a5fcfb12174 100644
--- a/pkgs/tools/misc/emv/default.nix
+++ b/pkgs/tools/misc/emv/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "emv";
   version = "1.95";
 
diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix
index d4f69340d0ae..1c0401e2eadc 100644
--- a/pkgs/tools/misc/ent/default.nix
+++ b/pkgs/tools/misc/ent/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, unzip}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "ent-1.1";
 
   s