diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index c4b7002a718..f5489a4a76f 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/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." diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index bf1a275046e..d7f819c45f6 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/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.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "10s4xpwrhd8wz3h2vj8ay4rf2hw8vzswfkr8ckckk3fhjcn130dy"; + sha256 = "18rk1rr9il5jc3103cnmii6hyc1j3k12d975sqrcqyg97h7f0jkb"; }; jarsrc = fetchurl { url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar"; - sha256 = "08jq21zpsgwsmsz7lpfxidj2s3mv8i23fjwyl9qc6dngskkx45sa"; + sha256 = "1higd309b43lly7fv1pd5lfd3lyrij95nrzklqmk8vf9llw6974p"; }; - 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; 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 ]; }; } diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch b/pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch similarity index 100% rename from pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch rename to pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch