diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2012-05-01 11:39:58 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2012-05-01 11:39:58 +0000 |
commit | 6ed169c19df56eb8251e86377ef970000062d18c (patch) | |
tree | ae00178ded3774d51683baa50d1f01c99472c4fa /pkgs/development/interpreters/clojure | |
parent | 304facbf3b763b18113d5f12e4b3c8c3866a2dea (diff) |
Update Clojure to 1.4.0
svn path=/nixpkgs/trunk/; revision=33963
Diffstat (limited to 'pkgs/development/interpreters/clojure')
-rw-r--r-- | pkgs/development/interpreters/clojure/binary.nix | 11 | ||||
-rw-r--r-- | pkgs/development/interpreters/clojure/default.nix | 9 |
2 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix index 8cf350e7e972a..3902d7f335cb9 100644 --- a/pkgs/development/interpreters/clojure/binary.nix +++ b/pkgs/development/interpreters/clojure/binary.nix @@ -1,19 +1,22 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "clojure-binary-1.2.1"; +stdenv.mkDerivation rec { + version = "1.4.0"; + name = "clojure-binary-${version}"; src = fetchurl { - url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip; - sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1"; + url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; + sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171"; }; + buildInputs = [ unzip ]; phases = "unpackPhase installPhase"; installPhase = " mkdir -p $out/lib/java + cp clojure-${version}.jar clojure.jar install -t $out/lib/java clojure.jar "; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index f68b89f039803..6c20ca7140693 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, unzip, ant}: -stdenv.mkDerivation { - name = "clojure-1.2.1"; +stdenv.mkDerivation rec { + version = "1.4.0"; + name = "clojure-${version}"; src = fetchurl { - url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip; - sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1"; + url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; + sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171"; }; buildInputs = [ unzip ant ]; |