Merge master into staging-next

2018-07-21 19:43:53 +02:00
parent 8213ff161c cc218fc915
commit ad47d658d1
2090 changed files with 4329 additions and 3730 deletions
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind, fetchpatch }:
+{ stdenv, qmake, qtbase, perl, python, php, kcachegrind }:

 let
  name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;
--- a/pkgs/development/tools/analysis/radare/default.nix
+++ b/pkgs/development/tools/analysis/radare/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libusb, readline, lua, libewf, perl,
+{stdenv, fetchurl, pkgconfig, libusb, readline, lua, perl,
 gtk2 ? null, vte ? null, gtkdialog ? null,
 python ? null,
 ruby ? null,
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:
+{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:

 stdenv.mkDerivation rec {
  name = "valgrind-3.13.0";
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper
+{ lib, buildPythonApplication, fetchFromGitHub
 , arrow, futures, logfury, requests, six, tqdm
 }:

--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, binutils, cmake, zlib, fetchFromGitHub }:
+{ stdenv, cmake, zlib, fetchFromGitHub }:

 stdenv.mkDerivation rec {
  version = "2018-06-15";
--- 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, fetchFromGitHub }:

 buildGoPackage rec {
-  name = "bazel-buildtools";
+  name = "bazel-buildtools-unstable-${version}";
  version = "2018-05-24";

  goPackagePath = "github.com/bazelbuild/buildtools";
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -2,7 +2,7 @@

 let
  baseName = "bloop";
-  version = "1.0.0-M11";
+  version = "1.0.0";
  deps = stdenv.mkDerivation {
    name = "${baseName}-deps-${version}";
    buildCommand = ''
@@ -16,12 +16,12 @@ let
    '';
    outputHashMode = "recursive";
    outputHashAlgo = "sha256";
-    outputHash     = "00p9mrwcms3skzicyj8frqs0r0a2rfvk5fbh58rk5yvcvkwl4fy1";
+    outputHash     = "0dgllwv9rjvpzvlbwwiynmfp15j2x48al7cb5rlmhq0an3q81hbh";
  };
 in
 stdenv.mkDerivation rec {
  name = "${baseName}-${version}";
-  nailgunCommit = "60c2d130";
+  nailgunCommit = "0c8b937b";

  buildInputs = [ jdk makeWrapper deps ];

--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }:
+{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "buck-${version}";
-  version = "v2017.10.01.01";
+  name = "buck-unstable-${version}";
+  version = "2017-10-01";

  src = fetchFromGitHub {
    owner = "facebook";
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:
+{ stdenv, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:

 let
  withPlugins = plugins: runCommand "wrapped-${package.name}" {
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2
+{ stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2
 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps
 , buildPlatform, hostPlatform
 }:
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchpatch, python }:
+{ lib, python }:

 let newPython = python.override {
  packageOverrides = self: super: {
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }:
+{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:

 let

--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,12 +52,12 @@ rec {
  };

  gradle_latest = gradleGen rec {
-    name = "gradle-4.8.1";
+    name = "gradle-4.9";
    nativeVersion = "0.14";

    src = fetchurl {
      url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "0wgdf1iv0izi957hay1xfsk5xnl6s2vx5dammcwy8say9fclscxg";
+      sha256 = "0a0dkdzmz0ynf73inii8djy2hihqd9c97fir9c0d4g8px3f6jvp6";
    };
  };

--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, stdenv, ninja, pkgconfig, targetPlatform, writeTextDir, substituteAll }: let
+{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let
  targetPrefix = lib.optionalString stdenv.isCross
                   (targetPlatform.config + "-");
 in python3Packages.buildPythonApplication rec {
--- a/pkgs/development/tools/build-managers/nant/default.nix
+++ b/pkgs/development/tools/build-managers/nant/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper
+{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper
 , targetVersion ? "4.5" }:

 let
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pythonPackages, runCommand, curl }:
+{ stdenv, pythonPackages }:

 with stdenv.lib;
 with pythonPackages;
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, writeText, callPackage, fetchurl,
+{ stdenv, fetchurl,
  fetchHex, erlang, hermeticRebar3 ? true,
-  tree, fetchFromGitHub, hexRegistrySnapshot }:
+  tree, hexRegistrySnapshot }:

 let
  version = "3.6.1";
--- a/pkgs/development/tools/build-managers/scons/common.nix
+++ b/pkgs/development/tools/build-managers/scons/common.nix
@@ -1,6 +1,6 @@
 { version, sha256 }:

-{ stdenv, fetchurl, fetchpatch, python2Packages }:
+{ stdenv, fetchurl, python2Packages }:

 let name = "scons";
 in python2Packages.buildPythonApplication {
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, stdenv }:
+{ callPackage }:

 let
  mkScons = args: callPackage (import ./common.nix args) { };
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2 }:
+{ stdenv, fetchurl, python2 }:

 stdenv.mkDerivation rec {
  name = "waf-${version}";
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
+{ stdenv, buildGoPackage, fetchFromGitHub
 , gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
 , go-md2man }:

--- a/pkgs/development/tools/castxml/default.nix
+++ b/pkgs/development/tools/castxml/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub
 , pythonPackages
-, pkgconfig
 , cmake
 , llvmPackages
 , withMan ? true
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby_2_4, perl, autoconf }:
+{ lib, bundlerEnv, ruby_2_4, perl, autoconf }:

 bundlerEnv {
  # Last updated via:
--- a/pkgs/development/tools/compass/default.nix
+++ b/pkgs/development/tools/compass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:

 bundlerEnv {
  name = "compass-1.0.3";
--- a/pkgs/development/tools/container-linux-config-transpiler/default.nix
+++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:

 with lib;

--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {

  buildCommand = ''
    install -Dm555 $src $out/bin/coursier
+    patchShebangs $out/bin/coursier
    wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin
  '';

--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, jre, makeWrapper, fetchMavenArtifact
+{ stdenv, fetchurl, jre, makeWrapper
 , mysqlSupport ? true, mysql_jdbc ? null }:

 assert mysqlSupport -> mysql_jdbc != null;
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "delve-${version}";
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , pythonPackages
 , glibcLocales
 , devpi-server
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -1,4 +1,4 @@
- { stdenv, pythonPackages, glibcLocales, nginx }:
+ { stdenv, pythonPackages, nginx }:

 pythonPackages.buildPythonApplication rec {
  name = "${pname}-${version}";
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool
-, makeWrapper, python2Packages }:
+{fetchurl, pkgconfig, libxml2Python, libxslt, intltool
+, python2Packages }:

 python2Packages.buildPythonApplication {
  name = "gnome-doc-utils-0.20.10";
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
  # Make six available for binaries, python.withPackages creates a wrapper
  # but scripts are not allowed in shebangs so we link it into sys.path.
  postInstall = ''
-    ln -s ${python.pkgs.six}/lib/python2.7/site-packages/* $out/share/gtk-doc/python/
+    ln -s ${python.pkgs.six}/${python.sitePackages}/* $out/share/gtk-doc/python/
  '';

  doCheck = false; # requires a lot of stuff
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "easyjson-unstable-${version}";
--- a/pkgs/development/tools/egg2nix/chicken-eggs.nix
+++ b/pkgs/development/tools/egg2nix/chicken-eggs.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv }:
+{ pkgs }:
 rec {
  inherit (pkgs) eggDerivation fetchegg;

--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }:
+{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }:

 let
  version = "1.8.2";
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  '';

  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3 python27 makeWrapper which ];
+  buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3.python python27 makeWrapper which ];

  buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target";
  configurePhase = ''
--- a/pkgs/development/tools/erlang/hex2nix/default.nix
+++ b/pkgs/development/tools/erlang/hex2nix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildRebar3, buildHex,
+{ fetchFromGitHub, buildRebar3,

  # Erlang dependencies:
  ibrowse_4_2_2,
--- a/pkgs/development/tools/erlang/relx-exe/default.nix
+++ b/pkgs/development/tools/erlang/relx-exe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, beamPackages, buildRebar3, buildHex, fetchHex
+{ stdenv, buildHex

 , getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }:

--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }:
+{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:

 buildGoPackage rec {
  name = "fac-${version}";
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pandoc, man }:
+{ stdenv, fetchFromGitHub, pandoc, man }:
 stdenv.mkDerivation rec {
  name = "git-ftp-${version}";
  version = "1.5.1";
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "go-bindata-${version}";
--- a/pkgs/development/tools/go-outline/default.nix
+++ b/pkgs/development/tools/go-outline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "go-outline-${version}";
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, gotools, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "go-repo-root-${version}";
--- a/pkgs/development/tools/go-symbols/default.nix
+++ b/pkgs/development/tools/go-symbols/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "go-symbols-${version}";
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "gocode-${version}";
--- a/pkgs/development/tools/goconvey/default.nix
+++ b/pkgs/development/tools/goconvey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "goconvey-${version}";
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "godef-${version}";
--- a/pkgs/development/tools/goimports/default.nix
+++ b/pkgs/development/tools/goimports/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "goimports-${version}";
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "lint-${version}";
--- a/pkgs/development/tools/gomodifytags/default.nix
+++ b/pkgs/development/tools/gomodifytags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "gomodifytags-${version}";
--- a/pkgs/development/tools/gopkgs/default.nix
+++ b/pkgs/development/tools/gopkgs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "gopkgs-${version}";
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "gotags-${version}";
--- a/pkgs/development/tools/gotests/default.nix
+++ b/pkgs/development/tools/gotests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "gotests-${version}";
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, go, buildGoPackage, fetchgit }:

 buildGoPackage rec {
-  name = "gotools-${version}";
-  version = "20170807-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "5d2fd3ccab986d52112bf301d47a819783339d0e";
+  name = "gotools-unstable-${version}";
+  version = "2018-07-20";
+  rev = "be728107ea8275e6f58ba07e246b94181acaab24";

  goPackagePath = "golang.org/x/tools";
  goPackageAliases = [ "code.google.com/p/go.tools" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
  src = fetchgit {
    inherit rev;
    url = "https://go.googlesource.com/tools";
-    sha256 = "0r3fp7na6pg0bc5xfycjvv951f0vma1qfnpw5zy6l75yxm5r47kn";
+    sha256 = "1vkc87qcnfybfcgq9kbwbwzvvzrwm6ar25q5i8z3q26b8dpaxmlw";
  };

  goDeps = ./deps.nix;
--- a/pkgs/development/tools/gotools/deps.nix
+++ b/pkgs/development/tools/gotools/deps.nix
@@ -4,8 +4,8 @@
    fetch = {
      type = "git";
      url = "https://go.googlesource.com/net";
-      rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
-      sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
+      rev = "0ed95abb35c445290478a5348a7b38bb154135fd";
+      sha256 = "1v7yhcgqj0fy7rsliijw2iwmvyd85hqshrhh2n083x62kw9n9nsl";
    };
  }
 ]
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "govers-${version}";
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "gox-${version}";
--- a/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, writeText, jshon, electron, hyper-haskell-server, extra-packages ? [] }:
+{ stdenv, fetchFromGitHub, jshon, electron, hyper-haskell-server, extra-packages ? [] }:

 let
  binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
--- a/pkgs/development/tools/haskell/hyper-haskell/server.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix
@@ -3,7 +3,7 @@
 let
 hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self);
 in stdenv.mkDerivation {
-  name = "hyper-haskell-server-with-packages";
+  name = "hyper-haskell-server-with-packages-${hyperHaskellEnv.version}";

  nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/development/tools/haskell/lambdabot/default.nix
+++ b/pkgs/development/tools/haskell/lambdabot/default.nix
@@ -1,4 +1,4 @@
-{ lib, haskellLib, fetchpatch, makeWrapper, haskellPackages
+{ lib, haskellLib, makeWrapper, haskellPackages
 , mueval
 , withDjinn ? true
 , aspell ? null
--- a/pkgs/development/tools/haskell/leksah/default.nix
+++ b/pkgs/development/tools/haskell/leksah/default.nix
@@ -3,7 +3,7 @@
 let
 leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]);
 in stdenv.mkDerivation {
-  name = "leksah";
+  name = "leksah-${leksahEnv.version}";

  buildInputs = [ gtk3 ];
  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, ansi-terminal, base, bytestring, Cabal, containers
 , deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty
-, tasty-golden, transformers, fetchFromGitHub, fetchpatch
+, tasty-golden, transformers, fetchFromGitHub
 }:

 mkDerivation {
--- a/pkgs/development/tools/hexio/default.nix
+++ b/pkgs/development/tools/hexio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, python, pcsclite, pth }:
+{ stdenv, fetchFromGitHub, python, pcsclite, pth }:

 stdenv.mkDerivation rec {
  pname = "hexio";
--- a/pkgs/development/tools/iaca/2.1.nix
+++ b/pkgs/development/tools/iaca/2.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }:
+{ stdenv, makeWrapper, requireFile, gcc, unzip }:
 with stdenv.lib;

 # v2.1: last version with NHM/WSM arch support
--- a/pkgs/development/tools/iaca/3.0.nix
+++ b/pkgs/development/tools/iaca/3.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, patchelf, unzip }:
+{ stdenv, requireFile, unzip }:
 with stdenv.lib;

 stdenv.mkDerivation {
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, llvmPackages, irony }:
+{ stdenv, cmake, llvmPackages, irony }:

 stdenv.mkDerivation rec {
  name = "irony-server-${version}";
--- a/pkgs/development/tools/jmespath/default.nix
+++ b/pkgs/development/tools/jmespath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "jmespath-${version}";
--- a/pkgs/development/tools/jp/default.nix
+++ b/pkgs/development/tools/jp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, jmespath }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "jp-${version}";
--- a/pkgs/development/tools/json2hcl/default.nix
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  pname = "json2hcl";
--- a/pkgs/development/tools/kube-aws/default.nix
+++ b/pkgs/development/tools/kube-aws/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:

 with lib;

--- a/pkgs/development/tools/leaps/default.nix
+++ b/pkgs/development/tools/leaps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "leaps-${version}";
--- a/pkgs/development/tools/librarian-puppet-go/default.nix
+++ b/pkgs/development/tools/librarian-puppet-go/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:

 buildGoPackage rec {
  name = "librarian-puppet-go-${version}";
--- a/pkgs/development/tools/manul/default.nix
+++ b/pkgs/development/tools/manul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "manul-unstable-2016-09-30";
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, which, pkgconfig, texinfo, perl, guile, libxml2 }:
+{ stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }:

 stdenv.mkDerivation rec {
  name = "autogen-${version}";
--- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
+{ stdenv, fetchurl, perl, autoconf, doCheck ? false }:

 stdenv.mkDerivation rec {
  name = "automake-1.16.1";
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPackages
 , fetchurl, zlib, autoreconfHook264
-, buildPlatform, hostPlatform, targetPlatform
+, hostPlatform, targetPlatform
 , noSysDirs, gold ? true, bison ? null
 }:

@@ -10,7 +10,7 @@ let
  # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3
  version = "2.30";
  basename = "binutils-${version}";
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optionals optionalString;
  # The targetPrefix prepended to binary names to allow multiple binuntils on the
  # PATH to both be usable.
  targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
--- a/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/pkgs/development/tools/misc/blackmagic/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub
-, gcc-arm-embedded, bash, libftdi
+, gcc-arm-embedded, libftdi
 , python, pythonPackages
 }:

--- a/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/pkgs/development/tools/misc/cbrowser/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, cscope, tk, makeWrapper }:
+{ fetchurl, stdenv, tk, makeWrapper }:

 stdenv.mkDerivation rec {
  name = "cbrowser-0.8";
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, runCommand, perl, zlib, makeWrapper }:
+{ stdenv, fetchurl, perl, zlib, makeWrapper }:

 let ccache = stdenv.mkDerivation rec {
  name = "ccache-${version}";
--- a/pkgs/development/tools/misc/cquery/default.nix
+++ b/pkgs/development/tools/misc/cquery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ fetchFromGitHub, makeWrapper
 , cmake, llvmPackages, ncurses }:

 let
--- a/pkgs/development/tools/misc/ctags/wrapped.nix
+++ b/pkgs/development/tools/misc/ctags/wrapped.nix
@@ -1,4 +1,4 @@
-{ pkgs, ctags, writeScriptBin }:
+{ pkgs, ctags }:

 with pkgs.stdenv.lib;

--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -1,15 +1,13 @@
 { fetchurl, stdenv, expect, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "dejagnu-1.6";
+  name = "dejagnu-1.6.1";

  src = fetchurl {
    url = "mirror://gnu/dejagnu/${name}.tar.gz";
-    sha256 = "0qypaakd2065jgpcv84zcsibl8gph3p334gb2qdmhsrbirhlmdh0";
+    sha256 = "14hnq1mh91vqprc43xdy4f15sycw6fbajrh7zi6cw2kyg6xjhnxz";
  };

-  patches = [ ./wrapped-runtest-program-name.patch ];
-
  buildInputs = [ expect makeWrapper ];

  doCheck = true;
--- a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch
+++ b/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch
@@ -1,15 +0,0 @@
-This patch gives `runtest' a `$0' that contains `runtest' instead
-of `.runtest-wrapped'.  This is required because `runtest' checks
-what `$0' looks like to determine the target.
-
--- dejagnu-1.4.4/runtest	2003-08-17 03:27:59.000000000 +0200
-+++ dejagnu-1.4.4/runtest	2010-03-18 15:57:58.000000000 +0100
-@@ -10,6 +10,7 @@
- # Get the execution path to this script and the current directory.
- #
- mypath=${0-.}
-+mypath="`echo $mypath | sed -'es|\.runtest-wrapped|runtest|g'`"
- if expr ${mypath} : '.*/.*' > /dev/null
- then
-     :
-
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchurl, ncurses, gettext
+{ stdenv, fetchurl, ncurses
 , withLibrary ? false, libtool
 , unicodeSupport ? true
 }:

-let optional = stdenv.lib.optional;
-    optStr = stdenv.lib.optionalString;
+let optStr = stdenv.lib.optionalString;
    buildShared = !stdenv.isDarwin;
 in

--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchFromGitHub
 , autoreconfHook
-, findutils                     # for xargs
+                     # for xargs
 , gettext
 , libtool
 , makeWrapper
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@@ -4,14 +4,14 @@ let
 in
 python27Packages.buildPythonApplication rec {
  pname = "gdbgui";
-  version = "0.11.1.2";
+  version = "0.13.0.0";

  buildInputs = [ gdb ];
  propagatedBuildInputs = builtins.attrValues deps.packages;

  src = python27Packages.fetchPypi {
    inherit pname version;
-    sha256 = "15502fg90df183mcg6nic8fakf111pgrlp7f044g3136wpwgfln7";
+    sha256 = "16a46kabhfqsgsks5l25kpgrvrkdah3h5f5m6ams2z9nzbrxl8bz";
  };

  postPatch = ''
--- a/pkgs/development/tools/misc/gdbgui/requirements.nix
+++ b/pkgs/development/tools/misc/gdbgui/requirements.nix
@@ -11,7 +11,7 @@
 let

  inherit (pkgs) makeWrapper;
-  inherit (pkgs.stdenv.lib) fix' extends inNixShell;
+  inherit (pkgs.stdenv.lib) fix' extends;

  pythonPackages =
  import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" {
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, libtool, makeWrapper
-, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags, pkgconfig
+, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags
 }:

 stdenv.mkDerivation rec {
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -1,9 +1,9 @@
 { stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub
 , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
 , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
-, guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc
+, guile, perl, postgresql, nukeReferences, git, boehmgc
 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
-, rpm, dpkg, cdrkit, fetchpatch, pixz }:
+, rpm, dpkg, cdrkit, pixz }:

 with stdenv;

--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
 , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
-, procps, autoreconfHook, utilmacros, gnome2 }:
+, procps, utilmacros, gnome2 }:

 stdenv.mkDerivation rec {
  name = "intel-gpu-tools-1.22";
--- a/pkgs/development/tools/misc/linuxkit/default.nix
+++ b/pkgs/development/tools/misc/linuxkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, go, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "linuxkit-${version}";
--- a/pkgs/development/tools/misc/loccount/default.nix
+++ b/pkgs/development/tools/misc/loccount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitLab }:
+{ stdenv, buildGoPackage, fetchFromGitLab }:
 buildGoPackage rec {
  name = "loccount-${version}";
  version = "1.2";
--- a/pkgs/development/tools/misc/md2man/default.nix
+++ b/pkgs/development/tools/misc/md2man/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, go, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:

 with lib;

--- a/pkgs/development/tools/misc/moby/default.nix
+++ b/pkgs/development/tools/misc/moby/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, go, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "moby-${version}";
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, libiconv, vanilla ? false }:
+{stdenv, fetchurl, libiconv, vanilla ? false }:

 with stdenv.lib;

--- a/pkgs/development/tools/misc/stm32flash/default.nix
+++ b/pkgs/development/tools/misc/stm32flash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:

 stdenv.mkDerivation rec {
  name = "stm32flash-0.5";
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:

 stdenv.mkDerivation rec {
  name = "swig-${version}";
--- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix
+++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, libusb, fetchgit }:
+{ stdenv, unzip, libusb, fetchgit }:
 let
  version = "2.1";
 in
--- a/pkgs/development/tools/misc/trv/default.nix
+++ b/pkgs/development/tools/misc/trv/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4
 , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find
-, cohttp, conduit, magic-mime, tzdata
+, cohttp, conduit, magic-mime
 }:

 assert stdenv.lib.versionOlder "4.02" ocaml.version;
--- a/pkgs/development/tools/nailgun/default.nix
+++ b/pkgs/development/tools/nailgun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre, makeWrapper }:
+{ stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }:

 let
  version = "0.9.1";
--- a/Show More
+++ b/Show More