Merge branch 'master' into staging

26 files changed, 291 insertions, 101 deletions

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 778aaa90cbe9..31d62bdae19b 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }:
 
-let
-  pname = "cppcheck";
-in
 stdenv.mkDerivation rec {
+  pname = "cppcheck";
+  version = "1.74";
   name = "${pname}-${version}";
-  version = "1.73";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "0l7yslf311h3kidi91q4zhqj3f3vsjp1gb2z50y20423fda87xin";
+    sha256 = "0m62byiprabm1m3mc4r2w54p7qyhgi8msipnpm66ychr8rz2yny0";
   };
 
   nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
@@ -27,8 +25,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A static analysis tool for C/C++ code";
     longDescription = ''
-      Check C/C++ code for memory leaks, mismatching
-      allocation-deallocation, buffer overruns and more.
+      Check C/C++ code for memory leaks, mismatching allocation-deallocation,
+      buffer overruns and more.
     '';
     homepage = http://cppcheck.sourceforge.net/;
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index 84ab79879b41..c1184445e28e 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, libpfm, zlib, python, pkgconfig, pythonPackages, which, procps, gdb }:
 
 stdenv.mkDerivation rec {
-  version = "4.2.0";
+  version = "4.3.0";
   name = "rr-${version}";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "rr";
     rev = version;
-    sha256 = "03fl2wgbc1cilaw8hrhfqjsbpi05cid6k4cr3s2vmv5gx0dnrgy4";
+    sha256 = "0hl59g6252zi1j9zng5x5gqlmdwa4gz7mbvz8h3b7z4gnn2q5l6c";
   };
 
   postPatch = ''
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
index 0ba346ec110f..045272e19d37 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -2,16 +2,16 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "backblaze-b2-${version}";
-  version = "0.4.4";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "Backblaze";
     repo = "B2_Command_Line_Tool";
-    rev = "74a5e567925899f1fc6204aa85d4c84c0d0e511a";
-    sha256 = "1g9j5s69w6n70nb18rvx3gm9f4gi1vis23ib8rn2v1khv6z2acqp";
+    rev = "3a4cd3f0b5309f79f98c2e0d51afc19fb2fe4201";
+    sha256 = "1gl1z7zg3s1xgx45i6b1bvx9iwviiiinl4my00h66qkhrw7ag8p1";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ six ];
+  propagatedBuildInputs = with pythonPackages; [ futures requests2 six tqdm4 ];
 
   checkPhase = ''
     python test_b2_command_line.py test
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index dabc7b0d7f25..533808243a2a 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -51,11 +51,11 @@ rec {
   };
 
   gradleLatest = gradleGen rec {
-    name = "gradle-2.14";
+    name = "gradle-2.14.1";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "1m98m4cxnvyl5ymkj6z8xb9vpdna47hdh5qrfblqkijjnqrlyfwr";
+      sha256 = "0fggjxpsnakdaviw7bn2jmsl06997phlqr1251bjmlgjf7d1xing";
     };
   };
 
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 35d18a858674..47c6e12a5860 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,24 +1,17 @@
-{ stdenv, fetchurl, ninja, python3 }:
-
-stdenv.mkDerivation rec {
-  name = "meson-0.26.0";
+{ lib, python3Packages, fetchurl }:
+python3Packages.buildPythonPackage rec {
+  name = "meson-0.32.0";
 
   src = fetchurl {
-    url = "https://github.com/jpakkane/meson/archive/0.26.0.tar.gz";
-    sha256 = "1hmfn1bkxnwsnlhw6x9ryfcm4zwsf2w7h51cll1xrxg1rq08fvck";
+    url = "mirror://pypi/m/meson/${name}.tar.gz";
+    sha256 = "1i5m4q53sr55aw8kx761kh0rsfwkpq0gfa0c0k3jf66y4aml6n54";
   };
 
-  buildInputs = [ ninja python3 ];
-
-  installPhase = ''
-    python3 ./install_meson.py --prefix=$out --destdir="$pkgdir/"
-  '';
-
-  meta = {
-    homepage = "http://mesonbuild.com";
+  meta = with lib; {
+    homepage = http://mesonbuild.com;
     description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.mbe ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ mbe rasendubi ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 206792ab4833..48ec100f593c 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "0.13.11";
+  version = "0.13.12";
 
   src = fetchurl {
     url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
-    sha256 = "19mg2xbc2vbqg33b986zvn7pj05cx106rccdzf9zs2npdnznysm3";
+    sha256 = "1pq3c9nhxbdpx5csmpvjv93nz2z04n2gzzwyd7sllaplqgwk00i8";
   };
 
   patchPhase = ''
@@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
     ln -s $out/share/sbt/bin/sbt $out/bin/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.scala-sbt.org/;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     description = "A build tool for Scala, Java and more";
-    maintainers = [ stdenv.lib.maintainers.rickynils ];
+    maintainers = with maintainers; [ rickynils ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
new file mode 100644
index 000000000000..170f07ca5c3d
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "gocd-agent-${version}-${rev}";
+  version = "16.5.0";
+  rev = "3305";
+
+  src = fetchurl {
+    url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip";
+    sha256 = "2cb988d36ec747b2917f3be040b430f2a8289c07353a6b6bdc95bf741fa1ed97";
+  };
+  meta = with stdenv.lib; {
+    description = "A continuous delivery server specializing in advanced workflow modeling and visualization";
+    homepage = http://www.go.cd;
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ swarren83 ];
+  };
+
+  buildInputs = [ unzip ];
+
+  buildCommand = "
+    unzip $src -d $out
+    mv $out/go-agent-${version} $out/go-agent
+  ";
+}
diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix
new file mode 100644
index 000000000000..0b9794fd6d7f
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "gocd-server-${version}-${rev}";
+  version = "16.5.0";
+  rev = "3305";
+
+  src = fetchurl {
+    url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip";
+    sha256 = "41139051f419dc340a5c05c76e5de06eeef3516526341f377ac77532511bfa2c";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A continuous delivery server specializing in advanced workflow modeling and visualization";
+    homepage = http://www.go.cd;
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ swarren83 ];
+  };
+
+  buildInputs = [ unzip ];
+
+  buildCommand = "
+    unzip $src -d $out
+    mv $out/go-server-${version} $out/go-server
+    mkdir -p $out/go-server/conf
+  ";
+}
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index e7355d167d92..01d1c97ba968 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.3";
+  version = "2.13";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "0x59dbvh6y25ki5jy51djbfbhf8g2j3yd9f3n66f7bkdfw8p78g1";
+    sha256 = "0rb3spml2c7cd34zjjc5mwsdcnwmcbcdc784nl8cczayiwz8nq3p";
   };
 
   buildCommand = ''
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = http://jenkins-ci.org;
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = [ maintainers.coconnor ];
+    maintainers = with maintainers; [ coconnor fpletz ];
   };
 }
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
new file mode 100644
index 000000000000..4a7d1bf87e31
--- /dev/null
+++ b/pkgs/development/tools/doctl/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "doctl-${version}";
+  version = "1.3.1";
+  rev = "a57555c195d06bc7aa5037af77fde0665ad1231f";
+  goPackagePath = "github.com/digitalocean/doctl";
+
+  src = fetchFromGitHub {
+    owner = "digitalocean";
+    repo = "doctl";
+    rev = "${rev}";
+    sha256 = "03z652fw0a628gv666w8vpi05a4sdilvs1j5scjhcbi82zsbkvma";
+  };
+
+  meta = {
+    description = "A command line tool for DigitalOcean services";
+    homepage = "https://github.com/digitalocean/doctl";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.siddharthist ];
+  };
+}
diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix
index faf1bd6d9bde..e8bd45dd4ae4 100644
--- a/pkgs/development/tools/haskell/tinc/default.nix
+++ b/pkgs/development/tools/haskell/tinc/default.nix
@@ -37,5 +37,6 @@ mkDerivation {
   description = "A dependency manager for Haskell";
   homepage = "https://github.com/sol/tinc#readme";
   license = stdenv.lib.licenses.mit;
+  hydraPlatforms = stdenv.lib.platforms.none;
   maintainers = [ stdenv.lib.maintainers.robbinch ];
 }
diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix
new file mode 100644
index 000000000000..aafb5f541443
--- /dev/null
+++ b/pkgs/development/tools/jmespath/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "jmespath-${version}";
+  version = "0.2.2";
+  rev = "${version}";
+
+  goPackagePath = "github.com/jmespath/go-jmespath";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "jmespath";
+    repo = "go-jmespath";
+    sha256 = "0f4j0m44limnjd6q5fk152g6jq2a5cshcdms4p3a1br8pl9wp5fb";
+  };
+  meta = with stdenv.lib; {
+    description = "A JMESPath implementation in Go";
+    homepage = "https://github.com/jmespath/go-jmespath";
+    maintainers = with maintainers; [ cransom ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix
new file mode 100644
index 000000000000..2cae6a7fcc87
--- /dev/null
+++ b/pkgs/development/tools/jp/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, jmespath }:
+
+buildGoPackage rec {
+  name = "jp-${version}";
+  version = "0.1.2";
+  rev = "${version}";
+
+  goPackagePath = "github.com/jmespath/jp";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "jmespath";
+    repo = "jp";
+    sha256 = "1i0jl0c062crigkxqx8zpyqliz8j4d37y95cna33jl777kx42r6h";
+  };
+  meta = with stdenv.lib; {
+    description = "A command line interface to the JMESPath expression language for JSON";
+    homepage = "https://github.com/jmespath/jp";
+    maintainers = with maintainers; [ cransom ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix
index f97404f7a014..fa8002d4f6c7 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/pkgs/development/tools/misc/itstool/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, libxml2Python }:
 
 stdenv.mkDerivation rec {
-  name = "itstool-1.2.0";
+  name = "itstool-2.0.2";
 
   src = fetchurl {
     url = "http://files.itstool.org/itstool/${name}.tar.bz2";
-    sha256 = "1akq75aflihm3y7js8biy7b5mw2g11vl8yq90gydnwlwp0zxdzj6";
+    sha256 = "bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a";
   };
 
-  buildInputs = [ python ];
+  buildInputs = [ python libxml2Python ];
 
   patchPhase =
     ''
diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index f93f7d6511db..2d5358b2255f 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "swig-${version}";
-  version = "3.0.7";
+  version = "3.0.10";
 
   src = fetchFromGitHub {
     owner = "swig";
     repo = "swig";
     rev = "rel-${version}";
-    sha256 = "18zp9546d5xfq88nyykk5v3hh0iyp8r59i2ridbavxn3z914mhyv";
+    sha256 = "049rj883r9mf2bgabj3b03p7cnmqgl5939lmh8v5nnia24zb51jg";
   };
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
     homepage = http://swig.org/;
-    # Licensing is a mess: http://www.swig.org/Release/LICENSE .
-    license = "BSD-style";
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    maintainers = [ lib.maintainers.urkud lib.maintainers.wkennington ];
+    # Different types of licenses available: http://www.swig.org/Release/LICENSE .
+    license = licenses.gpl3Plus;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ urkud wkennington ];
   };
 }
diff --git a/pkgs/development/tools/mypy-lang/default.nix b/pkgs/development/tools/mypy-lang/default.nix
index d5baf9949449..ebce2b86c1f7 100644
--- a/pkgs/development/tools/mypy-lang/default.nix
+++ b/pkgs/development/tools/mypy-lang/default.nix
@@ -2,14 +2,14 @@
 
 python35Packages.buildPythonApplication rec {
   name = "mypy-lang-${version}";
-  version = "0.4.2";
+  version = "0.4.3";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchurl {
     url = "mirror://pypi/m/mypy-lang/${name}.tar.gz";
-    sha256 = "12vwgzbpv0n403dvzas5ckw0f62slqk5j3024y65hi9n95r34rws";
+    sha256 = "11d8195xg8hksyh2qapbv66jvjgfpjwkc61nwljcfq9si144f2nb";
   };
 
   propagatedBuildInputs = with python35Packages; [ lxml ];
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index 48657a8e19d0..5ae27b476b41 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,27 +1,21 @@
-{ stdenv, fetchurl, ocaml, findlib, ncurses, camlp4 }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }:
+
+let version = "1.99.16-beta"; in
 
 stdenv.mkDerivation {
 
-  name = "ocp-build-1.99.9-beta";
+  name = "ocp-build-${version}";
 
-  src = fetchurl {
-    url = http://www.typerex.org/pub/ocp-build/ocp-build.1.99.9-beta.tar.gz;
-    sha256 = "0wcb49bp239ns9mz55ky0kfjcz80cp97k0j0rwaw4h5sp3phn4l0";
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "ocp-build";
+    rev = version;
+    sha256 = "1nkd7wlf1vrc4p20bs94vbkd970q2ag23csh9a897ka65rk08gvw";
   };
 
-  buildInputs = [ ocaml findlib ncurses camlp4 ];
+  buildInputs = [ ocaml findlib ncurses ];
   preInstall = "mkdir -p $out/bin";
 
-  # In the Nix sandbox, the TERM variable is unset and stty does not
-  # work. In such a case, ocp-build crashes due to a bug. The
-  # ./fix-for-no-term.patch fixes this bug in the source code and hence
-  # also in the final installed version of ocp-build. However, it does not
-  # fix the bug in the precompiled bootstrap version of ocp-build that is
-  # used during the compilation process. In order to bypass the bug until
-  # it's also fixed upstream, we simply set TERM to some valid entry in the
-  # terminfo database during the bootstrap.
-  TERM = "xterm";
-
   meta = with stdenv.lib; {
     homepage = http://www.typerex.org/ocp-build.html;
     description = "A build tool for OCaml";
diff --git a/pkgs/development/tools/ocaml/ocp-build/fix-for-no-term.patch b/pkgs/development/tools/ocaml/ocp-build/fix-for-no-term.patch
deleted file mode 100644
index 8ce83d095fb3..000000000000
--- a/pkgs/development/tools/ocaml/ocp-build/fix-for-no-term.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ocp-build-ocp-build.1.99.8-beta/src/ocp-build/buildTerm.ml	2014-10-27 13:54:37.532023502 +0100
-+++ ocp-build-ocp-build.1.99.8-beta/src/ocp-build/buildTerm.ml.new	2014-10-27 13:54:43.397099033 +0100
-@@ -49,7 +49,7 @@
-           | _ -> failwith "stty"
-         end
-       | _ -> raise Not_found
--    with Unix.Unix_error _ | End_of_file | Failure _ ->
-+    with Unix.Unix_error _ | End_of_file | Failure _ | Not_found ->
-       try
-         (* shell envvar *)
-         int_of_string (Sys.getenv "COLUMNS")
diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 796aa56ce0b5..108688b782ab 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -3,15 +3,23 @@
 
 let
   deps = import ./deps.nix { inherit fetchurl; };
-  version = "1.2.0";
+  version = "1.3.0";
   src = fetchurl {
     url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
-    sha256 = "13ffr2iabl5lyqqdcrs8z37lfqw1n102bkxwfx0540hj6brvkm2v";
+    sha256 = "0mk9v4s51jdrrcs78v3cm131pz3fdhjkd4cmmfn1kkcfcpqzw6j8";
     
   };
 in stdenv.mkDerivation rec {
   name = "pypi2nix-${version}";
-  srcs = with deps; [ src pip click setuptools zcbuildout zcrecipeegg ];
+  srcs = with deps; [
+    src
+    pip
+    click
+    setuptools
+    zcbuildout
+    zcrecipeegg
+    requests
+  ];  # six attrs effect ];
   buildInputs = [ python zip makeWrapper ];
   sourceRoot = ".";
 
@@ -23,6 +31,10 @@ in stdenv.mkDerivation rec {
     mv setuptools-*/setuptools          $out/pkgs/setuptools
     mv zc.buildout-*/src/zc             $out/pkgs/zc
     mv zc.recipe.egg-*/src/zc/recipe    $out/pkgs/zc/recipe
+    # mv six-*/six.py                    $out/pkgs/
+    # mv attrs-*/src/attr                $out/pkgs/attrs
+    # mv effect-*/effect                 $out/pkgs/effect
+    mv requests-*/requests              $out/pkgs/
 
     if [ "$IN_NIX_SHELL" != "1" ]; then
       if [ -e git-export ]; then
diff --git a/pkgs/development/tools/pypi2nix/deps.nix b/pkgs/development/tools/pypi2nix/deps.nix
index 2717270a164b..5d6f23c26c03 100644
--- a/pkgs/development/tools/pypi2nix/deps.nix
+++ b/pkgs/development/tools/pypi2nix/deps.nix
@@ -32,11 +32,8 @@ rec {
   effectVersion = "0.10.1";
   effectHash = "6a6fd28fb44179ce01a148d4e8bdbede";
 
-  chardetVersion = "2.3.0";
-  chardetHash = "25274d664ccb5130adae08047416e1a8";
-
-  aiohttpVersion = "0.21.6";
-  aiodnsHash = "d7f63e51bc86a61d9bccca13986c3855";
+  requestsVersion = "2.10.0";
+  requestsHash = "a36f7a64600f1bfec4d55ae021d232ae";
 
 
   # --- wheels used to bootstrap python environment ---------------------------
@@ -99,14 +96,9 @@ rec {
   #   md5 = effectHash;
   # };
 
-  chardet = fetchurl {
-    url = "https://pypi.python.org/packages/7d/87/4e3a3f38b2f5c578ce44f8dc2aa053217de9f0b6d737739b0ddac38ed237/chardet-${chardetVersion}.tar.gz";
-    md5 = chardetHash;
-  };
-
-  aiohttp = fetchurl {
-    url = "https://pypi.python.org/packages/04/78/9faeb8b5b1d53e8c81c99764412c2225d982943e4261bba2c6f725e15fce/aiohttp-${aiohttpVersion}.tar.gz";
-    md5 = aiodnsHash;
+  requests = fetchurl {
+    url = "https://pypi.python.org/packages/49/6f/183063f01aae1e025cf0130772b55848750a2f3a89bfa11b385b35d7329d/requests-${requestsVersion}.tar.gz";
+    md5 = requestsHash;
   };
 
 }
diff --git a/pkgs/development/tools/ronn/Gemfile b/pkgs/development/tools/ronn/Gemfile
new file mode 100644
index 000000000000..64f1df743abc
--- /dev/null
+++ b/pkgs/development/tools/ronn/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "ronn"
diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/development/tools/ronn/Gemfile.lock
new file mode 100644
index 000000000000..c2b90f634948
--- /dev/null
+++ b/pkgs/development/tools/ronn/Gemfile.lock
@@ -0,0 +1,19 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    hpricot (0.8.6)
+    mustache (1.0.3)
+    rdiscount (2.2.0.1)
+    ronn (0.7.3)
+      hpricot (>= 0.8.2)
+      mustache (>= 0.7.0)
+      rdiscount (>= 1.5.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ronn
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix
new file mode 100644
index 000000000000..7720c4f2bf2b
--- /dev/null
+++ b/pkgs/development/tools/ronn/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, bundlerEnv, makeWrapper, groff }:
+
+stdenv.mkDerivation rec {
+  name = "ronn-${version}";
+  version = env.gems.ronn.version;
+
+  env = bundlerEnv rec {
+    name = "ronn-gems";
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+
+  phases = ["installPhase"];
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/ronn $out/bin/ronn \
+      --set PATH ${groff}/bin
+  '';
+
+  meta = with lib; {
+    description = "markdown-based tool for building manpages";
+    homepage = https://rtomayko.github.io/ronn/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+    platforms = env.ruby.meta.platforms;
+  };
+}
diff --git a/pkgs/development/tools/ronn/gemset.nix b/pkgs/development/tools/ronn/gemset.nix
new file mode 100644
index 000000000000..ce804e1f9f5b
--- /dev/null
+++ b/pkgs/development/tools/ronn/gemset.nix
@@ -0,0 +1,34 @@
+{
+  hpricot = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z";
+      type = "gem";
+    };
+    version = "0.8.6";
+  };
+  mustache = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v4pdvgvs8gw0zbh5sy3l308amlsjg8sdfrkml0g0m0wwj4x7naf";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  rdiscount = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3";
+      type = "gem";
+    };
+    version = "2.2.0.1";
+  };
+  ronn = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07plsxxfx5bxdk72ii9za6km0ziqlq8jh3bicr4774dalga6zpw2";
+      type = "gem";
+    };
+    version = "0.7.3";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 3cb7a3e23466..ffaae16b7420 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -17,9 +17,11 @@ buildRustPackage rec {
   buildInputs = [ makeWrapper ];
 
   preCheck = ''
-    export RUST_SRC;_PATH="${rustPlatform.rust.rustc.src}/src"
+    export RUST_SRC_PATH="${rustPlatform.rust.rustc.src}/src"
   '';
 
+  doCheck = true;
+
   installPhase = ''
     mkdir -p $out/bin
     cp -p target/release/racer $out/bin/
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index c970b319a94d..6dfbb6978db7 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -4,7 +4,7 @@
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
 let
-  version = "1.8.1";
+  version = "1.8.4";
   rake = buildRubyGem {
     inherit ruby;
     gemName = "rake";
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url    = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_x86_64.deb";
-        sha256 = "0gb999ql4kfxd9473cx3xn6a11094dm4iyrx1dzd9v2sygh1l3pd";
+        sha256 = "fd38d8e00e494a617201facb42fc2cac627e5021db15e91c2a041eac6a2d8208";
       }
     else
       fetchurl {
         url    = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_i686.deb";
-        sha256 = "1nzg6i9i270xgaih381q096lb23rwxkif4ba9j62y3zjmj6az4xf";
+        sha256 = "555351717cacaa8660821df8988cc40a39923b06b698fca6bb90621008aab06f";
       };
 
   meta = with stdenv.lib; {
@@ -97,12 +97,12 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     # 'hide' the template file from shebang-patching
-    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.6/lib/bundler/templates/Executable
+    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable
     chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
   '';
 
   postFixup = ''
-    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.6/lib/bundler/templates/Executable
+    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable
     chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
   '';
 }