From 85dc90565f74aed870cbf49ccb4b3e643032483b Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sat, 10 Jan 2015 14:38:45 +0100 Subject: [PATCH] leiningen: Update to 2.5.1. --- .../tools/build-managers/leiningen/builder.sh | 2 +- .../tools/build-managers/leiningen/default.nix | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index a4aaed8f12f3..885f3189acce 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -7,7 +7,7 @@ mkdir -pv $out/bin $out/share/java out_bin=$out/bin/lein cp -v $src $out_bin -cp -v $jarsrc $out/share/java +cp -v $jarsrc "$out/share/java/$name-standalone.jar" for p in $patches; do diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 5f3a032051b1..00d8eade612e 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,17 +3,18 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.5.0"; + version = "2.5.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "1drl35313xp2gg5y52wp8414i2fm806rhgcsghl4igrm3afrv85x"; + sha256 = "0pqqb2bh0a17426diwyhk5vbxcfz45rppbxmjydsmai94jm3cgix"; }; jarsrc = fetchurl { - url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.jar"; - sha256 = "0fd7yqrj9asx1n3nszli7hr4fj47v2pdr9msk5g75955pw7yavp9"; + # NOTE: This is actually a .jar, Github has issues + url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; + sha256 = "1irl3w66xq1xbbs4g10dnw1vknfw8al70nhr744gfn2za27w0xdl"; }; patches = [ ./lein-fix-jar-path.patch ];