Re: [Nix-dev] New version of Leiningen

[Eelco Dolstra]

Hi,

On 29/02/12 02:22, Phil Hagelberg wrote:

 I've upgraded the packaging of Leiningen for the latest 1.7.0 version,
 attached.

I've committed the patch.  However, it doesn't work out of the box for me:

$ ./result/bin/lein
./result/bin/lein: line 90: which: command not found
./result/bin/lein: line 104: -b: command not found

-- 
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-dev] New version of Leiningen

[Phil Hagelberg]

I've upgraded the packaging of Leiningen for the latest 1.7.0 version,
attached.

thanks.

-Phil

Index: pkgs/development/tools/build-managers/leiningen/default.nix
===
--- pkgs/development/tools/build-managers/leiningen/default.nix	(revision 32683)
+++ pkgs/development/tools/build-managers/leiningen/default.nix	(working copy)
@@ -2,17 +2,17 @@
 
 stdenv.mkDerivation rec {
   pname = leiningen;
-  version = 1.6.2;
+  version = 1.7.0;
   name = ${pname}-${version};
 
   src = fetchurl {
-url = https://raw.github.com/technomancy/leiningen/stable/bin/lein-pkg;;
-sha256 = e177a493ed0c4a7874f1391d5cc72cc1e541e55ed3d6e075feec87b5da6f8277;
+url = https://raw.github.com/technomancy/leiningen/1.7.0/bin/lein-pkg;;
+sha256 = 1339f6ffc7bae3171174fc9eae990f5b9710ff2804038e931d531632c57f189c;
   };
 
   jarsrc = fetchurl {
-url = https://github.com/downloads/technomancy/leiningen/leiningen-1.6.2-standalone.jar;;
-sha256 = e35272556ece82d9a6a54b86266626da1b5f990ff556639dd7dd1025d6ed4226;
+url = https://github.com/downloads/technomancy/leiningen/leiningen-1.7.0-standalone.jar;;
+sha256 = 501eaa1c2a19ca4ffc2fde1776552cb513d69ee874abb547c40cee92156e50bf;
   };
 
   clojuresrc = fetchurl {
Index: pkgs/development/tools/build-managers/leiningen/lein.patch
===
--- pkgs/development/tools/build-managers/leiningen/lein.patch	(revision 32683)
+++ pkgs/development/tools/build-managers/leiningen/lein.patch	(working copy)
@@ -1,15 +1,14 @@
 lein-pkg	2012-01-09 20:47:44.0 -0800
-+++ lein-pkg-nix	2012-01-09 20:45:01.0 -0800
-@@ -70,7 +70,7 @@
+--- lein-pkg	2012-02-28 15:26:40.0 -0800
 lein-pkg-nix	2012-02-28 17:17:02.0 -0800
+@@ -71,30 +71,14 @@
  LEIN_PLUGIN_PATH=$(echo $DEV_PLUGINS | tr \\n :)
  LEIN_USER_PLUGIN_PATH=$(echo $(unique_user_plugins) | tr \\n :)
  CLASSPATH=$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/
 -CLOJURE_JAR=/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar
 +CLOJURE_JAR=$(dirname $0)/../lib/*clojure-1.2.1.jar
- NULL_DEVICE=/dev/null
  
  # apply context specific CLASSPATH entries
-@@ -78,23 +78,7 @@
+ if [ -f .lein-classpath ]; then
  CLASSPATH=`cat .lein-classpath`:$CLASSPATH
  fi
  
@@ -26,11 +25,8 @@
 -
 -# Do not use installed leiningen jar during self-compilation
 -if ! { [ $1 = compile ] 
--   grep -qsE 'defproject leiningen[[:space:]]+[[:digit:].]+' \
-- project.clj ;}; then
+-grep -qsE 'defproject leiningen[[:space:]]+[[:digit:].]+' \
+-project.clj ;}; then
 -CLASSPATH=$CLASSPATH:/usr/share/java/leiningen-$LEIN_VERSION.jar
 -fi
 +CLASSPATH=$CLASSPATH:$(dirname $0)/../lib/*
- 
- if [ $DEBUG ]; then
- echo $CLASSPATH
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev