Merge branch 'master' into staging

6 files changed, 42 insertions, 32 deletions

diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix
index fc97113bc471..80e8fe59c051 100644
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "autoconf-archive-${version}";
-  version = "2016.03.20";
+  version = "2016.09.16";
 
   src = fetchurl {
     url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
-    sha256 = "0dz4fnc723jqn3by22ds5fys7g31apzm1r9allldvva0yvzjxyw8";
+    sha256 = "10mxz9hfnfz66m1l9s28sbyfb9a04akz92wkyv9blhpq6p9fzwp8";
   };
 
   buildInputs = [ xz ];
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index 783607860dec..2ada782563e5 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -1,28 +1,27 @@
 { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3
-, pep8, python, makeWrapper, gnome3, pygobject3, libwnck3 }:
+, pythonPackages, makeWrapper, gnome3, libwnck3 }:
 
 let
   version = "${major}.11";
   major = "0.3";
-in
-
-stdenv.mkDerivation rec {
+in pythonPackages.mkPythonDerivation rec {
   name = "d-feet-${version}";
+  namePrefix = "";
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
     sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2";
   };
 
-  buildInputs = [
-    pkgconfig libxml2 itstool intltool glib gtk3 pep8 python
-    gnome3.defaultIconTheme makeWrapper pygobject3 libwnck3
+  buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3
+    gnome3.defaultIconTheme makeWrapper libwnck3
   ];
 
+  propagatedBuildInputs = with pythonPackages; [ pygobject3 pep8 ];
+
   preFixup =
     ''
       wrapProgram $out/bin/d-feet \
-        --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
         --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share"
     '';
diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix
index 3aeacd457dd0..d851741405ff 100644
--- a/pkgs/development/tools/misc/kibana/default.nix
+++ b/pkgs/development/tools/misc/kibana/default.nix
@@ -1,14 +1,23 @@
 { stdenv, makeWrapper, fetchurl, nodejs, coreutils, which }:
 
 with stdenv.lib;
-
-stdenv.mkDerivation rec {
+let
+  inherit (builtins) elemAt;
+  info = splitString "-" stdenv.system;
+  arch = elemAt info 0;
+  plat = elemAt info 1;
+  shas = {
+    "x86_64-linux"  = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw";
+    "i686-linux"    = "0d77a2v14pg5vr711hzbva8jjy0sxw9w889f2r1vhwngrhcfz4pf";
+    "x86_64-darwin" = "1cajljx13h8bncmayzvlzsynwambz61cspjnsn2h19zghn2vj2c9";
+  };
+in stdenv.mkDerivation rec {
   name = "kibana-${version}";
-  version = "4.5.2";
+  version = "4.6.0";
 
   src = fetchurl {
-    url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz";
-    sha256 = "1na8xh525znxaqjhxfvpx0q3rj85cjb6l9zlzd44dl31a9l117y4";
+    url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${arch}.tar.gz";
+    sha256 = shas."${stdenv.system}";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 017b5fdc08d1..e1741118fb0f 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -1,16 +1,16 @@
-{stdenv, fetchurl, lua, curl, makeWrapper, which}:
+{stdenv, fetchurl, lua, curl, makeWrapper, which, unzip}:
 let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.3.0";
+    version="2.4.0";
     name="${baseName}-${version}";
-    hash="15zdchj3wkjdbypj68kwqswxhkhrfnw72nlks6df4lk0nvp8zqv8";
-    url="http://luarocks.org/releases/luarocks-2.3.0-rc2.tar.gz";
-    sha256="15zdchj3wkjdbypj68kwqswxhkhrfnw72nlks6df4lk0nvp8zqv8";
+    hash="1hwpjj4nvy8m7hfmhf52vbhmlh7r3wfjjcc589yj8dnh528iqf24";
+    url="http://luarocks.org/releases/luarocks-2.4.0.tar.gz";
+    sha256="1hwpjj4nvy8m7hfmhf52vbhmlh7r3wfjjcc589yj8dnh528iqf24";
   };
   buildInputs = [
-    lua curl makeWrapper which
+    lua curl makeWrapper which unzip
   ];
 in
 stdenv.mkDerivation {
diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix
index 606cc5146470..c14a41cc5599 100644
--- a/pkgs/development/tools/misc/trv/default.nix
+++ b/pkgs/development/tools/misc/trv/default.nix
@@ -1,5 +1,6 @@
-{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core, async, async_unix, re2,
-  async_extra, sexplib, async_shell, core_extended, async_find, cohttp, uri, tzdata}:
+{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, uri, tzdata}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -20,9 +21,9 @@ stdenv.mkDerivation {
 
 
   buildInputs = [ ocaml findlib camlp4 ];
-  propagatedBuildInputs = [ core async async_unix
-                            async_extra sexplib async_shell core_extended
-                            async_find cohttp uri re2 ];
+  propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4
+                            async_extra_p4 sexplib_p4 async_shell core_extended_p4
+                            async_find cohttp uri re2_p4 ];
 
   createFindlibDestdir = true;
   dontStrip = true;
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index b511b7d1948b..75d371b4ec8d 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages, buildPythonApplication, makeWrapper
+{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python;
+in pythonPackages.mkPythonDerivation rec {
   name = "ycmd-2016-01-12";
+  namePrefix = "";
 
   src = fetchgit {
     url = "git://github.com/Valloric/ycmd.git";
@@ -10,13 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "1g0hivv3wla7z5dgnkcn3ny38p089pjfj36nx6k29zmprgmjinyr";
   };
 
-  buildInputs = [ python cmake boost makeWrapper ];
+  buildInputs = [ cmake boost ];
 
   propagatedBuildInputs = with pythonPackages; [ waitress frozendict bottle ];
 
   buildPhase = ''
     export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
-    python build.py --clang-completer --system-boost
+    ${python.interpreter} build.py --clang-completer --system-boost
   '';
 
   configurePhase = ":";
@@ -24,8 +27,6 @@ stdenv.mkDerivation rec {
   installPhase = with pythonPackages; ''
     mkdir -p $out/lib/ycmd/third_party $out/bin
     cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/
-    wrapProgram $out/lib/ycmd/ycmd/__main__.py \
-      --prefix PYTHONPATH : "$(toPythonPath ${waitress}):$(toPythonPath ${frozendict}):$(toPythonPath ${bottle})"
     ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
   '';