summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xpkgs/desktops/kde-4/kdebase/builder.sh21
-rw-r--r--pkgs/desktops/kde-4/kdebase/default.nix17
-rw-r--r--pkgs/desktops/kde-4/kdelibs/default.nix6
-rwxr-xr-xpkgs/desktops/kde-4/kdepim/builder.sh18
-rw-r--r--pkgs/desktops/kde-4/kdepim/default.nix55
-rw-r--r--pkgs/desktops/kde-4/kdepimlibs/default.nix10
-rw-r--r--pkgs/development/libraries/boost/default.nix7
-rw-r--r--pkgs/development/libraries/gpgme/default.nix6
-rw-r--r--pkgs/development/libraries/icu/default.nix14
-rw-r--r--pkgs/development/libraries/libgpg-error/default.nix6
-rw-r--r--pkgs/development/libraries/strigi/default.nix10
-rw-r--r--pkgs/development/tools/build-managers/cmake/default.nix6
-rw-r--r--pkgs/os-specific/linux/alsa/library/default.nix6
-rw-r--r--pkgs/os-specific/linux/alsa/utils/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix38
15 files changed, 186 insertions, 40 deletions
diff --git a/pkgs/desktops/kde-4/kdebase/builder.sh b/pkgs/desktops/kde-4/kdebase/builder.sh
new file mode 100755
index 00000000000..41cff761b36
--- /dev/null
+++ b/pkgs/desktops/kde-4/kdebase/builder.sh
@@ -0,0 +1,21 @@
+source ${stdenv}/setup
+
+myPreBuild()
+{
+	for i in ${qt}/include/*; do
+		NIX_CFLAGS_COMPILE="-I$i ${NIX_CFLAGS_COMPILE}"
+	done;
+	echo "${NIX_CFLAGS_COMPILE}"
+}
+preBuild=myPreBuild
+
+myPatchPhase()
+{
+	echo "Fixing dbus calls in CMakeLists.txt files"
+# Trailing slash in sed is essential
+	find .. -name CMakeLists.txt \
+	| xargs sed -e "s@\${DBUS_INTERFACES_INSTALL_DIR}/@${kdelibs}/share/dbus-1/interfaces/@" -i
+	sed -e '/^#define HAS_RANDR_1_2 1$/d' -i ../workspace/kcontrol/randr/randr.h
+}
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/desktops/kde-4/kdebase/default.nix b/pkgs/desktops/kde-4/kdebase/default.nix
index 84fa718ec01..94fdc2c1691 100644
--- a/pkgs/desktops/kde-4/kdebase/default.nix
+++ b/pkgs/desktops/kde-4/kdebase/default.nix
@@ -12,6 +12,7 @@
 , libXfixes
 , libXft
 , libXi
+, libXinerama
 , libXpm
 , libXrandr
 , libXrender
@@ -24,25 +25,31 @@
 , zlib, perl, qt, openssl, pcre
 , pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
 , freetype, bzip2, strigi, cmake, shared_mime_info, alsaLib, libungif
-, cups, kdelibs
+, libusb, glib, mesa
+, cups, kdelibs, kdepimlibs
 }:
 
 stdenv.mkDerivation {
-  name = "kdebase-3.91.0";
+  name = "kdebase-4.0beta1";
+  builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/stable/3.91.0/src/kdebase-3.91.0.tar.bz2;
-    sha256 = "0p1lgmd0jbf87g1khyjr0g9hph4lr1jd3l992nfm6xv9zc5i39br";
+    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdebase-3.92.0.tar.bz2;
+    sha256 = "1xh5a93l6anmix358fll4xfqm5fl4hpm1ksmlab8hr8s7vqng707";
   };
 
   buildInputs = [
 	inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
 	xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
 	libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
+	libXinerama mesa stdenv.gcc.libc
 	libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile
     zlib perl qt openssl pcre 
     pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
     libtool freetype bzip2 strigi cmake shared_mime_info alsaLib libungif cups
-	kdelibs
+	kdelibs kdepimlibs libusb glib
   ];
+# TODO : it should be done through setup-hooks
+  KDEDIRS="${kdelibs}/share/apps:${kdepimlibs}/share/apps";
+  inherit qt kdelibs;
 }
diff --git a/pkgs/desktops/kde-4/kdelibs/default.nix b/pkgs/desktops/kde-4/kdelibs/default.nix
index f7ef4caa524..247ad855f20 100644
--- a/pkgs/desktops/kde-4/kdelibs/default.nix
+++ b/pkgs/desktops/kde-4/kdelibs/default.nix
@@ -28,11 +28,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "kdelibs-3.91.0";
+  name = "kdelibs-4.0beta1";
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/stable/3.91.0/src/kdelibs-3.91.0.tar.bz2;
-    sha256 = "14zi2wd1k116dvg996cfw53sihm0y7wcqpdxhc4y458mcrb2a8sz";
+    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdelibs-3.92.0.tar.bz2;
+    sha256 = "19jd9nx5g0ayxavj3ys52wx5ppxw9yr9jylxk7qplxsm525ryf1p";
   };
 
   buildInputs = [
diff --git a/pkgs/desktops/kde-4/kdepim/builder.sh b/pkgs/desktops/kde-4/kdepim/builder.sh
new file mode 100755
index 00000000000..73d0e9febcd
--- /dev/null
+++ b/pkgs/desktops/kde-4/kdepim/builder.sh
@@ -0,0 +1,18 @@
+source ${stdenv}/setup
+
+myPreBuild()
+{
+	for i in ${qt}/include/*; do
+		NIX_CFLAGS_COMPILE="-I$i ${NIX_CFLAGS_COMPILE}"
+	done;
+	echo "${NIX_CFLAGS_COMPILE}"
+}
+preBuild=myPreBuild
+
+myPatchPhase()
+{
+	sed -e '3s/)/ ${CMAKE_MODULE_PATH})/' -i ../CMakeLists.txt
+}
+patchPhase=myPatchPhase
+
+genericBuild
diff --git a/pkgs/desktops/kde-4/kdepim/default.nix b/pkgs/desktops/kde-4/kdepim/default.nix
new file mode 100644
index 00000000000..f03f3a105c8
--- /dev/null
+++ b/pkgs/desktops/kde-4/kdepim/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl
+, inputproto, kbproto, scrnsaverproto, xextproto, xf86miscproto
+, xf86vidmodeproto, xineramaproto, xproto
+, libICE
+, libX11
+, libXau
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXdmcp
+, libXext
+, libXfixes
+, libXft
+, libXi
+, libXinerama
+, libXpm
+, libXrandr
+, libXrender
+, libXScrnSaver
+, libXt
+, libXtst
+, libXv
+, libXxf86misc
+, libxkbfile
+, zlib, perl, qt, openssl, pcre
+, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
+, freetype, bzip2, strigi, cmake, shared_mime_info, alsaLib, libungif
+, libusb, glib, mesa, gpgme, boost
+, cups, kdelibs, kdepimlibs
+}:
+
+stdenv.mkDerivation {
+  name = "kdepim-4.0beta1";
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdepim-3.92.0.tar.bz2;
+    sha256 = "1wlq1h7j07f24n1mjnv9wbfsxn2vn24qfn5dgn4j4fsl84qha16i";
+  };
+
+  buildInputs = [
+	inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
+	xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
+	libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
+	libXinerama mesa stdenv.gcc.libc
+	libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile
+    zlib perl qt openssl pcre 
+    pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
+    libtool freetype bzip2 strigi cmake shared_mime_info alsaLib libungif cups
+	kdelibs kdepimlibs libusb glib gpgme boost
+  ];
+# TODO : it should be done through setup-hooks
+  KDEDIRS="${kdelibs}/share/apps:${kdepimlibs}/share/apps";
+  inherit qt kdelibs;
+}
diff --git a/pkgs/desktops/kde-4/kdepimlibs/default.nix b/pkgs/desktops/kde-4/kdepimlibs/default.nix
index 4273bb665b9..63721073ab4 100644
--- a/pkgs/desktops/kde-4/kdepimlibs/default.nix
+++ b/pkgs/desktops/kde-4/kdepimlibs/default.nix
@@ -24,15 +24,15 @@
 , zlib, perl, qt, openssl, pcre
 , pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
 , freetype, bzip2, strigi, cmake, shared_mime_info, alsaLib, libungif
-, cups, kdelibs, boost
+, cups, kdelibs, boost, gpgme
 }:
 
 stdenv.mkDerivation {
-  name = "kdepimlibs-3.91.0";
+  name = "kdepimlibs-4.0beta1";
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/stable/3.91.0/src/kdepimlibs-3.91.0.tar.bz2;
-    sha256 = "0d9ir4xrbk9d1sm8551xac1v2bc0l1ssnqiqzjwni0mcavi6lpf5";
+    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdepimlibs-3.92.0.tar.bz2;
+    sha256 = "0q7zzj8n282xaxvdij74fb17w5c1vja7izxfrkcbq7arn9f40wbx";
   };
 
   buildInputs = [
@@ -43,6 +43,6 @@ stdenv.mkDerivation {
     zlib perl qt openssl pcre 
     pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
     libtool freetype bzip2 strigi cmake shared_mime_info alsaLib libungif cups
-	kdelibs boost
+	kdelibs boost gpgme
   ];
 }
diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index a5172e31625..27c42ad7203 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, icu, zlib, bzip2, python}:
 
 stdenv.mkDerivation {
   name = "boost-1.34.0";
@@ -6,4 +6,9 @@ stdenv.mkDerivation {
     url = http://kent.dl.sourceforge.net/sourceforge/boost/boost_1_34_0.tar.bz2;
     sha256 = "1lpganl8grvmy8rsbps5688yqiswvixjwz15d0kjfndp87xbhp25";
   };
+  buildInputs = [icu zlib bzip2 python];
+  preConfigure="
+    sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"--layout=system release threading=multi link=shared\"@g' -i configure
+  ";
+  configureFlags="--with-icu=${icu}";
 }
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 1eff12646d3..68bbbc40904 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, libgpgerror, gnupg}:
 
 stdenv.mkDerivation {
-  name = "gpgme-1.0.3";
+  name = "gpgme-1.1.4";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gpgme-1.0.3.tar.gz;
-    md5 = "4d33cbdf844fcee1c724e4cf2a32dd11";
+    url = ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.bz2;
+    sha256 = "0ncrv7p33rjq1avkxpp9x0gz6wna9y3b3dmw6nv366n5mgvxmpg8";
   };
   buildInputs = [libgpgerror gnupg];
 }
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
new file mode 100644
index 00000000000..6a38d32eb33
--- /dev/null
+++ b/pkgs/development/libraries/icu/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "icu4c-3.6";
+  src = fetchurl {
+    url = ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz;
+    sha256 = "0hdh8sbpmabijprdpn7rmsqilw97f3paxxsxa4hd61k2kpbfhdai";
+  };
+  postUnpack="
+    sourceRoot=\${sourceRoot}/source
+    echo Source root reset to \${sourceRoot}
+  ";
+  configureFlags="--disable-debug";
+}
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index ea37b987f03..c1f98d5c4b0 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "libgpg-error-1.0";
+  name = "libgpg-error-1.4";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libgpg-error-1.0.tar.gz;
-    md5 = "ff409db977e4a4897aa09ea420a28a2f";
+    url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.4.tar.gz;
+    sha256 = "06fn9rshrm7r49fkjc17xg39nz37kyda2l13qqgzjg69zz2pxxpz";
   };
 }
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index f6618bfae0d..85f21652b53 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, zlib, bzip2, expat, pkgconfig, cluceneCore, cluceneContrib,
-qt, cmake, dbus, libxml2 }:
+qt, cmake, dbus, libxml2, perl }:
 
 stdenv.mkDerivation {
-  name = "strigi-0.5.1";
+  name = "strigi-0.5.3dev";
 
   src = fetchurl {
-    url = ftp://ftp.chg.ru/pub/sourceforge/s/st/strigi/strigi-0.5.1.tar.bz2;
-    sha256 = "0n9ffqxdmz6ibki8rmac298z27937jddp7khmg2q8p15pnl5dq7i";
+    url = http://repo.calcforge.org/f8/strigi-0.5.3.tar.bz2;
+    sha256 = "0rv7l2s4r022hrsw3jw0pvxh0yzlaw53jhmjxi3cbi6mdvc1y2sv";
   };
 
   patchPhase="sed -e 's/ iconv / /' -i ../cmake/FindIconv.cmake;
   export CLUCENE_HOME=${cluceneCore}";
   buildInputs = [zlib cluceneCore cluceneContrib expat bzip2 pkgconfig qt cmake
-  stdenv.gcc.libc dbus libxml2];
+  stdenv.gcc.libc dbus libxml2 perl];
 
   meta = {
     description = "Strigi is a fast and light desktop search engine";
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index c07fbc7f593..5515bf288e8 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation {
-  name = "cmake-2.4.6";
+  name = "cmake-2.4.7";
   setupHook = ./setup-hook.sh;
 
   src = fetchurl {
-    url = http://www.cmake.org/files/v2.4/cmake-2.4.6.tar.gz;
-    sha256 = "0163q13gw9ff28dpbwq23h83qfqabvcxrzsi9cjpyc9dfg7jpf5g";
+    url = http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz;
+    sha256 = "0mkx23s7zq48hzzzw3vbzsfzfz3rjsiwgf3i00xawcxrjjrgxm9g";
   };
 
   buildInputs = [];
diff --git a/pkgs/os-specific/linux/alsa/library/default.nix b/pkgs/os-specific/linux/alsa/library/default.nix
index 6d0484556f5..32df29d722f 100644
--- a/pkgs/os-specific/linux/alsa/library/default.nix
+++ b/pkgs/os-specific/linux/alsa/library/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "alsa-lib-1.0.12";
+  name = "alsa-lib-1.0.14";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/alsa-lib-1.0.12.tar.bz2;
-    md5 = "d351d46c5e415d4c8448487737939c72";
+    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.14.tar.bz2;
+	sha256 = "18xhm53adgss20jnva2nfl9gk46kb5an6ah820pazqn0ykd97rh1";
   };
 }
diff --git a/pkgs/os-specific/linux/alsa/utils/default.nix b/pkgs/os-specific/linux/alsa/utils/default.nix
index 22555092ba2..ccc49432566 100644
--- a/pkgs/os-specific/linux/alsa/utils/default.nix
+++ b/pkgs/os-specific/linux/alsa/utils/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, alsaLib, ncurses, gettext}:
 
 stdenv.mkDerivation {
-  name = "alsa-utils-1.0.13";
+  name = "alsa-utils-1.0.14";
   src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.13.tar.bz2;
-    sha256 = "1w2hq2b4p3kvrl1a8nb6klrkkll20rx97hgvi4f36x5wjmwqmznp";
+    url = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.14.tar.bz2;
+    sha256 = "1jx5bwa8abx7aih4lymx4bnrmyip2yb0rp1mza97wpni1q7n6z9h";
   };
   buildInputs = [alsaLib ncurses gettext];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24f1135b167..f0dd7295d52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1274,7 +1274,7 @@ rec {
   };
 
   boost = import ../development/libraries/boost {
-    inherit fetchurl stdenv /* zlib bzip2 python */;
+    inherit fetchurl stdenv icu zlib bzip2 python;
   };
 
   cairo = import ../development/libraries/cairo {
@@ -1480,6 +1480,10 @@ rec {
     inherit aspell;
   };
 
+  icu = import ../development/libraries/icu {
+    inherit fetchurl stdenv;
+  };
+
   id3lib = import ../development/libraries/id3lib {
     inherit fetchurl stdenv;
   };
@@ -1776,7 +1780,7 @@ rec {
 
   strigi = import ../development/libraries/strigi {
 	  inherit stdenv fetchurl zlib cluceneCore cluceneContrib expat bzip2
-	  pkgconfig cmake dbus libxml2;
+	  pkgconfig cmake dbus libxml2 perl;
 	  qt = qt4;
   };
 
@@ -3473,7 +3477,8 @@ rec {
     inherit
       fetchurl stdenv zlib perl openssl pcre pkgconfig
       libjpeg libpng libtiff libxml2 libxslt libtool
-	  expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups boost;
+	  expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups
+	  boost gpgme;
 	inherit (xlibs)
 	  inputproto kbproto scrnsaverproto xextproto xf86miscproto
 	  xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
@@ -3484,19 +3489,40 @@ rec {
 	kdelibs = kdelibs4;
   };
 
+  kdepim4 = import ../desktops/kde-4/kdepim {
+    inherit
+      fetchurl stdenv zlib perl openssl pcre pkgconfig
+      libjpeg libpng libtiff libxml2 libxslt libtool libusb
+	  expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups
+	  mesa gpgme boost;
+	inherit (xlibs)
+	  inputproto kbproto scrnsaverproto xextproto xf86miscproto
+	  xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
+	  libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
+	  libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
+	  libxkbfile libXinerama;
+	inherit (gtkLibs) glib;
+    qt = qt4;
+	kdelibs = kdelibs4;
+	kdepimlibs = kdepimlibs4;
+  };
+
   kdebase4 = import ../desktops/kde-4/kdebase {
     inherit
       fetchurl stdenv zlib perl openssl pcre pkgconfig
-      libjpeg libpng libtiff libxml2 libxslt libtool
-	  expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups;
+      libjpeg libpng libtiff libxml2 libxslt libtool libusb
+	  expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups
+	  mesa;
 	inherit (xlibs)
 	  inputproto kbproto scrnsaverproto xextproto xf86miscproto
 	  xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
 	  libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
 	  libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
-	  libxkbfile;
+	  libxkbfile libXinerama;
+	inherit (gtkLibs) glib;
     qt = qt4;
 	kdelibs = kdelibs4;
+	kdepimlibs = kdepimlibs4;
   };
 
   kdebase = import ../desktops/kde/kdebase {
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-18 02:41:15 +0000