From 6ed169c19df56eb8251e86377ef970000062d18c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 May 2012 11:39:58 +0000
Subject: [PATCH] Update Clojure to 1.4.0

svn path=/nixpkgs/trunk/; revision=33963
---
 pkgs/development/interpreters/clojure/binary.nix  | 11 +++++++----
 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 8cf350e7e972..3902d7f335cb 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 f68b89f03980..6c20ca714069 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 ];