From 8242aa1a46c8e573d77cb1990f4ccd06f1246706 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 10 Aug 2010 18:08:31 +0000
Subject: kdebindings-4.5.0

svn path=/nixpkgs/trunk/; revision=23098
---
 pkgs/desktops/kde-4.5/bindings/default.nix         | 27 +++++++++-------------
 .../bindings/python-site-packages-install-dir.diff |  8 +++++--
 2 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix
index ce8f841726eb0..eae386030d398 100644
--- a/pkgs/desktops/kde-4.5/bindings/default.nix
+++ b/pkgs/desktops/kde-4.5/bindings/default.nix
@@ -1,42 +1,37 @@
-{ stdenv, fetchurl, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost
+{ kdePackage, 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";
-  };
+kdePackage rec {
+  pn = "kdebindings";
+  v = "4.5.0";
+  sha256 = "0x8c98gbp2rm3dckzw3l0jh2ch5g9sb2prmilwzl8d5psyhx39n6";
 
   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@")
+    CUSTOM_PERL_SITE_ARCH_DIR=$(perl -MConfig -e 'print $Config{sitearch}' | sed -e "s@${perl}@$out@")
     cmakeFlagsArray=(
-	  -DSIP_DEFAULT_SIP_DIR=$out/share/sip
+      -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
-	)
+      -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 ];
+          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;
   };
 }
 
diff --git a/pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff b/pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff
index d1a58201b5f36..7fe64e7eff552 100644
--- a/pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff
+++ b/pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff
@@ -39,7 +39,7 @@ diff --git a/python/pykde4/tools/pykdeuic4/CMakeLists.txt b/python/pykde4/tools/
 index ea711ba..115c777 100644
 --- a/python/pykde4/tools/pykdeuic4/CMakeLists.txt
 +++ b/python/pykde4/tools/pykdeuic4/CMakeLists.txt
-@@ -1,5 +1,5 @@
+@@ -1,5 +1,9 @@
  
 -PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/)
 -PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/)
@@ -47,4 +47,8 @@ index ea711ba..115c777 100644
 +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)" )
++IF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})
++  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)" )
++ELSE(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})
++  INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
++ENDIF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})
-- 
cgit 1.4.1


From 78565c5b5fa16639106c493476e4862d66bb40f3 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 10 Aug 2010 19:57:53 +0000
Subject: Add qimageblitz and kdebase-apps-4.5.0

svn path=/nixpkgs/trunk/; revision=23099
---
 pkgs/desktops/kde-4.5/base/default.nix              | 19 +++++++++++++++++++
 pkgs/desktops/kde-4.5/default.nix                   |  5 +++++
 .../kde-4.5/support/qimageblitz/default.nix         | 21 +++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/base/default.nix
 create mode 100644 pkgs/desktops/kde-4.5/support/qimageblitz/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/base/default.nix b/pkgs/desktops/kde-4.5/base/default.nix
new file mode 100644
index 0000000000000..a6603ae6dbbf1
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/base/default.nix
@@ -0,0 +1,19 @@
+{ kdePackage, cmake, perl, qt4, kdelibs, pciutils, libraw1394
+, automoc4, strigi, qimageblitz, soprano}:
+
+kdePackage {
+  pn = "kdebase";
+  v = "4.5.0";
+  sha256 = "1znmmx84hx3a31lhr55j3h91p9r6fv1c4q9hbgv4xwaijlkxk6dw";
+
+  preConfigure = "cd apps";
+
+  buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4
+    strigi qimageblitz soprano ];
+
+  meta = {
+    description = "KDE Base components";
+    longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index e0801d80ba767..59d51da5f61a1 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -26,11 +26,16 @@
 
   qca2_ossl = callPackage ./support/qca2/ossl.nix { };
 
+  qimageblitz = callPackage ./support/qimageblitz { };
+
 ### LIBS
   kdelibs = callPackage ./libs { };
 
   kdepimlibs = callPackage ./pimlibs { };
 
+### BASE
+  kdebase = callPackage ./base { };
+
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };
diff --git a/pkgs/desktops/kde-4.5/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.5/support/qimageblitz/default.nix
new file mode 100644
index 0000000000000..bb3d0220b4322
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/qimageblitz/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, lib, cmake, qt4}:
+
+let
+  pn = "qimageblitz";
+  v = "0.0.4";
+in
+
+stdenv.mkDerivation {
+  name = "${pn}-${v}";
+  src = fetchurl {
+    url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2";
+    sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9";
+  };
+  buildInputs = [ cmake qt4 ];
+
+  meta = {
+    description = "Graphical effect and filter library for KDE4";
+    license = "BSD";
+    homepage = "http://${pn}.sourceforge.net";
+  };
+}
-- 
cgit 1.4.1


From 7cecdce4139428a19f1d54d0cf411f883701c080 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 10 Aug 2010 20:18:51 +0000
Subject: qt-4.7: add symlink for kde-4.5

svn path=/nixpkgs/trunk/; revision=23100
---
 pkgs/development/libraries/qt-4.x/4.7/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix
index cc6d3c8d513e3..2d157b9e944c4 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -97,7 +97,9 @@ stdenv.mkDerivation rec {
     sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
   '';
 
-  postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else "";
+  postInstall = ''
+    ${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""}
+    ln -sv phonon $out/include/Phonon''
 
   enableParallelBuilding = true;
 
-- 
cgit 1.4.1


From a4829861ec474ab84913dc7c453dc4bd03a82930 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 11 Aug 2010 08:20:23 +0000
Subject: Fix evaluation error

svn path=/nixpkgs/trunk/; revision=23103
---
 pkgs/development/libraries/qt-4.x/4.7/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix
index 2d157b9e944c4..b0fb326f002ef 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     ${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""}
-    ln -sv phonon $out/include/Phonon''
+    ln -sv phonon $out/include/Phonon'';
 
   enableParallelBuilding = true;
 
-- 
cgit 1.4.1


From 5c8b4ec35a2d75767406dae3376e11a2d728270b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Aug 2010 09:25:35 +0000
Subject: * Linux 2.6.32.18.

svn path=/nixpkgs/trunk/; revision=23104
---
 pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
index 48c4b50a5b6c5..bb7a218f55594 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
@@ -206,11 +206,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.32.17";
+    version = "2.6.32.18";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "12ingi7ml0cw7hjbpaq5mxl4nvi7683kma3d1z0pzrzdd9wngh1x";
+      sha256 = "1z35clz0176blqk3ygfim0a6y7b4ndbjpc1pkz7pxnscsj1kl9k7";
     };
 
     config = configWithPlatform stdenv.platform;
-- 
cgit 1.4.1


From a60809353ac8b7625f6d0704eabc12aafd3ed051 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 11 Aug 2010 09:38:09 +0000
Subject: updated nss and nspr, added variant of nss including tools

svn path=/nixpkgs/trunk/; revision=23105
---
 pkgs/development/libraries/nspr/default.nix |  4 ++--
 pkgs/development/libraries/nss/default.nix  | 12 ++++++------
 pkgs/top-level/all-packages.nix             |  4 ++++
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 88dc9ffe69669..d835ee56b75d5 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.8.4"; in
+let version = "4.8.6"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "0ik73yimgfpj3lkqjnpf76b942j76i5yi1z8bn75dxxc08brl4cc";
+    sha256 = "0vcz39784bw42kv9f81dnfb9ciga66l4yg223j467yin2nq0n16r";
   };
 
   preConfigure = "cd mozilla/nsprpub";
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index a51c355b64488..e79beb49f32c0 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib }:
+{ stdenv, fetchurl, nspr, perl, zlib, includeTools ? false}:
 
 let
 
@@ -10,11 +10,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "nss-3.12.6";
+  name = "nss-3.12.7";
   
   src = fetchurl {
-    url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/nss-3.12.6.tar.gz;
-    sha1 = "461e81adbdef6c3f848fcfee0dc5ad8c2dbebd46";
+    url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_7_RTM/src/nss-3.12.7.tar.gz;
+    sha256 = "0x5h0r5hn4qzafxakhvqyw1r8r0zy09b7b0kmdh3ff6v29v4bnzx";
   };
 
   buildInputs = [nspr perl zlib];
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
       mv $out/public $out/include
       mv $out/*.OBJ/* $out/
       rmdir $out/*.OBJ
-      rm -rf $out/bin
+      ${if includeTools then "" else "rm -rf $out/bin"}
 
       # Borrowed from Gentoo.  Firefox expects an nss-config script,
       # but NSS doesn't provide it.
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
       NSS_VMINOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
       NSS_VPATCH=`cat lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
 
-      mkdir $out/bin
+      ${if includeTools then "" else "mkdir $out/bin"}
       cp ${nssConfig} $out/bin/nss-config
       chmod u+x $out/bin/nss-config
       substituteInPlace $out/bin/nss-config \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0f27404d09a5..25a83a498bca0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3505,6 +3505,10 @@ let
 
   nss = callPackage ../development/libraries/nss { };
 
+  nssTools = callPackage ../development/libraries/nss { 
+    includeTools = true;
+  };
+
   ode = builderDefsPackage (import ../development/libraries/ode) {
   };
 
-- 
cgit 1.4.1


From e33f4863fc6291f84fe723df8bdaa57590749da7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Aug 2010 09:53:31 +0000
Subject: pkgs/tools/networking/nbd: updated to version 2.9.18

svn path=/nixpkgs/trunk/; revision=23106
---
 pkgs/tools/networking/nbd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 2a634f9a2dc54..ecc0c7bf5d7fd 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, glib}:
 
 stdenv.mkDerivation rec {
-  name = "nbd-2.9.17";
+  name = "nbd-2.9.18";
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "07423fba4b1a6d394008505b86fe41d1978956035f49c1197de648fbaa7fb7ff";
+    sha256 = "afaaae330625b61ad67ba988721ddc4ad54bfc7e501daeb45f721c205bfb00f3";
   };
 
   buildInputs = [pkgconfig glib];
-- 
cgit 1.4.1


From b62f65d24ef37e016896f57733cc1b936cc96374 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Aug 2010 09:54:46 +0000
Subject: pkgs/tools/networking/nbd: removed hard-coded flags for static
 linking

A statically linked binary should rather be generated using the
appropriate stdenv adapter.

svn path=/nixpkgs/trunk/; revision=23107
---
 pkgs/tools/networking/nbd/default.nix | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index ecc0c7bf5d7fd..cbdaa39b16f17 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -9,12 +9,6 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [pkgconfig glib];
-
-  # Link this package statically to generate an nbd-server binary that
-  # has no dynamic dependencies and that can be used on (non-Nix) remote
-  # machines that have a different setup than the local one.
-  configureFlags = "LDFLAGS=-static";
-
   postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"'';
 
   meta = {
-- 
cgit 1.4.1


From cf1d2fb7542abfbe6ce42e1639db99b7d9ef0405 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 11 Aug 2010 10:34:15 +0000
Subject: Update pdf2djvu

svn path=/nixpkgs/trunk/; revision=23108
---
 pkgs/tools/typesetting/pdf2djvu/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index 9a647e081064e..ba70016c3c459 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
-stdenv.mkDerivation {
-  name = "pdf2djvu-0.5.3";
+stdenv.mkDerivation rec {
+  version = "0.7.4";
+  name = "pdf2djvu-${version}";
 
   src = fetchurl {
-    url = http://pdf2djvu.googlecode.com/files/pdf2djvu_0.5.3.tar.gz;
-    sha256 = "b36b958fc395dc8976485bef09aac2b97435d0d9f21b4cf8dacaa5b55f3f2c1c";
+    url = "http://pdf2djvu.googlecode.com/files/pdf2djvu_${version}.tar.gz";
+    sha256 = "4ca375cd4e873d82428bd934ecc7cdbc6331a8236090c2424bd3c3b7bfc1331c";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
-- 
cgit 1.4.1


From e4686546ecc4175712a50e6da4b659a8b86949ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Aug 2010 10:43:09 +0000
Subject: * Enable parallel building for the Linux kernel, an obvious
 candidate.

svn path=/nixpkgs/trunk/; revision=23109
---
 pkgs/os-specific/linux/kernel/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 1581171332443..408603841220d 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -60,6 +60,8 @@ in
 stdenv.mkDerivation {
   name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
 
+  enableParallelBuilding = true;
+
   passthru = {
     inherit version;
     # Combine the `features' attribute sets of all the kernel patches.
-- 
cgit 1.4.1


From 415cf4cd1c03bbae153061913d61c81177a4ad11 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Aug 2010 11:46:09 +0000
Subject: * Omit the "Defined by:" elements in the configuration.nix section of
   the manual.  While it's a useful feature, it has the unfortunate  
 side-effect of causing the manual to be rebuilt every time the user   adds an
 option definition to any module (including   configuration.nix), and
 rebuilding the manual is rather slow.

svn path=/nixpkgs/trunk/; revision=23110
---
 pkgs/lib/modules.nix | 1 -
 pkgs/lib/options.nix | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index 6457fd14eb597..4af87ec684489 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -259,7 +259,6 @@ rec {
               value = m.config;
             }) definitions;
 
-
           values = values_ ++
             optionals (option.isOption && option.decl ? extraConfigs)
               option.decl.extraConfigs;
diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index a9d74f2f3facd..d742544bef2a8 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -260,7 +260,7 @@ rec {
               throw "Option ${opt.name}: No description.";
 
             declarations = map (x: toString x.source) opt.declarations;
-            definitions = map (x: toString x.source) opt.definitions;
+            #definitions = map (x: toString x.source) opt.definitions;
           }
           // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; }
           // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; }
-- 
cgit 1.4.1


From 58ab0bf5bbfbef1a0fb32559bf43073ca6a9b814 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 11 Aug 2010 12:24:12 +0000
Subject: Add meta.platforms

svn path=/nixpkgs/trunk/; revision=23111
---
 pkgs/desktops/kde-4.5/support/strigi/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/support/strigi/default.nix b/pkgs/desktops/kde-4.5/support/strigi/default.nix
index 93778e7c9841b..10847482df3d6 100644
--- a/pkgs/desktops/kde-4.5/support/strigi/default.nix
+++ b/pkgs/desktops/kde-4.5/support/strigi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, cmake, qt4, perl, bzip2, libxml2, expat, exiv2
+{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, expat, exiv2
 , cluceneCore
 }:
 
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     homepage = http://strigi.sourceforge.net;
     description = "A very fast and efficient crawler to index data on your harddrive";
     license = "LGPL";
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    inherit (qt4.meta) platforms;
   };
 }
-- 
cgit 1.4.1


From 21587bf10ba15727396819ba89feb63d0a62478b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Aug 2010 13:25:30 +0000
Subject: * Use callPackage_i686 for i686-only packages.

svn path=/nixpkgs/trunk/; revision=23113
---
 pkgs/applications/networking/skype/default.nix |  4 +-
 pkgs/top-level/all-packages.nix                | 52 +++++++-------------------
 2 files changed, 16 insertions(+), 40 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix
index 00bafbb48b383..7e066b5e380ca 100644
--- a/pkgs/applications/networking/skype/default.nix
+++ b/pkgs/applications/networking/skype/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib
-, libXext, libX11, libXScrnSaver, libSM, qt, libICE, freetype, fontconfig}:
+, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig}:
 
 assert stdenv.system == "i686-linux";
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     libXv
     libXext 
     libX11 
-    qt
+    qt4
     libXScrnSaver
     libSM
     libICE
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25a83a498bca0..122951b2dd2dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -128,6 +128,8 @@ let
   # Used by wine, firefox with debugging version of Flash, ...
   pkgsi686Linux = forceSystem "i686-linux";
 
+  callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg);
+
   inherit __overrides;
 
 
@@ -5002,30 +5004,15 @@ let
   ### APPLICATIONS
 
 
-  aangifte2005 = import ../applications/taxes/aangifte-2005 {
-    inherit (pkgsi686Linux) stdenv fetchurl;
-    inherit (pkgsi686Linux.xlibs) libX11 libXext;
-  };
+  aangifte2005 = callPackage_i686 ../applications/taxes/aangifte-2005 { };
 
-  aangifte2006 = import ../applications/taxes/aangifte-2006 {
-    inherit (pkgsi686Linux) stdenv fetchurl;
-    inherit (pkgsi686Linux.xlibs) libX11 libXext;
-  };
+  aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { };
 
-  aangifte2007 = import ../applications/taxes/aangifte-2007 {
-    inherit (pkgsi686Linux) stdenv fetchurl;
-    inherit (pkgsi686Linux.xlibs) libX11 libXext libSM;
-  };
+  aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { };
 
-  aangifte2008 = import ../applications/taxes/aangifte-2008 {
-    inherit (pkgsi686Linux) stdenv fetchurl;
-    inherit (pkgsi686Linux.xlibs) libX11 libXext libSM;
-  };
+  aangifte2008 = callPackage_i686 ../applications/taxes/aangifte-2008 { };
 
-  aangifte2009 = import ../applications/taxes/aangifte-2009 {
-    inherit (pkgsi686Linux) stdenv fetchurl makeWrapper xdg_utils;
-    inherit (pkgsi686Linux.xlibs) libX11 libXext libSM;
-  };
+  aangifte2009 = callPackage_i686 ../applications/taxes/aangifte-2009 { };
 
   abcde = callPackage ../applications/audio/abcde { };
 
@@ -5034,7 +5021,7 @@ let
     inherit (gnome) libglade libgnomecanvas;
   };
 
-  adobeReader = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg) ../applications/misc/adobe-reader {
+  adobeReader = callPackage_i686 ../applications/misc/adobe-reader {
     inherit (pkgsi686Linux.gtkLibs) glib pango atk gtk;
   };
 
@@ -5571,11 +5558,7 @@ let
     inherit (gtkLibs) gtk;
   };
 
-  googleearth = import ../applications/misc/googleearth {
-    inherit (pkgsi686Linux) stdenv fetchurl glibc mesa freetype zlib glib;
-    inherit (pkgsi686Linux.xlibs) libSM libICE libXi libXv libXrender
-      libXrandr libXfixes libXcursor libXinerama libXext libX11;
-  };
+  googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
   gosmore = builderDefsPackage ../applications/misc/gosmore {
     inherit fetchsvn curl pkgconfig libxml2;
@@ -6011,10 +5994,7 @@ let
     inherit (kde4) qt4 kdelibs automoc4 phonon soprano;
   };
 
-  skype_linux = callPackage ../applications/networking/skype {
-    qt = qt46;
-    inherit (gtkLibs) glib;
-  };
+  skype_linux = callPackage_i686 ../applications/networking/skype { };
 
   slim = callPackage ../applications/display-managers/slim { };
 
@@ -6968,14 +6948,10 @@ let
     inherit (gtkLibs) gtk;
   };
 
-  wine =
-    # Wine cannot be built in 64-bit; use a 32-bit build instead.
-    import ../misc/emulators/wine {
-      inherit (pkgsi686Linux) fetchurl stdenv bison mesa ncurses
-        libpng libjpeg alsaLib lcms xlibs freetype
-        fontconfig fontforge libxml2 libxslt openssl;
-      flex = pkgsi686Linux.flex2535;
-    };
+  # Wine cannot be built in 64-bit; use a 32-bit build instead.
+  wine = callPackage_i686 ../misc/emulators/wine {
+    flex = pkgsi686Linux.flex2535;
+  };
 
   x2x = callPackage ../tools/X11/x2x { };
 
-- 
cgit 1.4.1


From e1926e376483018e929e30935ac983a35b99f46d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Aug 2010 13:55:56 +0000
Subject: * Add UNetbootin to the channel.

svn path=/nixpkgs/trunk/; revision=23114
---
 pkgs/tools/cd-dvd/unetbootin/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs')

diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 9b4e7fd914c63..ff5b260c9f358 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
     homepage = http://unetbootin.sourceforge.net/;
     description = "A tool to create bootable live USB drives from ISO images";
     license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
cgit 1.4.1


From 2b37d181a5507cc41ab3ffb91599132b2e2cb3b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Aug 2010 15:49:03 +0000
Subject: Added Python version 2.7.

svn path=/nixpkgs/trunk/; revision=23117
---
 .../interpreters/python/2.7/default.nix            | 97 ++++++++++++++++++++++
 .../interpreters/python/2.7/search-path.patch      | 27 ++++++
 .../interpreters/python/2.7/setup-hook.sh          | 15 ++++
 pkgs/top-level/all-packages.nix                    | 38 +++++++++
 4 files changed, 177 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/2.7/default.nix
 create mode 100644 pkgs/development/interpreters/python/2.7/search-path.patch
 create mode 100644 pkgs/development/interpreters/python/2.7/setup-hook.sh

(limited to 'pkgs')

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
new file mode 100644
index 0000000000000..44579dd717fe2
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -0,0 +1,97 @@
+{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
+, gdbmSupport ? true, gdbm ? null
+, sqlite ? null
+, db4 ? null
+, readline ? null
+, openssl ? null
+, tk ? null
+, tcl ? null
+, libX11 ? null
+, xproto ? null
+, arch ? null
+, sw_vers ? null
+, ncurses ? null
+}:
+
+assert zlibSupport -> zlib != null;
+assert gdbmSupport -> gdbm != null;
+assert stdenv.isDarwin -> arch != null;
+assert stdenv.isDarwin -> sw_vers != null;
+
+with stdenv.lib;
+
+let
+
+  majorVersion = "2.7";
+  version = "${majorVersion}";
+
+  buildInputs =
+    optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
+    [bzip2]
+    ++ optional zlibSupport zlib
+    ++ optional gdbmSupport gdbm
+    ++ optional (sqlite != null) sqlite
+    ++ optional (db4 != null) db4
+    ++ optional (readline != null) readline
+    ++ optional (openssl != null) openssl
+    ++ optional (tk != null) tk
+    ++ optional (tcl != null) tcl
+    ++ optional (libX11 != null) libX11
+    ++ optional (xproto != null) xproto
+    ++ optional (arch != null) arch
+    ++ optional (sw_vers != null) sw_vers
+    ++ optional (ncurses != null) ncurses
+    ;
+
+in
+
+stdenv.mkDerivation ( {
+  name = "python-${version}";
+
+  src = fetchurl {
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
+    sha256 = "935d3316edfec5eb98c2f6930756b47b00dc27192541e62d6fd0077ffa008af8";
+  };
+
+  patches = [
+    # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
+    ./search-path.patch
+  ];
+
+  inherit buildInputs;
+  C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
+  LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
+  configureFlags = "--enable-shared --with-threads --enable-unicode --with-wctype-functions";
+
+  preConfigure = ''
+    # Purity.
+    for i in /usr /sw /opt /pkg; do
+      substituteInPlace ./setup.py --replace $i /no-such-path
+    done
+  '' + (if readline != null then ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"
+  '' else "");
+
+  setupHook = ./setup-hook.sh;
+
+  postInstall = ''
+    rm -rf "$out/lib/python${majorVersion}/test"
+  '';
+
+  passthru = {
+    inherit zlibSupport;
+    sqliteSupport = sqlite != null;
+    db4Support = db4 != null;
+    readlineSupport = readline != null;
+    opensslSupport = openssl != null;
+    tkSupport = (tk != null) && (tcl != null);
+    libPrefix = "python${majorVersion}";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = {
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) )
diff --git a/pkgs/development/interpreters/python/2.7/search-path.patch b/pkgs/development/interpreters/python/2.7/search-path.patch
new file mode 100644
index 0000000000000..2e7b7526c0cea
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/search-path.patch
@@ -0,0 +1,27 @@
+diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py
+*** Python-2.4.4-orig/setup.py	2006-10-08 19:41:25.000000000 +0200
+--- Python-2.4.4/setup.py	2007-05-27 16:04:54.000000000 +0200
+***************
+*** 279,288 ****
+          # Check for AtheOS which has libraries in non-standard locations
+          if platform == 'atheos':
+              lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
+-             lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
+              inc_dirs += ['/system/include', '/atheos/autolnk/include']
+-             inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
+  
+          # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
+          if platform in ['osf1', 'unixware7', 'openunix8']:
+              lib_dirs += ['/usr/ccs/lib']
+--- 279,289 ----
+          # Check for AtheOS which has libraries in non-standard locations
+          if platform == 'atheos':
+              lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
+              inc_dirs += ['/system/include', '/atheos/autolnk/include']
+  
++         lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
++         inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
++         
+          # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
+          if platform in ['osf1', 'unixware7', 'openunix8']:
+              lib_dirs += ['/usr/ccs/lib']
diff --git a/pkgs/development/interpreters/python/2.7/setup-hook.sh b/pkgs/development/interpreters/python/2.7/setup-hook.sh
new file mode 100644
index 0000000000000..290525c357131
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/setup-hook.sh
@@ -0,0 +1,15 @@
+addPythonPath() {
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.6/site-packages
+}
+
+toPythonPath() {
+    local paths="$1"
+    local result=
+    for i in $paths; do
+        p="$i/lib/python2.6/site-packages"
+        result="${result}${result:+:}$p"
+    done
+    echo $result
+}
+
+envHooks=(${envHooks[@]} addPythonPath)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 122951b2dd2dc..063e49e9401b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2075,6 +2075,7 @@ let
   python = if getConfig ["python" "full"] false then pythonFull else pythonBase;
   python25 = if getConfig ["python" "full"] false then python25Full else python25Base;
   python26 = if getConfig ["python" "full"] false then python26Full else python26Base;
+  python27 = if getConfig ["python" "full"] false then python27Full else python27Base;
   pythonBase = python26Base;
   pythonFull = python26Full;
 
@@ -2116,6 +2117,25 @@ let
     ncurses = if getConfig ["python" "curses"] true then ncurses else null;
   });
 
+  python27Base = makeOverridable (import ../development/interpreters/python/2.7) {
+    inherit fetchurl stdenv zlib bzip2 gdbm;
+    arch = if stdenv.isDarwin then darwinArchUtility else null;
+    sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
+  };
+
+  python27Full = lowPrio (python27Base.override {
+    # FIXME: We lack ncurses support, needed, e.g., for `gpsd'.
+    db4 = if getConfig ["python" "db4Support"] true then db4 else null;
+    sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null;
+    readline = if getConfig ["python" "readlineSupport"] true then readline else null;
+    openssl = if getConfig ["python" "opensslSupport"] true then openssl else null;
+    tk = if getConfig ["python" "tkSupport"] true then tk else null;
+    tcl = if getConfig ["python" "tkSupport"] true then tcl else null;
+    libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null;
+    xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null;
+    ncurses = if getConfig ["python" "curses"] true then ncurses else null;
+  });
+
   python31Base = lowPrio (makeOverridable (import ../development/interpreters/python/3.1) {
     inherit fetchurl stdenv zlib bzip2 gdbm;
     arch = if stdenv.isDarwin then darwinArchUtility else null;
@@ -3934,6 +3954,13 @@ let
       setuptools = setuptools_python26;
     };
 
+  buildPython27Package =
+    import ../development/python-modules/generic {
+      inherit makeWrapper lib;
+      python = python26;
+      setuptools = setuptools_python27;
+    };
+
   pythonPackages = python26Packages;
 
   python25Packages = recurseIntoAttrs (import ./python-packages.nix {
@@ -3946,6 +3973,12 @@ let
     buildPythonPackage = buildPython26Package;
   });
 
+  python27Packages = recurseIntoAttrs (import ./python-packages.nix {
+    inherit pkgs;
+    python = python27;
+    buildPythonPackage = buildPython27Package;
+  });
+
   foursuite = callPackage ../development/python-modules/4suite { };
 
   bsddb3 = callPackage ../development/python-modules/bsddb3 { };
@@ -4004,6 +4037,11 @@ let
     python = python26;
   };
 
+  setuptools_python27 = builderDefsPackage (import ../development/python-modules/setuptools) {
+    inherit makeWrapper;
+    python = python27;
+  };
+
   wxPython = wxPython26;
 
   wxPython26 = callPackage ../development/python-modules/wxPython/2.6.nix {
-- 
cgit 1.4.1


From ee70d8481d82c907638f33c789138a4d94ee9a0b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Aug 2010 15:49:42 +0000
Subject: pkgs/top-level/all-packages.nix: strip trailing whitenspace

svn path=/nixpkgs/trunk/; revision=23118
---
 pkgs/top-level/all-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 063e49e9401b7..661cf6c0163ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3527,7 +3527,7 @@ let
 
   nss = callPackage ../development/libraries/nss { };
 
-  nssTools = callPackage ../development/libraries/nss { 
+  nssTools = callPackage ../development/libraries/nss {
     includeTools = true;
   };
 
@@ -4981,7 +4981,7 @@ let
   freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
 
   hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };
-  
+
   junicode = callPackage ../data/fonts/junicode { };
 
   liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };
@@ -6611,19 +6611,19 @@ let
   };
 
   xfce = xfce4;
-  
+
   xfce4 = recurseIntoAttrs
     (let callPackage = newScope pkgs.xfce4; in
      import ../desktops/xfce-4 { inherit callPackage pkgs; });
 
-  
+
   ### SCIENCE
 
   xplanet = callPackage ../applications/science/xplanet {
     inherit (gtkLibs) pango;
   };
 
-  
+
   ### SCIENCE/GEOMETRY
 
   drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
-- 
cgit 1.4.1


From 670135ecb641cdcbc9346295c8e3856633ffe463 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 11 Aug 2010 16:28:53 +0000
Subject: flup and ViewMTN seem to work just as well with default Python

svn path=/nixpkgs/trunk/; revision=23119
---
 pkgs/top-level/all-packages.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 661cf6c0163ac..45e7b0ac64a66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3984,9 +3984,7 @@ let
   bsddb3 = callPackage ../development/python-modules/bsddb3 { };
 
   flup = builderDefsPackage ../development/python-modules/flup {
-    inherit fetchurl stdenv;
-    python = python25;
-    setuptools = setuptools.passthru.function {python = python25;};
+    inherit fetchurl stdenv python setuptools;
   };
 
   numeric = callPackage ../development/python-modules/numeric { };
@@ -6159,7 +6157,8 @@ let
 
   viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
   {
-    inherit monotone flup cheetahTemplate highlight ctags
+    inherit 
+      monotone flup cheetahTemplate highlight ctags
       makeWrapper graphviz which python;
   };
 
-- 
cgit 1.4.1


From de3531c2d502d2a98396b0f1eda2200d731d6ad9 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 11 Aug 2010 16:49:31 +0000
Subject: Let kdePackage use manifest.nix

svn path=/nixpkgs/trunk/; revision=23120
---
 pkgs/desktops/kde-4.5/base/default.nix                 |  1 -
 pkgs/desktops/kde-4.5/bindings/default.nix             |  1 -
 pkgs/desktops/kde-4.5/kde-package/default.nix          | 10 +++++++---
 pkgs/desktops/kde-4.5/libs/default.nix                 |  1 -
 pkgs/desktops/kde-4.5/pimlibs/default.nix              |  1 -
 pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix |  1 -
 pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix  |  1 -
 7 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/base/default.nix b/pkgs/desktops/kde-4.5/base/default.nix
index a6603ae6dbbf1..02c38bacedef2 100644
--- a/pkgs/desktops/kde-4.5/base/default.nix
+++ b/pkgs/desktops/kde-4.5/base/default.nix
@@ -4,7 +4,6 @@
 kdePackage {
   pn = "kdebase";
   v = "4.5.0";
-  sha256 = "1znmmx84hx3a31lhr55j3h91p9r6fv1c4q9hbgv4xwaijlkxk6dw";
 
   preConfigure = "cd apps";
 
diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix
index eae386030d398..2628d115cd461 100644
--- a/pkgs/desktops/kde-4.5/bindings/default.nix
+++ b/pkgs/desktops/kde-4.5/bindings/default.nix
@@ -8,7 +8,6 @@
 kdePackage rec {
   pn = "kdebindings";
   v = "4.5.0";
-  sha256 = "0x8c98gbp2rm3dckzw3l0jh2ch5g9sb2prmilwzl8d5psyhx39n6";
 
   patches = [ ./python-site-packages-install-dir.diff ];
 
diff --git a/pkgs/desktops/kde-4.5/kde-package/default.nix b/pkgs/desktops/kde-4.5/kde-package/default.nix
index 6f41ed7daa619..9e1ef5006fd2c 100644
--- a/pkgs/desktops/kde-4.5/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/default.nix
@@ -1,12 +1,16 @@
 { stdenv, fetchurl }:
 
-a@{ pn, v, stable ? true, sha256, subdir ? null, ... }:
+let
+  manifest = import ./manifest.nix;
+in
+
+a@{ pn, v, stable ? true, subdir ? null, ... }:
 stdenv.mkDerivation ({
   name = "${pn}-${v}";
   src = fetchurl {
     url = "mirror://kde/" + (if stable then "" else "un") + "stable/" +
       (if subdir == null then "${v}/src" else subdir) + "/${pn}-${v}.tar.bz2";
-    inherit sha256;
+    sha256 = builtins.getAttr "${pn}-${v}.tar.bz2" manifest;
   };
   meta = {
     maintainers = with stdenv.lib.maintainers; [ sander urkud ];
@@ -14,4 +18,4 @@ stdenv.mkDerivation ({
     inherit stable;
     homepage = http://www.kde.org;
   } // ( if a ? meta then a.meta else { } );
-} // (removeAttrs a [ "meta" "pn" "v" "stable" "sha256" "subdir" ]))
+} // (removeAttrs a [ "meta" "pn" "v" "stable" "subdir" ]))
diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix
index 71daed339cd16..c749223535bf9 100644
--- a/pkgs/desktops/kde-4.5/libs/default.nix
+++ b/pkgs/desktops/kde-4.5/libs/default.nix
@@ -8,7 +8,6 @@
 kdePackage {
   pn = "kdelibs";
   v = "4.5.0";
-  sha256 = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx";
 
   buildInputs = [
     cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
diff --git a/pkgs/desktops/kde-4.5/pimlibs/default.nix b/pkgs/desktops/kde-4.5/pimlibs/default.nix
index 8452161b66c3d..b548ad66ecdab 100644
--- a/pkgs/desktops/kde-4.5/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.5/pimlibs/default.nix
@@ -4,7 +4,6 @@
 kdePackage {
   pn = "kdepimlibs";
   v = "4.5.0";
-  sha256 = "0n3wmc2c4jcxbi81i9jmw23b5ms43gia58qpr835im874641f54m";
 
   buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
     shared_mime_info kdelibs automoc4 akonadi soprano ];
diff --git a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
index b701e61ba03c4..ffd7fb819e8b7 100644
--- a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
+++ b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
@@ -3,7 +3,6 @@
 kdePackage {
   pn = "oxygen-icons";
   v = "4.5.0";
-  sha256 = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi";
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
diff --git a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
index 03543a6d7e2f7..6d0de5983133f 100644
--- a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
+++ b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
@@ -4,7 +4,6 @@ kdePackage {
   pn = "polkit-qt-1";
   v = "0.96.1";
   subdir = "apps/KDE4.x/admin";
-  sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
 
   buildInputs = [ cmake qt4 automoc4 ];
   propagatedBuildInputs = [ polkit glib ];
-- 
cgit 1.4.1


From 3658a8b0405d2d472dc7ef12e4a66db1e79a67d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Aug 2010 17:05:44 +0000
Subject: pkgs/development/interpreters/python/2.7/setup-hook.sh: fixed
 incorrect version number

svn path=/nixpkgs/trunk/; revision=23121
---
 pkgs/development/interpreters/python/2.7/setup-hook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/interpreters/python/2.7/setup-hook.sh b/pkgs/development/interpreters/python/2.7/setup-hook.sh
index 290525c357131..a393b70afe104 100644
--- a/pkgs/development/interpreters/python/2.7/setup-hook.sh
+++ b/pkgs/development/interpreters/python/2.7/setup-hook.sh
@@ -1,12 +1,12 @@
 addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.6/site-packages
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.7/site-packages
 }
 
 toPythonPath() {
     local paths="$1"
     local result=
     for i in $paths; do
-        p="$i/lib/python2.6/site-packages"
+        p="$i/lib/python2.7/site-packages"
         result="${result}${result:+:}$p"
     done
     echo $result
-- 
cgit 1.4.1


From 2449006cb6e894771700ecbe95a78e7db823f78b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 11 Aug 2010 17:31:49 +0000
Subject: Add manifest.nix

svn path=/nixpkgs/trunk/; revision=23122
---
 pkgs/desktops/kde-4.5/kde-package/manifest.nix | 87 ++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/kde-package/manifest.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
new file mode 100644
index 0000000000000..b96b9b85b33a1
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -0,0 +1,87 @@
+builtins.listToAttrs
+[
+{
+  name = "kdegraphics-4.5.0.tar.bz2";
+  value = "13ms1z26sb2pfadhagkykgnw0p7inrn36p4s9qr04qisy2b2vd6l";
+}
+{
+  name = "kdebase-workspace-4.5.0.tar.bz2";
+  value = "0wwg2rcwgkwi0k1a7v6h0ibvzk64mb2fvr02zbdkc94rh4pc25zw";
+}
+{
+  name = "oxygen-icons-4.5.0.tar.bz2";
+  value = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi";
+}
+{
+  name = "kdeplasma-addons-4.5.0.tar.bz2";
+  value = "1v0zcl65sqlz6ggin3mb6pr3gf2v15z8lyh0p4b95rslrzw6iih6";
+}
+{
+  name = "kdepimlibs-4.5.0.tar.bz2";
+  value = "0n3wmc2c4jcxbi81i9jmw23b5ms43gia58qpr835im874641f54m";
+}
+{
+  name = "kdegames-4.5.0.tar.bz2";
+  value = "1ax2qwmkpnc01prlkw5yx5hiqcv725b7yf6czr5gkjysjsqi3aqk";
+}
+{
+  name = "kdewebdev-4.5.0.tar.bz2";
+  value = "0frl9kfw549lfxrjbslxny12r4cg67ggnyclhb0rqma7i07g8gd8";
+}
+{
+  name = "kdelibs-4.5.0.tar.bz2";
+  value = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx";
+}
+{
+  name = "kdebase-4.5.0.tar.bz2";
+  value = "1znmmx84hx3a31lhr55j3h91p9r6fv1c4q9hbgv4xwaijlkxk6dw";
+}
+{
+  name = "kdeadmin-4.5.0.tar.bz2";
+  value = "1zwc8x1r7wg1qddw01b5zr3npmzibag17csiv4a1w6fsnvnny8k1";
+}
+{
+  name = "kdebase-runtime-4.5.0.tar.bz2";
+  value = "0cis9as2szqaxi0bhhw63sy6s8b994j8ffx5wsc84w4a8y3ld1s0";
+}
+{
+  name = "kdeedu-4.5.0.tar.bz2";
+  value = "15c6k1274ckhs4liqyxna5xka2gn4h9qfdvbh9ys85x08srb3051";
+}
+{
+  name = "kdebindings-4.5.0.tar.bz2";
+  value = "0x8c98gbp2rm3dckzw3l0jh2ch5g9sb2prmilwzl8d5psyhx39n6";
+}
+{
+  name = "kdemultimedia-4.5.0.tar.bz2";
+  value = "0b00d9kgy7jcfrxivw4gjvqzp5gd145cd4zbhbnjjdg5l9pvc721";
+}
+{
+  name = "kdetoys-4.5.0.tar.bz2";
+  value = "0lg12cjpk2x2qsk998jbsn0p7a26ans9zgf5966k4wmjcgx1zhqq";
+}
+{
+  name = "kdenetwork-4.5.0.tar.bz2";
+  value = "0xc8309z5c7k3hg38waavrs2hlpv8mf20paj9nadr8q3zs0q6nyp";
+}
+{
+  name = "kdesdk-4.5.0.tar.bz2";
+  value = "09w0n1v9qhxf7ijickw48s19rkaim36vnrxv28lrhj2x3s3s6n1s";
+}
+{
+  name = "kdeartwork-4.5.0.tar.bz2";
+  value = "15sdhrq6hx4i0wywilvvl3h8j5wfa7lgvr8siqxlipy94pfwrbwr";
+}
+{
+  name = "kdeutils-4.5.0.tar.bz2";
+  value = "1x4dwc193gsfcnryhkv2v3xafjr1a87ls0zfi56i1w2aj38b36l7";
+}
+{
+  name = "kdeaccessibility-4.5.0.tar.bz2";
+  value = "0p08xn3rdqf4a9mj4wrvnjj64mbxas3pns772a1sdmpxkyjlwwcx";
+}
+{
+  name = "polkit-qt-1-0.96.1.tar.bz2";
+  value = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
+}
+]
-- 
cgit 1.4.1


From 2050c3da7747178de3fea00b26ded46d6d063a3d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 11 Aug 2010 17:33:57 +0000
Subject: Add kdebase-workspace-4.5.0

svn path=/nixpkgs/trunk/; revision=23123
---
 pkgs/desktops/kde-4.5/base-workspace/default.nix | 23 +++++++++++++++++++++++
 pkgs/desktops/kde-4.5/default.nix                |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/base-workspace/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix
new file mode 100644
index 0000000000000..d80d78ed93321
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix
@@ -0,0 +1,23 @@
+{ kdePackage, cmake, perl, python, pam, consolekit
+, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings
+, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
+, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
+, automoc4, strigi, soprano, qimageblitz, akonadi
+, libdbusmenu_qt
+}:
+
+kdePackage {
+  pn = "kdebase-workspace";
+  v = "4.5.0";
+
+  buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
+    kdepimlibs kdebindings boost libusb libXi libXau libXdmcp
+    libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
+    strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt ];
+
+  meta = {
+    description = "KDE Workspace";
+    longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 59d51da5f61a1..0ef7f8b1edbef 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -36,6 +36,8 @@
 ### BASE
   kdebase = callPackage ./base { };
 
+  kdebase_workspace = callPackage ./base-workspace { };
+
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };
-- 
cgit 1.4.1


From 53d79f6f9c02cb0d7e34d18895340a8b0475b10d Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 11 Aug 2010 17:55:31 +0000
Subject: updated libvirt to 0.8.3

svn path=/nixpkgs/trunk/; revision=23124
---
 pkgs/development/libraries/libvirt/default.nix           |  7 ++-----
 pkgs/development/libraries/libvirt/non-absolute-ld.patch | 12 ------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/libvirt/non-absolute-ld.patch

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 39539b9ad4bda..e5d288d103b96 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,20 +1,17 @@
 { stdenv, fetchurl, libxml2, gnutls, devicemapper, perl }:
 
-let version = "0.7.5"; in
+let version = "0.8.3"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "922481aadf72a74cf14012fe3967c60d01e70f7e88908410d57428943ab4eb8b";
+    sha256 = "07vsk4g1nxvxc8yr6cdvwp9kvwgm2g7lh6aaggfkxb2775n87q9m";
   };
 
   buildInputs = [ libxml2 gnutls devicemapper perl ];
 
-  # fix for redhat bz 531496
-  patches = [ ./non-absolute-ld.patch ];
-
   # xen currently disabled in nixpkgs
   configureFlags = ''                                                  
     --without-xen
diff --git a/pkgs/development/libraries/libvirt/non-absolute-ld.patch b/pkgs/development/libraries/libvirt/non-absolute-ld.patch
deleted file mode 100644
index ba73010c43989..0000000000000
--- a/pkgs/development/libraries/libvirt/non-absolute-ld.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libvirt-0.7.5.orig/configure libvirt-0.7.5/configure
---- libvirt-0.7.5.orig/configure	2009-12-23 09:17:34.000000000 -0600
-+++ libvirt-0.7.5/configure	2010-01-13 21:16:02.000000000 -0600
-@@ -41051,7 +41051,7 @@
- 
- 
- VERSION_SCRIPT_FLAGS=-Wl,--version-script=
--`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \
-+`ld --help 2>&1 | grep -- --version-script >/dev/null` || \
-     VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
- 
- 
-- 
cgit 1.4.1


From c441b771f478dd0f9a7546405c96f2162abf7e41 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 11 Aug 2010 18:10:03 +0000
Subject: libvirt: add python to deps so python bindings are built

svn path=/nixpkgs/trunk/; revision=23125
---
 pkgs/development/libraries/libvirt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index e5d288d103b96..7199e61d6bc0e 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl }:
+{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl, python }:
 
 let version = "0.8.3"; in
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "07vsk4g1nxvxc8yr6cdvwp9kvwgm2g7lh6aaggfkxb2775n87q9m";
   };
 
-  buildInputs = [ libxml2 gnutls devicemapper perl ];
+  buildInputs = [ libxml2 gnutls devicemapper perl python ];
 
   # xen currently disabled in nixpkgs
   configureFlags = ''                                                  
-- 
cgit 1.4.1


From e897a308a65e9ad76706ecd1b41c47eee40f0060 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Aug 2010 19:47:05 +0000
Subject: * Added MESS, the Multi Emulator Super System.

svn path=/nixpkgs/trunk/; revision=23126
---
 pkgs/misc/emulators/mess/default.nix | 48 ++++++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/misc/emulators/mess/default.nix

(limited to 'pkgs')

diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix
new file mode 100644
index 0000000000000..b3897154e9acc
--- /dev/null
+++ b/pkgs/misc/emulators/mess/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtkLibs, gnome, mesa
+, expat, zlib }:
+
+let
+
+  version = "139";
+
+  mameSrc = fetchurl {
+    url = "http://www.aarongiles.com/mirror/releases/mame0${version}s.zip";
+    sha256 = "1mpkwxfz38cgxzvlni2y3fxas3b8qmnzj2ik2zzbd8mr622jdp79";
+  };
+  
+  messSrc = fetchurl {
+    url = "http://mess.redump.net/_media/downloads:mess0${version}s.zip";
+    name = "mess0139s.zip";
+    sha256 = "1v892cg6wn8cdwc8pf1gcqqdb1v1v295r6jw2hf58svwx3h27xyy";
+  };
+
+in
+
+stdenv.mkDerivation { 
+  name = "mess-0.${version}";
+
+  unpackPhase =
+    ''
+      unzip ${mameSrc}
+      # Yes, the MAME distribution is a zip file containing a zip file...
+      unzip mame.zip
+      unzip -o ${messSrc}
+    '';
+
+  makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1";
+
+  buildInputs =
+    [ unzip pkgconfig SDL gtkLibs.gtk gnome.GConf mesa expat zlib ];
+
+  installPhase =
+    ''
+      ensureDir $out/bin
+      cp mess* $out/bin/mess 
+    '';
+    
+  meta = {
+    homepage = http://www.mess.org/;
+    license = "non-commercial";
+    description = "Multi Emulator Super System, an emulator of many game consoles and computer systems";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45e7b0ac64a66..012240591dbb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6838,6 +6838,8 @@ let
 
   maven2 = callPackage ../misc/maven { };
 
+  mess = callPackage ../misc/emulators/mess { };
+
   nix = nixUnstable;
 
   nixStable = callPackage ../tools/package-management/nix {
-- 
cgit 1.4.1


From eab216c593bd6f6122366b861dae478413ddecd7 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Thu, 12 Aug 2010 05:59:01 +0000
Subject: fetch terminus-fonts from debian, the origin url is broken

svn path=/nixpkgs/trunk/; revision=23133
---
 pkgs/data/fonts/terminus-font/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 6ef03ca2dca72..039e046ed55fc 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -2,8 +2,10 @@
 stdenv.mkDerivation rec {
   name = "terminus-font-4.30";
   src = fetchurl {
-    url = "http://www.is-vn.bg/hamster/${name}.tar.gz";
-    sha256 = "ca15718f715f1ca7af827a8ab5543b0c0339b2515f39f8c15f241b2bc1a15a9a";
+#    urls = "http://www.is-vn.bg/hamster/${name}.tar.gz"
+#    sha256 = "ca15718f715f1ca7af827a8ab5543b0c0339b2515f39f8c15f241b2bc1a15a9a";
+     url = "http://ftp.de.debian.org/debian/pool/main/x/xfonts-terminus/xfonts-terminus_4.30.orig.tar.gz";
+     sha256 = "d7f1253d75f0aa278b0bbf457d15927ed3bbf2565b9f6b829c2b2560fedc1712";
   };
   buildInputs = [ perl bdftopcf mkfontdir mkfontscale ];
   patchPhase = ''
-- 
cgit 1.4.1


From 284217c135decb980694dd3876a4e30d89a72b10 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Thu, 12 Aug 2010 05:59:52 +0000
Subject: update ttf-mkfontdir

svn path=/nixpkgs/trunk/; revision=23134
---
 pkgs/tools/misc/ttmkfdir/cstring.patch | 12 ------------
 pkgs/tools/misc/ttmkfdir/default.nix   |  6 +++---
 2 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/misc/ttmkfdir/cstring.patch b/pkgs/tools/misc/ttmkfdir/cstring.patch
index 6b65b44e85180..e1da347c64f14 100644
--- a/pkgs/tools/misc/ttmkfdir/cstring.patch
+++ b/pkgs/tools/misc/ttmkfdir/cstring.patch
@@ -1,15 +1,3 @@
-diff --git a/directory.cpp b/directory.cpp
-index 5f0d78a..b94cbe5 100644
---- a/directory.cpp
-+++ b/directory.cpp
-@@ -2,6 +2,7 @@
- #include <dirent.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <cstring>
- 
- #include "directory.h"
-
 diff --git a/Makefile b/Makefile
 index e65b64c..52af5ed 100644
 --- a/Makefile
diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix
index 1d633634e595a..e4e8d3c3e9b54 100644
--- a/pkgs/tools/misc/ttmkfdir/default.nix
+++ b/pkgs/tools/misc/ttmkfdir/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }:
 
 stdenv.mkDerivation {
-  name = "ttf-mkfontdir-3.0.9-5.1";
+  name = "ttf-mkfontdir-3.0.9-6";
 
   src = fetchurl {
     url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz;
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
   # who knows more about C/C++ ..
   patches =
     [ (fetchurl {
-        url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-5.1.diff.gz;
-        sha256 = "1500kwvhxfq85zg7nwnn9dlvjxyg2ni7as17gdfm67pl9a45q3w4";
+        url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz;
+        sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633";
       })
     
       ./cstring.patch # also fixes some other compilation issues (freetype includes)
-- 
cgit 1.4.1


From 829f6c21087be09873785cd46cf2383fad91d159 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Thu, 12 Aug 2010 06:01:21 +0000
Subject: update chrome to available snapshots.

svn path=/nixpkgs/trunk/; revision=23135
---
 pkgs/applications/networking/browsers/chromium/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index bbe51bd1dadab..d549639914410 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -35,17 +35,17 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
   name = "chrome-${version}";
-  version = "51653";
+  version = "55366";
   src = 
     if stdenv.system == "x86_64-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
-        sha256 = "1d8q4ac8s3b1bncli537phzxshfr50j69y49409g5p64v7iya9kw";
+        sha256 = "1dazdfpnl278wwh03hs0x184ql5zh0yhpfiaw75j437dp3668hnj";
       } 
     else if stdenv.system == "i686-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
-        sha256 = "1kdhwkl7xxssmkrkkgrdwrwvbah97va7rxbwrfhlcnjgw60ppf9v";
+        sha256 = "1x5ykvp2hxc56p4bb1lykahkk1nzkqi2kkm474spplqcfnmd6j2b";
       } 
     else null;
 
-- 
cgit 1.4.1


From 05da3db77fe2b7c1300d6a047070a6a4dd6ad7eb Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 12 Aug 2010 10:39:29 +0000
Subject: Copy qca from kde-4.5 to make qca2_ossl build

svn path=/nixpkgs/trunk/; revision=23137
---
 pkgs/desktops/kde-4.4/default.nix              |  4 ++--
 pkgs/desktops/kde-4.4/support/qca2/default.nix | 13 ++++++++++---
 pkgs/desktops/kde-4.4/support/qca2/ossl.nix    | 19 ++++++++++++++-----
 3 files changed, 26 insertions(+), 10 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index fbdd9a5240e98..24db09632e1e0 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -32,11 +32,11 @@ pkgs.recurseIntoAttrs (rec {
   };
   
   qca2 = import ./support/qca2 {
-    inherit (pkgs) stdenv fetchurl lib which qt4;
+    inherit (pkgs) stdenv fetchurl which qt4;
   };
 
   qca2_ossl = import ./support/qca2/ossl.nix {
-    inherit (pkgs) stdenv fetchurl lib qt4 openssl;
+    inherit (pkgs) stdenv fetchurl fetchsvn qt4 openssl;
     inherit qca2;
   };
   
diff --git a/pkgs/desktops/kde-4.4/support/qca2/default.nix b/pkgs/desktops/kde-4.4/support/qca2/default.nix
index ceff834e95b9d..a55f7c8cb4316 100644
--- a/pkgs/desktops/kde-4.4/support/qca2/default.nix
+++ b/pkgs/desktops/kde-4.4/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 ];
   };
 }
diff --git a/pkgs/desktops/kde-4.4/support/qca2/ossl.nix b/pkgs/desktops/kde-4.4/support/qca2/ossl.nix
index be992eb42ea36..bfaa320618c7f 100644
--- a/pkgs/desktops/kde-4.4/support/qca2/ossl.nix
+++ b/pkgs/desktops/kde-4.4/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 ];
   };
 }
-- 
cgit 1.4.1


From 3a3867869afbe2973305d4a7a38ed8d0d4d410cc Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Thu, 12 Aug 2010 10:59:05 +0000
Subject: Adding tetgen

svn path=/nixpkgs/trunk/; revision=23138
---
 .../science/geometry/tetgen/default.nix             | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix                     |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/science/geometry/tetgen/default.nix

(limited to 'pkgs')

diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix
new file mode 100644
index 0000000000000..a5c3466d57bce
--- /dev/null
+++ b/pkgs/applications/science/geometry/tetgen/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl}: 
+
+stdenv.mkDerivation rec {
+  name = "tetgen-1.4.3";
+
+  src = fetchurl {
+    url = http://tetgen.berlios.de/files/tetgen1.4.3.tar.gz;
+    sha256 = "159i0vdjz7abb8bycz47ax4fqlzc82kv19sygqnrkr86qm4g43wy";
+  };
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp tetgen $out/bin
+  '';
+
+  meta = {
+    description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
+    homepage = "http://tetgen.berlios.de/";
+    license = "MIT";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 012240591dbb5..8d504a2f7f0e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6630,6 +6630,8 @@ let
     inherit libxml2 guile perl intltool libtool pkgconfig;
   };
 
+  tetgen = callPackage ../applications/science/geometry/tetgen { };
+
 
   ### SCIENCE/BIOLOGY
 
-- 
cgit 1.4.1


From 018a0f2fe7149f5ecb692d35921b51678bb10c8d Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Thu, 12 Aug 2010 11:00:01 +0000
Subject: Making qhull not only install the libraries, but also its programs.

svn path=/nixpkgs/trunk/; revision=23139
---
 pkgs/development/libraries/qhull/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix
index f91697fb117a2..8f9bfc6c130ca 100644
--- a/pkgs/development/libraries/qhull/default.nix
+++ b/pkgs/development/libraries/qhull/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     ensureDir $out/bin
     ensureDir $out/include/qhull
     ensureDir $out/lib
-    ensureDir $out/share/man/man1
+    cp qconvex qdelaunay qhalf qhull rbox qvoronoi $out/bin
     cp *.h $out/include/qhull
     cp libqhull.a $out/lib
   '';
-- 
cgit 1.4.1


From a1039a2744046c3ffe34a58048e223af82f2b3ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Aug 2010 11:22:06 +0000
Subject: pkgs/top-level/all-packages.nix: stripped trailing whitespace

svn path=/nixpkgs/trunk/; revision=23140
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d504a2f7f0e1..bd2b1951360c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6157,7 +6157,7 @@ let
 
   viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
   {
-    inherit 
+    inherit
       monotone flup cheetahTemplate highlight ctags
       makeWrapper graphviz which python;
   };
-- 
cgit 1.4.1


From ff1c057f7aa8b635b54e2ba7b308a76e20815eca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Aug 2010 11:23:54 +0000
Subject: pkgs/top-level/all-packages.nix: removed lowPri modifier from
 python27Full

The "full" version is preferrable over the "base" version in user
profiles.

svn path=/nixpkgs/trunk/; revision=23141
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd2b1951360c5..c5a46a2dc10b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2123,7 +2123,7 @@ let
     sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
   };
 
-  python27Full = lowPrio (python27Base.override {
+  python27Full = python27Base.override {
     # FIXME: We lack ncurses support, needed, e.g., for `gpsd'.
     db4 = if getConfig ["python" "db4Support"] true then db4 else null;
     sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null;
@@ -2134,7 +2134,7 @@ let
     libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null;
     xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null;
     ncurses = if getConfig ["python" "curses"] true then ncurses else null;
-  });
+  };
 
   python31Base = lowPrio (makeOverridable (import ../development/interpreters/python/3.1) {
     inherit fetchurl stdenv zlib bzip2 gdbm;
-- 
cgit 1.4.1


From 19158d7dec4edabb8ae572e0d6afe99c129866c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Aug 2010 11:54:55 +0000
Subject: * CURL: build without scp support on Cygwin because libssh2 doesn't  
 build.

svn path=/nixpkgs/trunk/; revision=23142
---
 pkgs/stdenv/generic/default.nix | 1 +
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index b30b9c8d4dc8b..1d7aaae7ccdce 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -96,6 +96,7 @@ let
                || result.system == "powerpc-linux"
                || result.system == "armv5tel-linux";
         isSunOS = result.system == "i386-sunos";
+        isCygwin = result.system == "i686-cygwin";
         isi686 = result.system == "i686-linux"
                || result.system == "i686-darwin"
                || result.system == "i686-freebsd"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5a46a2dc10b8..e98212f86bdec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -485,7 +485,7 @@ let
     inherit stdenv zlib openssl libssh2;
     zlibSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic));
     sslSupport = zlibSupport;
-    scpSupport = zlibSupport && (!stdenv.isSunOS);
+    scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
   };
 
   curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
-- 
cgit 1.4.1


From 70a603c4bbf664a18705fbeee1c1fb7e75a0c81c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Aug 2010 12:53:26 +0000
Subject: pkgs/top-level/all-packages.nix: dropped getConfig support for Python
 2.7

Python 2.7 can no longer be configured using the obsolete "getConfig"
mechanism. Instead, use "override" to fine-tune the installation.

svn path=/nixpkgs/trunk/; revision=23143
---
 pkgs/top-level/all-packages.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e98212f86bdec..e4cd4f6acb851 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2125,15 +2125,8 @@ let
 
   python27Full = python27Base.override {
     # FIXME: We lack ncurses support, needed, e.g., for `gpsd'.
-    db4 = if getConfig ["python" "db4Support"] true then db4 else null;
-    sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null;
-    readline = if getConfig ["python" "readlineSupport"] true then readline else null;
-    openssl = if getConfig ["python" "opensslSupport"] true then openssl else null;
-    tk = if getConfig ["python" "tkSupport"] true then tk else null;
-    tcl = if getConfig ["python" "tkSupport"] true then tcl else null;
-    libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null;
-    xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null;
-    ncurses = if getConfig ["python" "curses"] true then ncurses else null;
+    inherit db4 sqlite readline openssl tcl tk ncurses;
+    inherit (xlibs) libX11 xproto;
   };
 
   python31Base = lowPrio (makeOverridable (import ../development/interpreters/python/3.1) {
-- 
cgit 1.4.1


From 8c1717677eadf7f284dedb9cb15ebfd5b223389b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Aug 2010 12:53:36 +0000
Subject: pkgs/top-level/all-packages.nix: dropped TODO note from Python 2.7

The expression used to say "FIXME: We lack ncurses support", but it
looks to me like ncurses *is* supported.

svn path=/nixpkgs/trunk/; revision=23144
---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4cd4f6acb851..7e1eb41ed281a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2124,7 +2124,6 @@ let
   };
 
   python27Full = python27Base.override {
-    # FIXME: We lack ncurses support, needed, e.g., for `gpsd'.
     inherit db4 sqlite readline openssl tcl tk ncurses;
     inherit (xlibs) libX11 xproto;
   };
-- 
cgit 1.4.1


From 65eb1a248f51d1c7dd3ca24127e6563663e0935a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Aug 2010 12:53:45 +0000
Subject: pkgs/development/python-modules/zope: updated to version 3.4.0

svn path=/nixpkgs/trunk/; revision=23145
---
 pkgs/development/python-modules/zope/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/zope/default.nix b/pkgs/development/python-modules/zope/default.nix
index 3dc5da98e769c..c01945bf472b5 100644
--- a/pkgs/development/python-modules/zope/default.nix
+++ b/pkgs/development/python-modules/zope/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python}:
 
 stdenv.mkDerivation rec {
-	version = "3.2.1";
+  version = "3.4.0";
   name = "zope-${version}";
   src = fetchurl {
-	  url = "http://www.zope.org/Products/Zope3/${version}/Zope-${version}.tgz";
-    sha256 = "8431984af75054e4ddfe45bf708924240f8b6b02220cd84d090138413ac82341";
+    url = "http://www.zope.org/Products/Zope3/${version}/Zope-${version}.tgz";
+    sha256 = "3e834e8749945d8fc0a67bb724f2cf0c671f04f477e24fb8edb74828e331901d";
   };
   patches = [
     ./zope_python-2.4.4.patch
-- 
cgit 1.4.1


From 63ce55d85957404e469ae6556d7030de16375073 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Aug 2010 12:53:51 +0000
Subject: pkgs/top-level/all-packages.nix: lower priority of python27Base to
 ensure the full version is installed by default

svn path=/nixpkgs/trunk/; revision=23146
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e1eb41ed281a..ddcd1a7358d7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2117,11 +2117,11 @@ let
     ncurses = if getConfig ["python" "curses"] true then ncurses else null;
   });
 
-  python27Base = makeOverridable (import ../development/interpreters/python/2.7) {
+  python27Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.7) {
     inherit fetchurl stdenv zlib bzip2 gdbm;
     arch = if stdenv.isDarwin then darwinArchUtility else null;
     sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
-  };
+  });
 
   python27Full = python27Base.override {
     inherit db4 sqlite readline openssl tcl tk ncurses;
-- 
cgit 1.4.1


From ca1914fa1a0751024a7a52f4344849e2e7f5d821 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 12 Aug 2010 13:01:06 +0000
Subject: Remove old patch, add new one

Let other KDE modules install polkit policy files to $out,
not $kdelibs

svn path=/nixpkgs/trunk/; revision=23147
---
 pkgs/desktops/kde-4.5/libs/default.nix                      |  2 ++
 pkgs/desktops/kde-4.5/libs/polkit-install.patch             | 11 +++++++++++
 .../kde-4.5/libs/python-site-packages-install-dir.diff      | 13 -------------
 3 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/libs/polkit-install.patch
 delete mode 100644 pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix
index c749223535bf9..b7bb4573a9442 100644
--- a/pkgs/desktops/kde-4.5/libs/default.nix
+++ b/pkgs/desktops/kde-4.5/libs/default.nix
@@ -18,6 +18,8 @@ kdePackage {
 
   propagatedBuildInputs = [ shared_desktop_ontologies gcc.libc ];
 
+  patches = [ ./polkit-install.patch ];
+
   # cmake fails to find acl.h because of C++-style comment
   cmakeFlags = [
     "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON"
diff --git a/pkgs/desktops/kde-4.5/libs/polkit-install.patch b/pkgs/desktops/kde-4.5/libs/polkit-install.patch
new file mode 100644
index 0000000000000..68bf554879635
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/libs/polkit-install.patch
@@ -0,0 +1,11 @@
+Author: Yury Kudryashov
+Reason: other KDE modules try to install polkit action files into
+$kdelibs/share/polkit-1/actions
+--- a/cmake/modules/FindPolkitQt-1.cmake.old	2010-08-12 16:13:45.000000000 +0400
++++ b/cmake/modules/FindPolkitQt-1.cmake	2010-08-12 16:13:56.000000000 +0400
+@@ -101,4 +101,4 @@
+     endif (NOT PC_POLKITQT-1_PREFIX STREQUAL CMAKE_INSTALL_PREFIX)
+ endif (POLKITQT-1_FOUND)
+ 
+-set(POLKITQT-1_POLICY_FILES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions)
++set(POLKITQT-1_POLICY_FILES_INSTALL_DIR share/polkit-1/actions)
diff --git a/pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff b/pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff
deleted file mode 100644
index 05b280838c4d2..0000000000000
--- a/pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-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)
-- 
cgit 1.4.1


From a30807b8fd33e1f1b7a3504833219043b1af07c9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Aug 2010 13:56:57 +0000
Subject: Update WebKit. Enable MathML. Not maximum set of options is enabled
 now, probably..

svn path=/nixpkgs/trunk/; revision=23150
---
 pkgs/development/libraries/webkit/default.nix      | 26 +++++++++++++---------
 .../libraries/webkit/src-for-default.nix           | 10 ++++-----
 2 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index 7fdfb5aa06a58..b440a8e17fc39 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -24,22 +24,28 @@ rec {
   configureFlags = [
     "--enable-3D-transforms"
     "--enable-web-sockets"
-    "--enable-indexeddb"
+    "--enable-web-timing"
     "--enable-image-resizer"
 
-    # https://bugs.webkit.org/show_bug.cgi?id=41859
-    # "--enable-mathml"
+    "--enable-mathml"
 
-    # "--enable-blob-slice"
+    # https://bugs.webkit.org/show_bug.cgi?id=42943
+    # "--enable-wml"
     
-    # Seem incomplete as of now
-    # "--enable-file-reader"
-    # "--enable-file-writer"
+    # https://bugs.webkit.org/show_bug.cgi?id=43863
+    # "--enable-indexed-database"
 
-    # https://bugs.webkit.org/show_bug.cgi?id=40765
-    # "--enable-wml"
+    "--enable-xhtmlmp"
+
+    # "--enable-input-speech"
+
+    # https://bugs.webkit.org/show_bug.cgi?id=43878
+    # "--enable-file-writer"
+    # "--enable-blob"
 
-    # "--enable-xhtmlmp"
+    # May be or not be triggering  https://bugs.webkit.org/show_bug.cgi?id=43878
+    # "--enable-file-system"
+    # "--enable-directory-upload"
     ];
 
   /* doConfigure should be specified separately */
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 0400018168d89..75540ba9331af 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="r62632";
-   name="webkit-r62632";
-   hash="138b1iyp97v2sy8cqqkbgr9gpj954as0ndb13s738raj3yn5bc5g";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r62632.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r62632.tar.bz2";
+   version="r65222";
+   name="webkit-r65222";
+   hash="1s6pg0f03iazkn5jp6qj58k92cazfzmpxibav2nca2n6xk8a0jxw";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65222.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65222.tar.bz2";
   
   
 }
-- 
cgit 1.4.1


From 04ee1d78ad8ec2ec2454396e1dcebd5bafee01eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Aug 2010 14:01:51 +0000
Subject: pkgs/top-level/all-packages.nix: obsoleted setuptools_python26 and
 setuptools_python27

Instead of having different setuptools expressions, buildPythonPackage
uses override to choose the desired python version. Now, technically,
buildPythonPackage shouldn't exist in multiple versions either. Maybe
the whole thing should be moved into python packages?

svn path=/nixpkgs/trunk/; revision=23151
---
 pkgs/top-level/all-packages.nix | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ddcd1a7358d7a..2a806f0f2c1d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3934,24 +3934,21 @@ let
 
   ### DEVELOPMENT / PYTHON MODULES
 
-  buildPythonPackage =
-    import ../development/python-modules/generic {
-      inherit python setuptools makeWrapper lib;
-    };
+  buildPythonPackage = import ../development/python-modules/generic {
+    inherit python setuptools makeWrapper lib;
+  };
 
-  buildPython26Package =
-    import ../development/python-modules/generic {
-      inherit makeWrapper lib;
-      python = python26;
-      setuptools = setuptools_python26;
-    };
+  buildPython26Package = import ../development/python-modules/generic {
+    inherit makeWrapper lib;
+    python = python26;
+    setuptools = setuptools.override { python = python26; };
+  };
 
-  buildPython27Package =
-    import ../development/python-modules/generic {
-      inherit makeWrapper lib;
-      python = python26;
-      setuptools = setuptools_python27;
-    };
+  buildPython27Package = import ../development/python-modules/generic {
+    inherit makeWrapper lib;
+    python = python27;
+    setuptools = setuptools.override { python = python27; };
+  };
 
   pythonPackages = python26Packages;
 
@@ -4022,16 +4019,6 @@ let
     inherit python makeWrapper;
   };
 
-  setuptools_python26 = builderDefsPackage (import ../development/python-modules/setuptools) {
-    inherit makeWrapper;
-    python = python26;
-  };
-
-  setuptools_python27 = builderDefsPackage (import ../development/python-modules/setuptools) {
-    inherit makeWrapper;
-    python = python27;
-  };
-
   wxPython = wxPython26;
 
   wxPython26 = callPackage ../development/python-modules/wxPython/2.6.nix {
-- 
cgit 1.4.1


From 961fda939cb2a57ebc2daf4425587620bf7233fb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Aug 2010 14:56:14 +0000
Subject: Fix some broken URLs.

svn path=/nixpkgs/trunk/; revision=23152
---
 pkgs/development/tools/misc/elfutils/default.nix | 2 +-
 pkgs/os-specific/linux/lvm2/default.nix          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index ad3fd08e3ac7b..a01a5fb3796e2 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   
   src = fetchurl {
     urls = [
-      "https://fedorahosted.org/releases/e/l/elfutils/${name}.tar.bz2"
+      "https://fedorahosted.org/releases/e/l/elfutils/0.143/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
     sha256 = "1nl7x2gidd2i048yjlvyzhpbca9793z435cw8bsircjxfi5gmswa";
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 96b5e5b019adc..cffb7e8353d03 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "lvm2-${v}";
   
   src = fetchurl {
-    url = "ftp://sources.redhat.com/pub/lvm2/LVM2.${v}.tgz";
+    url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz";
     sha256 =  "2a4157b91b7ad5ea84359e8548b64947611beea01862e010be71f54b649e7ad1";
   };
   
-- 
cgit 1.4.1


From 9be0b9fea6ce7e0a76b0a71fce4e855d1d1cc79b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Aug 2010 14:57:15 +0000
Subject: Update version of ncftp.

The old version 3.2.3 seems to have disappeared from the hosting server.

svn path=/nixpkgs/trunk/; revision=23153
---
 pkgs/tools/networking/ncftp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix
index 9f4fb29c393d0..5c5cf342da9e3 100644
--- a/pkgs/tools/networking/ncftp/default.nix
+++ b/pkgs/tools/networking/ncftp/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "ncftp-3.2.3";
 
   src = fetchurl {
-    url = ftp://ftp.ncftp.com/ncftp/ncftp-3.2.3-src.tar.bz2;
-    sha256 = "0455rf6yw568izq2nvz58mjd719dgp9y63yx9cb7l620vvxz5x26";
+    url = ftp://ftp.ncftp.com/ncftp/ncftp-3.2.4-src.tar.bz2;
+    sha256 = "0v0cfc4kqsvmfighl47djw5nw82dl5j5g5i2s8wy375fllim0cv6";
   };
 
   preConfigure = ''
-- 
cgit 1.4.1


From b42dfe40ec66763b99b833f311fbc90905fafa17 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Aug 2010 14:58:02 +0000
Subject: Fix akonadi startup failure.

Patch akonadiserver so as to correct the datadir parameter passed to
mysql. Without this patch akonadiserver in KDE 4.4.5 would not start and
consequently kmail would crash during start up.

svn path=/nixpkgs/trunk/; revision=23154
---
 pkgs/desktops/kde-4.4/support/akonadi/default.nix       |  1 +
 .../support/akonadi/fix-broken-datadir-parameter.patch  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.4/support/akonadi/default.nix b/pkgs/desktops/kde-4.4/support/akonadi/default.nix
index 1f00d0461b93e..b93f65b9a6a68 100644
--- a/pkgs/desktops/kde-4.4/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.4/support/akonadi/default.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
     url = "http://download.akonadi-project.org/${name}.tar.bz2";
     sha256 = "1d2ancspavp4qg717hj56j1likb0ifdr65q1awbc2ghqqgd9znck";
   };
+  patches = [ ./fix-broken-datadir-parameter.patch ];
   buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
   meta = with stdenv.lib; {
     description = "KDE PIM Storage Service";
diff --git a/pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch b/pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch
new file mode 100644
index 0000000000000..fa33329d4b0f5
--- /dev/null
+++ b/pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch
@@ -0,0 +1,17 @@
+Fix broken datadir parameter.
+
+--- akonadi-1.3.85/server/src/storage/dbconfigmysql.cpp	2010-06-09 03:41:30.000000000 -0430
++++ akonadi-local-1.3.85/server/src/storage/dbconfigmysql.cpp	2010-08-11 00:21:20.547181479 -0430
+@@ -250,11 +250,10 @@
+   // synthesize the mysqld command
+   QStringList arguments;
+   arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir );
++  arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
+ #ifndef Q_WS_WIN
+-  arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir );
+   arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir );
+ #else
+-  arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
+   arguments << QString::fromLatin1( "--shared-memory" );
+ #endif
+ 
-- 
cgit 1.4.1


From 92d437c54f0c8f71014e0bd309c8a2928abd539d Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Thu, 12 Aug 2010 16:33:19 +0000
Subject: kernel updates and add kernel 2.6.35.1

svn path=/nixpkgs/trunk/; revision=23155
---
 pkgs/os-specific/linux/kernel/linux-2.6.27.nix |   4 +-
 pkgs/os-specific/linux/kernel/linux-2.6.31.nix |  10 +-
 pkgs/os-specific/linux/kernel/linux-2.6.34.nix |   4 +-
 pkgs/os-specific/linux/kernel/linux-2.6.35.nix | 207 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                |   9 ++
 5 files changed, 223 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.35.nix

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
index beb14c4c87b33..13713acb00c09 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
@@ -3,11 +3,11 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }:
 import ./generic.nix (
 
   rec {
-    version = "2.6.27.49";
+    version = "2.6.27.50";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "09gnh26gs4bkaj9ib3c5cnmbgj3bhbw7g6b49hz0xrp067slyxai";
+      sha256 = "09lrwrf2278wz5ic3hzjmqcahlazcpw7sxyvln09nmf42anaw7fc";
     };
 
     features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.31.nix b/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
index 6bc7e84f3fa42..d248e8f86083f 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
@@ -4,16 +4,12 @@ assert !userModeLinux;
 
 import ./generic.nix (
 
-  let
-    baseVersion = "2.6.31"; 
-  in
-
   rec {
-    version = "2.6.31";
+    version = "2.6.31.14";
   
     src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v2.6/linux-${baseVersion}.tar.bz2";
-      sha256 = "04im1rk53j1im1q8i6pl6qn75zd63dg51dxhq8cfxdsxp3vq7k8a";
+      url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
+      sha256 = "1c6ivcjgns4gbx04mhnhndqikm3prqhhfm2a5zrb1mfyvvishqpp";
     };
 
     features = {
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix b/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
index 281fbc5ea1ba4..633e158a35766 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
@@ -194,11 +194,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.34.2";
+    version = "2.6.34.3";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "1p1s35sffvsdfh5rd5jl8iyin0il690als0q75fszf0fx1bh63sr";
+      sha256 = "1mm5yphkclcmjbq7v40nn6js1canna1gl5d4065xiza0v5gdq83v";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
new file mode 100644
index 0000000000000..80bf835f663f6
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
@@ -0,0 +1,207 @@
+args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
+, ... }:
+
+let
+  configWithPlatform = kernelPlatform :
+    ''
+      # Don't include any debug features.
+      DEBUG_KERNEL n
+
+      # Support drivers that need external firmware.
+      STANDALONE n
+
+      # Make /proc/config.gz available.
+      IKCONFIG_PROC y
+
+      # Optimize with -O2, not -Os.
+      CC_OPTIMIZE_FOR_SIZE n
+
+      # Enable the kernel's built-in memory tester.
+      MEMTEST y
+
+      # Disable some expensive (?) features.
+      FTRACE n
+      KPROBES n
+      NUMA? n
+      PM_TRACE_RTC n
+
+      # Enable various subsystems.
+      ACCESSIBILITY y # Accessibility support
+      AUXDISPLAY y # Auxiliary Display support
+      DONGLE y # Serial dongle support
+      HIPPI y
+      MTD_COMPLEX_MAPPINGS y # needed for many devices
+      NET_POCKET y # enable pocket and portable adapters
+      SCSI_LOWLEVEL y # enable lots of SCSI devices
+      SCSI_LOWLEVEL_PCMCIA y
+      SPI y # needed for many devices
+      SPI_MASTER y
+      WAN y
+
+      # Networking options.
+      IP_PNP n
+      IPV6_PRIVACY y
+      NETFILTER_ADVANCED y
+      IP_VS_PROTO_TCP y
+      IP_VS_PROTO_UDP y
+      IP_VS_PROTO_ESP y
+      IP_VS_PROTO_AH y
+      IP_DCCP_CCID3 n # experimental
+      CLS_U32_PERF y
+      CLS_U32_MARK y
+
+      # Wireless networking.
+      IPW2100_MONITOR y # support promiscuous mode
+      IPW2200_MONITOR y # support promiscuous mode
+      IWL4965 y # Intel Wireless WiFi 4965AGN
+      IWL5000 y # Intel Wireless WiFi 5000AGN
+      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
+      HOSTAP_FIRMWARE_NVRAM y
+
+      # Some settings to make sure that fbcondecor works - in particular,
+      # disable tileblitting and the drivers that need it.
+
+      # Enable various FB devices.
+      FB y
+      FB_EFI y
+      FB_NVIDIA_I2C y # Enable DDC Support
+      FB_RIVA_I2C y
+      FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+      FB_ATY_GX y # Mach64 GX support
+      FB_SAVAGE_I2C y
+      FB_SAVAGE_ACCEL y
+      FB_SIS_300 y
+      FB_SIS_315 y
+      FB_3DFX_ACCEL y
+      FB_GEODE y
+
+      # Video configuration
+      # The intel drivers already require KMS
+      DRM_I915_KMS y
+
+      # Sound.
+      SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
+      SND_HDA_INPUT_BEEP y # Support digital beep via input layer
+      SND_USB_CAIAQ_INPUT y
+      PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+
+      # USB serial devices.
+      USB_SERIAL_GENERIC y # USB Generic Serial Driver
+      USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
+      USB_SERIAL_KEYSPAN_USA28 y
+      USB_SERIAL_KEYSPAN_USA28X y
+      USB_SERIAL_KEYSPAN_USA28XA y
+      USB_SERIAL_KEYSPAN_USA28XB y
+      USB_SERIAL_KEYSPAN_USA19 y
+      USB_SERIAL_KEYSPAN_USA18X y
+      USB_SERIAL_KEYSPAN_USA19W y
+      USB_SERIAL_KEYSPAN_USA19QW y
+      USB_SERIAL_KEYSPAN_USA19QI y
+      USB_SERIAL_KEYSPAN_USA49W y
+      USB_SERIAL_KEYSPAN_USA49WLC y
+
+      # Filesystem options - in particular, enable extended attributes and
+      # ACLs for all filesystems that support them.
+      EXT2_FS_XATTR y # Ext2 extended attributes
+      EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
+      EXT2_FS_SECURITY y # Ext2 Security Labels
+      EXT2_FS_XIP y # Ext2 execute in place support
+      EXT4_FS_POSIX_ACL y
+      EXT4_FS_SECURITY y
+      REISERFS_FS_XATTR y
+      REISERFS_FS_POSIX_ACL y
+      REISERFS_FS_SECURITY y
+      JFS_POSIX_ACL y
+      JFS_SECURITY y
+      XFS_QUOTA y
+      XFS_POSIX_ACL y
+      XFS_RT y # XFS Realtime subvolume support
+      OCFS2_DEBUG_MASKLOG n
+      BTRFS_FS_POSIX_ACL y
+      UBIFS_FS_XATTR y
+      UBIFS_FS_ADVANCED_COMPR y
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+      CIFS_XATTR y
+      CIFS_POSIX y
+
+      # Security related features.
+      STRICT_DEVMEM y # Filter access to /dev/mem
+      SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
+
+      # Misc. options.
+      8139TOO_8129 y
+      8139TOO_PIO n # PIO is slower
+      AIC79XX_DEBUG_ENABLE n
+      AIC7XXX_DEBUG_ENABLE n
+      AIC94XX_DEBUG n
+      B43_PCMCIA y
+      BLK_DEV_BSG n
+      BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
+      BLK_DEV_IDEACPI y # IDE ACPI support
+      BLK_DEV_INTEGRITY y
+      BSD_PROCESS_ACCT_V3 y
+      BT_HCIUART_BCSP y
+      BT_HCIUART_H4 y # UART (H4) protocol support
+      BT_HCIUART_LL y
+      BT_RFCOMM_TTY y # RFCOMM TTY support
+      CPU_FREQ_DEBUG n
+      CRASH_DUMP n
+      DMAR? n # experimental
+      DVB_DYNAMIC_MINORS y # we use udev
+      FUSION y # Fusion MPT device support
+      IDE_GD_ATAPI y # ATAPI floppy support
+      IRDA_ULTRA y # Ultra (connectionless) protocol
+      JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
+      JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
+      JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
+      JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
+      KALLSYMS_EXTRA_PASS n
+      LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
+      LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
+      LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
+      LOGO n # not needed
+      MEDIA_ATTACH y
+      MEGARAID_NEWGEN y
+      MICROCODE_AMD y
+      MODVERSIONS y
+      MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
+      MTRR_SANITIZER y
+      NET_FC y # Fibre Channel driver support
+      PPP_MULTILINK y # PPP multilink support
+      REGULATOR y # Voltage and Current Regulator Support
+      SCSI_LOGGING y # SCSI logging facility
+      SERIAL_8250 y # 8250/16550 and compatible serial support
+      SLIP_COMPRESSED y # CSLIP compressed headers
+      SLIP_SMART y
+      THERMAL_HWMON y # Hardware monitoring support
+      USB_DEBUG n
+      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
+      X86_CHECK_BIOS_CORRUPTION y
+      X86_MCE y
+
+      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
+      ${extraConfig}
+    '';
+in
+
+import ./generic.nix (
+
+  rec {
+    version = "2.6.35.1";
+  
+    src = fetchurl {
+      url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
+      sha256 = "04pax26ksdp8i61qr4qdwc98iw47vjnwi53x73hbii5v0dz3qixy";
+    };
+
+    config = configWithPlatform stdenv.platform;
+    configCross = configWithPlatform stdenv.cross.platform;
+
+    features.iwlwifi = true;
+  }
+
+  // removeAttrs args ["extraConfig"]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a806f0f2c1d2..32759354465b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4523,6 +4523,14 @@ let
       ];
   };
 
+  linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) {
+    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    kernelPatches =
+      [ /*kernelPatches.fbcondecor_2_6_33*/
+        kernelPatches.sec_perm_2_6_24
+      ];
+  };
+
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
@@ -4624,6 +4632,7 @@ let
     recurseIntoAttrs (linuxPackagesFor linux_2_6_32_systemtap pkgs.linuxPackages_2_6_32_systemtap);
   linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33 pkgs.linuxPackages_2_6_33);
   linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34 pkgs.linuxPackages_2_6_34);
+  linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35);
 
   # The current default kernel / kernel modules.
   linux = linux_2_6_32;
-- 
cgit 1.4.1


From c4fb84195588b7a328455337b8c9c3f4755da988 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Aug 2010 19:53:38 +0000
Subject: An update for Bazaar was long overdue

svn path=/nixpkgs/trunk/; revision=23156
---
 pkgs/applications/version-management/bazaar/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index 22d972eac456c..46a09ccf422ce 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -1,11 +1,13 @@
 {stdenv, fetchurl, python, makeWrapper}:
 
-stdenv.mkDerivation {
-  name = "bazaar-1.10rc1";
+stdenv.mkDerivation rec {
+  version = "2.2";
+  release = ".0";
+  name = "bazaar-${version}${release}";
 
   src = fetchurl {
-    url = http://launchpad.net/bzr/1.10/1.10rc1/+download/bzr-1.10rc1.tar.gz;
-    sha256 = "dc3669e15ced93e0956c13b724f604075e0323ce07fb08f6463946c85e69bec0";
+    url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz";
+    sha256 = "64cd6c23097884e40686adc7f0ad4a8200e2292bdc5e0caba3563b6f5c32bacf";
   };
 
   buildInputs = [python makeWrapper];
-- 
cgit 1.4.1


From 6c4b96434ee145046ddfa960cc2dc27d2ec9ccd9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Aug 2010 19:59:30 +0000
Subject: Update BzrTools together with Bazaar

svn path=/nixpkgs/trunk/; revision=23157
---
 pkgs/applications/version-management/bazaar/tools.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index c36ac2d63dc38..5e5292cf1306f 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -5,9 +5,10 @@ if ! bazaar.python.readlineSupport then
 else
 
 rec {
+  version = "2.2.0";
   src = fetchurl {
-    url = http://launchpad.net/bzrtools/stable/1.5.0/+download/bzrtools-1.5.0.tar.gz;
-    sha256 = "0lm4qhsjy3k8zp9hcahlf37v69w6lhhz2x3hjskgm3rk6b0bngjz";
+    url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
+    sha256 = "835e0dc2b3b798d3c88b960bf719fe3b4cec7ae241908aafeb6aafe4c83f591b";
   };
 
   buildInputs = [];
@@ -16,7 +17,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = [(simplyShare "bzrtools")];
       
-  name = "bzr-tools-1.5";
+  name = "bzr-tools-${version}";
   meta = {
     description = "Bazaar plugins.";
   };
-- 
cgit 1.4.1


From ac8fda68f67cb58d7abc5d7a33e5a5bd1b7eda73 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Aug 2010 22:05:04 +0000
Subject: Enable some more WebKit options

svn path=/nixpkgs/trunk/; revision=23158
---
 pkgs/development/libraries/webkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index b440a8e17fc39..ce00771e61a12 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -44,8 +44,8 @@ rec {
     # "--enable-blob"
 
     # May be or not be triggering  https://bugs.webkit.org/show_bug.cgi?id=43878
-    # "--enable-file-system"
-    # "--enable-directory-upload"
+    "--enable-file-system"
+    "--enable-directory-upload"
     ];
 
   /* doConfigure should be specified separately */
-- 
cgit 1.4.1


From ced0d6de0d596bb4cc47477ccfbc79788cf8803f Mon Sep 17 00:00:00 2001
From: Andres Löh <mail@andres-loeh.de>
Date: Fri, 13 Aug 2010 07:55:57 +0000
Subject: emacsPackages should inherit emacs to add the correct version to the
 inner scope

svn path=/nixpkgs/trunk/; revision=23159
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32759354465b3..cbaa697a141ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5332,6 +5332,8 @@ let
   });
 
   emacsPackages = emacs: self: let callPackage = newScope self; in rec {
+    inherit emacs;
+
     bbdb = callPackage ../applications/editors/emacs-modes/bbdb { };
 
     cedet = callPackage ../applications/editors/emacs-modes/cedet { };
-- 
cgit 1.4.1


From 2bf5f684c98f3c91dc01526c66c22a12ad07c1c3 Mon Sep 17 00:00:00 2001
From: Andres Löh <mail@andres-loeh.de>
Date: Fri, 13 Aug 2010 13:04:30 +0000
Subject: GHC 6.12 compatibility of some Haskell libraries.

svn path=/nixpkgs/trunk/; revision=23160
---
 pkgs/top-level/haskell-packages.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 819f7ee14161d..0c00beb352e0b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -489,7 +489,8 @@ rec {
   };
 
   httpdShed = import ../development/libraries/haskell/httpd-shed {
-    inherit cabal network;
+    inherit cabal;
+    network = network2217;
   };
 
   HUnit1221 = import ../development/libraries/haskell/HUnit/1.2.2.1.nix {
@@ -903,7 +904,8 @@ rec {
   };
 
   vacuum = import ../development/libraries/haskell/vacuum {
-    inherit cabal ghcPaths;
+    inherit cabal;
+    ghcPaths = ghcPaths0106;
   };
 
   vacuumCairo = import ../development/libraries/haskell/vacuum-cairo {
-- 
cgit 1.4.1


From 5422f21700ded1402627177df59eac3b61f5eddf Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 13 Aug 2010 14:06:23 +0000
Subject: xscreensaver: move hacks to default location, use stdenv, more deps

svn path=/nixpkgs/trunk/; revision=23161
---
 .../applications/graphics/xscreensaver/default.nix | 46 +++++++++++-----------
 1 file changed, 24 insertions(+), 22 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix
index 7c9af7f2545bd..c9d734f240804 100644
--- a/pkgs/applications/graphics/xscreensaver/default.nix
+++ b/pkgs/applications/graphics/xscreensaver/default.nix
@@ -1,41 +1,43 @@
-x@{ pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk
-, libxml2, libglade, builderDefsPackage, ... }:                                                                 
+{ stdenv, fetchurl, pkgconfig, bc, perl, pam
+, libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender
+, libXxf86misc
+, libjpeg, mesa, gtk , libxml2, libglade}:
 
-builderDefsPackage 
-(a: rec {
+stdenv.mkDerivation rec {
   version = "5.11";
   name = "xscreensaver-${version}";
-  url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
 
-  src = a.fetchurl {
-    inherit url;
+  src = fetchurl {
+    url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
     sha256="0w47s0qd8ab6ywhhhkqjx0grb2b28bh2flnkdpj3yaind202l0s7";
   };
 
-  buildInputs = with a;
-    [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade
-      xlibs.xlibs xlibs.libXmu
-    ];
+  buildInputs =
+    [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
+    libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
+    libXxf86misc ];
 
   configureFlags =
-    [ "--with-gl"
-      "--with-dpms"
-      "--with-pixbuf"
+    [
+      "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
+
+      "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
+      "--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
+      "--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay"
+
       "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
-      "--with-hackdir=\${out}/share/xscreensaver-hacks"
     ];
 
-  preConfigure = a.fullDepEntry
+  preConfigure =
     ''
       sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
         -i driver/Makefile.in po/Makefile.in.in
-    '' ["minInit" "doUnpack"];
-
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
+    '';
 
   meta = {
+    homepage = http://www.jwz.org/xscreensaver/;
     description = "A set of screensavers";
-    maintainers = [ a.lib.maintainers.raskin ];
-    platforms = a.lib.platforms.allBut "i686-cygwin";
+    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+    platforms = stdenv.lib.platforms.allBut "i686-cygwin";
   };
-}) x
+}
-- 
cgit 1.4.1


From dfd195020a88313e189804333d6d36fc23f9929f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 13 Aug 2010 14:06:29 +0000
Subject: Add eigen to kde-4.5

svn path=/nixpkgs/trunk/; revision=23162
---
 pkgs/desktops/kde-4.5/default.nix               | 2 ++
 pkgs/desktops/kde-4.5/support/eigen/default.nix | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 0ef7f8b1edbef..f5e79c8dd2699 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -14,6 +14,8 @@
 
   automoc4 = callPackage ./support/automoc4 { };
 
+  eigen = callPackage ./support/eigen { };
+
   oxygen_icons = callPackage ./support/oxygen-icons { };
 
   polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
diff --git a/pkgs/desktops/kde-4.5/support/eigen/default.nix b/pkgs/desktops/kde-4.5/support/eigen/default.nix
index 30a47d1d0413b..e72de6c1b2582 100644
--- a/pkgs/desktops/kde-4.5/support/eigen/default.nix
+++ b/pkgs/desktops/kde-4.5/support/eigen/default.nix
@@ -1,20 +1,20 @@
-{stdenv, fetchurl, lib, cmake}:
+{stdenv, fetchurl, cmake}:
 
 let
-  v = "2.0.14";
+  v = "2.0.15";
 in
 stdenv.mkDerivation {
   name = "eigen-${v}";
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
     name = "eigen-${v}.tar.bz2";
-    sha256 = "01xkdqs6hqkwcq5yzpdz79da0i512s818pbg8fl9w3m2vvndzs6p";
+    sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79";
   };
   buildInputs = [ cmake ];
   meta = {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = "LGPL";
     homepage = http://eigen.tuxfamily.org ;
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
   };
 }
-- 
cgit 1.4.1


From 794c9dd1d7fb78fcf19ace2bae83d5242fdc393b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 13 Aug 2010 14:06:36 +0000
Subject: Add kdeartwork-4.5.0

svn path=/nixpkgs/trunk/; revision=23163
---
 .../kde-4.5/artwork/FindXscreensaver.cmake         | 85 ++++++++++++++++++++++
 pkgs/desktops/kde-4.5/artwork/default.nix          | 25 ++++---
 pkgs/desktops/kde-4.5/default.nix                  |  2 +
 3 files changed, 100 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake
new file mode 100644
index 0000000000000..caa5ddd925499
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake
@@ -0,0 +1,85 @@
+#Macro to find xscreensaver directory
+
+# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (NOT XSCREENSAVER_FOUND)
+  FIND_PATH(XSCREENSAVER_DIR deco
+    HINTS
+      ${KDE4_INCLUDE_DIR}
+	PATHS
+      /usr
+      /usr/local
+      /opt/local
+      /usr/X11R6
+      /opt/kde
+      /opt/kde3
+      /usr/kde
+      /usr/local/kde
+      /usr/local/xscreensaver
+      /usr/openwin/lib/xscreensaver
+      /etc
+	PATH_SUFFIXES
+      lib${LIB_SUFFIX}/xscreensaver
+      lib/xscreensaver
+	  lib${LIB_SUFFIX}/misc/xscreensaver
+	  lib/misc/xscreensaver
+	  libexec/xscreensaver
+	  bin/xscreensaver-hacks
+	  hacks)
+  message(XSCREENSAVER_DIR ${XSCREENSAVER_DIR})
+
+  set(XSCREENSAVER_CONFIG_DIR)
+  FIND_PATH(XSCREENSAVER_CONFIG_DECO config/deco.xml
+    PATHS
+    ${KDE4_INCLUDE_DIR}
+    /usr/
+    /usr/local/
+    /opt/local/
+    /usr/X11R6/
+    /opt/kde/
+    /opt/kde3/
+    /usr/kde/
+    /usr/local/kde/
+    /usr/openwin/lib/xscreensaver/
+    /etc/
+    PATH_SUFFIXES xscreensaver share/xscreensaver
+  )
+  #MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+
+  if(XSCREENSAVER_CONFIG_DECO)
+	set(XSCREENSAVER_CONFIG_DIR "${XSCREENSAVER_CONFIG_DECO}/config/")
+	#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
+  endif(XSCREENSAVER_CONFIG_DECO)
+
+
+  # Try and locate XScreenSaver config when path doesn't include config
+  if(NOT XSCREENSAVER_CONFIG_DIR)
+    FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
+      /etc/xscreensaver
+      )
+  endif(NOT XSCREENSAVER_CONFIG_DIR)
+endif(NOT XSCREENSAVER_FOUND)
+
+#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
+
+# Need to fix hack
+if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+	set(XSCREENSAVER_FOUND TRUE)
+endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+
+if (XSCREENSAVER_FOUND)
+  if (NOT Xscreensaver_FIND_QUIETLY)
+    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
+  endif (NOT Xscreensaver_FIND_QUIETLY)
+else (XSCREENSAVER_FOUND)
+  if (Xscreensaver_FIND_REQUIRED)
+    message(FATAL_ERROR "XScreenSaver not found")
+  endif (Xscreensaver_FIND_REQUIRED)
+endif (XSCREENSAVER_FOUND)
+
+
+MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.5/artwork/default.nix b/pkgs/desktops/kde-4.5/artwork/default.nix
index e4e94ebb6dc09..ca036322f489e 100644
--- a/pkgs/desktops/kde-4.5/artwork/default.nix
+++ b/pkgs/desktops/kde-4.5/artwork/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchurl, lib, cmake, qt4, perl, xscreensaver
-, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
+{ kdePackage, cmake, qt4, perl, xscreensaver
+, kdelibs, kdebase_workspace, automoc4, strigi, eigen}:
+
+kdePackage {
+  pn = "kdeartwork";
+  v = "4.5.0";
+
+  buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4
+    strigi eigen ];
+
+  preConfigure = ''
+    cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake
+    '';
 
-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 ];
   };
 }
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index f5e79c8dd2699..e3a52ab861ab1 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -40,6 +40,8 @@
 
   kdebase_workspace = callPackage ./base-workspace { };
 
+  kdeartwork = callPackage ./artwork { };
+
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };
-- 
cgit 1.4.1


From 5ee59b9f2ef4b054549ae4c5064dcefd9641e2c9 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 13 Aug 2010 14:06:41 +0000
Subject: Make unix_chkpwd suid root

svn path=/nixpkgs/trunk/; revision=23164
---
 pkgs/os-specific/linux/pam/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 59c2deab47f8c..bca5609659c7f 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation {
   buildInputs = [ flex cracklib ]
     ++ stdenv.lib.optional (stdenv.system != "armv5tel-linux") libxcrypt;
 
+  postInstall = ''
+    mv -v $out/sbin/unix_chkpwd{,.orig}
+    ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd
+    '';
+
   preConfigure = ''
     configureFlags="$configureFlags --includedir=$out/include/security"
   '';
-- 
cgit 1.4.1


From c5e44e6829a25f29e780af72cbeb282fa5b0f61e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 13 Aug 2010 23:09:53 +0000
Subject: More metadata

svn path=/nixpkgs/trunk/; revision=23166
---
 pkgs/os-specific/linux/iproute/default.nix  |  5 +++++
 pkgs/os-specific/linux/pam/default.nix      |  6 ++++++
 pkgs/os-specific/linux/pam_ldap/default.nix | 15 +++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index ba9430fb7f0ae..604a0bba6ff36 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -16,4 +16,9 @@ stdenv.mkDerivation rec {
   makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc MANDIR=$(out)/share/man";
 
   buildInputs = [bison flex db4];
+
+  meta = {
+    homepage =
+      http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2;
+  };
 }
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index bca5609659c7f..f27c6af31bb5b 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -19,4 +19,10 @@ stdenv.mkDerivation {
   preConfigure = ''
     configureFlags="$configureFlags --includedir=$out/include/security"
   '';
+
+  meta = {
+    homepage = http://ftp.kernel.org/pub/linux/libs/pam/;
+    description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user";
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix
index cb37e4a18158b..2be869e73e3a3 100644
--- a/pkgs/os-specific/linux/pam_ldap/default.nix
+++ b/pkgs/os-specific/linux/pam_ldap/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pam, openldap}:
    
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "pam_ldap-183";
    
   src = fetchurl {
-    url = http://www.padl.com/download/pam_ldap-183.tar.gz;
+    url = "http://www.padl.com/download/${name}.tar.gz";
     md5 = "c0ad81e9d9712ddc6599a6e7a1688778";
   };
 
@@ -13,4 +13,15 @@ stdenv.mkDerivation {
   ";
 
   buildInputs = [pam openldap];
+
+  meta = {
+    homepage = http://www.padl.com/OSS/pam_ldap.html;
+    description = "LDAP backend for PAM";
+    longDescription = ''
+      The pam_ldap module provides the means for Solaris and Linux servers and
+      workstations to authenticate against LDAP directories, and to change their
+      passwords in the directory.'';
+    license = "LGPL";
+    inherit (pam.meta) platforms;
+  };
 }
-- 
cgit 1.4.1


From c55090ec787f25e16e72ce004f9ff585a52eb7d0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 13 Aug 2010 23:11:11 +0000
Subject: Upgrade iproute, add meta info

svn path=/nixpkgs/trunk/; revision=23167
---
 pkgs/os-specific/linux/iproute/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 604a0bba6ff36..ba0f1d4fd0f94 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,24 +1,31 @@
-{fetchurl, stdenv, flex, bison, db4}:
+{fetchurl, stdenv, flex, bison, db4, iptables}:
 
 stdenv.mkDerivation rec {
-  name = "iproute2-2.6.29-1";
+  name = "iproute2-2.6.35";
 
   src = fetchurl {
     url = "http://devresources.linux-foundation.org/dev/iproute2/download/${name}.tar.bz2";
-    sha256 = "16zvhdzv7yqyvmwxyqa6shzsld6r0wpnk37dig69sk20wpzv1zqk";
+    sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla";
   };
  
   preConfigure =
     ''
       patchShebangs ./configure
+      sed -e '/ARPDDIR/d' -i Makefile
     '';
+  postConfigure = "cat Config";
 
-  makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc MANDIR=$(out)/share/man";
+  makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin"
+   + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}"
+  + " MANDIR=$(out)/share/man";
 
-  buildInputs = [bison flex db4];
+  buildInputs = [bison flex db4 iptables];
 
   meta = {
     homepage =
       http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2;
+    description = "A collection of utilities for controlling TCP / IP"
+      + " networking and traffic control in Linux";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
cgit 1.4.1


From 83a87e99595db4057399742de8683f262abb16c3 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 13 Aug 2010 23:11:58 +0000
Subject: More meta.platforms

svn path=/nixpkgs/trunk/; revision=23168
---
 pkgs/os-specific/linux/htop/default.nix     | 1 +
 pkgs/os-specific/linux/iptables/default.nix | 1 +
 pkgs/top-level/release.nix                  | 3 ---
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index e7691f1006ff0..6a23209935176 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -10,5 +10,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An interactive process viewer for Linux";
     homepage = "http://htop.sourceforge.net";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index 1f56a92efe1ae..2f447f72ab237 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A program to configure the Linux IP packet filtering ruleset";
     homepage = http://www.netfilter.org/projects/iptables/index.html;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 01d21a49e6488..dc5d0f387e904 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -159,8 +159,6 @@ with (import ./release-lib.nix);
   inetutils = linux;
   inkscape = linux;
   iputils = linux;
-  iproute = linux;
-  iptables = linux;
   irssi = linux;
   jfsutils = linux;
   jfsrec = linux;
@@ -228,7 +226,6 @@ with (import ./release-lib.nix);
   openssh = linux;
   openssl = all;
   pam_console = linux;
-  pam_ldap = linux;
   pam_login = linux;
   pam_unix2 = linux;
   pan = gtkSupported;
-- 
cgit 1.4.1


From e7b1d4c69e8b2d0950b315d839f7a1100d2bdb7b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 13 Aug 2010 23:14:16 +0000
Subject: Add kdebase-runtime-4.5.0

svn path=/nixpkgs/trunk/; revision=23169
---
 pkgs/desktops/kde-4.5/base-runtime/default.nix | 25 +++++++++++++++++
 pkgs/desktops/kde-4.5/base-runtime/freeze.diff | 37 ++++++++++++++++++++++++++
 pkgs/desktops/kde-4.5/default.nix              |  2 ++
 3 files changed, 64 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/base-runtime/default.nix
 create mode 100644 pkgs/desktops/kde-4.5/base-runtime/freeze.diff

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/base-runtime/default.nix b/pkgs/desktops/kde-4.5/base-runtime/default.nix
new file mode 100644
index 0000000000000..35466b4b62476
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/base-runtime/default.nix
@@ -0,0 +1,25 @@
+{ kdePackage, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba,
+  shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano,
+  cluceneCore, attica, virtuoso, makeWrapper }:
+
+kdePackage {
+  pn = "kdebase-runtime";
+  v = "4.5.0";
+
+  buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba shared_mime_info
+    exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica
+    makeWrapper];
+
+  patches = [ ./freeze.diff ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
+        --prefix PATH : "${virtuoso}/bin"
+  '';
+
+  meta = {
+    description = "KDE runtime";
+    longDescription = "Libraries and tools which supports running KDE desktop applications";
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/base-runtime/freeze.diff b/pkgs/desktops/kde-4.5/base-runtime/freeze.diff
new file mode 100644
index 0000000000000..62079f6e8ce58
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/base-runtime/freeze.diff
@@ -0,0 +1,37 @@
+Index: kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp
+===================================================================
+--- a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp	(revision 1160390)
++++ b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp	(revision 1160391)
+@@ -36,6 +36,7 @@
+ #include <QtDBus/QDBusConnection>
+ #include <QtDBus/QDBusInterface>
+ #include <QtDBus/QDBusPendingCallWatcher>
++#include <QtCore/QTimer>
+ #include <QtCore/QStringList>
+ 
+ #include <KDebug>
+@@ -60,6 +61,11 @@
+ 
+ void UpnpNetworkBuilder::start()
+ {
++    QTimer::singleShot(0, this, SLOT(startBrowse()));
++}
++
++void UpnpNetworkBuilder::startBrowse()
++{
+     qDBusRegisterMetaType<DeviceTypeMap>();
+     qDBusRegisterMetaType<Cagibi::Device>();
+ 
+Index: kioslave/network/network/builder/upnp/upnpnetworkbuilder.h
+===================================================================
+--- a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h	(revision 1160390)
++++ b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h	(revision 1160391)
+@@ -63,6 +63,8 @@
+     void removeUPnPDevices( const QList<Cagibi::Device>& devices );
+ 
+   private Q_SLOTS:
++    void startBrowse();
++
+     void onDevicesAdded( const DeviceTypeMap& deviceTypeMap );
+     void onDevicesRemoved( const DeviceTypeMap& deviceTypeMap );
+     void onAddedDeviceDetails( const Cagibi::Device& device );
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index e3a52ab861ab1..ad2b2684c6d73 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -40,6 +40,8 @@
 
   kdebase_workspace = callPackage ./base-workspace { };
 
+  kdebase_runtime = callPackage ./base-runtime { };
+
   kdeartwork = callPackage ./artwork { };
 
 ### DEVELOPMENT
-- 
cgit 1.4.1


From dc831feb4b72ed34c39f23dc05d26114f2f4ab9c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 13 Aug 2010 23:50:44 +0000
Subject: Add kdeutils-4.5.0

svn path=/nixpkgs/trunk/; revision=23170
---
 pkgs/desktops/kde-4.5/default.nix                  |  2 ++
 pkgs/desktops/kde-4.5/utils/cmake-module-path.diff | 10 ++++++++
 pkgs/desktops/kde-4.5/utils/default.nix            | 30 ++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/utils/cmake-module-path.diff
 create mode 100644 pkgs/desktops/kde-4.5/utils/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index ad2b2684c6d73..06970e445dabc 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -42,6 +42,8 @@
 
   kdebase_runtime = callPackage ./base-runtime { };
 
+  kdeutils = callPackage ./utils { };
+
   kdeartwork = callPackage ./artwork { };
 
 ### DEVELOPMENT
diff --git a/pkgs/desktops/kde-4.5/utils/cmake-module-path.diff b/pkgs/desktops/kde-4.5/utils/cmake-module-path.diff
new file mode 100644
index 0000000000000..4564d0318d440
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/cmake-module-path.diff
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt	2010-04-15 12:58:25.000000000 +0400
++++ b/CMakeLists.txt.new	2010-08-14 03:30:16.000000000 +0400
+@@ -1,6 +1,6 @@
+ project( kdeutils )
+ 
+-set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
++set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
+ 
+ # search packages used by KDE
+ find_package( KDE4 REQUIRED )
diff --git a/pkgs/desktops/kde-4.5/utils/default.nix b/pkgs/desktops/kde-4.5/utils/default.nix
new file mode 100644
index 0000000000000..250090b5892c1
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/default.nix
@@ -0,0 +1,30 @@
+{ kdePackage, cmake, qt4, perl, gmp, python, libzip, libarchive, xz
+, sip, pyqt4, pycups, rhpl, system_config_printer, qjson, shared_mime_info
+, kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, qimageblitz, qca2}:
+
+kdePackage {
+  pn = "kdeutils";
+  v = "4.5.0";
+  
+  inherit system_config_printer;
+  preConfigure = ''
+    sed -e "s@/usr\(/share/system-config-printer\)@${system_config_printer}\1@" -i \
+      printer-applet/cmake-modules/FindSystemConfigPrinter.py \
+      printer-applet/printer-applet.py
+    sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" printer-applet/cmake-modules/FindSystemConfigPrinter.py
+    '';
+
+  cmakeFlags = "-DCMAKE_MODULE_PATH=${qjson}/share/apps/cmake/modules";
+  patches = [ ./cmake-module-path.diff ];
+  
+  buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4
+    pycups rhpl system_config_printer kdelibs kdepimlibs kdebase kdebindings
+    automoc4 qimageblitz qca2 qjson shared_mime_info ];
+                  
+  meta = {
+    description = "KDE Utilities";
+    license = "GPL";
+    homepage = http://www.kde.org;
+    inherit (kdelibs.meta) maintainers platforms;
+  };
+}
-- 
cgit 1.4.1


From 2d062ba772a906115090b22c4253c450bbbf6149 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 14 Aug 2010 09:18:57 +0000
Subject: Allow override options being required in kernel configuration..
 Otherwise modifying significantly config via extraConfig becomes practically
 impossible.

svn path=/nixpkgs/trunk/; revision=23171
---
 pkgs/os-specific/linux/kernel/generate-config.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl
index 3db050c900c7b..05b6867bc5531 100644
--- a/pkgs/os-specific/linux/kernel/generate-config.pl
+++ b/pkgs/os-specific/linux/kernel/generate-config.pl
@@ -26,7 +26,7 @@ while (<ANSWERS>) {
     s/#.*//;
     if (/^\s*([A-Za-z0-9_]+)(\?)?\s+(\S+)\s*$/) {
         $answers{$1} = $3;
-        $requiredAnswers{$1} = 1 unless defined $2;
+        $requiredAnswers{$1} = !(defined $2);
     } elsif (!/^\s*$/) {
         die "invalid config line: $_";
     }
-- 
cgit 1.4.1


From 1975eefcb413e7f257f1c3fbdfba2f64280c7c17 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Aug 2010 09:46:55 +0000
Subject: Add kdemultimedia-4.5.0

svn path=/nixpkgs/trunk/; revision=23172
---
 pkgs/desktops/kde-4.5/default.nix            |  2 ++
 pkgs/desktops/kde-4.5/multimedia/default.nix | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/multimedia/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 06970e445dabc..d09a4f17f2891 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -44,6 +44,8 @@
 
   kdeutils = callPackage ./utils { };
 
+  kdemultimedia = callPackage ./multimedia { };
+
   kdeartwork = callPackage ./artwork { };
 
 ### DEVELOPMENT
diff --git a/pkgs/desktops/kde-4.5/multimedia/default.nix b/pkgs/desktops/kde-4.5/multimedia/default.nix
new file mode 100644
index 0000000000000..9a020970c5d0a
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/multimedia/default.nix
@@ -0,0 +1,18 @@
+{ kdePackage, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac,
+cdparanoia, lame , kdelibs, automoc4, ffmpeg}:
+
+kdePackage {
+  pn = "kdemultimedia";
+  v = "4.5.0";
+
+  buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib
+    cdparanoia lame kdelibs automoc4 ffmpeg ];
+
+  meta = {
+    description = "KDE Multimedia";
+    longDescription = ''
+      Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer.
+    '';
+    license = "GPL";
+  };
+}
-- 
cgit 1.4.1


From 3a2f49375083d776a874d54090215ff0e53332fd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 14 Aug 2010 16:04:02 +0000
Subject: Add latest Linux kernel for real i686 platform, not modern
 amd64-in-32bit-mode

svn path=/nixpkgs/trunk/; revision=23173
---
 pkgs/top-level/all-packages.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbaa697a141ce..af1847cdf2f99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -978,7 +978,7 @@ let
   pg_top = callPackage ../tools/misc/pg_top { };
 
   pdsh = callPackage ../tools/networking/pdsh {
-    rsh = true;			# enable internal rsh implementation
+    rsh = true;          # enable internal rsh implementation
     ssh = openssh;
   };
 
@@ -4531,6 +4531,16 @@ let
       ];
   };
 
+  linux_2_6_35_oldI686 = linuxPackages_2_6_35.override {
+      extraConfig = ''
+          HIGHMEM64G? n
+          XEN? n
+      '';
+      extraMeta = {
+        platforms = ["i686-linux"];
+      };
+  };
+
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
-- 
cgit 1.4.1


From 69a9e0a9facfef5e368af37b6c45cddcba6febb1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 14 Aug 2010 17:13:42 +0000
Subject: Fix stupid typo in linux_2_6_35_oldI686 definition

svn path=/nixpkgs/trunk/; revision=23174
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af1847cdf2f99..c35da52301261 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4531,13 +4531,14 @@ let
       ];
   };
 
-  linux_2_6_35_oldI686 = linuxPackages_2_6_35.override {
+  linux_2_6_35_oldI686 = linux_2_6_35.override {
       extraConfig = ''
           HIGHMEM64G? n
           XEN? n
       '';
       extraMeta = {
         platforms = ["i686-linux"];
+	maintainers = [lib.maintainers.raskin];
       };
   };
 
-- 
cgit 1.4.1


From f2fb66e606e93adc3941d5d4d1872fd32b03cfc6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 14 Aug 2010 20:32:35 +0000
Subject: Update DirectFB

svn path=/nixpkgs/trunk/; revision=23177
---
 pkgs/development/libraries/directfb/src-for-default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/directfb/src-for-default.nix b/pkgs/development/libraries/directfb/src-for-default.nix
index 265be997b6fac..b181d2858f579 100644
--- a/pkgs/development/libraries/directfb/src-for-default.nix
+++ b/pkgs/development/libraries/directfb/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.4.2";
-   name="directfb-1.4.2";
-   hash="1invmmccscv44v2pa83050cv5n028q0j12cgwwpc7ac83vi4f605";
+   version="1.4.3";
+   name="directfb-1.4.3";
+   hash="0y79lwzq7srlbgrva7b5y8klbp6gmr8hxrayq8njaw7by3jald8l";
    url="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${version}.tar.gz";
-   advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.2.tar.gz";
+   advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.3.tar.gz";
   
   
 }
-- 
cgit 1.4.1


From 36ec694b7b4f00554a11679334827618417da8ac Mon Sep 17 00:00:00 2001
From: Andres Löh <mail@andres-loeh.de>
Date: Sun, 15 Aug 2010 11:42:54 +0000
Subject: uu-parsinglib version bump.

svn path=/nixpkgs/trunk/; revision=23178
---
 pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
index 421e23aa5612c..1967bec9e0712 100644
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "uu-parsinglib";
-  version = "2.3.4";
-  sha256 = "c5faeade06f363c2e7b95a2b7eeba752bf2dd1f4ff0cebbe09aaef9b79f8fdb2";
+  version = "2.5.4.2";
+  sha256 = "94f8f3f7e64dd87a4930190f922a07014e21e3cc320ba1ffefdae7db4401bfcd";
   meta = {
     description = "New version of the Utrecht University parser combinator library";
   };
-- 
cgit 1.4.1


From db36f89eca7d935c8348874421929d703721094b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 15 Aug 2010 13:54:27 +0000
Subject: Add cln

svn path=/nixpkgs/trunk/; revision=23179
---
 pkgs/development/libraries/cln/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/cln/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
new file mode 100644
index 0000000000000..5734e2cbe53e8
--- /dev/null
+++ b/pkgs/development/libraries/cln/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "cln-1.3.1";
+
+  src = fetchurl {
+    url = "${meta.homepage}${name}.tar.bz2";
+    sha256 = "1sd8jy5vnmww537zq6g6i586ffslm7fjliz04krv6scapgklq6ca";
+  };
+
+  buildInputs = [ gmp ];
+
+  meta = {
+    description = "C/C++ library for numbers, a part of GiNaC";
+    homepage = http://www.ginac.de/CLN/;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c35da52301261..408f21bf888dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2624,6 +2624,8 @@ let
 
   clearsilver = callPackage ../development/libraries/clearsilver { };
 
+  cln = callPackage ../development/libraries/cln { };
+
   clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) {
   };
 
-- 
cgit 1.4.1


From 4db505847545e3d019afda52e99911b728f1f7f0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 15 Aug 2010 13:55:02 +0000
Subject: Add libqalculate

svn path=/nixpkgs/trunk/; revision=23180
---
 pkgs/development/libraries/libqalculate/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix                     |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/libqalculate/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
new file mode 100644
index 0000000000000..9c75bd51db140
--- /dev/null
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cln, libxml2, glib, intltool, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libqalculate-0.9.7";
+
+  src = fetchurl {
+    url = "mirror://sf/qalculate/${name}.tar.gz";
+    sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs";
+  };
+
+  buildInputs = [ intltool pkgconfig ];
+  propagatedBuildInputs = [ cln libxml2 glib ];
+
+  meta = {
+    description = "An advanced calculator library";
+    homepage = http://qalculate.sourceforge.net;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 408f21bf888dc..863dac828120f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3342,6 +3342,8 @@ let
 
   libpseudo = callPackage ../development/libraries/libpseudo { };
 
+  libqalculate = callPackage ../development/libraries/libqalculate { };
+
   librsync = callPackage ../development/libraries/librsync { };
 
   libsigcxx = callPackage ../development/libraries/libsigcxx { };
-- 
cgit 1.4.1


From 1a7a128b584f51b299700801a51a49d91e85a31b Mon Sep 17 00:00:00 2001
From: Andres Löh <mail@andres-loeh.de>
Date: Sun, 15 Aug 2010 18:28:08 +0000
Subject: Version bumps for a number of Haskell packages.

svn path=/nixpkgs/trunk/; revision=23181
---
 pkgs/development/libraries/haskell/haskell-src-exts/default.nix | 4 ++--
 pkgs/development/libraries/haskell/hscolour/default.nix         | 6 +++---
 pkgs/development/libraries/haskell/uniplate/default.nix         | 4 ++--
 pkgs/development/tools/haskell/hlint/default.nix                | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
index fe847b5c135c7..6b4d48c67154f 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "haskell-src-exts";
-  version = "1.1.4";
-  sha256 = "83c98d8bc16622039b14220190c571ed7f8459f129803b593373df5c15e3f2f1";
+  version = "1.9.0";
+  sha256 = "dedb529217dfe393f75f26b735f7dd09eea50006481f60d06e169de6f328d1da";
   extraBuildInputs = [happy];
   propagatedBuildInputs = [cpphs];
   meta = {
diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix
index 02ab7c0bfd8d8..f1593a6e7f6e5 100644
--- a/pkgs/development/libraries/haskell/hscolour/default.nix
+++ b/pkgs/development/libraries/haskell/hscolour/default.nix
@@ -2,10 +2,10 @@
 
 cabal.mkDerivation (self : {
   pname = "hscolour";
-  version = "1.15";
-  sha256 = "762f07977d971939360e2a418dfad2a8e5f908b9a88f3a861fa13937cbcfef1e";
+  version = "1.17";
+  sha256 = "b645cdde1b7827dae1519a4423031b4c6bed82a8edb52aa295bea86478ce24b0";
   meta = {
     description = "Colourise Haskell code";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix
index 7d7a14a8f8e05..fe887014ef155 100644
--- a/pkgs/development/libraries/haskell/uniplate/default.nix
+++ b/pkgs/development/libraries/haskell/uniplate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "uniplate";
-  version = "1.2.0.3";
-  sha256 = "77cf07c96ae62799d790284c0c84beca9ee17c9c2416d4de6641f3fddd644b58";
+  version = "1.5.1";
+  sha256 = "cfeaaaabbbe318992df0c51a0c04729b22dac244f415b80a3b388708ed9cfc33";
   propagatedBuildInputs = [mtl];
   meta = {
     description = "Uniform type generic traversals";
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 2f11636dd14ee..4f8812c5b96ef 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self : {
   pname = "hlint";
-  version = "1.6.11";
+  version = "1.7.3";
   name = self.fname;
-  sha256 = "20210c72826be92ae34247d4e02e64187c3c99f70f8a099c747c46415e010af5";
+  sha256 = "afd4aa623fedf5257464bf18f38376a951d130f3004664803763e67cc55d9e83";
   extraBuildInputs = [haskellSrcExts mtl uniplate hscolour parallel];
   meta = {
     description = "Source code suggestions";
-- 
cgit 1.4.1


From 0c9a370aa053d0042bcadcc34ff042224fe7aa54 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Aug 2010 07:45:39 +0000
Subject: * Updated desktop-file-utils to 0.16.

svn path=/nixpkgs/trunk/; revision=23182
---
 pkgs/tools/misc/desktop-file-utils/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix
index fd63016ddb88b..4266f4ab768d8 100644
--- a/pkgs/tools/misc/desktop-file-utils/default.nix
+++ b/pkgs/tools/misc/desktop-file-utils/default.nix
@@ -1,10 +1,17 @@
-{stdenv, fetchurl, pkgconfig, glib}:
+{ stdenv, fetchurl, pkgconfig, glib }:
+
+stdenv.mkDerivation rec {
+  name = "desktop-file-utils-0.16";
 
-stdenv.mkDerivation {
-  name = "desktop-file-utils-0.15";
   src = fetchurl {
-    url = http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.15.tar.gz;
-    md5 = "2fe8ebe222fc33cd4a959415495b7eed";
+    url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.bz2";
+    sha256 = "18y9am8n43rrnnldd1cy09ls39xz1gx3qczax2c4cjxayx5vwq3r";
   };
+
   buildInputs = [ pkgconfig glib ];
+
+  meta = {
+    homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils;
+    description = "Command line utilities for working with .desktop files";
+  };
 }
-- 
cgit 1.4.1


From 737262c77935229f5257a806092ac2b97621d02a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 16 Aug 2010 08:23:59 +0000
Subject: Add kdeaccessibility-4.5.0

svn path=/nixpkgs/trunk/; revision=23185
---
 pkgs/desktops/kde-4.5/accessibility/default.nix | 14 ++++++++++++++
 pkgs/desktops/kde-4.5/default.nix               |  3 +++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/accessibility/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/accessibility/default.nix b/pkgs/desktops/kde-4.5/accessibility/default.nix
new file mode 100644
index 0000000000000..048111389bf5c
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/accessibility/default.nix
@@ -0,0 +1,14 @@
+{kdePackage, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4 }:
+
+kdePackage {
+  pn = "kdeaccessibility";
+  v = "4.5.0";
+
+  # TODO: speech dispatcher and/or freetts
+  buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 ];
+
+  meta = {
+    description = "KDE accessibility tools";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index d09a4f17f2891..95528cd60af1d 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -42,6 +42,9 @@
 
   kdebase_runtime = callPackage ./base-runtime { };
 
+### OTHER MODULES
+  kdeaccessibility = callPackage ./accessibility { };
+
   kdeutils = callPackage ./utils { };
 
   kdemultimedia = callPackage ./multimedia { };
-- 
cgit 1.4.1


From 0ee0fb93878eb9ec8a31173592929af8787f99c5 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 16 Aug 2010 08:34:26 +0000
Subject: Add libktorrent

svn path=/nixpkgs/trunk/; revision=23186
---
 pkgs/development/libraries/libktorrent/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/libktorrent/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
new file mode 100644
index 0000000000000..ead4205b2896c
--- /dev/null
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt47, automoc4,
+  perl }:
+
+stdenv.mkDerivation rec {
+  name = "libktorrent-1.0.2";
+
+  src = fetchurl {
+    url = "${meta.homepage}/downloads/4.0.2/${name}.tar.bz2";
+    sha256 = "11kh1mcijwzr2kf7hpxadggh346kdb5jy8rnmawhi9nc0i7wyjlw";
+  };
+
+# TODO: xfs.h
+  buildInputs = [ cmake kdelibs gmp qca2 boost gettext qt47 automoc4 perl ];
+
+  meta = {
+    description = "A bittorrent library used in ktorrent";
+    homepage = http://ktorrent.org;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 863dac828120f..2471c33e1454b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3243,6 +3243,8 @@ let
     useGTK = getPkgConfig "libiodbc" "gtk" false;
   };
 
+  libktorrent = newScope kde45 ../development/libraries/libktorrent { };
+
   liblqr1 = callPackage ../development/libraries/liblqr-1 {
     inherit (gnome) glib;
   };
-- 
cgit 1.4.1


From f9a218b69160caf8319c2c2492448150c6df6141 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 16 Aug 2010 12:40:03 +0000
Subject: Add ebook-tools-0.1.1

svn path=/nixpkgs/trunk/; revision=23189
---
 pkgs/tools/text/ebook-tools/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/text/ebook-tools/default.nix

(limited to 'pkgs')

diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix
new file mode 100644
index 0000000000000..57e5b21582b95
--- /dev/null
+++ b/pkgs/tools/text/ebook-tools/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, libxml2, libzip }:
+
+let
+  pn = "ebook-tools";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pn}-0.1.1";
+
+  src = fetchurl {
+    url = "mirror://sf/${pn}/${name}.tar.gz";
+    sha256 = "07flqm0c252jklggjmg998qzyvwlw67c3db2jbg734figngrjh79";
+  };
+
+  buildInputs = [ cmake libxml2 libzip ];
+
+  meta = {
+    homepage = "http://${pn}.sourceforge.net";
+    description = "Tools and libs for dealing with various ebook file formats";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2471c33e1454b..33f1242ad47b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -548,6 +548,8 @@ let
 
   e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { };
 
+  ebook_tools = callPackage ../tools/text/ebook-tools { };
+
   ecryptfs = callPackage ../tools/security/ecryptfs { };
 
   enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { };
-- 
cgit 1.4.1


From 6d97359a618149ec5482cf7e670b78f31ea3aace Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 16 Aug 2010 12:40:41 +0000
Subject: Add kdegraphics-4.5.0

svn path=/nixpkgs/trunk/; revision=23190
---
 pkgs/desktops/kde-4.5/default.nix          |  2 ++
 pkgs/desktops/kde-4.5/graphics/default.nix | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/graphics/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 95528cd60af1d..2a48df7f7d897 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -47,6 +47,8 @@
 
   kdeutils = callPackage ./utils { };
 
+  kdegraphics = callPackage ./graphics { };
+
   kdemultimedia = callPackage ./multimedia { };
 
   kdeartwork = callPackage ./artwork { };
diff --git a/pkgs/desktops/kde-4.5/graphics/default.nix b/pkgs/desktops/kde-4.5/graphics/default.nix
new file mode 100644
index 0000000000000..555f5ef32e3ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/graphics/default.nix
@@ -0,0 +1,21 @@
+{ kdePackage, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2
+, libspectre, popplerQt4, djvulibre, chmlib, shared_mime_info, libXxf86vm
+, kdelibs, automoc4, strigi, qimageblitz, soprano, qca2, ebook_tools }:
+
+kdePackage {
+  pn = "kdegraphics";
+  v = "4.5.0";
+
+  buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre
+    (popplerQt4.override { inherit qt4; }) chmlib shared_mime_info libXxf86vm
+    kdelibs automoc4 strigi qimageblitz soprano qca2 djvulibre ebook_tools ];
+
+  meta = {
+    description = "KDE graphics utilities";
+    longDescription = ''
+      Contains various graphics utilities such as Gwenview image viewer and
+      Okular  document reader.
+    '';
+    license = "GPL";
+  };
+}
-- 
cgit 1.4.1


From 42b5198e5b4b9b6bcb63906a8be6e399a403b22a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Aug 2010 17:03:19 +0000
Subject: pkgs/top-level/all-packages.nix: disable doCheck for setuptools when
 run with Python 2.7

The regression test suite fails with the following error:

  ======================================================================
  FAIL: test_get_script_header_jython_workaround (setuptools.tests.test_resources.ScriptHeaderTests)
  ----------------------------------------------------------------------
  Traceback (most recent call last):
    File "/tmp/nix-build-0zz04maf217x7a6fq18ccmx5s1mrijlr-setuptools-0.6c11.drv-0/setuptools-0.6c11/setuptools/tests/test_resources.py", line 524, in test_get_script_header_jython_workaround
      self.assert_('Unable to adapt shebang line' in sys.stdout.getvalue())
  AssertionError: False is not True

I'm not sure yet what the problem is.

svn path=/nixpkgs/trunk/; revision=23193
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33f1242ad47b6..9f95fae2dd42e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3955,7 +3955,7 @@ let
   buildPython27Package = import ../development/python-modules/generic {
     inherit makeWrapper lib;
     python = python27;
-    setuptools = setuptools.override { python = python27; };
+    setuptools = setuptools.override { python = python27; doCheck = false; };
   };
 
   pythonPackages = python26Packages;
-- 
cgit 1.4.1


From 9670fca780f0b9f6123f199b3867f0bf2c55e275 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Aug 2010 17:03:35 +0000
Subject: Added "python-$version-wrapper" expression.

The python wrapper expression expects a list of Python modules, $extraLibs,
which are added to $PYTHONPATH before executing the actual Python interpreter.

svn path=/nixpkgs/trunk/; revision=23194
---
 pkgs/development/interpreters/python/2.4/default.nix | 16 +++++++++-------
 pkgs/development/interpreters/python/2.5/default.nix | 12 +++++++-----
 pkgs/development/interpreters/python/2.6/default.nix |  1 +
 pkgs/development/interpreters/python/2.7/default.nix |  1 +
 pkgs/development/interpreters/python/3.1/default.nix |  1 +
 pkgs/development/interpreters/python/wrapper.nix     | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix                      |  2 ++
 7 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/wrapper.nix

(limited to 'pkgs')

diff --git a/pkgs/development/interpreters/python/2.4/default.nix b/pkgs/development/interpreters/python/2.4/default.nix
index f83b69e71e4fa..f9673cc68d9e1 100644
--- a/pkgs/development/interpreters/python/2.4/default.nix
+++ b/pkgs/development/interpreters/python/2.4/default.nix
@@ -8,14 +8,16 @@ let
 
   buildInputs =
     optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
-    [bzip2] ++ 
+    [bzip2] ++
     optional zlibSupport zlib;
 
 in
 
 stdenv.mkDerivation {
   name = "python-2.4.6";
-  
+  majorVersion = "2.4";
+  version = "2.4.6";
+
   src = fetchurl {
     url = http://www.python.org/ftp/python/2.4.6/Python-2.4.6.tar.bz2;
     sha256 = "021y88a4ki07dgq19yhg6zfvmncfiz7h5b2255438i9zmlwl246s";
@@ -25,22 +27,22 @@ stdenv.mkDerivation {
     # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
     ./search-path.patch
   ];
-  
+
   inherit buildInputs;
   C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
   LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
-  
+
   configureFlags = "--enable-shared";
-  
+
   preConfigure = ''
     # Purity.
-    for i in /usr /sw /opt /pkg; do 
+    for i in /usr /sw /opt /pkg; do
       substituteInPlace ./setup.py --replace $i /no-such-path
     done
   '';
 
   setupHook = ./setup-hook.sh;
-  
+
   postInstall = ''
     rm -rf $out/lib/python2.4/test
   '';
diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix
index 33aa66d765d2d..d1cb7703b9f9a 100644
--- a/pkgs/development/interpreters/python/2.5/default.nix
+++ b/pkgs/development/interpreters/python/2.5/default.nix
@@ -39,7 +39,9 @@ in
 
 stdenv.mkDerivation ( {
   name = "python-2.5.4";
-  
+  majorVersion = "2.5";
+  version = "2.5.4";
+
   src = fetchurl {
     url = http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tar.bz2;
     sha256 = "0401g346ixng1im6gp11rgkfhx3v05qrpn5qjfx26mgy5dm8k3dw";
@@ -49,15 +51,15 @@ stdenv.mkDerivation ( {
     # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
     ./search-path.patch
   ];
-  
+
   inherit buildInputs;
   C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
   LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
   configureFlags = "--enable-shared --with-wctype-functions";
-  
+
   preConfigure = ''
     # Purity.
-    for i in /usr /sw /opt /pkg; do 
+    for i in /usr /sw /opt /pkg; do
       substituteInPlace ./setup.py --replace $i /no-such-path
     done
   '' + (if readline != null then ''
@@ -65,7 +67,7 @@ stdenv.mkDerivation ( {
   '' else "");
 
   setupHook = ./setup-hook.sh;
-  
+
   postInstall = ''
     rm -rf $out/lib/python2.5/test
   '';
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 3fd035b09bb82..53428de33f45d 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -47,6 +47,7 @@ in
 
 stdenv.mkDerivation ( {
   name = "python-${version}";
+  inherit majorVersion version;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 44579dd717fe2..1b828cd516066 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -47,6 +47,7 @@ in
 
 stdenv.mkDerivation ( {
   name = "python-${version}";
+  inherit majorVersion version;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
diff --git a/pkgs/development/interpreters/python/3.1/default.nix b/pkgs/development/interpreters/python/3.1/default.nix
index 963a4aec26c5b..6cfafe2c8992d 100644
--- a/pkgs/development/interpreters/python/3.1/default.nix
+++ b/pkgs/development/interpreters/python/3.1/default.nix
@@ -49,6 +49,7 @@ in
 
 stdenv.mkDerivation ( {
   name = "python3-${version}";
+  inherit majorVersion version;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
new file mode 100644
index 0000000000000..9002fc0ea1afc
--- /dev/null
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -0,0 +1,19 @@
+{stdenv, python, makeWrapper, extraLibs ? []}:
+
+stdenv.mkDerivation {
+  name = "python-${python.version}-wrapper";
+
+  propagatedBuildInputs = [python makeWrapper] ++ extraLibs;
+
+  unpackPhase = "true";
+  installPhase = ''
+    ensureDir "$out/bin"
+    declare -p
+    for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do
+      makeWrapper "$python/bin/$prg" "$out/bin/$prg" --set PYTHONPATH "$PYTHONPATH"
+    done
+  '';
+
+  inherit python;
+  inherit (python) meta;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f95fae2dd42e..895d321af7923 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2081,6 +2081,8 @@ let
   pythonBase = python26Base;
   pythonFull = python26Full;
 
+  pythonWrapper = callPackage ../development/interpreters/python/wrapper.nix { };
+
   python24 = callPackage ../development/interpreters/python/2.4 { };
 
   python25Base = makeOverridable (import ../development/interpreters/python/2.5) {
-- 
cgit 1.4.1


From 501117b1c5ee4c9702b3a2c0b6c2ece6d5c6eb24 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 16 Aug 2010 20:37:18 +0000
Subject: Rewrite builsystem fixes in upstream-supported manner

svn path=/nixpkgs/trunk/; revision=23195
---
 pkgs/desktops/kde-4.5/utils/default.nix      | 14 ++++++--------
 pkgs/desktops/kde-4.5/utils/log-feature.diff | 10 ++++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/utils/log-feature.diff

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/utils/default.nix b/pkgs/desktops/kde-4.5/utils/default.nix
index 250090b5892c1..fb038179dafc2 100644
--- a/pkgs/desktops/kde-4.5/utils/default.nix
+++ b/pkgs/desktops/kde-4.5/utils/default.nix
@@ -1,30 +1,28 @@
 { kdePackage, cmake, qt4, perl, gmp, python, libzip, libarchive, xz
 , sip, pyqt4, pycups, rhpl, system_config_printer, qjson, shared_mime_info
+, kdebase_workspace
 , kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, qimageblitz, qca2}:
 
 kdePackage {
   pn = "kdeutils";
   v = "4.5.0";
   
-  inherit system_config_printer;
-  preConfigure = ''
+  postPatch = ''
+    cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules
     sed -e "s@/usr\(/share/system-config-printer\)@${system_config_printer}\1@" -i \
       printer-applet/cmake-modules/FindSystemConfigPrinter.py \
       printer-applet/printer-applet.py
     sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" printer-applet/cmake-modules/FindSystemConfigPrinter.py
     '';
 
-  cmakeFlags = "-DCMAKE_MODULE_PATH=${qjson}/share/apps/cmake/modules";
-  patches = [ ./cmake-module-path.diff ];
-  
   buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4
     pycups rhpl system_config_printer kdelibs kdepimlibs kdebase kdebindings
-    automoc4 qimageblitz qca2 qjson shared_mime_info ];
+    automoc4 qimageblitz qca2 qjson shared_mime_info kdebase_workspace ];
+
+  patches = [ ./log-feature.diff ];
                   
   meta = {
     description = "KDE Utilities";
     license = "GPL";
-    homepage = http://www.kde.org;
-    inherit (kdelibs.meta) maintainers platforms;
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/log-feature.diff b/pkgs/desktops/kde-4.5/utils/log-feature.diff
new file mode 100644
index 0000000000000..050f06fd3977e
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/log-feature.diff
@@ -0,0 +1,10 @@
+--- kdeutils-4.5.0.orig/CMakeLists.txt.orig	2010-08-16 18:21:33.000000000 +0400
++++ kdeutils-4.5.0/CMakeLists.txt	2010-08-16 18:27:05.000000000 +0400
+@@ -36,6 +36,7 @@
+ endif( GMP_FOUND )
+ if( UNIX )
+     find_package( KDE4Workspace )
++    macro_log_feature( KDE4Workspace_FOUND "KDE4Workspace" "KDE workscpace library, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Required to build kremotecontrol." )
+     if( KDE4Workspace_FOUND AND QT_QTXMLPATTERNS_FOUND )
+         macro_optional_add_subdirectory( kremotecontrol )
+     endif( KDE4Workspace_FOUND AND QT_QTXMLPATTERNS_FOUND )
-- 
cgit 1.4.1


From ee967575e681f6371d11f308c69c44c7e924a937 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 17 Aug 2010 09:57:03 +0000
Subject: Add kdetoys-4.5.0

svn path=/nixpkgs/trunk/; revision=23198
---
 pkgs/desktops/kde-4.5/default.nix      |  2 ++
 pkgs/desktops/kde-4.5/toys/default.nix | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/toys/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 2a48df7f7d897..027ba6f0fba19 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -51,6 +51,8 @@
 
   kdemultimedia = callPackage ./multimedia { };
 
+  kdetoys = callPackage ./toys { };
+
   kdeartwork = callPackage ./artwork { };
 
 ### DEVELOPMENT
diff --git a/pkgs/desktops/kde-4.5/toys/default.nix b/pkgs/desktops/kde-4.5/toys/default.nix
new file mode 100644
index 0000000000000..1798660053643
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/toys/default.nix
@@ -0,0 +1,12 @@
+{kdePackage, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4}:
+
+kdePackage {
+  pn = "kdetoys";
+  v = "4.5.0";
+
+  buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 ];
+  meta = {
+    description = "KDE Toys";
+    license = "GPL";
+  };
+}
-- 
cgit 1.4.1


From f01ceffb9ed027993c7eb4fcf4e1b109767e5f09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Aug 2010 10:17:32 +0000
Subject: pkgs/development/interpreters/python/wrapper.nix: clean up debug code

svn path=/nixpkgs/trunk/; revision=23200
---
 pkgs/development/interpreters/python/wrapper.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 9002fc0ea1afc..6f29f79e2c168 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -8,9 +8,8 @@ stdenv.mkDerivation {
   unpackPhase = "true";
   installPhase = ''
     ensureDir "$out/bin"
-    declare -p
     for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do
-      makeWrapper "$python/bin/$prg" "$out/bin/$prg" --set PYTHONPATH "$PYTHONPATH"
+      makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH"
     done
   '';
 
-- 
cgit 1.4.1


From 7b00a8c39fb22e0f0c837edf853bf9eb380c4902 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Aug 2010 10:18:17 +0000
Subject: pkgs/development/python-modules/pygtk: move installed python code
 down one directory hierarchy so that $PYTHONPATH can be guessed

svn path=/nixpkgs/trunk/; revision=23201
---
 pkgs/development/python-modules/pygtk/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index 3dc37ebe2f081..d4dd123709419 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.16/pygtk-2.16.0.tar.bz2;
     sha256 = "1a24fkxslir8zb800hs4ix9iyvgqsy5c6hdfirrh2yi1mw0mxbkz";
   };
-  
+
   buildInputs = [python pkgconfig glib gtk]
     ++ (if libglade != null then [libglade] else [])
   ;
@@ -18,5 +18,15 @@ stdenv.mkDerivation {
   postInstall = ''
     rm $out/bin/pygtk-codegen-2.0
     ln -s ${pygobject}/bin/pygobject-codegen-2.0  $out/bin/pygtk-codegen-2.0
+
+    # All python code is installed into a "gtk-2.0" sub-directory. That
+    # sub-directory may be useful on systems which share several library
+    # versions in the same prefix, i.e. /usr/local, but on Nix that directory
+    # is useless. Furthermore, its existence makes it very hard to guess a
+    # proper $PYTHONPATH that allows "import gtk" to succeed.
+    cd $(toPythonPath $out)/gtk-2.0
+    for n in *; do
+      ln -s "gtk-2.0/$n" "../$n"
+    done
   '';
 }
-- 
cgit 1.4.1


From f99f1bc055a17812dcb94caf761af03a08a6a0d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Aug 2010 10:19:48 +0000
Subject: pkgs/top-level/all-packages.nix: lower priority of the various python
 versions to give preference to pythonWrapper

svn path=/nixpkgs/trunk/; revision=23202
---
 pkgs/top-level/all-packages.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 895d321af7923..186c791385b5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2083,11 +2083,11 @@ let
 
   pythonWrapper = callPackage ../development/interpreters/python/wrapper.nix { };
 
-  python24 = callPackage ../development/interpreters/python/2.4 { };
+  python24 = lowPrio (callPackage ../development/interpreters/python/2.4 { });
 
-  python25Base = makeOverridable (import ../development/interpreters/python/2.5) {
+  python25Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.5) {
     inherit fetchurl stdenv zlib bzip2 gdbm;
-  };
+  });
 
   python25Full = lowPrio (python25Base.override {
     # FIXME: We lack ncurses support, needed, e.g., for `gpsd'.
@@ -2102,11 +2102,11 @@ let
     ncurses = if getConfig ["python" "curses"] true then ncurses else null;
   });
 
-  python26Base = makeOverridable (import ../development/interpreters/python/2.6) {
+  python26Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.6) {
     inherit fetchurl stdenv zlib bzip2 gdbm;
     arch = if stdenv.isDarwin then darwinArchUtility else null;
     sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
-  };
+  });
 
   python26Full = lowPrio (python26Base.override {
     # FIXME: We lack ncurses support, needed, e.g., for `gpsd'.
@@ -2127,10 +2127,10 @@ let
     sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
   });
 
-  python27Full = python27Base.override {
+  python27Full = lowPrio (python27Base.override {
     inherit db4 sqlite readline openssl tcl tk ncurses;
     inherit (xlibs) libX11 xproto;
-  };
+  });
 
   python31Base = lowPrio (makeOverridable (import ../development/interpreters/python/3.1) {
     inherit fetchurl stdenv zlib bzip2 gdbm;
-- 
cgit 1.4.1


From ed5011cc02053fd4b2adeb831f658ca0cd046944 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Aug 2010 11:35:49 +0000
Subject: * Make sure that in an override like:

    python = pkgs.python27Full;
    pythonBase = pkgs.python27Base;

  a build of (say) Firefox doesn't depend on python26 as well as
  python27.  This happens because python27Full has this line:

    inherit (xlibs) libX11 xproto;

  which causes python27Full to use libX11 from pkgsOrig, where the
  override hasn't been applied.  The solution is to change it to

    inherit (pkgs.xlibs) libX11 xproto;

  In the future, to prevent this, we should make all-packages.nix a
  non-rec set and require all package references to explicitly go
  through pkgs.<attr>.  (Then we can also drop the ugly __overrides
  language "feature".)

svn path=/nixpkgs/trunk/; revision=23203
---
 pkgs/top-level/all-packages.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 186c791385b5c..b9c9067a742ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -97,10 +97,10 @@ let
   # otherwise the basic overrided packages will not be built with the
   # crossStdenv adapter.
   overrides = (getConfig ["packageOverrides"] (pkgs: {})) pkgsOrig //
-    (if (pkgsOrig.stdenv ? overrides && crossSystem == null)
-    then pkgsOrig.stdenv.overrides else { });
+    (if pkgsOrig.stdenv ? overrides && crossSystem == null
+     then pkgsOrig.stdenv.overrides else { });
 
-  pkgsOrig = pkgsFun {}; # the un-overriden packages, passed to packageOverrides
+  pkgsOrig = pkgsFun { }; # the un-overriden packages, passed to packageOverrides
   pkgs = pkgsFun overrides; # the overriden, final packages
 
 
@@ -2122,18 +2122,18 @@ let
   });
 
   python27Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.7) {
-    inherit fetchurl stdenv zlib bzip2 gdbm;
+    inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
     arch = if stdenv.isDarwin then darwinArchUtility else null;
     sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
   });
 
   python27Full = lowPrio (python27Base.override {
-    inherit db4 sqlite readline openssl tcl tk ncurses;
-    inherit (xlibs) libX11 xproto;
+    inherit (pkgs) db4 sqlite readline openssl tcl tk ncurses;
+    inherit (pkgs.xlibs) libX11 xproto;
   });
 
   python31Base = lowPrio (makeOverridable (import ../development/interpreters/python/3.1) {
-    inherit fetchurl stdenv zlib bzip2 gdbm;
+    inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
     arch = if stdenv.isDarwin then darwinArchUtility else null;
     sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
   });
@@ -4201,11 +4201,11 @@ let
       xkeyboard_config dbus hal libuuid openssl gperf m4
       automake autoconf libtool xmlto asciidoc udev;
 
-    # !!! pythonBase is use instead of python because this cause an infinite
-    # !!! recursion when the flag python.full is set to true.  Packages
-    # !!! contained in the loop are python, tk, xlibs-wrapper, libX11,
-    # !!! libxcd (and xcb-proto).
-    python =  pythonBase;
+    # !!! pythonBase is used instead of python because this causes an
+    # infinite recursion when the flag python.full is set to true.
+    # Packages contained in the loop are python, tk, xlibs-wrapper,
+    # libX11, libxcd (and xcb-proto).
+    python = pythonBase;
   });
 
   xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };
-- 
cgit 1.4.1


From 4cbec5ca20bc10046314fd6bb1f804b0733131cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Aug 2010 13:13:34 +0000
Subject: * Latest Flash player.

svn path=/nixpkgs/trunk/; revision=23204
---
 .../networking/browsers/mozilla-plugins/flashplayer-10/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
index e0f4b632c76cc..0f89522325bd8 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -51,9 +51,9 @@ let
         url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_debug_linux_121709.tar.gz;
         sha256 = "162cnzn8sfdvr8mwyggsxi2bcl7zzi1nrl61bw481hhhpwnrjdx4";
       } else {
-        version = "10.1.53.64";
+        version = "10.1.82.76";
         url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-        sha256 = "1598vn4dd96cp1nv225vvjpna70ydkd8lcyfm88gnpzkwx2scz1b";
+        sha256 = "c6f8831ce648e7fa8e037f1fa8362d2d998cae0e06490e792bcd5871f3eb936a";
       }
     else throw "flashplayer is not supported on this platform";
 
-- 
cgit 1.4.1


From f5f32a5b4b2d199ee372e28f0b1debc36b90b699 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Aug 2010 15:21:42 +0000
Subject: * Nix 0.16.

svn path=/nixpkgs/trunk/; revision=23208
---
 pkgs/tools/package-management/nix/default.nix | 32 ++++++++++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 3138c0954e662..c75fa1ed60cda 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,33 +1,43 @@
-{ stdenv, fetchurl, aterm, perl, curl, bzip2, openssl ? null
+{ stdenv, fetchurl, perl, curl, bzip2, openssl ? null
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.15";
-  
+  name = "nix-0.16";
+
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/326788/download/4/${name}.tar.bz2";
-    sha256 = "2d125e75dba387075a8bd443926d7fc6752e54cc9a21c2ef32e44fffc445a8ce";
+    url = "http://nixos.org/releases/nix/${name}/build/565033/download/4/${name}.tar.bz2";
+    sha256 = "0648ed285f263a2cc5a704c4aee70ec5f0415c3749f540c2691a2a613492c7c3";
   };
 
-  buildInputs = [ perl curl openssl ];
+  buildNativeInputs = [ perl ];
+  buildInputs = [ curl openssl ];
 
   configureFlags =
     ''
       --with-store-dir=${storeDir} --localstatedir=${stateDir}
-      --with-aterm=${aterm} --with-bzip2=${bzip2}
-      ${stdenv.lib.optionalString (openssl != null) "--with-openssl=${openssl}"}
+      --with-bzip2=${bzip2}
       --disable-init-state
+      CFLAGS=-O3 CXXFLAGS=-O3
     '';
 
-  doCheck = true;
+  crossAttrs = {
+    configureFlags =
+      ''
+        --with-store-dir=${storeDir} --localstatedir=${stateDir}
+        --with-bzip2=${bzip2.hostDrv}
+        --disable-init-state
+        CFLAGS=-O3 CXXFLAGS=-O3
+      '';
+    doCheck = false;
+  };
 
-  passthru = { inherit aterm; };
+  doCheck = true;
 
   meta = {
     description = "The Nix Deployment System";
     homepage = http://nixos.org/;
-    license = "LGPL";
+    license = "LGPLv2+";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9c9067a742ea..f92c7d9fd9c8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6853,7 +6853,7 @@ let
 
   mess = callPackage ../misc/emulators/mess { };
 
-  nix = nixUnstable;
+  nix = nixStable;
 
   nixStable = callPackage ../tools/package-management/nix {
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
-- 
cgit 1.4.1


From 1b13b33e8d0615ea54e4e22f44c38ecb11bbecc4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Aug 2010 15:46:06 +0000
Subject: pkgs/development/libraries/boost: updated to boost 1.44.0

Support paralllel building (if enabled by the user via --build-cores).

svn path=/nixpkgs/trunk/; revision=23210
---
 pkgs/development/libraries/boost/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index a549b5181ae7e..fdccb83dd97d3 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -33,7 +33,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "boost-1.43.0";
+  name = "boost-1.44.0";
 
   meta = {
     homepage = "http://boost.org/";
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_43_0.tar.bz2";
-    sha256 = "0831h19ph65r2rai6ipk5c2bx04af8q423mzr89fh454385i0krl";
+    url = "mirror://sourceforge/boost/boost_1_44_0.tar.bz2";
+    sha256 = "1nvq36mvzr1fr85q0jh86rk3bk65s1y55jgqgzfg3lcpkl12ihs5";
   };
 
   buildInputs = [icu expat zlib bzip2 python];
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
   configureScript = "./bootstrap.sh";
   configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
 
-  buildPhase = "./bjam -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
+  buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
 
   installPhase = ":";
 }
-- 
cgit 1.4.1


From 19465458527f5a7b3502f0fdc389816e5812206e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 17 Aug 2010 16:37:14 +0000
Subject: Update WebKit

svn path=/nixpkgs/trunk/; revision=23211
---
 pkgs/development/libraries/webkit/src-for-default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 75540ba9331af..dc9371cbe687e 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="r65222";
-   name="webkit-r65222";
-   hash="1s6pg0f03iazkn5jp6qj58k92cazfzmpxibav2nca2n6xk8a0jxw";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65222.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65222.tar.bz2";
+   version="r65398";
+   name="webkit-r65398";
+   hash="0y9pfhff1nyc818li8lqdkq906yi1r9n9zzmgymx8zpqxg8kcmk8";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65398.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65398.tar.bz2";
   
   
 }
-- 
cgit 1.4.1


From fc9f451cadb6e546f4c13407f1855b2cd2e1b6fb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 17 Aug 2010 16:51:12 +0000
Subject: Fix bootstrap calls

svn path=/nixpkgs/trunk/; revision=23212
---
 pkgs/build-support/builder-defs/builder-defs.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index 3ef0c862964b2..c82a954a73af2 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -34,6 +34,9 @@ let inherit (builtins) head tail trace; in
                 else if (hasSuffixHack ".bz2" s) then "plain-bz2"
                 else if (hasSuffixHack ".gz" s) then "plain-gz"
 
+		# For bootstrap calls
+		else if (s ==("" + (substring 0 0 s))) then "empty"
+
                 else (abort "unknown archive type : ${s}"));
 
         # changing this ? see [1]
@@ -241,6 +244,8 @@ let inherit (builtins) head tail trace; in
                 NAME=\$(basename ${s} .gz)
                 gzip -d <${s} > \$PWD/\$(basename ${s} .gz)/\${NAME#*-}
                 cd \$(basename ${s} .gz)
+        " else if (archiveType s) == "empty" then "
+	        echo No source to unpack - doing nothing ..
         " else (abort "unknown archive type : ${s}"))+
                 # goSrcDir is typically something like "cd mysubdir" .. but can be anything else 
                 (if args ? goSrcDir then args.goSrcDir else "")
-- 
cgit 1.4.1


From 4b4ab6551c10ef6c705739c96488318e21d4954d Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 17 Aug 2010 16:53:34 +0000
Subject: Improve os-specific/linux/blcr.  Fix a problem with shared objects

svn path=/nixpkgs/trunk/; revision=23213
---
 pkgs/os-specific/linux/blcr/0.8.2.nix   |  51 ------
 pkgs/os-specific/linux/blcr/default.nix |  55 ++++++
 pkgs/os-specific/linux/blcr/fixes.patch | 304 --------------------------------
 pkgs/top-level/all-packages.nix         |   4 +-
 4 files changed, 57 insertions(+), 357 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/blcr/0.8.2.nix
 create mode 100644 pkgs/os-specific/linux/blcr/default.nix
 delete mode 100644 pkgs/os-specific/linux/blcr/fixes.patch

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/blcr/0.8.2.nix b/pkgs/os-specific/linux/blcr/0.8.2.nix
deleted file mode 100644
index d5d715c223c87..0000000000000
--- a/pkgs/os-specific/linux/blcr/0.8.2.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchurl, kernel, perl, makeWrapper, autoconf, automake, libtool }:
-
-assert stdenv.isLinux;
-
-let
-  version = "0.8.2";
-  website = https://ftg.lbl.gov/CheckpointRestart;
-in
-
-stdenv.mkDerivation {
-  name = "blcr-${version}-${kernel.version}";
-
-  src = fetchurl {
-    url = "${website}/downloads/blcr-${version}.tar.gz";
-    sha256 = "1ldvzrajljkm318z5ix1p27n0gmv7gqxij6ck7p5fz4ncdbb01x8";
-  };
-
-  patches = [ ./fixes.patch ];
-
-  buildInputs = [ perl makeWrapper autoconf automake libtool ];
-
-  # this gives "configure: error: unrecognized option: `-d'"
-  /*
-  configureFlags = [
-    "--with-linux=$(ls -d ${kernel}/lib/modules/ * /build)"
-    "--with-kmod-dir=$out/lib/modules/$(cd ${kernel}/lib/modules; ls -d 2.6.*)" 
-    "--with-system-map=${kernel}/System.map"
-  ];
-  */
-
-  configurePhase = ''
-    autoreconf
-    ./configure --prefix=$out \
-    --with-linux=$(ls -d ${kernel}/lib/modules/*/build) \
-    --with-kmod-dir=$out/lib/modules/$(cd ${kernel}/lib/modules; ls -d 2.6.*) \
-    --with-system-map=${kernel}/System.map
-  '';
-
-  postInstall = ''
-    for prog in "$out/bin/"*
-    do
-      wrapProgram "$prog" --prefix LD_LIBRARY_PATH ":" "$out/lib"
-    done
-  '';
-      
-  meta = {
-    description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)";
-    homepage = website;
-    license = "GPL2";
-  };
-}
diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
new file mode 100644
index 0000000000000..fb0db8e671c1f
--- /dev/null
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, kernel, perl, makeWrapper, autoconf, automake, libtool }:
+
+assert stdenv.isLinux;
+
+let
+  version = "0.8.2";
+  website = https://ftg.lbl.gov/CheckpointRestart;
+in
+
+stdenv.mkDerivation {
+  name = "blcr-${version}-${kernel.version}";
+
+  src = fetchurl {
+    url = "${website}/downloads/blcr-${version}.tar.gz";
+    sha256 = "1ldvzrajljkm318z5ix1p27n0gmv7gqxij6ck7p5fz4ncdbb01x8";
+  };
+  
+  patchFlags = "-p0";
+
+  patches = map fetchurl [
+    { url = http://upc-bugs.lbl.gov/blcr-dist/blcr-0.8.2+kernel-2.6.31.patch01;
+      sha256 = "0jnz18kbrm64hahvhk35zakcpylad1khsp5kjxkj19j0lkjv3m4h";
+    }
+    { url = http://upc-bugs.lbl.gov/blcr-dist/blcr-0.8.2+kernel-2.6.32.patch02;
+      sha256 = "1f5s9c7iiaxd67ki3bmz09mf66shzbl97hvwaq4nmk6miq94k1fw";
+    }
+    { url = http://upc-bugs.lbl.gov/blcr-dist/blcr-0.8.2+kernel-2.6.34.patch03;
+      sha256 = "09924h83xdwpxjlx3yg5b51fgm6gjywn2rb4nnygz16n87wqvb41";
+    }
+  ];
+
+  buildInputs = [ perl makeWrapper autoconf automake libtool ];
+
+  preConfigure = ''
+    ./autogen.sh
+    configureFlagsArray=(
+      --with-linux=$(ls -d ${kernel}/lib/modules/*/build)
+      --with-kmod-dir=$out/lib/modules/$(cd ${kernel}/lib/modules; ls -d 2.6.*)
+      --with-system-map=${kernel}/System.map
+    )
+  '';
+
+  postInstall = ''
+    for prog in "$out/bin/"*
+    do
+      wrapProgram "$prog" --prefix LD_LIBRARY_PATH ":" "$out/lib"
+    done
+  '';
+      
+  meta = {
+    description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)";
+    homepage = website;
+    license = "GPL2";
+  };
+}
diff --git a/pkgs/os-specific/linux/blcr/fixes.patch b/pkgs/os-specific/linux/blcr/fixes.patch
deleted file mode 100644
index 879352d83254c..0000000000000
--- a/pkgs/os-specific/linux/blcr/fixes.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/acinclude.m4 blcr-0.8.2/acinclude.m4
---- blcr-0.8.2-orig/acinclude.m4	2009-06-12 22:37:01.000000000 +0200
-+++ blcr-0.8.2/acinclude.m4	2010-07-29 21:18:29.000000000 +0200
-@@ -953,8 +953,9 @@
- # When complete sets LINUX_SYMTAB_CMD such that
- # "eval $LINUX_SYMTAB_CMD" will produce a System.map on stdout.
- cr_stripped_maps=''
-+m4_define([cr_ksymtab_patt],[[-e '[TD] sys_open' -e '[AB] _end']])
- AC_DEFUN([_CR_CHECK_SYSTEM_MAP],[
--  if test -n "$1" -a -r "$1" && grep ' [[AB]] _end' <"$1" >/dev/null 2>/dev/null; then
-+  if test -n "$1" -a -r "$1" && grep cr_ksymtab_patt <"$1" >/dev/null 2>/dev/null; then
-     if grep -B1 '[[AB]] _end' <"$1" | grep _stext >/dev/null 2>/dev/null; then
-       # Reject "stripped" files (such as in FC2)
-       # Recognized (poorly) by _stext and _end as last two entries.
-@@ -968,7 +969,7 @@
- ])
- AC_DEFUN([_CR_CHECK_VMLINUX],[
-   AC_REQUIRE([AC_PROG_NM])
--  if test -n "$1" -a -r "$1" && ($NM "$1" | grep ' [[AB]] _end') >/dev/null 2>/dev/null; then
-+  if test -n "$1" -a -r "$1" && ($NM "$1" | grep cr_ksymtab_patt) >/dev/null 2>/dev/null; then
-     LINUX_VMLINUX="$1"
-     LINUX_SYMTAB_FILE="$1"
-     LINUX_SYMTAB_CMD="$NM $1 2>/dev/null"
-diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/blcr_imports/module.c blcr-0.8.2/blcr_imports/module.c
---- blcr-0.8.2-orig/blcr_imports/module.c	2008-05-13 08:06:19.000000000 +0200
-+++ blcr-0.8.2/blcr_imports/module.c	2010-07-29 21:18:29.000000000 +0200
-@@ -81,7 +81,13 @@
- 
- 	/* Check current kernel against System.map used at configure time */
- 	{
-+#if defined(CR_EXPORTED_KCODE_register_chrdev)
- 	    unsigned long offset1 = CR_EXPORTED_KCODE_register_chrdev - (unsigned long)&register_chrdev;
-+#elif defined(CR_EXPORTED_KCODE___register_chrdev)
-+	    unsigned long offset1 = CR_EXPORTED_KCODE___register_chrdev - (unsigned long)&__register_chrdev;
-+#else
-+	    #error "No register_chrdev symbol for validation of System.map"
-+#endif
- 	    unsigned long offset2 = CR_EXPORTED_KCODE_register_blkdev - (unsigned long)&register_blkdev;
- 	    if (
- #if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PHYSICAL_ALIGN)
-diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/config/kbuild.mak.in blcr-0.8.2/config/kbuild.mak.in
---- blcr-0.8.2-orig/config/kbuild.mak.in	2008-08-04 20:39:29.000000000 +0200
-+++ blcr-0.8.2/config/kbuild.mak.in	2010-07-29 21:18:29.000000000 +0200
-@@ -1,7 +1,7 @@
- # Here are the configuration bits needed in the "caller" to use this file
- #SUBDIR = vmadump4
- #TARGET = vmadump
--#SOURCES = vmadump_common.c vmadump_@CR_ARCH@.c optional.h
-+#SOURCES = vmadump_common.c vmadump_@CR_KARCH@.c optional.h
- #[optional]EXTRA_CFLAGS = -I$(top_builddir)/include -I$(top_builddir) -I$(srcdir)
- #[optional]IMPORTS_FROM = /some/other/kbuild/module/dir /and/another
- #
-@@ -26,7 +26,7 @@
- # Remove headers from the list of sources, and sort to remove possible duplicates
- DOT_C := $(sort $(filter %.c,$(SOURCES)))
- 
--ifeq ($(TOPDIR),)
-+ifeq ($(srctree),)
- # not within KBUILD - implement automake's standard goals
- 
- all: $(LINUX_OBJ)/.config prepare
-diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/configure.ac blcr-0.8.2/configure.ac
---- blcr-0.8.2-orig/configure.ac	2009-06-16 00:33:56.000000000 +0200
-+++ blcr-0.8.2/configure.ac	2010-07-29 21:18:29.000000000 +0200
-@@ -123,6 +123,8 @@
- AC_CONFIG_AUX_DIR(./config)
- AM_INIT_AUTOMAKE([foreign no-exeext std-options])
- 
-+AM_MAINTAINER_MODE([enable])
-+
- ################################################################################
- # Boilerplate for versions and copyrights in generated files
- ################################################################################
-@@ -454,9 +456,10 @@
- AC_SUBST(CR_CLIENT_LDADD)
- 
- # If building the tests, we can optionally test C++
--if test x"$cr_build_tests" = xyes; then
-+# Note, however, that  bug 2619 reports that we can't call this conditionally.
-+dnl if test x"$cr_build_tests" = xyes; then
-   CR_PROG_CXX
--fi
-+dnl fi
- 
- ################################################################################
- # Check libraries
-@@ -843,6 +846,22 @@
- # Checks for matching (we hope) symbol table
- CR_LINUX_SYMTAB
- 
-+# Set and substitute CR_KARCH to enable i386 userland on x86_64 kernels
-+CR_KARCH=$CR_ARCH
-+if test $CR_ARCH = i386; then
-+       # probe the System.map to find out if we need to change CR_KARCH at all.
-+       # All this does is count the number of *digits* in a hex formatted address
-+       AC_MSG_NOTICE([Testing if KARCH is the same as ARCH])
-+       symlen=`$LINUX_SYMTAB_CMD | head -n1 | sed 's/ .*$//;s/\(.\)/\1\n/g;s/\n$//'|wc -l`
-+       if test $symlen -eq 16; then
-+               AC_MSG_NOTICE([Changing KARCH to x86_64])
-+               CR_KARCH=x86_64
-+       else
-+               AC_MSG_NOTICE([Not touching KARCH])
-+       fi
-+fi
-+AC_SUBST([CR_KARCH], $CR_KARCH)
-+
- ## Check for optional kernel headers...
- CR_CHECK_KERNEL_HEADER([linux/syscalls.h])
- CR_CHECK_KERNEL_HEADER([linux/pspace.h])
-@@ -985,7 +1004,7 @@
- fi
- 
- # put_task_struct() requires one of these:
--CR_FIND_KSYM([__put_task_struct],[CODE])
-+CR_FIND_KSYM([__put_task_struct],[CODE],[extern void __put_task_struct(struct task_struct *);])
- CR_FIND_KSYM([__put_task_struct_cb],[CODE])
- 
- CR_CHECK_KERNEL_MEMBER([mm.task_size],[#include <linux/sched.h>],
-@@ -1025,7 +1044,7 @@
- if test -n "${HAVE_MAP_VSYSCALL}"; then
-   CR_FIND_KSYM([map_vsyscall],[CODE])
- fi
--if test $CR_ARCH = x86_64; then
-+if test $CR_KARCH = x86_64; then
-   CR_FIND_KSYM([syscall32_setup_pages],[CODE],
- 	[extern int syscall32_setup_pages(void *, int);])
- fi
-@@ -1093,7 +1112,7 @@
- CR_FIND_KSYM([do_sigaltstack],[CODE],
- 	[extern int do_sigaltstack(const stack_t *, stack_t *, unsigned long);])
- 
--if test $CR_ARCH = i386 -o $CR_ARCH = x86_64; then
-+if test $CR_KARCH = i386 -o $CR_KARCH = x86_64; then
-   CR_CHECK_KERNEL_TYPE([struct n_desc_struct],[
- 	#include <linux/sched.h>
- 	#include <asm/desc.h>])
-@@ -1144,7 +1163,7 @@
-   fi
- fi
- 
--if test $CR_ARCH = i386; then
-+if test $CR_KARCH = i386; then
-   CR_CHECK_KERNEL_MEMBER([pt_regs.xcs],[#include <asm/ptrace.h>],[struct pt_regs],[int],[xcs])
-   CR_CHECK_KERNEL_MEMBER([pt_regs.xfs],[#include <asm/ptrace.h>],[struct pt_regs],[int],[xfs])
-   CR_CHECK_KERNEL_MEMBER([pt_regs.xgs],[#include <asm/ptrace.h>],[struct pt_regs],[int],[xgs])
-@@ -1230,6 +1249,7 @@
- if test -z "${HAVE_2_ARG_FIND_PID}${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then
-   CR_BAD_KERNEL([unable to determine how to map (type, pid_nr) -> struct task])
- fi
-+CR_FIND_KSYM([find_task_by_pid_ns],[CODE])
- 
- CR_CHECK_KERNEL_CALL([alloc_pid],[#include <linux/sched.h>])
- if test -n "${HAVE_ALLOC_PID}"; then
-@@ -1492,7 +1512,7 @@
- CR_FIND_KSYM([sys_mremap],[CODE],
- 	[extern asmlinkage unsigned long sys_mremap(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr);])
- CR_FIND_KSYM([do_sigaction],[CODE])
--if test $CR_ARCH = x86_64; then
-+if test $CR_KARCH = x86_64; then
-   CR_FIND_KSYM([load_gs_index],[CODE])
- 
-   CR_CHECK_KERNEL_CALL([read_pda],[#include <asm/percpu.h>])
-@@ -1536,7 +1556,10 @@
- # the System.map used to locate symbols and configure time.
- CR_FIND_EXPORTED_KSYM([register_chrdev],[CODE])
- if test "$cr_addr" = "0"; then
--  CR_BAD_KERNEL([kernel does not export register_chrdev])
-+  CR_FIND_EXPORTED_KSYM([__register_chrdev],[CODE])
-+  if test "$cr_addr" = "0"; then
-+    CR_BAD_KERNEL([kernel does not export register_chrdev or __register_chrdev])
-+  fi
- fi
- CR_FIND_EXPORTED_KSYM([register_blkdev],[CODE])
- if test "$cr_addr" = "0"; then
-diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/cr_module/cr_kcompat.h blcr-0.8.2/cr_module/cr_kcompat.h
---- blcr-0.8.2-orig/cr_module/cr_kcompat.h	2009-06-12 22:37:03.000000000 +0200
-+++ blcr-0.8.2/cr_module/cr_kcompat.h	2010-07-29 21:18:29.000000000 +0200
-@@ -274,7 +274,8 @@
- #elif HAVE_2_ARG_FIND_PID
-   #define cr_have_pid(T,P) (find_pid((T),(P)) != NULL)
- #else
--  #error
-+  // XXX: untested!
-+  #define cr_have_pid(T,P) (pid_task(find_vpid(P),(T)) != NULL)
- #endif
- 
- // Process table iterators
-@@ -583,4 +584,9 @@
-   #error "no cr_do_pipe() definition"
- #endif
- 
-+#if !defined(DECLARE_MUTEX)
-+  #define DECLARE_MUTEX(m) DEFINE_SEMAPHORE(m)
-+  #define init_MUTEX(m) sema_init(m, 1)
-+#endif
-+
- #endif /* _CR_KCOMPAT_H */
-diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/cr_module/Makefile.am blcr-0.8.2/cr_module/Makefile.am
---- blcr-0.8.2-orig/cr_module/Makefile.am	2008-09-03 02:29:00.000000000 +0200
-+++ blcr-0.8.2/cr_module/Makefile.am	2010-07-29 21:18:29.000000000 +0200
-@@ -31,13 +31,13 @@
- 
- BPROC_VERSION	= "4.0.0pre8"
- vmadump_dir	= $(top_srcdir)/vmadump4
--vmad_sources	= $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_ARCH@.c
-+vmad_sources	= $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_KARCH@.c
- vmad_include	= -I$(vmadump_dir) -D__NR_vmadump=-1 -DBPROC_VERSION='$(BPROC_VERSION)'
- 
- cr_sources	= $(my_sources) $(vmad_sources)
- INCLUDES =	-I$(top_builddir)/include	\
- 		-I$(top_srcdir)/include		\
--		-I$(srcdir)/arch/@CR_ARCH@	\
-+		-I$(srcdir)/arch/@CR_KARCH@	\
- 		$(vmad_include)
- 
- # echo an arbitrary make/environment variable (needed by kbuild glue)
-diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/include/blcr_ksyms.h blcr-0.8.2/include/blcr_ksyms.h
---- blcr-0.8.2-orig/include/blcr_ksyms.h	2008-12-02 01:17:42.000000000 +0100
-+++ blcr-0.8.2/include/blcr_ksyms.h	2010-07-29 21:18:29.000000000 +0200
-@@ -55,7 +55,11 @@
- 
- #if defined(__i386__) || defined(__x86_64__)
-   #ifdef CONFIG_RELOCATABLE
--    #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE_register_chrdev + register_chrdev)
-+    #ifndef CR_EXPORTED_KCODE___register_chrdev
-+      #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE_register_chrdev + register_chrdev)
-+    #else
-+      #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE___register_chrdev + __register_chrdev)
-+    #endif
-   #else
-     #define _CR_RELOC_KSYM(_addr) _addr
-   #endif
-diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/libcr/arch/arm/cr_atomic.h blcr-0.8.2/libcr/arch/arm/cr_atomic.h
---- blcr-0.8.2-orig/libcr/arch/arm/cr_atomic.h	2008-09-05 05:55:11.000000000 +0200
-+++ blcr-0.8.2/libcr/arch/arm/cr_atomic.h	2010-07-29 21:18:29.000000000 +0200
-@@ -33,6 +33,25 @@
- #ifndef _CR_ATOMIC_H
- #define _CR_ATOMIC_H	1
- 
-+#if defined(__ARM_ARCH_2__) || defined(__ARM_ARCH_3__)
-+  // Sanity-check that we're not building on a really old architecture,
-+  // so that the using #ifdef __ARM_ARCH_4__ works to test for
-+  // lack of blx <register> support.
-+  #error "ARM Architecture versions prior to ARMv4 not supported."
-+#elif defined(__ARM_ARCH_4T__) && defined(__thumb__)
-+  // The inline asm is not compatible with Thumb-1 anyway, but in particular
-+  // we assume later that if __ARM_ARCH_4__ is not defined, we have ARMv5
-+  // or above.  Ensure here that this assumption will be valid.
-+  #error "Building for Thumb on ARMv4 is not supported."
-+#endif
-+
-+// Determine whether to use BLX <register> for function calls to
-+// computed addresses:
-+#undef ARM_HAVE_BLX_REG
-+#if !(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__))
-+  #define ARM_HAVE_BLX_REG 1
-+#endif
-+
- #include "blcr_config.h"
- 
- #ifndef _STRINGIFY
-@@ -61,7 +80,7 @@
-     __asm__ __volatile__("": : :"memory");
- }
- 
--#if defined(CR_KCODE___kuser_cmpxchg)
-+#if 1
- // For kernel >= 2.6.12, we use __kernel_cmpxchg()
- //    See linux-2.6.12/arch/arm/kernel/entry-armv.S
- // For >= ARM6 we could/should be using load-exclusive directly.
-@@ -83,10 +102,15 @@
- 
-     __asm__ __volatile__ (
- 	"0:	ldr	r0, [r2]	@ r0 = *p		\n"
-+	"	add	r1, r0, %2	@ r1 = r0 + op		\n"
- 	"	mov	r3, #" _STRINGIFY(cri_kuser_base) "	\n"
-+#ifdef ARM_HAVE_BLX_REG
-+	"	sub	r3, r3, #" _STRINGIFY(cri_kuser_offset) "\n"
-+	"	blx	r3\n"
-+#else // ARMv4T and below
- 	"	adr	lr, 1f		@ lr = return address	\n"
--	"	add	r1, r0, %2	@ r1 = r0 + op		\n"
- 	"	sub	pc, r3, #" _STRINGIFY(cri_kuser_offset) "\n"
-+#endif
- 	"1:	bcc     0b		@ retry on Carry Clear"
- 	: "=&r" (__sum)
- 	: "r" (__ptr), "rIL" (op)
-@@ -135,9 +159,14 @@
-     __asm__ __volatile__ (
- 	"0:     mov     r0, r4          @ r0 = oldval           \n"
- 	"	mov	r3, #" _STRINGIFY(cri_kuser_base) "	\n"
--	"	mov	lr, pc		@ lr = return addr	\n"
-+#ifdef ARM_HAVE_BLX_REG
-+	"	sub	r3, r3, #" _STRINGIFY(cri_kuser_offset) "\n"
-+	"	blx	r3\n"
-+#else // ARMv4T and below
-+	"	adr	lr, 1f		@ lr = return addr	\n"
- 	"	sub	pc, r3, #" _STRINGIFY(cri_kuser_offset) "\n"
--	"       ldrcc   ip, [r2]        @ if (!swapped) ip=*p   \n"
-+#endif
-+	"1:	ldrcc   ip, [r2]        @ if (!swapped) ip=*p   \n"
- 	"       eorcs   ip, r4, #1      @ else ip=oldval^1      \n"
- 	"       teq     r4, ip          @ if (ip == oldval)     \n"
- 	"       beq     0b              @    then retry           "
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f92c7d9fd9c8f..041d55712f754 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4570,8 +4570,8 @@ let
 
     aufs2_util = callPackage ../os-specific/linux/aufs2-util { };
 
-    blcr = callPackage ../os-specific/linux/blcr/0.8.2.nix {
-      libtool = libtool_1_5; # libtool 2 causes a fork bomb
+    blcr = callPackage ../os-specific/linux/blcr {
+      #libtool = libtool_1_5; # libtool 2 causes a fork bomb
     };
 
     exmap = callPackage ../os-specific/linux/exmap {
-- 
cgit 1.4.1


From 4e0ed004b73cb1641feec25f36ee844abad67696 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 17 Aug 2010 17:00:20 +0000
Subject: Fix some more wrong-on-bootstrap cases

svn path=/nixpkgs/trunk/; revision=23214
---
 pkgs/build-support/builder-defs/builder-defs.nix | 28 +++++++++++++-----------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index c82a954a73af2..55cc30b9fb235 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -434,7 +434,7 @@ let inherit (builtins) head tail trace; in
         realPhaseNames = 
 	  (optional ([] != attrByPath ["neededDirs"] [] args) "createDirs")
 	  ++
-	  args.phaseNames 
+	  (attrByPath ["phaseNames"] [] args)
 	  ++ 
           ["doForceShare" "doPropagate" "doForceCopy"]
 	  ++
@@ -500,18 +500,20 @@ let inherit (builtins) head tail trace; in
         done
    '') ["minInit" "addInputs" "doUnpack"];
 
-   installFonts = fullDepEntry (''
-           ensureDir $out/share/fonts/truetype/public/${args.name}
-           ensureDir $out/share/fonts/opentype/public/${args.name}
-           ensureDir $out/share/fonts/type1/public/${args.name}
-           ensureDir $out/share/texmf/fonts/enc/${args.name}
-           ensureDir $out/share/texmf/fonts/map/${args.name}
-
-        cp *.ttf $out/share/fonts/truetype/public/${args.name} || echo No TrueType fonts
-        cp *.otf $out/share/fonts/opentype/public/${args.name} || echo No OpenType fonts
-           cp *.{pfm,afm,pfb} $out/share/fonts/type1/public/${args.name} || echo No Type1 Fonts
-           cp *.enc $out/share/texmf/fonts/enc/${args.name} || echo No fontenc data
-           cp *.map $out/share/texmf/fonts/map/${args.name} || echo No fontmap data
+   installFonts = 
+      let retrievedName = (if args ? name then args.name else ""); in
+   fullDepEntry (''
+           ensureDir $out/share/fonts/truetype/public/${retrievedName}
+           ensureDir $out/share/fonts/opentype/public/${retrievedName}
+           ensureDir $out/share/fonts/type1/public/${retrievedName}
+           ensureDir $out/share/texmf/fonts/enc/${retrievedName}
+           ensureDir $out/share/texmf/fonts/map/${retrievedName}
+
+        cp *.ttf $out/share/fonts/truetype/public/${retrievedName} || echo No TrueType fonts
+        cp *.otf $out/share/fonts/opentype/public/${retrievedName} || echo No OpenType fonts
+           cp *.{pfm,afm,pfb} $out/share/fonts/type1/public/${retrievedName} || echo No Type1 Fonts
+           cp *.enc $out/share/texmf/fonts/enc/${retrievedName} || echo No fontenc data
+           cp *.map $out/share/texmf/fonts/map/${retrievedName} || echo No fontmap data
    '') ["minInit" "defEnsureDir"];
 
    simplyShare = shareName: fullDepEntry (''
-- 
cgit 1.4.1


From f194a8aa9346c1265a9cf47166743b782febd408 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 17 Aug 2010 20:28:40 +0000
Subject: update to 2.7.3

svn path=/nixpkgs/trunk/; revision=23215
---
 pkgs/applications/networking/instant-messengers/pidgin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index c7c7ec40ccece..9d290224c42ef 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -21,10 +21,10 @@
 } :
 
 stdenv.mkDerivation {
-  name = "pidgin-2.7.2";
+  name = "pidgin-2.7.3";
   src = fetchurl {
-    url = mirror://sourceforge/pidgin/pidgin-2.7.2.tar.bz2;
-    sha256 = "1h3112548rjkz4gycm2yq9wjfp1jcdk30qcgvckpf6c4yckg3dca";
+    url = mirror://sourceforge/pidgin/pidgin-2.7.3.tar.bz2;
+    sha256 = "1wi3wckn3gkbrgx0kk1b690nxj1i4xcp3xn5wrra6gwcgfm8hmwb";
   };
 
   inherit nss ncurses;
-- 
cgit 1.4.1


From 9e2074f1996f787f8099ab102f3fa5558eeb3b49 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 18 Aug 2010 09:55:34 +0000
Subject: remove mvncobertura phase

svn path=/nixpkgs/trunk/; revision=23219
---
 pkgs/build-support/release/maven-build.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index 2fa42dd1b1016..acd74eb194e06 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -17,7 +17,7 @@ in
 
 stdenv.mkDerivation ( rec {
   inherit name src; 
-  phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest mvnCobertura" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase";
+  phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase";
 
   setupPhase = ''
     runHook preSetupPhase
@@ -44,6 +44,16 @@ stdenv.mkDerivation ( rec {
 
   mvnTest = ''
     mvn test ${mvnFlags}
+
+    if [ -d target/site/cobertura ] ; then
+      cp -R target/site/cobertura $out/cobertura
+      echo "report cobertura $out/cobertura" >> $out/nix-support/hydra-build-products
+    fi
+
+    if [ -d target/target/surefire-reports ] ; then
+      cp -R target/target/surefire-reports $out/surefire
+      echo "report surefire $out/surefire" >> $out/nix-support/hydra-build-products
+    fi
   '';  
 
   mvnJavadoc = ''
@@ -52,12 +62,6 @@ stdenv.mkDerivation ( rec {
     echo "report javadoc $out/apidocs" >> $out/nix-support/hydra-build-products
   '';  
 
-  mvnCobertura = ''
-    mvn cobertura:cobertura ${mvnFlags}
-    cp -R target/site/cobertura $out/cobertura
-    echo "report cobertura $out/cobertura" >> $out/nix-support/hydra-build-products
-  '';  
-
   mvnCheckstyle = ''
     mvn checkstyle:checkstyle ${mvnFlags}
     ensureDir $out/checkstyle
-- 
cgit 1.4.1


From b2c12ca3e9e3b2bda9c01cd4d8ed09c33e8763f8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 18 Aug 2010 10:13:48 +0000
Subject: added 'force user = root' to smb.conf to prevent permissions problems
 in vms caused by unknown uids

svn path=/nixpkgs/trunk/; revision=23220
---
 pkgs/build-support/vm/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs')

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index b9882914b266d..0e21483d034ef 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -241,6 +241,7 @@ rec {
         path = /
         read only = no
         guest ok = yes
+        force user = root
       SMB
 
       rm -f ./samba
-- 
cgit 1.4.1


From fa7ec152dbcf682361945235c16ccd56b26fca07 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 18 Aug 2010 11:03:36 +0000
Subject: revert earlier change

svn path=/nixpkgs/trunk/; revision=23222
---
 pkgs/build-support/vm/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 0e21483d034ef..b9882914b266d 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -241,7 +241,6 @@ rec {
         path = /
         read only = no
         guest ok = yes
-        force user = root
       SMB
 
       rm -f ./samba
-- 
cgit 1.4.1


From e7dd6dcc6ac097ccfd74f552a715888e4d56f25c Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 18 Aug 2010 11:48:35 +0000
Subject: wrong location for surefire reports

svn path=/nixpkgs/trunk/; revision=23224
---
 pkgs/build-support/release/maven-build.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index acd74eb194e06..c8753c98fa02c 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -50,8 +50,8 @@ stdenv.mkDerivation ( rec {
       echo "report cobertura $out/cobertura" >> $out/nix-support/hydra-build-products
     fi
 
-    if [ -d target/target/surefire-reports ] ; then
-      cp -R target/target/surefire-reports $out/surefire
+    if [ -d target/surefire-reports ] ; then
+      cp -R target/surefire-reports $out/surefire
       echo "report surefire $out/surefire" >> $out/nix-support/hydra-build-products
     fi
   '';  
-- 
cgit 1.4.1


From 904c8cfa0a2e3f013a194fe86425490a2310fc66 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 18 Aug 2010 14:25:07 +0000
Subject: Castle-Combat: Start fixing; rewrite using `buildPythonPackage'.

svn path=/nixpkgs/trunk/; revision=23225
---
 pkgs/games/castle-combat/default.nix | 59 ++++++++++++++++++------------------
 pkgs/top-level/all-packages.nix      |  2 +-
 pkgs/top-level/release.nix           |  2 +-
 3 files changed, 32 insertions(+), 31 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix
index 29ebb00f1078d..07778363fd544 100644
--- a/pkgs/games/castle-combat/default.nix
+++ b/pkgs/games/castle-combat/default.nix
@@ -1,54 +1,53 @@
-{ fetchurl, stdenv, python, pygame, twisted, numeric, lib, makeWrapper }:
+{ fetchurl, stdenv, buildPythonPackage, pygame, twisted, numeric, makeWrapper }:
 
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
   name = "castle-combat-0.8.1";
+  namePrefix = "";
 
   src = fetchurl {
     url = "mirror://sourceforge/castle-combat/${name}.tar.gz";
     sha256 = "1hp4y5dgj88j9g44h4dqiakrgj8lip1krlrdl2qpffin08agrvik";
   };
 
-  buildInputs = [ python pygame twisted makeWrapper ];
+  buildInputs = [ makeWrapper ];
+  propagatedBuildInputs =
+    [ pygame twisted
+
+      # XXX: `Numeric.pth' should be found by Python but it's not.
+      # Gobolinux has the same problem:
+      # http://bugs.python.org/issue1431 .
+      numeric
+    ];
 
   patchPhase = ''
     sed -i "src/common.py" \
         -e "s|^data_path *=.*$|data_path = \"$out/share/${name}\"|g"
-  '';
 
-  buildPhase =   ''python setup.py build --build-base "$out"'';
-  installPhase = ''
-    python setup.py install --prefix "$out"
+    mv -v "src/"*.py .
+    sed -i "setup.py" -e's/"src"/""/g'
+  '';
 
+  postInstall = ''
     ensureDir "$out/share/${name}"
-    cp -rv data/* "$out/share/${name}"
+    cp -rv "data/"* "$out/share/${name}"
 
-    ${postInstall}
+    mv -v "$out/bin/castle-combat.py" "$out/bin/castle-combat"
   '';
 
-  postInstall = ''
-    mv "$out/bin/castle-combat.py" "$out/bin/castle-combat"
-    wrapProgram "$out/bin/castle-combat" \
-      --prefix PYTHONPATH ":"          \
-      ${lib.concatStringsSep ":"
-         ([ "$out/lib/python2.5/site-packages/src"
-
-            # XXX: `Numeric.pth' should be found by Python but it's not.
-            # Gobolinux has the same problem:
-            # http://bugs.python.org/issue1431 .
-            "${numeric}/lib/python2.5/site-packages/Numeric" ] ++
-          (map (path: path + "/lib/python2.5/site-packages")
-               ([ "${pygame}" "${twisted}" ]
-                ++ twisted.propagatedBuildInputs)))} \
-      \
-      --prefix LD_LIBRARY_PATH ":" \
-               "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib"
+  postPhases = "fixLoaderPath";
 
+  fixLoaderPath =
+    let dollar = "\$"; in
+    '' sed -i "$out/bin/castle-combat" \
+           -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\
+export LD_LIBRARY_PATH=\"$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\""
+    '';
       # ^
       # `--- The run-time says: "libgcc_s.so.1 must be installed for
-      # pthread_cancel to work", which means it need help to find it.
+      # pthread_cancel to work", which means it needs help to find it.
 
-      rm -rf "$out/lib/src"
-  '';
+  # No test suite.
+  doCheck = false;
 
   meta = {
     description = "Castle-Combat, a clone of the old arcade game Rampart";
@@ -64,5 +63,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.linux-games.com/castle-combat/;
 
     license = "unknown";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 041d55712f754..5cad7d29e1037 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6395,7 +6395,7 @@ let
 
   bsdgames = callPackage ../games/bsdgames { };
 
-  castleCombat = callPackage ../games/castle-combat { };
+  castle_combat = callPackage ../games/castle-combat { };
 
   construoBase = callPackage ../games/construo {
     mesa = null;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index dc5d0f387e904..0ebde53ca3968 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -48,7 +48,7 @@ with (import ./release-lib.nix);
   bvi = all;
   bzip2 = all;
   cabextract = all;
-  castleCombat = linux;
+  castle_combat = linux;
   cdrkit = linux;
   chatzilla = linux;
   cksfv = all;
-- 
cgit 1.4.1


From 4a909f0838c82990f7449df078742f0555ec8728 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 18 Aug 2010 14:27:04 +0000
Subject: libcanberra: Remove useless ‘gthread’ argument.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixpkgs/trunk/; revision=23226
---
 pkgs/development/libraries/libcanberra/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index f80ada89e7f81..db2feeecb122c 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libtool, gtk, gthread
+{ stdenv, fetchurl, pkgconfig, libtool, gtk
 , alsaLib, pulseaudio, gstreamer, libvorbis, libcap }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5cad7d29e1037..5934556b9102e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3153,7 +3153,7 @@ let
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra = callPackage ../development/libraries/libcanberra {
-    inherit (gtkLibs) gtk gthread;
+    inherit (gtkLibs) gtk;
     gstreamer = gst_all.gstreamer;
   };
 
-- 
cgit 1.4.1


From be4bd94e3502b2efc5a792bad19ec92311f55189 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 18 Aug 2010 14:45:13 +0000
Subject: ati-drivers: Comment out broken assertion.

svn path=/nixpkgs/trunk/; revision=23227
---
 pkgs/os-specific/linux/ati-drivers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index be5eff7e56e2e..65c42e09039a9 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
   # moved assertions here because the name is evaluated when the NixOS manual is generated
   # Don't make that fail - fail lazily when a users tries to build this derivation only
   dummy =
-    assert xorg.xorgserver.name == "xorg-server-1.7.5";
+    # assert xorg.xorgserver.name == "xorg-server-1.7.5";
     assert stdenv.system == "x86_64-linux"; # i686-linux should work as well - however I didn't test it.
     null;
 
-- 
cgit 1.4.1


From 0b529ff4d7ed63647a46be5c4b185c368fa8eff8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Aug 2010 15:03:34 +0000
Subject: pkgs/development/interpreters/python/2.7: added various meta
 attributes

svn path=/nixpkgs/trunk/; revision=23228
---
 pkgs/development/interpreters/python/2.7/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 1b828cd516066..d9ec86088bb82 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -92,6 +92,18 @@ stdenv.mkDerivation ( {
   enableParallelBuilding = true;
 
   meta = {
+    homepage = "http://python.org";
+    description = "Python -- a high-level dynamically-typed programming language";
+    longDescription = ''
+      Python is a remarkably powerful dynamic programming language that
+      is used in a wide variety of application domains. Some of its key
+      distinguishing features include: clear, readable syntax; strong
+      introspection capabilities; intuitive object orientation; natural
+      expression of procedural code; full modularity, supporting
+      hierarchical packages; exception-based error handling; and very
+      high level dynamic data types.
+    '';
+    license = "GPLv2";
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
-- 
cgit 1.4.1


From f8a0e0781594a93eb0f9772b60990fa5690b47d3 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 15:52:58 +0000
Subject: sort, add kdegames-4.5.0

svn path=/nixpkgs/trunk/; revision=23229
---
 pkgs/desktops/kde-4.5/default.nix       | 11 +++--------
 pkgs/desktops/kde-4.5/games/default.nix | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/games/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 027ba6f0fba19..2cbd3bf15f849 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -44,17 +44,12 @@
 
 ### OTHER MODULES
   kdeaccessibility = callPackage ./accessibility { };
-
-  kdeutils = callPackage ./utils { };
-
+  kdeartwork = callPackage ./artwork { };
+  kdegames = callPackage ./games { };
   kdegraphics = callPackage ./graphics { };
-
   kdemultimedia = callPackage ./multimedia { };
-
   kdetoys = callPackage ./toys { };
-
-  kdeartwork = callPackage ./artwork { };
-
+  kdeutils = callPackage ./utils { };
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };
diff --git a/pkgs/desktops/kde-4.5/games/default.nix b/pkgs/desktops/kde-4.5/games/default.nix
new file mode 100644
index 0000000000000..662813ce86e0f
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/games/default.nix
@@ -0,0 +1,20 @@
+{kdePackage, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
+, kdebindings, twisted, python, pyqt4, sip, makeWrapper }:
+
+kdePackage {
+  pn = "kdegames";
+  v = "4.5.0";
+
+# TODO: ggz
+  buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2
+    kdebindings twisted python pyqt4 sip makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/kajongg --set PYTHONPATH $PYTHONPATH
+    wrapProgram $out/bin/kajonggserver --set PYTHONPATH $PYTHONPATH'';
+
+  meta = {
+    description = "KDE Games";
+    license = "GPL";
+  };
+}
-- 
cgit 1.4.1


From 0be1e1af98efa0dc2a91afcb28da84f20191165f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 15:54:10 +0000
Subject: Add kdenetwork-4.5.0

svn path=/nixpkgs/trunk/; revision=23230
---
 pkgs/desktops/kde-4.5/default.nix              |  1 +
 pkgs/desktops/kde-4.5/network/default.nix      | 34 +++++++++++++++
 pkgs/desktops/kde-4.5/network/log-feature.diff | 60 ++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/network/default.nix
 create mode 100644 pkgs/desktops/kde-4.5/network/log-feature.diff

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 2cbd3bf15f849..c5f5ebfee5d64 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -48,6 +48,7 @@
   kdegames = callPackage ./games { };
   kdegraphics = callPackage ./graphics { };
   kdemultimedia = callPackage ./multimedia { };
+  kdenetwork = callPackage ./network { };
   kdetoys = callPackage ./toys { };
   kdeutils = callPackage ./utils { };
 ### DEVELOPMENT
diff --git a/pkgs/desktops/kde-4.5/network/default.nix b/pkgs/desktops/kde-4.5/network/default.nix
new file mode 100644
index 0000000000000..e7e4a8cd5616b
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/network/default.nix
@@ -0,0 +1,34 @@
+{ kdePackage, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
+, libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr
+, libXi, libXtst, libXdamage, libXxf86vm, libktorrent, kdebase
+, kdebase_workspace
+, kdelibs, kdepimlibs, automoc4, qca2, soprano, qimageblitz, strigi}:
+
+kdePackage {
+  pn = "kdenetwork";
+  v = "4.5.0";
+
+  buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
+    libvncserver libmsn giflib gpgme boost libv4l libotr libXi libXtst
+    libXdamage libXxf86vm kdelibs kdepimlibs automoc4 qca2 soprano
+    qimageblitz strigi libktorrent kdebase kdebase_workspace ];
+
+  patches = [ ./log-feature.diff ];
+#TODO
+# * telepathy-qt4 (0.18 or higher)  <http://telepathy.freedesktop.org>
+# * KWebKitPart  <https://svn.kde.org/home/kde/trunk/extragear/base/kwebkitpart>
+# * libortp (0.13 or higher)  <http://www.linphone.org/index.php/eng/code_review/ortp>
+# * XMMS  <http://www.xmms.org>
+# * mediastreamer (2.3.0 or higher)  <http://www.linphone.org/index.php/eng/code_review/mediastreamer2>
+# * libmeanwhile  <http://meanwhile.sf.net>
+# * libgadu (1.8.0 or higher)  <http://toxygen.net/libgadu/>
+
+# Let cmake find libktorrent. Waiting for upstream fix in 4.5.1
+  KDEDIRS="${libktorrent}";
+
+  meta = {
+    description = "KDE network utilities";
+    longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/network/log-feature.diff b/pkgs/desktops/kde-4.5/network/log-feature.diff
new file mode 100644
index 0000000000000..6770dd399e332
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/network/log-feature.diff
@@ -0,0 +1,60 @@
+--- a/kget/CMakeLists.txt	2010-08-16 19:08:36.000000000 +0400
++++ b/kget/CMakeLists.txt	2010-08-16 22:04:24.000000000 +0400
+@@ -53,21 +53,20 @@
+ add_subdirectory(desktop)
+ add_subdirectory(plasma)
+ 
+-# find kworkspace library to allow the shutdown after downloads completed option
+-find_library(KDE4_KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+-if(KDE4_KWORKSPACE_LIBRARY)
+-    set(KDE4_KWORKSPACE_LIBS ${kworkspace_LIB_DEPENDS} ${KDE4_KWORKSPACE_LIBRARY})
++macro_optional_find_package(KDE4Workspace)
++macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace libraries, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Allows 'shutdown after downloads completed' in kget")
++if(KDE4WORKSPACE_FOUND)
+     add_definitions(-DHAVE_KWORKSPACE)
+-    set(KWORKSPACE_FOUND true)
+-endif(KDE4_KWORKSPACE_LIBRARY)
++	include_directories(${KDE4WORKSPACE_INCLUDE_DIR})
++endif(KDE4WORKSPACE_FOUND)
+ 
+ # find libkonq to allow actions and open with options in the context menu of a transfer
+-find_library(KDE4_KONQUEROR_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+-if(KDE4_KONQUEROR_LIBRARY)
+-    set(KDE4_KONQUEROR_LIBS ${konq_LIB_DEPENDS} ${KDE4_KONQUEROR_LIBRARY})
++macro_optional_find_package(LibKonq)
++macro_log_feature(LIBKONQ_FOUND "libkonq" "KDE4 Konqueror library" "http://www.kde.org" FALSE "" "Needed to build actions and open with options in the context menu of a transfer")
++if(LIBKONQ_FOUND)
+     add_definitions(-DHAVE_KONQUEROR)
+-    set(KONQUEROR_FOUND true)
+-endif(KDE4_KONQUEROR_LIBRARY)
++	include_directories(${LIBKONQ_INCLUDE_DIR})
++endif(LIBKONQ_FOUND)
+ 
+ 
+ include_directories(
+@@ -142,9 +141,9 @@
+ 
+ target_link_libraries(kgetcore ${KDE4_KIO_LIBS})
+ 
+-if (KWORKSPACE_FOUND)
+-    target_link_libraries(kgetcore ${KDE4_KWORKSPACE_LIBS})
+-endif (KWORKSPACE_FOUND)
++if (KDE4WORKSPACE_FOUND)
++    target_link_libraries(kgetcore ${KDE4WORKSPACE_KWORKSPACE_LIBS})
++endif (KDE4WORKSPACE_FOUND)
+ 
+ if (HAVE_NEPOMUK)
+   target_link_libraries(kgetcore ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
+@@ -294,9 +293,9 @@
+   target_link_libraries(kget ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
+ endif (HAVE_NEPOMUK)
+ 
+-if (KONQUEROR_FOUND)
+-  target_link_libraries(kget ${KDE4_KONQUEROR_LIBS})
+-endif (KONQUEROR_FOUND)
++if (LIBKONQ_FOUND)
++  target_link_libraries(kget ${LIBKONQ_LIBRARY})
++endif (LIBKONQ_FOUND)
+ 
+ if (QGPGME_FOUND)
+   target_link_libraries(kget ${QGPGME_LIBRARIES})
-- 
cgit 1.4.1


From fc3845c0cdd68e4a40b724125c86e04b4cf2b36d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 15:54:27 +0000
Subject: kdeedu-4.5.0

svn path=/nixpkgs/trunk/; revision=23231
---
 pkgs/desktops/kde-4.5/default.nix     |  1 +
 pkgs/desktops/kde-4.5/edu/default.nix | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/edu/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index c5f5ebfee5d64..94df62b1e2fd2 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -45,6 +45,7 @@
 ### OTHER MODULES
   kdeaccessibility = callPackage ./accessibility { };
   kdeartwork = callPackage ./artwork { };
+  kdeedu = callPackage ./edu { };
   kdegames = callPackage ./games { };
   kdegraphics = callPackage ./graphics { };
   kdemultimedia = callPackage ./multimedia { };
diff --git a/pkgs/desktops/kde-4.5/edu/default.nix b/pkgs/desktops/kde-4.5/edu/default.nix
new file mode 100644
index 0000000000000..2b9fe044dfd24
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/edu/default.nix
@@ -0,0 +1,27 @@
+{ kdePackage, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
+, xplanet, libspectre, pkgconfig, libqalculate
+, kdelibs, automoc4, eigen, attica}:
+
+kdePackage {
+  pn = "kdeedu";
+  v = "4.5.0";
+
+#TODO:
+#* Boost.Python (1.31 or higher)  <http://www.boost.org/> - fails to find
+# * libcfitsio0 (3.09 or higher)  <http://indi.sf.net>
+# * libindi (0.6.1 or higher)  <http://indi.sf.net>
+# * R  <http://www.r-project.org/>
+# * OCaml  <http://caml.inria.fr/>
+# * LibFacile  <http://www.recherche.enac.fr/log/facile/>
+# * Avogadro (1.0 or higher)  <http://avogadro.openmolecules.net>
+# * libgps
+
+  buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm
+    gsl xplanet kdelibs automoc4 eigen attica libspectre pkgconfig
+    libqalculate ];
+
+  meta = {
+    description = "KDE Educative software";
+    license = "GPL";
+  };
+}
-- 
cgit 1.4.1


From ee6b753bfe71a4ce0a3b67cfd49197e21777d3ea Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 15:55:12 +0000
Subject: kdeplasma-addons-4.5.0

svn path=/nixpkgs/trunk/; revision=23232
---
 pkgs/desktops/kde-4.5/default.nix               |  1 +
 pkgs/desktops/kde-4.5/plasma-addons/default.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/plasma-addons/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 94df62b1e2fd2..d984c4fe61bd0 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -50,6 +50,7 @@
   kdegraphics = callPackage ./graphics { };
   kdemultimedia = callPackage ./multimedia { };
   kdenetwork = callPackage ./network { };
+  kdeplasma_addons = callPackage ./plasma-addons { };
   kdetoys = callPackage ./toys { };
   kdeutils = callPackage ./utils { };
 ### DEVELOPMENT
diff --git a/pkgs/desktops/kde-4.5/plasma-addons/default.nix b/pkgs/desktops/kde-4.5/plasma-addons/default.nix
new file mode 100644
index 0000000000000..39f67fdaa8ee7
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/plasma-addons/default.nix
@@ -0,0 +1,18 @@
+{ kdePackage, cmake, qt4, perl, automoc4, kdelibs, soprano, kdeedu
+, boost, eigen, kdebase_workspace, attica, python, qca2, qimageblitz
+, shared_mime_info, kdepimlibs, kdegraphics, libqalculate, libXtst }:
+# , qwt, scim, kdeedu 
+
+kdePackage {
+  pn = "kdeplasma-addons";
+  v = "4.5.0";
+
+  buildInputs = [ cmake qt4 perl automoc4 kdelibs boost eigen kdebase_workspace
+    attica python qca2 qimageblitz shared_mime_info kdepimlibs kdegraphics
+    libqalculate soprano libXtst kdeedu ];
+
+  meta = {
+    description = "KDE Plasma Addons";
+    license = "GPL";
+  };
+}
-- 
cgit 1.4.1


From 1e4d14863cb23c3beef952f8c0185cd3df33a6f1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 15:56:40 +0000
Subject: make lensfun configure output debug info

svn path=/nixpkgs/trunk/; revision=23233
---
 pkgs/development/libraries/lensfun/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index 6aa5867d8ffdc..6d54dc25e9454 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -12,11 +12,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig glib zlib libpng ];
 
+  configureFlags = "-v";
+
   meta = with stdenv.lib; {
     platforms = platforms.all;
     maintainers = [ maintainers.urkud ];
     license = "LGPL3";
-    description = "An opensource database of photographic lenses and their
-      characteristics";
+    description = "An opensource database of photographic lenses and their characteristics";
   };
 }
-- 
cgit 1.4.1


From e9fd810997aadfcc857a19b792c26a2c82cb6ac2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 18:56:03 +0000
Subject: antlr-2: compile library

svn path=/nixpkgs/trunk/; revision=23235
---
 .../tools/parsing/antlr/2.7.7-fixes.patch          | 26 ++++++++++++++++++++++
 pkgs/development/tools/parsing/antlr/2.7.7.nix     |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch

(limited to 'pkgs')

diff --git a/pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch b/pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch
new file mode 100644
index 0000000000000..a71b7718e3bf8
--- /dev/null
+++ b/pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch
@@ -0,0 +1,26 @@
+diff --git a/lib/cpp/antlr/CharScanner.hpp b/lib/cpp/antlr/CharScanner.hpp
+index 8a97e97..1835a3e 100644
+--- a/lib/cpp/antlr/CharScanner.hpp
++++ b/lib/cpp/antlr/CharScanner.hpp
+@@ -11,6 +11,8 @@
+ #include <antlr/config.hpp>
+ 
+ #include <map>
++#include <cstdio>
++#include <cstring>
+ 
+ #ifdef HAS_NOT_CCTYPE_H
+ #include <ctype.h>
+diff --git a/scripts/config.make.in b/scripts/config.make.in
+index c23dd5c..6057309 100644
+--- a/scripts/config.make.in
++++ b/scripts/config.make.in
+@@ -38,7 +38,7 @@ MAKEOVERRIDES := $(patsubst SUBDIRS=%,,$(MAKEOVERRIDES))
+ all clean distclean test install force-target clean-target :: 
+ 	@dirs="$(SUBDIRS)" ; \
+ 	test -z "$${dirs}" && { \
+-		dirs=`/bin/ls` ; \
++		dirs=`ls` ; \
+   } ; \
+ 	for d in . $${dirs} ; do \
+ 		case $${d} in \
diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix
index f1caa951f66ce..8d68479dd0e6e 100644
--- a/pkgs/development/tools/parsing/antlr/2.7.7.nix
+++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix
@@ -6,5 +6,6 @@ stdenv.mkDerivation {
     url = "http://www.antlr2.org/download/antlr-2.7.7.tar.gz";
     sha256 = "1ffvcwdw73id0dk6pj2mlxjvbg0662qacx4ylayqcxgg381fnfl5";
   };
+  patches = [ ./2.7.7-fixes.patch ];
   buildInputs = [jdk python];
 }
-- 
cgit 1.4.1


From 6ba9dcb54c12d9c9377a387eeced3bfc1575f93a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 18:56:48 +0000
Subject: Add kdesdk-4.5.0

svn path=/nixpkgs/trunk/; revision=23236
---
 pkgs/desktops/kde-4.5/default.nix        |  1 +
 pkgs/desktops/kde-4.5/sdk/default.nix    | 21 ++++++++++++
 pkgs/desktops/kde-4.5/sdk/find-svn.patch | 59 ++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/sdk/default.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/find-svn.patch

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index d984c4fe61bd0..8eeea097558b1 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -51,6 +51,7 @@
   kdemultimedia = callPackage ./multimedia { };
   kdenetwork = callPackage ./network { };
   kdeplasma_addons = callPackage ./plasma-addons { };
+  kdesdk = callPackage ./sdk { };
   kdetoys = callPackage ./toys { };
   kdeutils = callPackage ./utils { };
 ### DEVELOPMENT
diff --git a/pkgs/desktops/kde-4.5/sdk/default.nix b/pkgs/desktops/kde-4.5/sdk/default.nix
new file mode 100644
index 0000000000000..b03a1d88595dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/default.nix
@@ -0,0 +1,21 @@
+{ kdePackage, binutils, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr,
+  aprutil , shared_mime_info, hunspell , kdelibs, kdepimlibs, automoc4,
+  kdebindings, strigi, kdebase, libtool, antlr}:
+
+kdePackage {
+  pn = "kdesdk";
+  v = "4.5.0";
+
+  buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion aprutil apr
+    shared_mime_info kdelibs kdepimlibs automoc4 strigi hunspell kdebindings
+    kdebase libtool binutils antlr ];
+
+  patches = [ ./find-svn.patch ];
+
+#cmakeFlags = "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=ON -DBUILD_kioslave=ON";
+  meta = {
+    description = "KDE SDK";
+    longDescription = "Contains various development utilities such as the Umbrello UML modeler and Cerivisia CVS front-end";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/find-svn.patch b/pkgs/desktops/kde-4.5/sdk/find-svn.patch
new file mode 100644
index 0000000000000..61cb49b308f2c
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/find-svn.patch
@@ -0,0 +1,59 @@
+diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake
+index 59bcb96..2eac05d 100644
+--- a/cmake/modules/FindSVN.cmake
++++ b/cmake/modules/FindSVN.cmake
+@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS
+ FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS
+    /usr/local/apr/bin
+ )
++find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS
++   /usr/local/apr/bin
++)
+ 
+ if(SVNCONFIG_EXECUTABLE)
+ 
+@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE)
+       set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
+    else(APRCONFIG_EXECUTABLE)
+       FIND_PATH(_INCLUDES apr_pools.h
+-         ${SVN_INCLUDES}/apr-0/
+-         ${SVN_INCLUDES}/apr-1/
+-         ${SVN_INCLUDES}/apr-1.0/
+-         /usr/include/apr-0/
+-         /usr/include/apr-1/
+-         /usr/include/apr-1.0/
+-         /usr/local/include/apr-0/
+-         /usr/local/include/apr-1/
+-         /usr/local/include/apr-1.0/
++         HINTS ${SVN_INCLUDES}
++         PATHS /usr /usr/local
++         SUFFIXES apr-0 apr-1 apr-1.0
+       )
+       if(_INCLUDES)
+          set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
+@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE)
+          set(SVN_FOUND FALSE) # no apr == can't compile!
+       endif(_INCLUDES)
+    endif(APRCONFIG_EXECUTABLE)
++
++   # Use apu-config if it exists
++   if(APUCONFIG_EXECUTABLE)
++      EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES)
++      string(REPLACE "-I" "" _INCLUDES ${_INCLUDES})
++      string(REPLACE " " ";" _INCLUDES ${_INCLUDES})
++      set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
++   else(APUCONFIG_EXECUTABLE)
++      FIND_PATH(_INCLUDES apu.h
++         HINTS ${SVN_INCLUDES}
++         PATHS /usr /usr/local
++         SUFFIXES apr-0 apr-1 apr-1.0
++      )
++      if(_INCLUDES)
++         set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
++      else(_INCLUDES)
++         set(SVN_FOUND FALSE) # no apr == can't compile!
++      endif(_INCLUDES)
++   endif(APUCONFIG_EXECUTABLE)
+    FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1)
+    if(SVN_LIBRARIES)
+       FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1)
-- 
cgit 1.4.1


From 96edbab084df3092d10299ebe4ee42f4f0062439 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 18:58:02 +0000
Subject: kdewebdev-4.5.0

svn path=/nixpkgs/trunk/; revision=23237
---
 pkgs/desktops/kde-4.5/default.nix        |  1 +
 pkgs/desktops/kde-4.5/webdev/default.nix | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/webdev/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 8eeea097558b1..dea1a2218ae86 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -54,6 +54,7 @@
   kdesdk = callPackage ./sdk { };
   kdetoys = callPackage ./toys { };
   kdeutils = callPackage ./utils { };
+  kdewebdev = callPackage ./webdev { };
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };
diff --git a/pkgs/desktops/kde-4.5/webdev/default.nix b/pkgs/desktops/kde-4.5/webdev/default.nix
new file mode 100644
index 0000000000000..24d1f49bd6c18
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/webdev/default.nix
@@ -0,0 +1,14 @@
+{ kdePackage, cmake, qt4, perl, libxml2, libxslt, boost
+, kdelibs, kdepimlibs, automoc4, ruby, htmlTidy, zlib }:
+
+kdePackage {
+  pn = "kdewebdev";
+  v = "4.5.0";
+
+  buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs
+    automoc4 htmlTidy ruby zlib ];
+  meta = {
+    description = "KDE Web development utilities";
+    license = "GPL";
+  };
+}
-- 
cgit 1.4.1


From 0b8bd11ce36dac938d341e6db4867f2c0a3cf5d7 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 18:58:53 +0000
Subject: Add kdeadmin-4.5.0

svn path=/nixpkgs/trunk/; revision=23238
---
 pkgs/desktops/kde-4.5/admin/builder.sh  | 13 +++++++++++++
 pkgs/desktops/kde-4.5/admin/default.nix | 22 ++++++++++++++++++++++
 pkgs/desktops/kde-4.5/default.nix       |  2 +-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/kde-4.5/admin/builder.sh
 create mode 100644 pkgs/desktops/kde-4.5/admin/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/admin/builder.sh b/pkgs/desktops/kde-4.5/admin/builder.sh
new file mode 100644
index 0000000000000..78e29543c1f02
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/admin/builder.sh
@@ -0,0 +1,13 @@
+source $stdenv/setup
+
+myPatchPhase()
+{
+    for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py
+    do
+	sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i
+    done
+
+	sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
+}
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/desktops/kde-4.5/admin/default.nix b/pkgs/desktops/kde-4.5/admin/default.nix
new file mode 100644
index 0000000000000..61f5b018a7b14
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/admin/default.nix
@@ -0,0 +1,22 @@
+{ kdePackage, cmake, qt4, pkgconfig, perl, python
+, sip, pyqt4, pycups, rhpl, system_config_printer
+, kdelibs, kdepimlibs, kdebindings, automoc4}:
+
+kdePackage {
+  pn = "kdeadmin";
+  v = "4.5.0";
+
+  builder = ./builder.sh;
+
+  inherit system_config_printer;
+
+  PYTHONPATH = "${pycups}/lib/python${python.majorVersion}/site-packages";
+
+  buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer
+                  kdelibs kdepimlibs kdebindings automoc4 ];
+
+  meta = {
+    description = "KDE Administration Utilities";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index dea1a2218ae86..8d9ea757a68b2 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -44,6 +44,7 @@
 
 ### OTHER MODULES
   kdeaccessibility = callPackage ./accessibility { };
+  kdeadmin = callPackage ./admin { };
   kdeartwork = callPackage ./artwork { };
   kdeedu = callPackage ./edu { };
   kdegames = callPackage ./games { };
@@ -58,5 +59,4 @@
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };
-  
 }
-- 
cgit 1.4.1


From 59e4742a6accd7fc79523eb4d0d4abc7051c7431 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 22:52:59 +0000
Subject: kdepim-4.4.5: don't build kleopatra

It doesn't compile with new boost. If someone cares, find a patch in KDE SVN history.

svn path=/nixpkgs/trunk/; revision=23239
---
 pkgs/desktops/kde-4.4/pim/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.4/pim/default.nix b/pkgs/desktops/kde-4.4/pim/default.nix
index ec5c0231d913b..6d8588146dac7 100644
--- a/pkgs/desktops/kde-4.4/pim/default.nix
+++ b/pkgs/desktops/kde-4.4/pim/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation {
     sha256 = "0n95wjk1ly7zfn9wv589a9hrc0r7wvik7jrvsgimnxr0rapxk3bp";
   };
   builder = ./builder.sh;  
+  cmakeFlags = "-DBUILD_kleopatra=OFF"; # doesn't build with new boost
   buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
                   shared_mime_info libXScrnSaver
                   kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ];
-- 
cgit 1.4.1


From 9c1a9c2c4b524d0664564afa05753f27d325e649 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 22:53:42 +0000
Subject: Make qt47 more override-friendly

svn path=/nixpkgs/trunk/; revision=23240
---
 pkgs/top-level/all-packages.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5934556b9102e..4e1fc4a54ce4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3643,13 +3643,11 @@ let
   };
 
   qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
-    inherit (gst_all) gstreamer gstPluginsBase;
-    inherit (gnome) glib;
+    inherit (pkgs.gst_all) gstreamer gstPluginsBase;
+    inherit (pkgs.gnome) glib;
   };
 
-  qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator {
-    qt4 = qt46;
-  };
+  qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
 
   quassel = callPackage ../applications/networking/irc/quassel {
     inherit (kde4) qt4 kdelibs phonon automoc4;
-- 
cgit 1.4.1


From 2957f9cc112864f49745b608afa1b24f8fc36a88 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 18 Aug 2010 23:04:21 +0000
Subject: Now packageOverrides = p: { kde4 = kde45; qt4 = qt47; } should work

svn path=/nixpkgs/trunk/; revision=23241
---
 pkgs/desktops/kde-4.5/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix   | 3 +--
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 8d9ea757a68b2..7bb4ada00731a 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -1,8 +1,12 @@
-{ callPackage, stdenv, fetchurl } :
+{ callPackage, stdenv, fetchurl, qt47 } :
 
 {
   recurseForRelease = true;
 
+  qt4 = qt47;
+
+  phonon = null;
+
   kdePackage = import ./kde-package {
     inherit stdenv fetchurl;
   };
@@ -56,6 +60,9 @@
   kdetoys = callPackage ./toys { };
   kdeutils = callPackage ./utils { };
   kdewebdev = callPackage ./webdev { };
+
+  kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
+  kdepim = callPackage ../kde-4.4/pim { };
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e1fc4a54ce4b..0014420bf45f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6610,12 +6610,11 @@ let
 
   kde45 = callPackage ../desktops/kde-4.5 {
     callPackage = newScope ({
-      qt4 = qt47;
       pyqt4 = pyqt4.override { qt4 = qt47; };
       libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; };
       shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; };
       stdenv = stdenv2;
-    } // kde45);
+    } // pkgs.kde45);
   };
 
   xfce = xfce4;
-- 
cgit 1.4.1


From 105d0e540befbdd32dfaa52d8faccdf26ea0b8c1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 19 Aug 2010 08:31:13 +0000
Subject: startSamba: reintroduce force user option set to current user

svn path=/nixpkgs/trunk/; revision=23242
---
 pkgs/build-support/vm/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index b9882914b266d..ca0c5f38fb74e 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -139,7 +139,7 @@ rec {
     mount -o bind /dev /fs/dev
 
     echo "mounting host filesystem..."
-    mount -t cifs //10.0.2.4/qemu /fs/hostfs -o guest,username=nobody
+    mount -t cifs //10.0.2.4/qemu /fs/hostfs -o guest,sec=none
 
     mkdir -p /fs/nix/store
     mount -o bind /fs/hostfs/nix/store /fs/nix/store
@@ -227,6 +227,8 @@ rec {
 
   startSamba =
     ''
+      export WHO=`whoami`
+
       cat > $TMPDIR/smb.conf <<SMB
       [global]
         private dir = $TMPDIR
@@ -238,6 +240,7 @@ rec {
         smb passwd file = $TMPDIR/smbpasswd
         security = share
       [qemu]
+        force user = $WHO
         path = /
         read only = no
         guest ok = yes
-- 
cgit 1.4.1


From 435ba71ac065e12b8c982534252ac5dea66a4688 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Aug 2010 09:55:50 +0000
Subject: * Fix a "undefined variable `pyrex'" error that only happens on Nix  
 0.15, not 0.16.

svn path=/nixpkgs/trunk/; revision=23244
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0014420bf45f8..8026345e5d6af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5237,6 +5237,7 @@ let
       glib pango libglade libgtkhtml gtkhtml
       libgnomecanvas libgnomeprint
       libgnomeprintui gnomepanel gnomedesktop;
+    inherit pyrex;
     gnomegtk = gnome.gtk;
   };
 
-- 
cgit 1.4.1


From 12bfda97b8a7387c28e30b4d458a849c4bcff58a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 19 Aug 2010 12:24:14 +0000
Subject: maven-build: if surefire was run, generate html and add to result

svn path=/nixpkgs/trunk/; revision=23246
---
 pkgs/build-support/release/maven-build.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index c8753c98fa02c..093e6ccc7ef27 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -47,12 +47,14 @@ stdenv.mkDerivation ( rec {
 
     if [ -d target/site/cobertura ] ; then
       cp -R target/site/cobertura $out/cobertura
-      echo "report cobertura $out/cobertura" >> $out/nix-support/hydra-build-products
+      echo "report coverage $out/cobertura" >> $out/nix-support/hydra-build-products
     fi
 
     if [ -d target/surefire-reports ] ; then
-      cp -R target/surefire-reports $out/surefire
-      echo "report surefire $out/surefire" >> $out/nix-support/hydra-build-products
+      mvn surefire-report:report-only
+      cp -vR target/surefire-reports $out/surefire
+      cp -v target/site/surefire-report.html $out/surefire/index.html
+      echo "report coverage $out/surefire/index.html" >> $out/nix-support/hydra-build-products
     fi
   '';  
 
-- 
cgit 1.4.1


From 1ac9dcd24d3c41954068f2bd2e415552cb0de7c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Aug 2010 12:37:10 +0000
Subject: * Fix eval-release.nix by testing whether all attributes of a  
 derivation evaluate inside the tryEval.  This catches cases such as  
 aufs2-util, which fails due to an assertion in its dependency aufs2. *
 Explicitly blacklist "xbursttools" because it gives some   evaluation error
 in cross-OpenSSL.  No idea why, probably due to   some pass-through
 attribute.

svn path=/nixpkgs/trunk/; revision=23247
---
 maintainers/scripts/eval-release.nix          | 8 ++++++--
 pkgs/lib/customisation.nix                    | 2 +-
 pkgs/lib/trivial.nix                          | 4 ++++
 pkgs/tools/misc/partition-manager/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix               | 7 ++++---
 5 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'pkgs')

diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix
index 64dbbd15cf385..62607fcc497f4 100644
--- a/maintainers/scripts/eval-release.nix
+++ b/maintainers/scripts/eval-release.nix
@@ -6,9 +6,13 @@ let
 
   lib = (import ../.. {}).lib;
 
-  rel = removeAttrs (import ../../pkgs/top-level/release.nix) ["tarball"];
+  rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ];
 
-  maybe = x: let y = builtins.tryEval x; in if y.success then y.value else null;
+  strictList = xs: lib.fold (x: xs: lib.seq x xs) xs xs;
+  
+  strictAttrs = as: strictList (lib.attrValues as);
+
+  maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" null;
 
   call = attrs: lib.flip lib.mapAttrs attrs
     (n: v: builtins.trace n (
diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix
index 7b4b390cbef3e..e8946ddf7439d 100644
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@@ -54,7 +54,7 @@ rec {
         makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs));
       deepOverride = newArgs:
         makeOverridable f (lib.overrideExisting (lib.mapAttrs (deepOverrider newArgs) origArgs) newArgs);
-      origArgs = origArgs;
+      #origArgs = origArgs;
     };
 
   deepOverrider = newArgs: name: x: if builtins.isAttrs x then (
diff --git a/pkgs/lib/trivial.nix b/pkgs/lib/trivial.nix
index aaae36afa058f..af47a8c88415e 100644
--- a/pkgs/lib/trivial.nix
+++ b/pkgs/lib/trivial.nix
@@ -18,4 +18,8 @@ rec {
   # Flip the order of the arguments of a binary function.
   flip = f: a: b: f b a;
 
+  # `seq x y' evaluates x, then returns y.  That is, it forces strict
+  # evaluation of its first argument.
+  seq = x: y: if x == null then y else y;
+  
 }
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index fd8abf7caf39c..7775aae5bd8ac 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt, kde, perl }:
+{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt4, kde, perl }:
 
 stdenv.mkDerivation {
   name = "partitionmanager-1.0.0";
@@ -9,16 +9,16 @@ stdenv.mkDerivation {
   };
 
   buildInputs =
-    [ cmake gettext parted libuuid qt kde.kdelibs kde.kdebase kde.automoc4 perl kde.phonon ];
+    [ cmake gettext parted libuuid qt4 kde.kdelibs kde.kdebase kde.automoc4 perl kde.phonon ];
 
   preConfigure = ''
     export VERBOSE=1
-    cmakeFlagsArray=($cmakeFlagsArray -DGETTEXT_INCLUDE_DIR=${gettext}/include -DCMAKE_INCLUDE_PATH=${qt}/include/QtGui )
+    cmakeFlagsArray=($cmakeFlagsArray -DGETTEXT_INCLUDE_DIR=${gettext}/include -DCMAKE_INCLUDE_PATH=${qt4}/include/QtGui )
   '';
 
   postInstall = ''
     set -x
-    rpath=`patchelf --print-rpath $out/bin/partitionmanager-bin`:${qt}/lib 
+    rpath=`patchelf --print-rpath $out/bin/partitionmanager-bin`:${qt4}/lib 
     for p in $out/bin/partitionmanager-bin; do
       patchelf --set-rpath $rpath $p
     done
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8026345e5d6af..5556a128bf7ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1303,7 +1303,8 @@ let
     inherit stdenv fetchgit autoconf automake libusb confuse;
     # It needs a cross compiler for mipsel to build the firmware it will
     # load into the Ben Nanonote
-    gccCross = let
+    gccCross =
+      let
         pkgsCross = (import ./all-packages.nix) {
           inherit system;
           inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
@@ -4879,7 +4880,8 @@ let
   windows = rec {
     w32api = callPackage ../os-specific/windows/w32api {
       gccCross = gccCrossStageStatic;
-      binutilsCross = binutilsCross;    };
+      binutilsCross = binutilsCross;
+    };
 
     w32api_headers = w32api.override {
       onlyHeaders = true;
@@ -5919,7 +5921,6 @@ let
 
   partitionManager = callPackage ../tools/misc/partition-manager {
     kde = kde44;
-    qt = qt4;
   };
 
   pdftk = callPackage ../tools/typesetting/pdftk { };
-- 
cgit 1.4.1


From cf336d9c1d890e4b95c3f0235d6e5dc2bfbb0201 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 19 Aug 2010 13:36:57 +0000
Subject: maven-build: use single target in stead of assembly to prevent test
 from being run twice

svn path=/nixpkgs/trunk/; revision=23249
---
 pkgs/build-support/release/maven-build.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index 093e6ccc7ef27..90596b76942ec 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation ( rec {
   '';  
 
   mvnAssembly = ''
-    mvn assembly:assembly ${mvnFlags}
+    mvn assembly:single ${mvnFlags}
   '';
 
   mvnRelease = ''
-- 
cgit 1.4.1


From e8f1c8a08a30ecb54b5c28839c0b8df9d71e4b7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Aug 2010 14:33:44 +0000
Subject: * Check eval-release.nix.

svn path=/nixpkgs/trunk/; revision=23250
---
 pkgs/top-level/make-tarball.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 93a833c994fef..fb9c772d9ac05 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -56,6 +56,11 @@ releaseTools.makeSourceTarball {
             -qa \* --drv-path --system-filter \* --system --meta --xml
         stopNest
     done
+
+    header "checking eval-release.nix"
+    nix-instantiate --eval-only --strict --xml ./maintainers/scripts/eval-release.nix > $TMPDIR/out.xml
+    xmllint --noout $TMPDIR/out.xml
+    stopNest
   '';
 
   distPhase = ''
-- 
cgit 1.4.1


From b4f887b7fb185328b38111b72f0bd9e2928850ac Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 19 Aug 2010 16:53:28 +0000
Subject: GNU Zile 2.3.19.

svn path=/nixpkgs/trunk/; revision=23254
---
 pkgs/applications/editors/zile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 36bccbac5570f..3d7fef640ca46 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.3.17";
+  name = "zile-2.3.19";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "1wrg53qz0s4336nq8z2v7pi18vpz5ifxvlwq4jv0w4rwmbksgvi0";
+    sha256 = "1c2by5d5d1nmap3wc55giscsj47xx16viv7b07c6c4nssnlniszs";
   };
 
   buildInputs = [ ncurses ];
-- 
cgit 1.4.1


From b4cea12d6a2dc6c7ef57a0cb959ed6173a5cfdcf Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 19 Aug 2010 16:54:39 +0000
Subject: GnuTLS 2.10.1.

svn path=/nixpkgs/trunk/; revision=23255
---
 pkgs/development/libraries/gnutls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 64a73084d305c..93cec825d6bab 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-2.10.0";
+  name = "gnutls-2.10.1";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.bz2";
-    sha256 = "124cysx5rxpgi9sxw7yx9hlb8900l4nx2kar6gcnvgs3w4y695l5";
+    sha256 = "1vh2qc2pk6srlqk4ag0v7ba41jmy9816a2mj8yx1253626y7h43k";
   };
 
   configurePhase = ''
-- 
cgit 1.4.1


From 1f2cf8991498b785bb627fad6326c07ada8cf1f1 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 19 Aug 2010 16:55:00 +0000
Subject: GNU Bison 2.4.3.

svn path=/nixpkgs/trunk/; revision=23256
---
 pkgs/development/tools/parsing/bison/bison-2.4.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix
index 245bdad1f929c..61ce9b895dbdd 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.4.nix
+++ b/pkgs/development/tools/parsing/bison/bison-2.4.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, m4}:
 
 stdenv.mkDerivation rec {
-  name = "bison-2.4.2";
+  name = "bison-2.4.3";
 
   src = fetchurl {
     url = "mirror://gnu/bison/${name}.tar.bz2";
-    sha256 = "1f2gmy9bhajrypyz25rqjbz5j024yikr2kaggjjsc15gm4x29ysp";
+    sha256 = "019s3pdzggb71g7p7dgajhh53gh0h6nfl4yrzrs0jzsc37ph4lwk";
   };
 
   buildInputs = [m4];
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/bison/;
 
     license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 
   passthru = { glrSupport = true; };
-- 
cgit 1.4.1


From d9e30eb4a469dd61de1539cb3e26a8de872c00be Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 19 Aug 2010 16:55:51 +0000
Subject: GNU Rush 1.7.

svn path=/nixpkgs/trunk/; revision=23257
---
 pkgs/shells/rush/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix
index dd1b47f5619bb..4354a3cd0b3a1 100644
--- a/pkgs/shells/rush/default.nix
+++ b/pkgs/shells/rush/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "rush-1.6";
+  name = "rush-1.7";
 
   src = fetchurl {
     url = "mirror://gnu/rush/${name}.tar.gz";
-    sha256 = "1j9h1imql05cijav6hr9jigcmy1br8fs9vahvh6y7pf53k4lcfrv";
+    sha256 = "0fh0gbbp0iiq3wbkf503xb40r8ljk42vyj9bnlflbz82d6ipy1rm";
   };
 
   doCheck = true;
-- 
cgit 1.4.1


From 82968aa583cfa6036c738fabec4f6f22a8c6ac39 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 19 Aug 2010 16:56:41 +0000
Subject: GNU Parallel 20100722.

svn path=/nixpkgs/trunk/; revision=23258
---
 pkgs/tools/misc/parallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index f2223d5ce3e5e..2e8bb49f2361c 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20100620";
+  name = "parallel-20100722";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1hzdzvkm5cqciy6lhcbdzi4aar09fgsf0lfb4a89mnlq4xdmr8jj";
+    sha256 = "1dq2icd6xigi4pf66178pdim6dmpw7vkfndwady5r93kymz7m399";
   };
 
   patchPhase =
-- 
cgit 1.4.1


From 1b56623a8ad2d8e9328849c9ec9b17e87dfba559 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 19 Aug 2010 16:57:09 +0000
Subject: GnuPG 2.0.16.

svn path=/nixpkgs/trunk/; revision=23259
---
 pkgs/tools/security/gnupg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 7b89dcb25b871..3c558bbf6730b 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -13,11 +13,11 @@ assert useUsb -> (libusb != null);
 assert useCurl -> (curl != null);
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.15";
+  name = "gnupg-2.0.16";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "070diybdiwf45d8xqbb5lwf3jjvhja1lcr6sf4fcw8519lpqi0aq";
+    sha256 = "02x86pgzkdx9fg6mma36lrd8746zr1qvm995rvvb1sq2gjbvnnhd";
   };
 
   buildInputs = [ readline zlib libgpgerror pth libgcrypt libassuan libksba ]
-- 
cgit 1.4.1


From c8b7ed425b7331a04df4e3ed87227cc036632509 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 19 Aug 2010 16:58:08 +0000
Subject: GNU Autoconf 2.67.

svn path=/nixpkgs/trunk/; revision=23260
---
 pkgs/development/tools/misc/autoconf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index 64a758d5231e5..6896da2ec4c8f 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, m4, perl }:
 
 stdenv.mkDerivation rec {
-  name = "autoconf-2.65";
+  name = "autoconf-2.67";
 
   src = fetchurl {
     url = "mirror://gnu/autoconf/${name}.tar.bz2";
-    sha256 = "0sqkh2xirg3yq7774aqmbi2nbx8rv3yf6v2xzwlz5ypkax0984fv";
+    sha256 = "1vwalyqzgk1liyinblbc78isxa5qa4fvs5bx2fkjd7crfhhdkph0";
   };
 
   buildInputs = [ m4 perl ];
-- 
cgit 1.4.1


From e16427a899e6e23cc2b2aa5e50916ebc048e84a1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 19 Aug 2010 22:52:00 +0000
Subject: Fix broken datadir in 4.5.0 as well

svn path=/nixpkgs/trunk/; revision=23261
---
 pkgs/desktops/kde-4.5/support/akonadi/default.nix       |  1 +
 .../support/akonadi/fix-broken-datadir-parameter.patch  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/support/akonadi/default.nix b/pkgs/desktops/kde-4.5/support/akonadi/default.nix
index 5ef0fcb183c0c..0d6e4dc3e65ea 100644
--- a/pkgs/desktops/kde-4.5/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.5/support/akonadi/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
     sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5";
   };
   buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
+  patches = [ ./fix-broken-datadir-parameter.patch ];
   meta = with stdenv.lib; {
     description = "KDE PIM Storage Service";
     license = "LGPL";
diff --git a/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch b/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch
new file mode 100644
index 0000000000000..fa33329d4b0f5
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch
@@ -0,0 +1,17 @@
+Fix broken datadir parameter.
+
+--- akonadi-1.3.85/server/src/storage/dbconfigmysql.cpp	2010-06-09 03:41:30.000000000 -0430
++++ akonadi-local-1.3.85/server/src/storage/dbconfigmysql.cpp	2010-08-11 00:21:20.547181479 -0430
+@@ -250,11 +250,10 @@
+   // synthesize the mysqld command
+   QStringList arguments;
+   arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir );
++  arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
+ #ifndef Q_WS_WIN
+-  arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir );
+   arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir );
+ #else
+-  arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
+   arguments << QString::fromLatin1( "--shared-memory" );
+ #endif
+ 
-- 
cgit 1.4.1


From 9e4202d273e05c4585466385bc383581ac74d142 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 19 Aug 2010 22:52:53 +0000
Subject: make makeOverridable noop for functions like a: b: c(a, b)

svn path=/nixpkgs/trunk/; revision=23262
---
 pkgs/lib/customisation.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix
index e8946ddf7439d..f97b494ae92de 100644
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@@ -49,13 +49,17 @@ rec {
   # let d = makeOverridable stdenv.mkDerivation { name = ..; buildInputs; }
   #     noBuildInputs = d.override { buildInputs = []; }
   #     additionalBuildInputs = d.override ( args : args // { buildInputs = args.buildInputs ++ [ additional ]; } )
-  makeOverridable = f: origArgs: f origArgs //
-    { override = newArgs:
-        makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs));
-      deepOverride = newArgs:
-        makeOverridable f (lib.overrideExisting (lib.mapAttrs (deepOverrider newArgs) origArgs) newArgs);
-      #origArgs = origArgs;
-    };
+  makeOverridable = f: origArgs:
+    let
+      ff = f origArgs;
+    in
+      if builtins.isAttrs ff then (ff //
+        { override = newArgs:
+            makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs));
+          deepOverride = newArgs:
+            makeOverridable f (lib.overrideExisting (lib.mapAttrs (deepOverrider newArgs) origArgs) newArgs);
+        })
+      else ff;
 
   deepOverrider = newArgs: name: x: if builtins.isAttrs x then (
     if x ? deepOverride then (x.deepOverride newArgs) else
-- 
cgit 1.4.1


From c7c210735d172de366a24b2a354ba874ed864a77 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 19 Aug 2010 22:54:38 +0000
Subject: Fix symlink. TODO: upstream fix

svn path=/nixpkgs/trunk/; revision=23263
---
 pkgs/desktops/kde-4.5/base-runtime/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/base-runtime/default.nix b/pkgs/desktops/kde-4.5/base-runtime/default.nix
index 35466b4b62476..7abac4aa594ae 100644
--- a/pkgs/desktops/kde-4.5/base-runtime/default.nix
+++ b/pkgs/desktops/kde-4.5/base-runtime/default.nix
@@ -1,6 +1,6 @@
 { kdePackage, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba,
   shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano,
-  cluceneCore, attica, virtuoso, makeWrapper }:
+  cluceneCore, attica, virtuoso, makeWrapper, oxygen_icons }:
 
 kdePackage {
   pn = "kdebase-runtime";
@@ -13,6 +13,8 @@ kdePackage {
   patches = [ ./freeze.diff ];
 
   postInstall = ''
+    rm -v $out/share/icons/default.kde4
+    ln -s ${oxygen_icons}/share/icons/oxygen $out/share/icons/default.kde4
     wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
         --prefix PATH : "${virtuoso}/bin"
   '';
-- 
cgit 1.4.1


From b16167a028053013db9cfd6f172cef98644aae14 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 19 Aug 2010 22:56:06 +0000
Subject: Add kdepim{,-runtime}-4.4.92 to manifest

svn path=/nixpkgs/trunk/; revision=23264
---
 pkgs/desktops/kde-4.5/kde-package/manifest.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index b96b9b85b33a1..d33a365a19cd1 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -1,5 +1,13 @@
 builtins.listToAttrs
 [
+{
+  name = "kdepim-runtime-4.4.92.tar.bz2";
+  value = "1gshcnra3fcbj6ww7rfaw6ny1x9mf4l7pxwlrppv2slgwg141msy";
+}
+{
+  name = "kdepim-4.4.92.tar.bz2";
+  value = "0mhpifynnypg81nhwfvr28hbpr7c6w488afasprqhxbs4q57lin6";
+}
 {
   name = "kdegraphics-4.5.0.tar.bz2";
   value = "13ms1z26sb2pfadhagkykgnw0p7inrn36p4s9qr04qisy2b2vd6l";
-- 
cgit 1.4.1


From 6345fa2d1d703d51cb36733e9d9a439c7b4b90e0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 19 Aug 2010 22:57:09 +0000
Subject: kdepim-runtime-4.4.92

svn path=/nixpkgs/trunk/; revision=23265
---
 pkgs/desktops/kde-4.5/default.nix             |  3 ++-
 pkgs/desktops/kde-4.5/pim-runtime/default.nix | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/kde-4.5/pim-runtime/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 7bb4ada00731a..1d2abb5284a2b 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -61,7 +61,8 @@
   kdeutils = callPackage ./utils { };
   kdewebdev = callPackage ./webdev { };
 
-  kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
+  #kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
+  kdepim_runtime = callPackage ./pim-runtime { };
   kdepim = callPackage ../kde-4.4/pim { };
 ### DEVELOPMENT
 
diff --git a/pkgs/desktops/kde-4.5/pim-runtime/default.nix b/pkgs/desktops/kde-4.5/pim-runtime/default.nix
new file mode 100644
index 0000000000000..2d1787f62a756
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/pim-runtime/default.nix
@@ -0,0 +1,14 @@
+{ kdePackage, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }:
+
+kdePackage rec {
+	pn = "kdepim-runtime";
+	v = "4.4.92";
+	stable = false;
+	subdir = "kdepim/${v}/src";
+
+	buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ];
+
+  meta = {
+    description = "Runtime files for KDE PIM: akonadi agents etc.";
+  };
+}
-- 
cgit 1.4.1


From 9d4feab5c5ffa4d0b72eed784f2033d4a4dcb907 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Aug 2010 08:52:59 +0000
Subject: * NixOS: use nixStable.

svn path=/nixpkgs/trunk/; revision=23267
---
 pkgs/top-level/all-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5556a128bf7ed..d46f78850e15b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6859,10 +6859,13 @@ let
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
 
+  nixUnstable = nixStable;
+  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
+  */
 
   # The SQLite branch.
   nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) {
-- 
cgit 1.4.1


From 544cb2a0c9c10759bc7a0a43e89e99b706aa0e1b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 20 Aug 2010 09:07:35 +0000
Subject: updated calibre to 0.7.14

svn path=/nixpkgs/trunk/; revision=23268
---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 5261037e1c5cc..3dc6a427f25ec 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.7.0";
+  name = "calibre-0.7.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.gz";
-    sha256 = "0aij3gqkfvhzrsfk0ms9mlawrdj46r3634cglbwsapv17g2wv6mg";
+    sha256 = "07vnmxxpg77pmd7fhcrlnark02bn6zj62hbsybdqz8fp1yp99wkn";
   };
 
   inherit python;
-- 
cgit 1.4.1


From 7120017365f8b7e0334b0bc34cde75025d25646f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Aug 2010 09:18:53 +0000
Subject: * Add meta info to xpf.

svn path=/nixpkgs/trunk/; revision=23269
---
 pkgs/tools/text/xml/xpf/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix
index 7ad55102c4f84..fa8e8078362a4 100644
--- a/pkgs/tools/text/xml/xpf/default.nix
+++ b/pkgs/tools/text/xml/xpf/default.nix
@@ -4,9 +4,16 @@ assert libxml2.pythonSupport == true;
 
 stdenv.mkDerivation {
   name = "xpf-0.2";
+  
   src = fetchurl {
     url = http://nixos.org/tarballs/xpf-0.2.tar.gz;
     md5 = "d92658828139e1495e052d0cfe25d312";
   };
+  
   buildInputs = [python libxml2];
+
+  meta = {
+    description = "XML Pipes and Filters - command line tools for manipulating and querying XML data";
+    homepage = http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters;
+  };
 }
-- 
cgit 1.4.1


From 2e230288bf1050c59139c3543ef5a88c6beef329 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Aug 2010 09:29:10 +0000
Subject: * Latest kernels.

svn path=/nixpkgs/trunk/; revision=23270
---
 pkgs/os-specific/linux/kernel/linux-2.6.27.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-2.6.34.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-2.6.35.nix | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
index 13713acb00c09..dfbe507fd8f85 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
@@ -3,11 +3,11 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }:
 import ./generic.nix (
 
   rec {
-    version = "2.6.27.50";
+    version = "2.6.27.51";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "09lrwrf2278wz5ic3hzjmqcahlazcpw7sxyvln09nmf42anaw7fc";
+      sha256 = "092x3ribl63i1kj27kg4qmvr20sys0wl58qsf1wjiy33pw5j63lk";
     };
 
     features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
index bb7a218f55594..e719dda314cab 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
@@ -206,11 +206,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.32.18";
+    version = "2.6.32.19";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "1z35clz0176blqk3ygfim0a6y7b4ndbjpc1pkz7pxnscsj1kl9k7";
+      sha256 = "09scjb73gqnby49ahkmabzlg0v72pqc7nvicr207a4nyhijfi6fw";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix b/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
index 633e158a35766..1f44ae0551004 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
@@ -194,11 +194,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.34.3";
+    version = "2.6.34.4";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "1mm5yphkclcmjbq7v40nn6js1canna1gl5d4065xiza0v5gdq83v";
+      sha256 = "19flipl10cbn4xf4skjr6v3p8baxv3igzvhxm175lkrg2qphv5nd";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
index 80bf835f663f6..9a0a9f3d86089 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
@@ -190,11 +190,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.35.1";
+    version = "2.6.35.2";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "04pax26ksdp8i61qr4qdwc98iw47vjnwi53x73hbii5v0dz3qixy";
+      sha256 = "1cvbk58i4724v1wkjc574d61in5q4d3l1ix6icy59dsnhx5v9krn";
     };
 
     config = configWithPlatform stdenv.platform;
-- 
cgit 1.4.1


From 3be78e74fbb96f974bbd00d093cbc07dab6a8877 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Aug 2010 10:07:35 +0000
Subject: * Added xmlstarlet.

svn path=/nixpkgs/trunk/; revision=23271
---
 pkgs/tools/text/xml/xmlstarlet/default.nix | 31 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/text/xml/xmlstarlet/default.nix

(limited to 'pkgs')

diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix
new file mode 100644
index 0000000000000..ffeb9a8cd7c1b
--- /dev/null
+++ b/pkgs/tools/text/xml/xmlstarlet/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "xmlstarlet-1.0.2";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/xmlstar/${name}.tar.gz";
+    sha256 = "07a5c3fhqpvyy07pggl3ky7ahvlcpsmppy71x4h4albvanfbpjwj";
+  };
+
+  buildInputs = [ pkgconfig libxml2 libxslt ];
+
+  preConfigure =
+    ''
+      export LIBXSLT_PREFIX=${libxslt}
+      export LIBXML_PREFIX=${libxml2}
+      export LIBXSLT_LIBS=$(pkg-config --libs libxslt libexslt)
+      export LIBXML_LIBS=$(pkg-config --libs libxml-2.0)
+    '';
+
+  postInstall =
+    ''
+      ln -s xml $out/bin/xmlstarlet
+    '';
+
+  meta = {
+    description = "A command line tool for manipulating and querying XML data";
+    homepage = http://xmlstar.sourceforge.net/;
+    license = "bsd";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d46f78850e15b..298c380f5f065 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1341,6 +1341,8 @@ let
     inherit (gnome) libgnomeprint;
   };
 
+  xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { };
+
   xmlto = callPackage ../tools/typesetting/xmlto { };
 
   xmltv = callPackage ../tools/misc/xmltv { };
-- 
cgit 1.4.1


From 7dea1a0f4f0b893780e0e4d8a64b77642fa22205 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Aug 2010 13:13:26 +0000
Subject: * Revert to 2.6.32.18 for now, because we get a lot of "BUG:  
 scheduling while atomic" errors   (e.g.
 http://hydra.nixos.org/build/568323/log/raw).  This might be   fixed by this
 patch: http://lkml.org/lkml/2010/8/6/672

svn path=/nixpkgs/trunk/; revision=23272
---
 pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
index e719dda314cab..bb7a218f55594 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
@@ -206,11 +206,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.32.19";
+    version = "2.6.32.18";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "09scjb73gqnby49ahkmabzlg0v72pqc7nvicr207a4nyhijfi6fw";
+      sha256 = "1z35clz0176blqk3ygfim0a6y7b4ndbjpc1pkz7pxnscsj1kl9k7";
     };
 
     config = configWithPlatform stdenv.platform;
-- 
cgit 1.4.1