Merge branch 'master' into stdenv-updates

Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix

pkgs/development/tools/build-managers/leiningen/builder.sh

@@ -21,7 +21,3 @@ chmod -v 755 $out_bin
 patchShebangs $out
 
 wrapProgram $out_bin --prefix PATH ":" ${rlwrap}/bin
-
-echo "Testing out \"lein version\"..."
-$out_bin version
-echo "Success."

pkgs/development/tools/build-managers/leiningen/default.nix

@@ -1,21 +1,21 @@
-{stdenv, fetchurl, makeWrapper, openjdk, rlwrap, clojure }:
+{ stdenv, fetchurl, makeWrapper, jdk, rlwrap, clojure }:
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.1.2";
+  version = "2.3.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "10s4xpwrhd8wz3h2vj8ay4rf2hw8vzswfkr8ckckk3fhjcn130dy";
+    sha256 = "07z4sr4ssi9lqr1kydxn4gp992n44jsr6llarlvpx0ns8yi4gx0l";
   };
 
   jarsrc = fetchurl {
     url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
-    sha256 = "08jq21zpsgwsmsz7lpfxidj2s3mv8i23fjwyl9qc6dngskkx45sa";
+    sha256 = "00hmxyvrzxjwa2qz3flnrvg2k2llzvprk9b5szyrh3rv5z5jd4hw";
   };
 
-  patches = ./lein_2.1.2.patch;
+  patches = ./lein_2.3.0.patch;
 
   inherit rlwrap clojure;
 
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
-  propagatedBuildInputs = [ openjdk clojure ];
+  propagatedBuildInputs = [ jdk clojure ];
 
   meta = {
-    homepage = https://github.com/technomancy/leiningen;
+    homepage = http://leiningen.org/;
     description = "Project automation for Clojure";
     license = "EPL";
     platforms = stdenv.lib.platforms.unix;
-    maintainer = with stdenv.lib.maintainers; [the-kenny];
+    maintainer = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }

pkgs/development/tools/build-managers/rebar/default.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, erlang }:
+
+stdenv.mkDerivation {
+  name = "rebar-2.1.0-pre";
+
+  src = fetchurl {
+    url = "https://github.com/basho/rebar/archive/2.1.0-pre.tar.gz";
+    sha256 = "0dsbk9ssvk1hx9275900dg4bz79kpwcid4gsz09ziiwzv0jjbrjn";
+  };
+
+  buildInputs = [ erlang ];
+
+  buildPhase = "escript bootstrap";
+  installPhase = ''
+    mkdir -p $out/bin
+    cp rebar $out/bin/rebar
+  '';
+
+  meta = {
+    homepage = "https://github.com/rebar/rebar";
+    description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases.";
+
+    longDescription = ''
+      rebar is a self-contained Erlang script, so it's easy to
+      distribute or even embed directly in a project. Where possible,
+      rebar uses standard Erlang/OTP conventions for project
+      structures, thus minimizing the amount of build configuration
+      work. rebar also provides dependency management, enabling
+      application writers to easily re-use common libraries from a
+      variety of locations (git, hg, etc).
+      '';
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+  };
+}