Merge trunk

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

9 files changed, 76 insertions, 38 deletions

diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index 0746dd5b3bec..1af31c2ba5cc 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -1,22 +1,19 @@
 { stdenv, fetchurl, emacs, texinfo }:
 
 let
-  version = "1.0.0";
+  version = "1.1.0";
 in
 stdenv.mkDerivation {
   name = "magit-${version}";
 
   src = fetchurl {
     url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz";
-    sha256 = "1hfdl90d96zin31v8x4p8zx5f0x0i5i9hccysx6q3prdgw9r6wzq";
+    sha256 = "8e147e1f2e69938232f859daf712515b46aa367d7b7d90b42538e083f52a72b4";
   };
 
   buildInputs = [emacs texinfo];
 
-  configurePhase =
-    '' sed -i Makefile \
-           -e "s|^PREFIX=.*$|PREFIX=$out|g ; s|/etc/emacs/|$out/etc/emacs/|"
-    '';
+  configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )";
 
   meta = {
     description = "Magit, an Emacs interface to Git";
@@ -34,7 +31,7 @@ stdenv.mkDerivation {
     '';
 
     license = "GPLv3+";
-    homepage = "http://github.com/philjackson/magit";
+    homepage = "https://github.com/magit/magit";
     platforms = stdenv.lib.platforms.all;
     maintainers = with stdenv.lib.maintainers; [ simons ludo ];
   };
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 533e196cee4d..a06ec7c0b8e8 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -3,7 +3,7 @@
 , withGNOME ? false, libgnomeui }:
 
 stdenv.mkDerivation rec {
-  inherit (src) name;
+  name = src.pkgname;
 
   src = fetchurl_gnome {
     project = "dia";
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 6d4431516f8e..895453aae446 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,22 +1,28 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
 kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
-liblqr1, lensfun, pkgconfig }:
+liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
+shared_desktop_ontologies, marble }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-1.5.0";
+  name = "digikam-2.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/digikam/${name}.tar.bz2";
-    sha256 = "1vvzw132aw2c1z2v1zc3aqa99kvg501krr2law35ri12zkqjsvaz";
+    sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc";
   };
 
   buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
     lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
-    pkgconfig ];
+    pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies
+    marble ];
 
   KDEDIRS=kdeedu;
 
-  patches = [ ./include.diff ];
+  # Make digikam find some FindXXXX.cmake
+  preConfigure = ''
+    cp ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules;
+    cp ${marble}/share/apps/cmake/modules/FindMarble.cmake cmake/modules;
+  '';
 
   meta = {
     description = "Photo Management Program";
diff --git a/pkgs/applications/graphics/digikam/include.diff b/pkgs/applications/graphics/digikam/include.diff
deleted file mode 100644
index 0762ce04d263..000000000000
--- a/pkgs/applications/graphics/digikam/include.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-index 9ee36cc..c6e5c00 100644
---- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-+++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS)
- 
-     INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/
-                          ${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/
-+						 ${LIBMARBLEWIDGET_INCLUDE_DIR}/..
-                          ${QT_INCLUDE_DIR}
-                        )
- 
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index b38a6cb5644b..b8100fbd7093 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt4, icu
+, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite
 , pil, makeWrapper, unrar, chmlib, pythonPackages, xz
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.8.30";
+  name = "calibre-0.8.32";
 
   src = fetchurl {
     url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz";
-    sha256 = "1w94kaynxiksjfi6wqlvwnryl08f8m0ylqwgzwkz1hjznqiji282";
+    sha256 = "0d0zq4sr0qm8jarg0ps24lfizb4hyb57pjsp81y1sb5nzjki7jml";
   };
 
   inherit python;
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
     [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
       fontconfig podofo qt4 pil chmlib icu
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
-      pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
+      pythonPackages.cssutils pythonPackages.beautifulsoap
+      pythonPackages.sqlite3 sqlite
     ];
 
   installPhase = ''
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
       $out/lib/calibre/calibre/ebooks/metadata/*.py
       $out/lib/calibre/calibre/ebooks/rtf2xml/*.py"
 
-    sed -i "s/env python/python/" $PYFILES
+    sed -i "s/env python[0-9.]*/python/" $PYFILES
     for a in $out/bin/*; do
       wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH --prefix LD_LIBRARY_PATH : ${unrar}/lib
     done
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
new file mode 100644
index 000000000000..1202c4327bb4
--- /dev/null
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "task-warrior-1.9.4";
+
+  src = fetchurl {
+    url = http://www.taskwarrior.org/download/task-1.9.4.tar.gz;
+    sha256 = "0jnk30k1b2j3nx39il70jmj6p49wxp6cl4awd8hw71gqkcf6480h";
+  };
+
+  meta = {
+    description = "Command-line todo list manager";
+    homepage = http://taskwarrior.org/;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/applications/misc/taskwarrior/unstable.nix b/pkgs/applications/misc/taskwarrior/unstable.nix
new file mode 100644
index 000000000000..057ebbe57c53
--- /dev/null
+++ b/pkgs/applications/misc/taskwarrior/unstable.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, lua5 }:
+
+stdenv.mkDerivation {
+  name = "task-warrior-2.0.0.beta4";
+
+  src = fetchurl {
+    url = http://www.taskwarrior.org/download/task-2.0.0.beta4.tar.gz;
+    sha256 = "1c9n6b5ly3m5kminnsvqgmjxdkb68w4av9kdnh47dw4sj3gwrn1w";
+  };
+
+  NIX_LDFLAGS = "-ldl";
+
+  buildInputs = [ cmake lua5 ];
+
+  meta = {
+    description = "Command-line todo list manager";
+    homepage = http://taskwarrior.org/;
+    license = "MIT";
+  };
+}
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 209ba934b9ef..793d5c9452aa 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -9,11 +9,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "hol_light-20111204";
+  name = "hol_light-20111224";
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "114";
-    sha256 = "a9203a0118caf5d0ca7621abafab4af6245e1c1ae6ba628ead7c6f69aa86d9d3";
+    rev = "116";
+    sha256 = "c840cc2dfeb2088484692cb0073e6a7bb85e3e44e95aee1e0f5a8e223f7ccae6";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index b94b350a8482..b44f6d9f3aa8 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,10 +1,12 @@
 {stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua
 , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
+, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau
+, libXdmcp, pixman, doxygen
 , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
 , docbook_xml_dtd_45, libxslt, coreutils}:
 
 let
-  version = "3.4.9";
+  version = "3.4.11";
 in
 
 stdenv.mkDerivation rec {
@@ -12,11 +14,12 @@ stdenv.mkDerivation rec {
  
   src = fetchurl {
     url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "0382v482904xv295l0gvhwzc64b7631miiv8wyq7jxmwqf2vfbp7";
+    sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d";
   };
  
   buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
-    imlib2 libxcb libxdg_basedir xcbutil libstartup_notification libev
+    imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm
+    libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
     asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ];
 
   # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
@@ -27,10 +30,17 @@ stdenv.mkDerivation rec {
     sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
     # Remove the 'root' PATH override (I don't know why they have that)
     sed /WHOAMI/d -i utils/awsetbg
+    # Russian manpages fail to be generated:
+    #  [ 56%] Generating manpages/ru/man1/awesome.1.xml
+    #  asciidoc: ERROR: <stdin>: line 3: name section expected
+    #  asciidoc: FAILED: <stdin>: line 3: section title expected
+    #  make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
+    substituteInPlace CMakeLists.txt \
+      --replace "set(AWE_MAN_LANGS es fr de ru)" \
+                "set(AWE_MAN_LANGS es fr de)"
   '';
 
-  patches = [ ./cmake284.patch ];
-
+  # XXX: maybe not needed anymore
   # Somehow libev does not get into the rpath, although it should.
   # Something may be wrong in the gcc wrapper.
   preBuild = ''