svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32713

pkgs/development/tools/build-managers/cmake/2.8.7.nix

@@ -0,0 +1,61 @@
+{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
+, useNcurses ? false, ncurses, useQt4 ? false, qt4
+, darwinInstallNameToolUtility }:
+
+with stdenv.lib;
+
+let
+  os = stdenv.lib.optionalString;
+  majorVersion = "2.8";
+  minorVersion = "7";
+  version = "${majorVersion}.${minorVersion}";
+in
+
+# WARNING: Do NOT upgrade cmake in trunk: it fails to build on i686-linux
+stdenv.mkDerivation rec {
+  name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
+
+  inherit majorVersion;
+
+  src = fetchurl {
+    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
+    sha256 = "130923053d8fe1a2ae032a3f09021f9024bf29d7a04ed10ae04647ff00ecf59f";
+  };
+
+  patches =
+    # Don't search in non-Nix locations such as /usr, but do search in
+    # Nixpkgs' Glibc.
+    optional (stdenv ? glibc) ./search-path.patch;
+
+  buildInputs = [ curl expat zlib bzip2 libarchive ]
+    ++ optional stdenv.isDarwin darwinInstallNameToolUtility
+    ++ optional useNcurses ncurses
+    ++ optional useQt4 qt4;
+
+  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
+  
+  configureFlags =
+    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
+    + stdenv.lib.optionalString useQt4 " --qt-gui";
+
+  setupHook = ./setup-hook.sh;
+
+  postUnpack =
+    ''
+      dontUseCmakeConfigure=1
+      source $setupHook
+      fixCmakeFiles $sourceRoot
+    '';
+
+  preConfigure = optionalString (stdenv ? glibc)
+    ''
+      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
+    '';
+
+  meta = {
+    homepage = http://www.cmake.org/;
+    description = "Cross-Platform Makefile Generator";
+    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}

pkgs/development/tools/build-managers/leiningen/builder.sh

@@ -15,6 +15,8 @@ cp -v $clojuresrc $out/lib
 patch --verbose $out_bin -p0 < $patches
 chmod -v 755 $out_bin
 
+patchShebangs $out
+
 echo "Testing out \"lein version\"..."
 $out_bin version
 echo "Success."

pkgs/development/tools/build-managers/leiningen/default.nix

@@ -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 {
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/technomancy/leiningen;
     description = "Project automation for Clojure";
     license = "EPL";
-
     platforms = stdenv.lib.platforms.unix;
   };
-}
+}

pkgs/development/tools/build-managers/leiningen/lein.patch

@@ -1,15 +1,14 @@
---- lein-pkg	2012-01-09 20:47:44.000000000 -0800
-+++ lein-pkg-nix	2012-01-09 20:45:01.000000000 -0800
-@@ -70,7 +70,7 @@
+--- lein-pkg	2012-02-28 15:26:40.000000000 -0800
++++ lein-pkg-nix	2012-02-28 17:17:02.000000000 -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