Update Clojure to 1.4.0

svn path=/nixpkgs/trunk/; revision=33963
This commit is contained in:
Michael Raskin 2012-05-01 11:39:58 +00:00
parent 304facbf3b
commit 6ed169c19d
2 changed files with 12 additions and 8 deletions

View file

@ -1,19 +1,22 @@
{stdenv, fetchurl, unzip}: {stdenv, fetchurl, unzip}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "clojure-binary-1.2.1"; version = "1.4.0";
name = "clojure-binary-${version}";
src = fetchurl { src = fetchurl {
url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip; url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1"; sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
}; };
buildInputs = [ unzip ]; buildInputs = [ unzip ];
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
installPhase = " installPhase = "
mkdir -p $out/lib/java mkdir -p $out/lib/java
cp clojure-${version}.jar clojure.jar
install -t $out/lib/java clojure.jar install -t $out/lib/java clojure.jar
"; ";

View file

@ -1,11 +1,12 @@
{stdenv, fetchurl, unzip, ant}: {stdenv, fetchurl, unzip, ant}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "clojure-1.2.1"; version = "1.4.0";
name = "clojure-${version}";
src = fetchurl { src = fetchurl {
url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip; url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1"; sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
}; };
buildInputs = [ unzip ant ]; buildInputs = [ unzip ant ];