Merging from trunk (the callPackage change)

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

pkgs/applications/misc/rsibreak/default.nix

@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, cmake, kdelibs, kdebase_workspace }:
+
+stdenv.mkDerivation rec {
+  name = "rsibreak-0.10";
+
+  src = fetchurl {
+    url = "http://www.rsibreak.org/files/${name}.tar.bz2";
+    sha256 = "02vvwmzhvc9jfrzmnfn3cygx63yx7g360lcslwj1vikzkg834ik0";
+  };
+
+  buildInputs = [ cmake kdelibs kdebase_workspace ];
+}

pkgs/applications/misc/xneur/0.8.nix

@@ -16,9 +16,9 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     sed -e 's/-Werror//' -i configure
-    sed -e 's/for aspell_dir in/for aspell_dir in ${aspell} /' -i configure
-    sed -e 's/for imlib2_dir in/for imlib2_dir in ${imlib2} /' -i configure
-    sed -e 's/for xosd_dir in/for xosd_dir in ${xosd} /' -i configure
+    sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure
+    sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure
+    sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
   '';
 
   meta = {

pkgs/applications/misc/xneur/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="0.9.8";
-   name="xneur-0.9.8";
-   hash="11xpw5vj4yccyq54jnx63kv6lkxa3fqr3kjncmgdc8xqk1pa7jmd";
+   version="0.9.9";
+   name="xneur-0.9.9";
+   hash="07ircm7ngc84h6fpy8q01444vy9cm08q4mbl3q3ya0dg00cq64z4";
    url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2";
-   advertisedUrl="http://dists.xneur.ru/release-0.9.8/tgz/xneur-0.9.8.tar.bz2";
+   advertisedUrl="http://dists.xneur.ru/release-0.9.9/tgz/xneur-0.9.9.tar.bz2";
   
   
 }

pkgs/applications/science/logic/isabelle/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, nettools, polyml, emacs, emacsPackages }:
+{ stdenv, fetchurl, perl, nettools, polyml, proofgeneral }:
 # nettools needed for hostname
 
 let
@@ -6,7 +6,6 @@ let
   version = "2009-1";
   name = "${pname}${version}";
   theories = ["HOL" "FOL" "ZF"];
-  proofgeneral = (emacsPackages emacs).proofgeneral;
 in
 
 stdenv.mkDerivation {

pkgs/build-support/gcc-cross-wrapper/builder.sh

@@ -11,7 +11,7 @@ if test -z "$nativeLibc"; then
     cflagsCompile="$cflagsCompile -B$libc/lib/ -isystem $libc/include"
     ldflags="$ldflags -L$libc/lib"
     # Get the proper dynamic linker for glibc and uclibc. 
-    dlinker=`eval 'echo $libc/lib/ld-*.so.?'`
+    dlinker=`eval 'echo $libc/lib/ld*.so.?'`
     if [ -n "$dlinker" ]; then
       ldflagsBefore="-dynamic-linker $dlinker"
     fi

pkgs/desktops/kde-4.5/artwork/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, lib, cmake, qt4, perl, xscreensaver
+, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
+
+stdenv.mkDerivation {
+  name = "kdeartwork-4.4.92";
+  src = fetchurl {
+    url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
+    sha256 = "17c481za2jfrmhd946jbhgwpcyzjkgjkk2jw84wbj8v694ry3xym";
+  };
+  buildInputs = [ cmake qt4 perl xscreensaver
+                  kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
+  meta = {
+    description = "KDE artwork";
+    longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers";
+    license = "LGPL";
+    homepage = http://www.kde.org;
+    maintainers = [ lib.maintainers.sander ];
+  };
+}

pkgs/desktops/kde-4.5/bindings/default.nix

@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost
+, kdelibs, kdepimlibs, automoc4, soprano, akonadi, attica, polkit_qt_1, ruby
+}:
+
+# This function will only build the pykde4 module. I don't need the other bindings and
+# some bindings are even broken.
+
+stdenv.mkDerivation rec {
+  name = "kdebindings-4.4.95";
+  
+  src = fetchurl {
+    url = "mirror://kde/unstable/4.4.95/src/${name}.tar.bz2";
+    sha256 = "115xl1jcpnyr71573if0nvb3hy8z5hxqy5qlvc71pdprzrp78xbc";
+  };
+
+  patches = [ ./python-site-packages-install-dir.diff ];
+
+  preConfigure = ''
+    CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitearchdir']" | sed -e "s@${ruby}@$out@")
+    CUSTOM_RUBY_SITE_LIB_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitelibdir']" | sed -e "s@${ruby}@$out@")
+	CUSTOM_PERL_SITE_ARCH_DIR=$(perl -MConfig -e 'print $Config{sitearch}' | sed -e "s@${perl}@$out@")
+    cmakeFlagsArray=(
+	  -DSIP_DEFAULT_SIP_DIR=$out/share/sip
+      -DCUSTOM_RUBY_SITE_ARCH_DIR=$CUSTOM_RUBY_SITE_ARCH_DIR
+	  -DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR
+	  -DCUSTOM_PERL_SITE_ARCH_DIR=$CUSTOM_PERL_SITE_ARCH_DIR
+	)
+  '';
+  
+  # Okular seems also an optional depenedency which I left out
+  buildInputs = [ cmake perl python sip pyqt4 zlib libpng freetype fontconfig qt4 boost
+		  kdelibs kdepimlibs automoc4 soprano akonadi attica polkit_qt_1 ruby ];
+
+  meta = {
+    description = "KDE bindings";
+    longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
+    license = "LGPL";
+    homepage = http://www.kde.org;
+	inherit (kdelibs.meta) maintainers;
+  };
+}
+

pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff

@@ -0,0 +1,50 @@
+diff --git a/python/pykde4/CMakeLists.txt b/python/pykde4/CMakeLists.txt
+index 01b69dc..375661d 100644
+--- a/python/pykde4/CMakeLists.txt
++++ b/python/pykde4/CMakeLists.txt
+@@ -188,12 +188,12 @@ IF(POLKITQT_FOUND)
+     SET(PYKDE_MODULES "${PYKDE_MODULES} polkitqt")
+ ENDIF(POLKITQT_FOUND)
+ 
+-PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4)
++PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4)
+ 
+ MESSAGE(STATUS "KDE_VERSION: ${KDE_VERSION}")
+ MESSAGE(STATUS "KDE4_INCLUDE_DIR: ${KDE4_INCLUDE_DIR}")
+ MESSAGE(STATUS "KDE4_LIB_DIR: ${KDE4_LIB_DIR}")
+-MESSAGE(STATUS "PYTHON_SITE_PACKAGES_DIR: ${PYTHON_SITE_PACKAGES_DIR}")
++MESSAGE(STATUS "PYTHON_SITE_PACKAGES_INSTALL_DIR: ${PYTHON_SITE_PACKAGES_INSTALL_DIR}")
+ 
+ # Setup and install pykdeconfig.py
+ 
+@@ -225,7 +225,7 @@ _pkg_config = {
+     'konsolepart':          'False',
+     'libdir':               '${LIB_DIR}',
+     'pykde_kde_sip_flags':  '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
+-    'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_DIR}/PyKDE4',
++    'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',
+     'pykde_modules':        '${PYKDE_MODULES}',
+     'pykde_sip_dir':        '${SIP_DEFAULT_SIP_DIR}/PyKDE4',
+     'pykde_version':        kde_version_hex,
+@@ -235,7 +235,7 @@ _pkg_config = {
+ _default_macros = None")
+ 
+ CONFIGURE_FILE(pykdeconfig.py.in ${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py)
+-PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4)
++PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4)
+ 
+ # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
+ # (Don't forget the / at the end of sip/.)
+diff --git a/python/pykde4/tools/pykdeuic4/CMakeLists.txt b/python/pykde4/tools/pykdeuic4/CMakeLists.txt
+index ea711ba..115c777 100644
+--- a/python/pykde4/tools/pykdeuic4/CMakeLists.txt
++++ b/python/pykde4/tools/pykdeuic4/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ 
+-PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/)
+-PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/)
++PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/widget-plugins/)
++PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/)
+ find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH})
+-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )

pkgs/desktops/kde-4.5/default.nix

@@ -0,0 +1,79 @@
+pkgs:
+
+pkgs.recurseIntoAttrs (rec {
+
+### SUPPORT
+  akonadi = import ./support/akonadi {
+    inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost
+      mysql;
+    inherit automoc4 soprano;
+  };
+
+  attica = import ./support/attica {
+    inherit (pkgs) stdenv fetchurl cmake qt4;
+  };
+
+  automoc4 = import ./support/automoc4 {
+    inherit (pkgs) stdenv fetchurl cmake qt4;
+  };
+
+  oxygen_icons = import ./support/oxygen-icons {
+    inherit (pkgs) stdenv fetchurl cmake;
+  };
+
+#  phonon = import ./support/phonon {
+#    inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 xineLib pulseaudio;
+#    inherit (pkgs.gst_all) gstreamer gstPluginsBase;
+#    inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs;
+#    inherit automoc4;
+#  };
+#
+  polkit_qt_1 = import ./support/polkit-qt-1 {
+    inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 glib polkit;
+    inherit automoc4;
+  };
+
+  strigi = import ./support/strigi {
+    inherit (pkgs) stdenv fetchurl lib cmake perl;
+    inherit (pkgs) bzip2 qt4 libxml2 expat exiv2 cluceneCore;
+  };
+
+  soprano = import ./support/soprano {
+    inherit (pkgs) stdenv fetchurl cmake cluceneCore redland libiodbc qt4;
+  };
+
+  qca2 = import ./support/qca2 {
+    inherit (pkgs) stdenv fetchurl which qt4;
+  };
+
+  qca2_ossl = import ./support/qca2/ossl.nix {
+    inherit (pkgs) stdenv fetchurl qt4 openssl;
+    inherit qca2;
+    inherit (pkgs) fetchsvn;
+  };
+
+### LIBS
+  kdelibs = import ./libs {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
+    inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info
+      kerberos acl attr shared_desktop_ontologies enchant libdbusmenu_qt;
+    inherit (pkgs) docbook_xsl docbook_xml_dtd_42;
+    inherit (pkgs.xlibs) libXScrnSaver;
+    inherit automoc4 strigi soprano qca2 attica polkit_qt_1;
+  };
+
+  kdepimlibs = import ./pimlibs {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme libical
+      openldap shared_mime_info;
+    inherit kdelibs automoc4 akonadi soprano;
+  };
+
+### DEVELOPMENT
+
+  kdebindings = import ./bindings {
+	inherit (pkgs) stdenv fetchurl cmake perl lib python sip zlib libpng pyqt4
+	  freetype fontconfig qt4 boost ruby;
+    inherit kdelibs kdepimlibs automoc4 soprano akonadi attica polkit_qt_1;
+  };
+  
+})

pkgs/desktops/kde-4.5/libs/default.nix

@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, cmake, perl
+, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
+, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
+, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
+}:
+
+stdenv.mkDerivation rec {
+  name = "kdelibs-4.4.95";
+
+  src = fetchurl {
+    url = "mirror://kde/unstable/4.4.95/src/${name}.tar.bz2";
+    sha256 = "1fyjbdbzqxvl7rws4bvra1l4sczc1a72zdin7izif8dyjq6xblj0";
+  };
+
+  buildInputs = [
+    cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
+    shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
+    libXScrnSaver enchant libdbusmenu_qt polkit_qt_1
+    automoc4 strigi soprano qca2 attica
+  ];
+
+  patches = [ ./python-site-packages-install-dir.diff ];
+
+  propagatedBuildInputs = [ shared_desktop_ontologies stdenv.gcc.libc ];
+
+  # cmake fails to find acl.h because of C++-style comment
+  cmakeFlags = [
+    "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON"
+    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+    ];
+
+  meta = with stdenv.lib; {
+    description = "KDE libraries";
+    license = "LGPL";
+    homepage = http://www.kde.org;
+    maintainers = [ maintainers.sander maintainers.urkud ];
+  };
+}

pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff

@@ -0,0 +1,13 @@
+Source: upstream r1153602
+Index: a/cmake/modules/SIPMacros.cmake
+===================================================================
+--- a/cmake/modules/SIPMacros.cmake	(revision 1153601)
++++ b/cmake/modules/SIPMacros.cmake	(revision 1153602)
+@@ -119,6 +119,6 @@
+     TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES})
+     SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name})
+ 
+-    INSTALL(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/${_parent_module_path}")
++    INSTALL(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_INSTALL_DIR}/${_parent_module_path}")
+ 
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)

pkgs/desktops/kde-4.5/pimlibs/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
+, kdelibs, automoc4, akonadi, soprano}:
+
+stdenv.mkDerivation rec {
+  name = "kdepimlibs-4.4.95";
+
+  src = fetchurl {
+    url = "mirror://kde/unstable/4.4.95/src/${name}.tar.bz2";
+    sha256 = "06ap22p9x7l698skkrnsh7k3h1z0v6h3h3fwjrv4y6lv5vygccny";
+  };
+
+  buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
+    shared_mime_info kdelibs automoc4 akonadi soprano ];
+
+  meta = {
+    description = "KDE PIM libraries";
+    license = "LGPL";
+    homepage = http://www.kde.org;
+    inherit (kdelibs.meta) maintainers;
+  };
+}

pkgs/desktops/kde-4.5/support/akonadi/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
 
 stdenv.mkDerivation rec {
-  name = "akonadi-1.3.85";
+  name = "akonadi-1.4.0";
   src = fetchurl {
     url = "http://download.akonadi-project.org/${name}.tar.bz2";
-    sha256 = "1d2ancspavp4qg717hj56j1likb0ifdr65q1awbc2ghqqgd9znck";
+    sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5";
   };
   buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
   meta = with stdenv.lib; {

pkgs/desktops/kde-4.5/support/automoc4/default.nix

@@ -1,15 +1,15 @@
-{stdenv, fetchurl, lib, cmake, qt4}:
+{stdenv, fetchurl, cmake, qt4}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "automoc4-0.9.88";
   src = fetchurl {
-    url = mirror://kde/stable/automoc4/0.9.88/automoc4-0.9.88.tar.bz2;
-    md5 = "91bf517cb940109180ecd07bc90c69ec";
+    url = "mirror://kde/stable/automoc4/0.9.88/${name}.tar.bz2";
+    sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93";
   };
   buildInputs = [ cmake qt4 ];
   meta = {
     description = "KDE Meta Object Compiler";
     license = "BSD";
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ stdenv.lib.maintainers.sander ];
   };
 }

pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl, cmake}:
+
+stdenv.mkDerivation rec {
+  name = "oxygen-icons-4.4.92";
+  src = fetchurl {
+    url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
+    sha256 = "1aqc5p93c9jz660x94pxx7anamrpmwd490jy0lw38y99lbdhgz9k";
+  };
+  buildInputs = [ cmake ];
+  meta = with stdenv.lib; {
+    description = "KDE Oxygen theme icons";
+    longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
+    license = "GPL";
+    maintainers = [ maintainers.sander ];
+  };
+}

pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix

@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
+
+stdenv.mkDerivation rec {
+  name = "polkit-qt-1-0.96.1";
+  
+  src = fetchurl {
+    url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
+    sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
+  };
+
+  buildInputs = [ cmake qt4 automoc4 ];
+  propagatedBuildInputs = [ polkit glib ];
+}

pkgs/desktops/kde-4.5/support/qca2/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib, which, qt4}:
+{stdenv, fetchurl, which, qt4}:
 
 stdenv.mkDerivation {
   name = "qca-2.0.2";
@@ -7,10 +7,17 @@ stdenv.mkDerivation {
     sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
   };
   buildInputs = [ which qt4 ];
-  meta = {
+  preBuild = ''
+    sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\
+            EMSA3_SHA224,     ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
+            EMSA3_SHA256,     ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
+            EMSA3_SHA384,     ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
+            EMSA3_SHA512      ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding'
+  '';
+  meta = with stdenv.lib; {
     description = "Qt Cryptographic Architecture";
     license = "LGPL";
     homepage = http://delta.affinix.com/qca;
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ maintainers.sander maintainers.urkud ];
   };
 }

pkgs/desktops/kde-4.5/support/qca2/ossl-remove-whirlpool.patch

@@ -1,74 +0,0 @@
-Source: Upstream, SVN r864423
-Upstream: Yes
-Reason: Fix compilation w/ >=dev-libs/openssl-0.9.8g
-
-
-From 883f1057b31387e7cbfe66f6b3cf5781a6ca49fb Mon Sep 17 00:00:00 2001
-From: infiniti <infiniti@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
-Date: Wed, 24 Sep 2008 19:22:26 +0000
-Subject: [PATCH] remove whirlpool usage.  the algorithm is missing on at least 0.9.8g and
- 0.9.8i, even though there's an OBJ_whirlpool definition in 0.9.8i.
-
-git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca@864423 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
----
- plugins/qca-ossl/qca-ossl.cpp |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/qca-ossl.cpp b/qca-ossl.cpp
-index 746a863..f9efd84 100644
---- a/qca-ossl.cpp
-+++ b/qca-ossl.cpp
-@@ -6616,9 +6616,11 @@ static QStringList all_hash_types()
- #ifdef SHA512_DIGEST_LENGTH
- 	list += "sha512";
- #endif
-+/*
- #ifdef OBJ_whirlpool
- 	list += "whirlpool";
- #endif
-+*/
- 	return list;
- }
- 
-@@ -6863,10 +6865,12 @@ public:
- 		else if ( type == "sha512" )
- 			return new opensslHashContext( EVP_sha512(), this, type);
- #endif
-+/*
- #ifdef OBJ_whirlpool
- 		else if ( type == "whirlpool" )
- 			return new opensslHashContext( EVP_whirlpool(), this, type);
- #endif
-+*/
- 		else if ( type == "pbkdf1(sha1)" )
- 			return new opensslPbkdf1Context( EVP_sha1(), this, type );
- 		else if ( type == "pbkdf1(md2)" )
--- 
-1.6.0.4
-
-
-From 70730a58fe6d9ba5b50b8971424663ba52947e4c Mon Sep 17 00:00:00 2001
-From: infiniti <infiniti@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
-Date: Wed, 24 Sep 2008 19:23:30 +0000
-Subject: [PATCH] fix warning
-
-git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca@864425 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
----
- plugins/qca-ossl/qca-ossl.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/qca-ossl.cpp b/qca-ossl.cpp
-index f9efd84..1790364 100644
---- a/qca-ossl.cpp
-+++ b/qca-ossl.cpp
-@@ -327,7 +327,7 @@ static X509_EXTENSION *new_subject_key_id(X509 *cert)
- 	X509V3_CTX ctx;
- 	X509V3_set_ctx_nodb(&ctx);
- 	X509V3_set_ctx(&ctx, NULL, cert, NULL, NULL, 0);
--	X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, "hash");
-+	X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, (char *)"hash");
- 	return ex;
- }
- 
--- 
-1.6.0.4

pkgs/desktops/kde-4.5/support/qca2/ossl.nix

@@ -1,23 +1,32 @@
-{stdenv, fetchurl, lib, qt4, qca2, openssl}:
+{stdenv, fetchurl, fetchsvn, qt4, qca2, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "qca-ossl-2.0.0-beta3";
+  version = "2.0.0-beta3";
+  name = "qca-ossl-${version}";
   src = fetchurl {
     url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2";
     sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08";
   };
+  # SVN version has stabilized and has a lot of fixes for fresh OpenSSL
+  # Take the main source from there
+  svn_src = fetchsvn {
+    url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca/plugins/qca-ossl ; 
+    rev = 1115936;
+    sha256 =  "ef2c0307e8834e1e7cb23b6fea1cc22486328a37186301a6c11161b1c93d834b";
+  };
   buildInputs = [ qt4 qca2 openssl ];
   dontAddPrefix = true;
   configureFlags="--no-separate-debug-info --with-qca=${qca2}
     --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib";
   preConfigure=''
+    cp ${svn_src}/qca-ossl.cpp .
+
     configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins"
   '';
-  patches = [ ./ossl-remove-whirlpool.patch ];
-  meta = {
+  meta = with stdenv.lib; {
     description = "Qt Cryptographic Architecture OpenSSL plugin";
     license = "LGPL";
     homepage = http://delta.affinix.com/qca;
-    maintainers = [ lib.maintainers.urkud ];
+    maintainers = [ maintainers.urkud ];
   };
 }

pkgs/desktops/kde-4.5/support/soprano/default.nix

@@ -1,11 +1,11 @@
-{stdenv, fetchurl, lib, cmake, qt4, cluceneCore, redland, libiodbc}:
+{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.4.63";
+  name = "soprano-2.4.64";
 
   src = fetchurl {
     url = "mirror://sf/soprano/${name}.tar.bz2";
-    sha256 = "0iqs0dy5d0pgf2x3vpigwvs8vp7mvfvzimkdw7dvqlqbbld05qbf";
+    sha256 = "1jrpgp573r2q20v108a0528f92n7g892pdr44fgskcq7wf8l8mzv";
   };
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     homepage = http://soprano.sourceforge.net/;
     description = "An object-oriented C++/Qt4 framework for RDF data";
     license = "LGPL";
-    maintainers = with lib.maintainers; [ sander urkud ];
-    platforms = qt4.meta.platforms;
+    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    inherit (qt4.meta) platforms;
   };
 }

pkgs/desktops/kde-4.5/support/strigi/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, lib, cmake, qt4, perl, bzip2, libxml2, expat, exiv2
+, cluceneCore
+}:
+
+stdenv.mkDerivation rec {
+  name = "strigi-0.7.1";
+  
+  src = fetchurl {
+    url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2";
+    sha256 = "1cra4jlpd7cdvckwalfjrf2224qvhbkmxdd3sn02q9jhv830b0yi";
+  };
+  includeAllQtDirs=true;
+  
+  CLUCENE_HOME = cluceneCore;
+  
+  # Dependencies such as SQLite and FAM are unreliable in this release
+  buildInputs = [
+    cmake perl qt4 bzip2 stdenv.gcc.libc libxml2 expat exiv2 cluceneCore
+  ];
+
+  meta = {
+    homepage = http://strigi.sourceforge.net;
+    description = "A very fast and efficient crawler to index data on your harddrive";
+    license = "LGPL";
+    maintainers = [ lib.maintainers.sander ];
+  };
+}

pkgs/development/compilers/sbcl/default.nix

@@ -15,8 +15,6 @@ rec {
   /* doConfigure should be removed if not needed */
   phaseNames = ["setVars" "doFixNewer" "doFixTests" "setVersion" "doBuild" "doInstall" "doWrap"];
 
-  goSrcDir = "test -d sbcl-*/ && cd sbcl-*/ || true ";
-      
   setVars = a.fullDepEntry (''
     export INSTALL_ROOT=$out
     mkdir test-home
@@ -38,6 +36,7 @@ rec {
      is not good enought
   */
   doFixNewer = a.fullDepEntry(''
+    pwd
 
     sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
     sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp

pkgs/development/libraries/openssl/default.nix

@@ -27,14 +27,10 @@ stdenv.mkDerivation rec {
 
   crossAttrs = {
     preConfigure=''
-      export cross=$crossSystem-
-    '';
-    configureFlags="--libdir=lib ${opensslCrossSystem} shared";
-    buildPhase = ''
-      make CC=$crossConfig-gcc \
-        AR="$crossConfig-ar r" \
-        RANLIB=$crossConfig-ranlib
+      # It's configure does not like --build or --host
+      export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
     '';
+    configureScript = "./Configure";
   };
 
   meta = {

pkgs/development/libraries/qt-4.x/4.7/default.nix

@@ -84,6 +84,7 @@ stdenv.mkDerivation rec {
     -exceptions -xmlpatterns
     -multimedia -audio-backend -phonon -phonon-backend
     -webkit -javascript-jit
+    -make libs -make tools -make translations
     ${if buildDemos == true then "-make demos" else "-nomake demos"}
     ${if buildExamples == true then "-make examples" else "-nomake examples"}
     ${if useDocs then "-make docs" else "-nomake docs"}'';
@@ -105,7 +106,7 @@ stdenv.mkDerivation rec {
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
     maintainers = with maintainers; [ urkud sander ];
-    platforms = platforms.mesaPlatforms;
+    platforms = platforms.linux;
     priority = 10;
   };
 }

pkgs/lib/lists.nix

@@ -177,4 +177,10 @@ rec {
     let loop = l: if tail l == [] then head l else loop (tail l); in
     loop list;
 
+  # Zip two lists together.
+  zipTwoLists = xs: ys:
+    if xs != [] && ys != [] then
+      [ {first = head xs; second = head ys;} ]
+      ++ zipTwoLists (tail xs) (tail ys)
+    else [];
 }

pkgs/tools/filesystems/fusesmb/default.nix

@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Samba mounted via FUSE";
     homepage = http://www.ricardis.tudelft.nl/~vincent/fusesmb/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/top-level/release.nix

@@ -276,7 +276,6 @@ with (import ./release-lib.nix);
   slim = linux;
   sloccount = allBut "i686-cygwin";
   smartmontools = all;
-  smbfsFuse = linux;
   socat = linux;
   spidermonkey = linux;
   splashutils = linux;