Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages

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

4 files changed, 87 insertions, 39 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e383ebb573..a2dbda33baf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -373,12 +373,12 @@ let
     monolithic = false;
     daemon = true;
   };
-  
+
   amuleGui = amule.override {
     monolithic = false;
     client = true;
   };
-  
+
   aria = builderDefsPackage (import ../tools/networking/aria) {
   };
 
@@ -781,6 +781,8 @@ let
 
   jwhois = callPackage ../tools/networking/jwhois { };
 
+  kdiff3 = newScope pkgs.kde4 ../tools/text/kdiff3 { };
+
   keychain = callPackage ../tools/misc/keychain { };
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };
@@ -946,6 +948,7 @@ let
 
   openjade = callPackage ../tools/text/sgml/openjade {
     stdenv = overrideGCC stdenv gcc33;
+    opensp = opensp.override { stdenv = overrideGCC stdenv gcc33; };
   };
 
   openobex = callPackage ../tools/bluetooth/openobex { };
@@ -1201,7 +1204,10 @@ let
 
   telnet = callPackage ../tools/networking/telnet { };
 
-  texmacs = callPackage ../applications/office/texmacs { };
+  texmacs = callPackage ../applications/editors/texmacs {
+    tex = texLive; /* tetex is also an option */
+    extraFonts = true;
+  };
 
   tor = callPackage ../tools/security/tor { };
 
@@ -1219,7 +1225,7 @@ let
   unetbootin = callPackage ../tools/cd-dvd/unetbootin { };
 
   upx = callPackage ../tools/compression/upx { };
-  
+
   usbmuxd = callPackage ../tools/misc/usbmuxd {};
 
   vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
@@ -2249,7 +2255,7 @@ let
   antDarwin = apacheAnt.override rec { jdk = openjdkDarwin; name = "ant-" + jdk.name; } ;
 
   ant = apacheAnt;
-  
+
   apacheAnt = callPackage ../development/tools/build-managers/apache-ant {
     name = "ant-" + jdk.name;
   };
@@ -2621,6 +2627,8 @@ let
 
   ccrtp = callPackage ../development/libraries/ccrtp { };
 
+  check = callPackage ../development/libraries/check { };
+
   chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) {
     inherit cmake freeglut mesa;
     inherit (xlibs) libX11 xproto inputproto libXi libXmu;
@@ -3140,6 +3148,8 @@ let
 
   judy = callPackage ../development/libraries/judy { };
 
+  kdevplatform = newScope pkgs.kde4 ../development/libraries/kdevplatform { };
+
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
 
   lablgtk = callPackage ../development/libraries/lablgtk {
@@ -3736,12 +3746,12 @@ let
     monolithic = false;
     daemon = true;
   };
-  
+
   quasselClient = quassel.override {
     monolithic = false;
     client = true;
   };
-  
+
   quesoglc = callPackage ../development/libraries/quesoglc { };
 
   readline = readline6;
@@ -3834,7 +3844,7 @@ let
   t1lib = callPackage ../development/libraries/t1lib { };
 
   taglib = callPackage ../development/libraries/taglib { };
-  
+
   taglib17 = callPackage ../development/libraries/taglib/1.7.nix { };
 
   taglib_extras = callPackage ../development/libraries/taglib-extras { };
@@ -3895,7 +3905,7 @@ let
   };
 
   wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
-    inherit (gtkLibs216) gtk;
+    inherit (gtkLibs) gtk;
   };
 
   wtk = callPackage ../development/libraries/wtk { };
@@ -4070,10 +4080,6 @@ let
 
   bsddb3 = callPackage ../development/python-modules/bsddb3 { };
 
-  flup = builderDefsPackage ../development/python-modules/flup {
-    inherit fetchurl stdenv python setuptools;
-  };
-
   numeric = callPackage ../development/python-modules/numeric { };
 
   pil = callPackage ../development/python-modules/pil { };
@@ -4263,7 +4269,7 @@ let
   });
   squid = squids.squid3Beta; # has ipv6 support
 
-  tomcat5 = callPackage ../servers/http/tomcat { };
+  tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
 
   tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };
 
@@ -4983,6 +4989,8 @@ let
 
   ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };
 
+  ubootGuruplug = callPackage ../misc/uboot/guruplug.nix { };
+
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
   uclibcCross = import ../os-specific/linux/uclibc {
@@ -5411,6 +5419,8 @@ let
 
   dia = callPackage ../applications/graphics/dia { };
 
+  digikam = newScope pkgs.kde4 ../applications/graphics/digikam { };
+
   djvulibre = callPackage ../applications/misc/djvulibre { };
 
   djview4 = callPackage ../applications/graphics/djview { };
@@ -5586,6 +5596,8 @@ let
 
   feh = callPackage ../applications/graphics/feh { };
 
+  filelight = newScope pkgs.kde4 ../applications/misc/filelight { };
+
   firefox = firefox36Pkgs.firefox;
   firefoxWrapper = firefox36Wrapper;
 
@@ -5683,6 +5695,11 @@ let
 
   gocr = callPackage ../applications/graphics/gocr { };
 
+  gobby5 = callPackage ../applications/editors/gobby {
+    inherit (gtkLibs) gtkmm;
+    inherit (gnome) gtksourceview;
+  };
+
   gphoto2 = callPackage ../applications/misc/gphoto2 { };
 
   gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix {
@@ -5823,15 +5840,16 @@ let
 
   jwm = callPackage ../applications/window-managers/jwm { };
 
-  kadu = callPackage ../applications/networking/instant-messengers/kadu {
-    qt = qt4;
-    inherit fetchurl cmake libgadu bash libsndfile wget alsaLib;
-    inherit (xlibs) libXScrnSaver libX11;
-    inherit (kde45) qca2;
-  };
+  kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { };
 
   kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
 
+  kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { };
+
+  kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { };
+
+  kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { };
+
   kermit = callPackage ../tools/misc/kermit { };
 
   kino = import ../applications/video/kino {
@@ -5842,12 +5860,22 @@ let
     inherit (xlibs) libXv libX11;
   };
 
+  kipi_plugins = newScope pkgs.kde4 ../applications/graphics/kipi-plugins { };
+
+  kmplayer = newScope pkgs.kde4 ../applications/video/kmplayer {
+    inherit (pkgs.gtkLibs) pango;
+  };
+
   koffice = newScope pkgs.kde4 ../applications/office/koffice { };
 
+  konq_plugins = newScope pkgs.kde4 ../applications/networking/browsers/konq-plugins { };
+
   konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
 
   krename = newScope pkgs.kde4 ../applications/misc/krename { };
 
+  krusader = newScope pkgs.kde4 ../applications/misc/krusader { };
+
   ktorrent = newScope pkgs.kde4 ../applications/networking/ktorrent { };
 
   lame = callPackage ../applications/audio/lame { };
@@ -6259,9 +6287,9 @@ let
 
   viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
   {
-    inherit
-      monotone flup cheetahTemplate highlight ctags
+    inherit monotone cheetahTemplate highlight ctags
       makeWrapper graphviz which python;
+    flup = pythonPackages.flup;
   };
 
   vim = callPackage ../applications/editors/vim { };
@@ -7003,7 +7031,7 @@ let
     tex = tetex;
   };
 
-  mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { 
+  mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {
     lua = lua5;
     inherit (pythonPackages) pexpect paramiko;
   };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f4f84067899..15b41b6f3de 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -137,6 +137,8 @@ rec {
 
   ghcCore = callPackage ../development/libraries/haskell/ghc-core {};
 
+  ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
+
   ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
 
   ghcPaths_0_1_0_6 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.6.nix {};
@@ -151,6 +153,14 @@ rec {
     network = network_2_2_1_7;
   };
 
+  glade = callPackage ../development/libraries/haskell/glade {
+    inherit (pkgs) pkgconfig gnome glibc;
+  };
+
+  glib = callPackage ../development/libraries/haskell/glib {
+    inherit (pkgs) pkgconfig glib glibc;
+  };
+
   GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
 
   GLUT2121 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {
@@ -166,6 +176,11 @@ rec {
     inherit (pkgs.xlibs) libSM libICE libXmu libXi;
   };
 
+  gtk = callPackage ../development/libraries/haskell/gtk {
+    inherit (pkgs) pkgconfig glibc;
+    inherit (pkgs.gtkLibs) gtk;
+  };
+
   gtk2hs = callPackage ../development/libraries/haskell/gtk2hs {
     inherit (pkgs) pkgconfig gnome cairo;
   };
@@ -417,6 +432,11 @@ rec {
     random = random_newtime;
   };
 
+  pango = callPackage ../development/libraries/haskell/pango {
+    inherit (pkgs) pkgconfig glibc;
+    inherit (pkgs.gtkLibs) pango;
+  };
+
   parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {};
 
   parallel = callPackage ../development/libraries/haskell/parallel {};
@@ -732,6 +752,8 @@ rec {
 
   tar = callPackage ../development/tools/haskell/tar {};
 
+  threadscope = callPackage ../development/tools/haskell/threadscope {};
+
   uuagc = callPackage ../development/tools/haskell/uuagc {};
 
   # Applications.
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 58bfa7e341b..a380e5f30c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -171,6 +171,20 @@ rec {
     };
   });
 
+  flup = buildPythonPackage (rec {
+    name = "flup-1.0.2";
+
+    src = fetchurl {
+      url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz";
+      sha256 = "1nbx174g40l1z3a8arw72qz05a1qxi3didp9wm7kvkn1bxx33bab";
+    };
+
+    meta = {
+      homepage = "http://trac.saddi.com/flup";
+      description = "FastCGI Python module set";
+    };
+  });
+
   foolscap = buildPythonPackage (rec {
     name = "foolscap-0.5.1";
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f385e9a069a..8efcdd651c9 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -449,22 +449,6 @@ with (import ./release-lib.nix);
     kile = linux;
   };
 
-  kde44 = {
-    krusader = linux;
-    kmplayer = linux;
-    ktorrent = linux;
-    koffice = linux;
-    konversation = linux;
-    kdesvn = linux;
-    amarok = linux;
-    k3b = linux;
-    l10n.ca = linux;
-    l10n.de = linux;
-    l10n.fr = linux;
-    l10n.nl = linux;
-    l10n.ru = linux;
-  };
-
   linuxPackages_2_6_27 = {
     aufs = linux;
     kernel = linux;