Updating from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=22254
2010-06-14 09:28:10 +00:00 · 2010-06-14 09:28:10 +00:00 · 86345919c2
commit 86345919c2
parent bf11f132e0 b88adf69c3
212 changed files with 4513 additions and 3738 deletions
--- a/maintainers/docs/update-upstream-data.txt
+++ b/maintainers/docs/update-upstream-data.txt
@ -0,0 +1,15 @@
+Semi-automatic source information updating using "update-upstream-data.sh" script and "src-{,info-}for-*.nix"
+
+1. Recognizing when a pre-existing package uses this mechanism.
+
+Packages using this automatical update mechanism have src-info-for-default.nix and src-for-default.nix next to default.nix. src-info-for-default.nix describes getting the freshest source from upstream web site; src-for-default.nix is a generated file with the current data about used source. Both files define a simple attrSet. 
+
+src-info-for-default.nix (for a file grabbed via http) contains at least downloadPage attribute - it is the page we need to look at to find out the latest version. It also contains baseName that is used for automatical generation of package name containing version. It can contain extra data for trickier cases.
+
+src-for-default.nix will contain advertisedUrl (raw URL chosen on the site; its change prompts regeneration of source data), url for fetchurl, hash, version retrieved from the download URL and suggested package name.
+
+2. Updating a package
+
+nixpkgs/pkgs/build-support/upstream-updater directory contains some scripts. The worker script is called update-upstream-data.sh. This script requires main expression name (e.g. default.nix). It can optionally accpet a second parameter, URL which will be used instead of getting one by parsing the downloadPage (version extraction, mirror URL creation etc. will still be run). After running the script, check src-for-default.nix (or replace default.nix with expression name, if there are seceral expressions in the directory) for new version information.
+
+
--- a/maintainers/scripts/gnu/gnupdate.scm
+++ b/maintainers/scripts/gnu/gnupdate.scm
@ -28,7 +28,7 @@
             (srfi srfi-11)
             (srfi srfi-37)
             (system foreign)
-             (rnrs bytevector))
+             (rnrs bytevectors))


 ;;;
--- a/maintainers/scripts/gnu/sxml-match.scm
+++ b/maintainers/scripts/gnu/sxml-match.scm
--- a/pkgs/applications/audio/lame/default.nix
+++ b/pkgs/applications/audio/lame/default.nix
@ -1,10 +1,10 @@
 {stdenv, fetchurl, nasm}:

-stdenv.mkDerivation {
-  name = "lame-3.98.2";
+stdenv.mkDerivation rec {
+  name = "lame-3.98.4";
  src = fetchurl {
-    url = mirror://sourceforge/lame/lame-398-2.tar.gz;
-    sha256 = "0cmgr515szd9kd19mpzvwl3cbnpfyjyi47swj4afblcfkmb2hym1";
+    url = "mirror://sourceforge/lame/${name}.tar.gz";
+    sha256 = "1j3jywv6ic2cy0x0q1a1h6rcl6xmcs5f58xawjdkl8hpcv3l8cdc";
  };

  buildInputs = [ nasm ];
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs, perl }:
+{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:

 let
  pname = "ProofGeneral";
@ -15,28 +15,32 @@ stdenv.mkDerivation {
    sha256 = "ae430590d6763618df50a662a37f0627d3c3c8f31372f6f0bb2116b738fc92d8";
  };

-  buildInputs = [ emacs perl ];
-
  sourceRoot = name;

-  postPatch = "EMACS=emacs make clean";
+  buildInputs = [ emacs texinfo texLive perl which ];

-  # Skip building ...
-  buildPhase = "true";
+  patchPhase =
+    '' sed -i "Makefile" \
+           -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
+               s|/sbin/install-info|install-info|g"

-  installPhase = ''
-    DEST=$out/share/emacs/site-lisp/ProofGeneral
-    ensureDir $DEST
-    cp -a * $DEST
-  '';
+       sed -i "bin/proofgeneral" -e's/which/type -p/g'
+    '';
+
+  installPhase =
+    # Copy `texinfo.tex' in the right place so that `texi2pdf' works.
+    '' cp -v "${automake}/share/"automake-*/texinfo.tex doc
+       make install install-doc
+    '';

  meta = {
-    description = "A generic front-end for proof assistants";
+    description = "Proof General, an Emacs front-end for proof assistants";
    longDescription = ''
      Proof General is a generic front-end for proof assistants (also known as
      interactive theorem provers), based on the customizable text editor Emacs.
    '';
    homepage = website;
-    license = "GPL";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
  };
 }
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@ -1,17 +1,25 @@
-{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib }:
+{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib
+, libXinerama }:

 stdenv.mkDerivation {
-  name = "feh-1.3.4";
+  name = "feh-1.6.1";

  src = fetchurl {
-    url = http://linuxbrit.co.uk/downloads/feh-1.3.4.tar.gz;
-    sha256 = "091iz2id5z80vn2qxg0ipwncv5bv8i9ifw2q15ja9zazq6xz5fc1";
+    url = http://www.chaosdorf.de/~derf/feh/feh-1.6.1.tar.bz2;
+    sha256 = "1mv09b34ar0dx4wl22xak2g554xgpylicqy5zbnk3bh66vn9pxz2";
  };

-  buildInputs = [x11 imlib2 giblib libjpeg libpng];
+  buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama];
+
+  preBuild = ''
+    makeFlags="PREFIX=$out"
+  '';

  meta = {
    description = "A light-weight image viewer";
-    homepage = http://linuxbrit.co.uk/feh/;
+    homepage = https://derf.homelinux.org/projects/feh/;
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
  };
 }
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@ -1,14 +1,14 @@
 { fetchurl, stdenv, cmake, qt4 }:

 stdenv.mkDerivation rec {
-  name = "paraview-3.6.2";
+  name = "paraview-3.8.0";
  src = fetchurl {
-    url = "http://www.paraview.org/files/v3.6/${name}.tar.gz";
-    sha256 = "017axalkiaqd13jfbb4awcxvpndnzaq35ys7svm5rnizdwd5hbq6";
+    url = "http://www.paraview.org/files/v3.8/ParaView-3.8.0.tar.gz";
+    sha256 = "0y20daf59hn9dmbp1cmx0085z34qccwps04hv2lh9s15namca9py";
  };

  preConfigure = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.6"
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.8"
  '';

  buildInputs = [ cmake qt4 ];
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@ -1,35 +1,26 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl
+, ghostscript, atk, gtk, glib, fontconfig, freetype
+, libgnomecanvas, libgnomeprint, libgnomeprintui
+, pango, libX11, xproto, zlib, poppler, popplerData
+, autoconf, automake, libtool, pkgconfig}:
+stdenv.mkDerivation rec {
+  version = "0.4.5";
+  name = "xournal-" + version;
+  src = fetchurl {
+    url = "mirror://sourceforge/xournal/${name}.tar.gz";
+    sha256 = "1lamfzhby06w2pg56lpv1symdixcwmg6wvi7g6br6la4ak5w5mx7";
+  };

-  version = a.lib.attrByPath ["version"] "0.4.2.1" a; 
-  buildInputs = with a; [
+  buildInputs = [
    ghostscript atk gtk glib fontconfig freetype
    libgnomecanvas libgnomeprint libgnomeprintui
    pango libX11 xproto zlib poppler popplerData
    autoconf automake libtool pkgconfig
  ];
-in
-rec {
-  src = fetchurl {
-    url = "http://downloads.sourceforge.net/xournal/xournal-${version}.tar.gz";
-    sha256 = "1zxqcdhsd7h19c6pz7dwkr8bncn64v07liiqyw504m2v8lylrsif";
-  };

-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setEnvVars" "doAutotools" "doConfigure" "doMakeInstall"];
-
-  setEnvVars = a.noDepEntry (''
-    export NIX_LDFLAGS="-lX11"
-  '');
-      
-  name = "xournal-" + version;
+  NIX_LDFLAGS="-lX11 -lz";
  meta = {
    description = "note-taking application (supposes stylus)";
-    maintainers = [
-    ];
+    maintainers = [ stdenv.lib.maintainers.guibert ];
  };
 }
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@ -4,11 +4,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "calibre-0.6.47";
+  name = "calibre-0.7.0";

  src = fetchurl {
    url = "mirror://sourceforge/calibre/${name}.tar.gz";
-    sha256 = "16s5rqlwbyq4al8xl5qr8ha6nyhcyd8q9gzm8pbi3q0ksda2k2qi";
+    sha256 = "0aij3gqkfvhzrsfk0ms9mlawrdj46r3634cglbwsapv17g2wv6mg";
  };

  inherit python;
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@ -1,11 +1,11 @@
 {stdenv, fetchurl, libX11, libXinerama}:

 stdenv.mkDerivation rec {
-  name = "dmenu-4.0";
+  name = "dmenu-4.1.1";

  src = fetchurl {
    url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "0qp8n9hz15lzqp5dnq6lqknxhmlrgv20x2bnbc2zr891bql0hif0";
+    sha256 = "02p687yi3fmnpkbvnskpryz54dc4i8pzf1spxc554s91wrd7fpwy";
  };

  buildInputs = [ libX11 libXinerama ];
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@ -6,11 +6,11 @@ zlib }:
 assert stdenv.system == "i686-linux";

 stdenv.mkDerivation {
-  name = "googleearth-5.1.3533.1731";
+  name = "googleearth-5.1.3535.3218";

  src = fetchurl {
    url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin;
-    sha256 = "1sxs1nwb2zh2j8dbwm65r04byn66yn79kpzhilhswly6r8d7yivg";
+    sha256 = "f721e4e8db3a7351c77a8aea425ec334ff01e163481cbcf6cdda9dbb0ad422ac";
  };

  buildNativeInputs = [
@ -34,10 +34,12 @@ stdenv.mkDerivation {
  ];

  phases = "unpackPhase installPhase";
+  
  unpackPhase = ''
    bash $src --noexec --target unpacked
    cd unpacked
  '';
+  
  installPhase =''
    ensureDir $out/{opt/googleearth/,bin};
    tar xf googleearth-data.tar -C $out/opt/googleearth
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@ -0,0 +1,30 @@
+a@{fetchsvn, libxml2, gtk, curl, pkgconfig, lib, ...} :  
+let 
+  fetchsvn = a.fetchsvn;
+
+  buildInputs = with a; [
+    libxml2 gtk curl pkgconfig
+  ];
+in
+rec {
+  src = fetchsvn {
+    url = http://svn.openstreetmap.org/applications/rendering/gosmore;
+    sha256 = "0r6c6gk0pjljwcqxjy18d2s526pyv2kwydf5gl9k68s1b20ps3nd";
+    rev = "21657";
+  } + "/";
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  name = "gosmore-r21657";
+  meta = {
+    description = "Open Street Map viewer";
+    maintainers = [
+      a.lib.maintainers.raskin
+    ];
+    platforms = a.lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/misc/grass/default.nix
+++ b/pkgs/applications/misc/grass/default.nix
@ -0,0 +1,182 @@
+{getConfig, ...}@a:
+
+# You can set gui by exporting GRASS_GUI=..
+# see http://grass.itc.it/gdp/html_grass64/g.gui.html
+# defaulting to wxpython because this is used in the manual
+let inherit (builtins) getAttr;
+    inherit (a.composableDerivation) edf wwf;
+    inherit (a.stdenv.lib) maybeAttr optionalString;
+
+    # wrapper for wwf call
+    # lib: the lib whose include and lib paths should be passed
+    # {}@args: additional args being merged before passing everything to wwf
+    wwfp = lib: {name, ...}@args:
+      let mbEnable = maybeAttr "enable" {} args;
+      in wwf (args // {
+      enable =  mbEnable // {
+        buildInputs = [ lib ]
+          ++ maybeAttr "buildInputs" [] mbEnable;
+        configureFlags = [
+          "--with-${name}-libs=${lib}/lib"
+          "--with-${name}-includes=${lib}/include"
+        ] ++ maybeAttr "configureFlags" [] mbEnable;
+      };
+    });
+in
+a.composableDerivation.composableDerivation {} (fix: {
+
+  name = "grass-6.4.0RC6";
+
+  buildInputs = [
+    # gentoos package depends on gmath ? 
+    a.pkgconfig
+    a.flex a.bison a.libXmu a.libXext a.libXp a.libX11 a.libXt a.libSM a.libICE
+    a.libXpm a.libXaw a.flex a.bison a.gdbm
+    a.makeWrapper
+  ];
+
+  cfg = {
+    _64bitSupport = getConfig ["grass" "64bitSupport"] true;
+    cursesSupport = getConfig ["grass" "curses"] true;
+    gdalSupport = getConfig ["grass" "gdal"] true;
+    pythonSupport = getConfig ["grass" "python"] true;
+    wxwidgetsSupport = getConfig ["grass" "wxwidgets"] true;
+    readlineSupport = getConfig ["grass" "readline"] true;
+    jpegSupport = getConfig ["grass" "jpeg"] true;
+    tiffSupport = getConfig ["grass" "tiff"] true;
+    pngSupport = getConfig ["grass" "png"] true;
+    tcltkSupport = getConfig ["grass" "tcltk"] true;
+    postgresSupport = getConfig ["grass" "postgres"] true;
+    mysqlSupport = getConfig ["grass" "mysql"] true;
+    sqliteSupport = getConfig ["grass" "sqlite"] true;
+    ffmpegSupport = getConfig ["grass" "ffmpeg"] true;
+    openglSupport = getConfig ["grass" "opengl"] true;
+    odbcSupport = getConfig ["grass" "odbc"] false; # fails to find libodbc - why ?
+    fftwSupport = getConfig ["grass" "fftw"] true;
+    blasSupport = getConfig ["grass" "blas"] true;
+    lapackSupport = getConfig ["grass" "lapack"] true;
+    cairoSupport = getConfig ["grass" "cairo"] true;
+    motifSupport = getConfig ["grass" "motif"] true;
+    freetypeSupport = getConfig ["grass" "freetype"] true;
+    projSupport = getConfig ["grass" "proj"] true;
+    opendwgSupport = getConfig ["grass" "dwg"] false;
+    largefileSupport = getConfig ["grass" "largefile"] true;
+  };
+
+  # ?? NLS support:                no
+  # ?? GLw support:                no
+  # ?? DWG support:                no
+  flags = {
+
+    python = {
+      configureFlags = [ "--with-python=${a.python}/bin/python-config" ];
+      buildInputs = [a.python a.swig];
+    };
+    
+  }
+  // edf { name = "_64bit"; feat = "64bit"; }
+  // wwfp a.ncurses { name = "curses"; }
+  // wwfp a.gdal { name = "gdal"; }
+  // wwfp a.wxGTK { name = "wxwidgets"; value = "${a.wxGTK}/bin/wx-config"; }
+  // wwfp a.readline { name = "readline"; }
+  // wwfp a.libjpeg { name = "jpeg"; }
+  // wwfp a.libtiff { name = "tiff"; }
+  // wwfp a.libpng { name = "png"; }
+  // wwfp a.tk { name = "tcltk"; enable.buildInputs = [ a.tcl ]; }
+  // wwfp a.postgresql { name = "postgres"; }
+  // wwf {
+    name = "mysql";
+    enable = {
+      buildInputs = [ a.mysql ];
+      configureFlags = [
+        "--with-mysql-libs=${a.mysql}/lib/mysql"
+        "--with-mysql-includes=${a.mysql}/include/mysql"
+      ];
+    };
+  }
+  // wwfp a.sqlite { name = "sqlite"; }
+  // wwf {
+    name = "ffmpeg";
+    enable = {
+      configureFlags = [
+        "--with-ffmpeg-libs=${a.ffmpeg}/lib"
+        "--with-ffmpeg-includes=${a.ffmpeg}/include"
+      ];
+      # is there a nicer way to pass additional include directories?
+      # this should work: --with-ffmpeg-includes=/usr/include/lib[av|sw]*
+      # I did not try
+      preConfigure = ''
+        for dir in ${a.ffmpeg}/include/*; do
+          if [ -d $dir ]; then
+            NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$dir"
+          fi
+        done
+      '';
+      buildInputs = [a.ffmpeg];
+    };
+  }
+  // wwfp a.mesa { name = "opengl"; }
+  // wwfp a.unixODBC { name = "odbc"; }
+  // wwfp a.fftw { name = "fftw"; }
+  // wwf {
+    name = "blas"; 
+    enable.configureFlags = [ "--with-blas-libs=${a.blas}/lib" ];
+  }
+  // wwf {
+    name = "lapack";
+    enable.configureFlags = [ "--with-lapack-libs=${a.liblapack}/lib" ];
+  }
+  // wwfp a.cairo {
+    name = "cairo";
+    enable.buildInputs = [ a.fontconfig a.libXrender ];
+  }
+  // wwfp a.motif { name = "motif"; }
+  // wwf {
+    name="freetype";
+    enable = {
+      buildInputs = [ a.freetype ];
+      configureFlags = [
+        "--with-freetype-libs=${a.freetype}/lib"
+        "--with-freetype-includes=${a.freetype}/include/freetype2"
+      ];
+    };
+  }
+  // wwfp a.proj { name = "proj"; enable.configureFlags = [ "--with-proj-share=${a.proj}/share"]; }
+  // wwfp a.opendwg { name = "opendwg"; }
+  // edf {
+    name = "largefile";
+  };
+  /* ?
+  // wwf {
+    name = "x";
+    enable.buildInputs = [];
+  };
+  */
+
+  src = a.fetchurl {
+    url = "http://grass.itc.it/grass64/source/grass-6.4.0RC6.tar.gz";
+    sha256 = "043cxa224rd4q1x2mq7sl7ylnxv2vvb4k8laycgcjnp60nzhlmaz";
+  };
+
+  postInstall = ''
+    e=$(echo $out/bin/grass*)
+    mv $out/bin/{,.}$(basename $e)
+    cat >> $e << EOF
+    #!/bin/sh
+    export PATH=${a.python}/bin:\$PATH
+    export GRASS_WISH=\${a.tk}/bin/wish
+    export GRASS_GUI=\''${GRASS_GUI:-wxpython}
+    export SHELL=/bin/sh
+    ${optionalString fix.fixed.cfg.wxwidgetsSupport ''export PYTHONPATH=\$PYTHONPATH\''${PYTHONPATH:+:}:$(toPythonPath ${a.wxPython})''}
+    exec $out/bin/.$(basename $e)
+    EOF
+    chmod +x $e
+  '';
+
+  meta = {
+    description = "free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization";
+    homepage = http://grass.itc.it/index.php;
+    license = [ "GPL" ];
+  };
+
+})
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@ -1,14 +1,14 @@
-{ stdenv, fetchurl, Xaw3d, ghostscriptX }:
+{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }:

 stdenv.mkDerivation rec {
-  name = "gv-3.6.9";
+  name = "gv-3.7.1";

  src = fetchurl {
    url = "mirror://gnu/gv/${name}.tar.gz";
-    sha256 = "1b7n4xbgbgjvbq9kmacmk12vfwzc443bcs38p8k4yb60m7r7qzkb";
+    sha256 = "0541p3jlxvvw4136250rizybrl8sqyg03avy0w4r4kiw9w5f31ys";
  };

-  buildInputs = [ Xaw3d ghostscriptX ];
+  buildInputs = [ Xaw3d ghostscriptX perl ];

  patchPhase = ''
    sed 's|\<gs\>|${ghostscriptX}/bin/gs|g' -i "src/"*.in
--- a/pkgs/applications/misc/htmldoc/default.nix
+++ b/pkgs/applications/misc/htmldoc/default.nix
@ -0,0 +1,16 @@
+{ stdenv, fetchurl, fltk, openssl, libpng, libjpeg }:
+stdenv.mkDerivation rec {
+  name = "htmldoc-1.8.27";
+  src = fetchurl {
+    url = http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2;
+    sha256 = "04wnxgx6fxdxwiy9vbawdibngwf55mi01hjrr5fkfs22fcix5zw9";
+  };
+  buildInputs = [ fltk openssl libpng libjpeg ];
+  meta = {
+    homepage = http://www.htmldoc.org/;
+    description = "Converts HTML files to indexed HTML, PS or PDF";
+    license = "GPLv2";
+    maintainers = with stdenv.lib.maintainers; [ viric ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@ -0,0 +1,23 @@
+{stdenv, fetchurl, qt, boost}:
+
+stdenv.mkDerivation {
+  name = "merkaartor-0.16.0";
+  src = fetchurl {
+    url = http://www.merkaartor.org/downloads/source/merkaartor-0.16.0.tar.bz2;
+    sha256 = "0l33vgwwkqj65i86qq5j33bbf6q02hs8r1frjnd7icqdaqqv08d7";
+  };
+
+  configurePhase = ''
+    qmake -makefile PREFIX=$out
+  '';
+
+  buildInputs = [ qt boost ];
+
+  meta = {
+    description = "An openstreetmap editor";
+    homepage = http://merkaartor.org/;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
--- a/pkgs/applications/misc/qgis/default.nix
+++ b/pkgs/applications/misc/qgis/default.nix
@ -6,19 +6,19 @@ let inherit (builtins) getAttr;
 in
 composableDerivation.composableDerivation {} {

-  buildInputs = [ gdal cmake qt flex bison proj geos x11 sqlite gsl];
+  buildInputs = [ gdal cmake qt flex bison proj geos x11 sqlite gsl pyqt4];
    cfgOption = [
                  # without this option it can't find sqlite libs yet (missing symbols..) (TODO)
                  "-DWITH_INTERNAL_SQLITE3=TRUE"
                ];

-  name = "qgis-1.0.1-2";
+  name = "qgis-1.4.0";

  # src = args.fetchsvn { url=https://svn.qgis.org/repos/qgis/trunk/qgis;
  #                md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; };
  src = fetchurl {
-    url = "http://download.osgeo.org/qgis/src/qgis_1.0.1-2.tar.gz";
-    sha256 = "07yyic9sn1pz20wjk7k560jwqz6b19rhf2gawybz38xq1f8rjwd4";
+    url = http://download.osgeo.org/qgis/src/qgis_1.4.0.tar.gz;
+    sha256 = "1nn71j9pnkqcprwvzqnybh6ybl0zp50jj04lm769bnjbxknpxq5v";
  };

  meta = {
--- a/pkgs/applications/misc/qgis/trunk.nix
+++ b/pkgs/applications/misc/qgis/trunk.nix
@ -0,0 +1,23 @@
+{qgis, fetchurl,  sourceFromHead, python, sip}:
+qgis.merge {
+
+  name = "qgis-trunk";
+
+  buildInputs = [ sip python ];
+
+  preConfigure = ''
+    export PYTHONPATH=$(toPythonPath ${sip})
+  '';
+
+  cfgOption = [
+                # without this option it can't find sqlite libs yet (missing symbols..) (TODO)
+                "-DWITH_INTERNAL_SQLITE3=TRUE"
+                "-DPYTHON_EXECUTABLE=${python}/bin/python"
+              ];
+
+  # REGION AUTO UPDATE:    { name="qgis"; type="svn"; url="https://svn.osgeo.org/qgis/trunk/qgis"; }
+  src = sourceFromHead "qgis-13572.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/qgis-13572.tar.gz"; sha256 = "fd4c0e19919901cbee7ead7522acdbecbf17c5b9050e34ef91f8ea6e2736bec8"; });
+  # END
+
+}
--- a/pkgs/applications/misc/simgrid/default.nix
+++ b/pkgs/applications/misc/simgrid/default.nix
@ -0,0 +1,59 @@
+{ fetchurl, stdenv, cmake, ruby }:
+
+stdenv.mkDerivation rec {
+  name = "simgrid-3.4.1";
+
+  src = fetchurl {
+    url = "https://gforge.inria.fr/frs/download.php/26944/${name}.tar.bz2";
+    sha256 = "acd2bb2c1abf59e9b190279b1c38582b7c1edd4b6ef4c6a9b01100740f1a6b28";
+  };
+
+  /* FIXME: Ruby currently disabled because of this:
+
+     Linking C shared library ../src/.libs/libsimgrid.so
+     ld: cannot find -lruby-1.8.7-p72
+
+   */
+  buildInputs = [ cmake /* ruby */ ];
+
+  preConfigure =
+    # Make it so that libsimgrid.so will be found when running programs from
+    # the build dir.
+    '' export LD_LIBRARY_PATH="$PWD/src/.libs"
+       export cmakeFlags="-Dprefix=$out"
+    '';
+
+  makeFlags = "VERBOSE=1";
+
+  patchPhase =
+    '' for i in "src/smpi/"*
+       do
+         sed -i "$i" -e's|/bin/bash|/bin/sh|g'
+       done
+    '';
+
+  installPhase = "make install-simgrid";
+
+  # Fixing the few tests that fail is left as an exercise to the reader.
+  doCheck = false;
+
+  meta = {
+    description = "SimGrid, a simulator for distributed applications in heterogeneous environments";
+
+    longDescription =
+      '' SimGrid is a toolkit that provides core functionalities for the
+         simulation of distributed applications in heterogeneous distributed
+         environments.  The specific goal of the project is to facilitate
+         research in the area of distributed and parallel application
+         scheduling on distributed computing platforms ranging from simple
+         network of workstations to Computational Grids.
+      '';
+
+    homepage = http://simgrid.gforge.inria.fr/;
+
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation {
                   "--with-tk="  + tk  + "/lib";

  postInstall = ''
-    wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/tk8.4"
+    wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
    wrapProgram $out/bin/wnb    --prefix PATH : "$out/bin"
  '';

--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, gtk, poppler }:
+stdenv.mkDerivation rec {
+  name = "zathura-0.0.5";
+  src = fetchurl {
+    #url = "https://pwmt.org/zathura/download/{name}.tar.gz"
+    # Site's SSL cert is invalid, and I dunno how to pass --insecure to curl.
+    # Thanks Mark Weber for mirroring this tarball.
+    url = "http://mawercer.de/~nix/${name}.tar.gz";
+    sha256 = "e4dfbcceafc7bcb5c4e1ff349822c610db6378906ab65aabba8be246d7ee9b52";
+  };
+  buildInputs = [ pkgconfig gtk poppler ];
+  patchPhase = ''
+    substituteInPlace config.mk --replace 'PREFIX = /usr' "PREFIX = $out"
+  '';
+  meta = {
+    homepage = https://pwmt.org/zathura/;
+    description = "A highly customizable and functional PDF viewer";
+    longDescription = ''
+      zathura is a highly customizable and functional PDF viewer based on the
+      poppler rendering library and the gtk+ toolkit. The idea behind zathura
+      is an application that provides a minimalistic and space saving interface
+      as well as an easy usage that mainly focuses on keyboard interaction.
+    '';
+    license = "free";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@ -5,20 +5,20 @@
 assert stdenv.isLinux && stdenv.gcc.gcc != null;

 stdenv.mkDerivation rec {
-  name = "opera-10.00";
+  name = "opera-10.10";

  builder = ./builder.sh;
  
  src =
    if stdenv.system == "i686-linux" then
      fetchurl {
-        url = "http://mirror.liteserver.nl/pub/opera/linux/1000/final/en/i386/shared/${name}.gcc4-shared-qt3.i386.tar.gz";
-        sha256 = "1l87rxdzq2mb92jbwj4gg79j177yzyfbkqb52gcdwicw8jcmhsad";
+        url = "http://mirror.liteserver.nl/pub/opera/linux/1010/final/en/i386/shared/opera-10.10.gcc4-shared-qt3.i386.tar.bz2";
+        sha256 = "0y8xahwgx5jw83ky4zkw8ixyfgnd2xg9k0zq15yivhimi60fsppc";
      }
    else if stdenv.system == "x86_64-linux" then
      fetchurl {
-        url = "http://mirror.liteserver.nl/pub/opera/linux/1000/final/en/x86_64/${name}.gcc4-shared-qt3.x86_64.tar.gz";
-        sha256 = "0w9a56j3jz0bjdj98k6n4xmrjnkvlxm32cfvh2c0f5pvgwcr642i";
+        url = "http://mirror.liteserver.nl/pub/opera/linux/1010/final/en/x86_64/opera-10.10.gcc4-shared-qt3.x86_64.tar.bz2";
+        sha256 = "1z0zgalqv9lnf1jsg3zg9diqfyszh75r7m1dbkifkdawn4zv4q3s";
      }
    else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";

--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@ -2,7 +2,7 @@ a :
 let 
  fetchurl = a.fetchurl;

-  version = a.lib.attrByPath ["version"] "0.12.1" a; 
+  version = a.lib.attrByPath ["version"] "0.13.4" a; 
  buildInputs = with a; [
    python pyGtkGlade gtk perl intltool dbus gettext
    pkgconfig makeWrapper libglade pyopenssl libXScrnSaver
@ -13,8 +13,8 @@ let
 in
 rec {
  src = fetchurl {
-    url = "http://www.gajim.org/downloads/gajim-${version}.tar.gz";
-    sha256 = "1iglh0i819m1a8qjkbyv2ydzbzhjgnaxyyq1jnikrwlbah5mjpbv";
+    url = "http://www.gajim.org/downloads/0.13/gajim-${version}.tar.gz";
+    sha256 = "0w7ddimwbapz51k76agqac5lwaqrsacl01zgq3jngrkgpfjlvxym";
  };

  inherit buildInputs;
@ -26,8 +26,19 @@ rec {
    sed -e '/-L[$]x_libraries/d' -i configure
  '') ["addInputs" "doUnpack"];

+  fixScriptNames = a.fullDepEntry (''
+    mkdir "$out"/bin-wrapped
+    for i in "$out"/bin/.*-wrapped; do
+      name="$i"
+      name="''${name%-wrapped}"
+      name="''${name##*/.}"
+      mv "$i" "$out/bin-wrapped/$name"
+      sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name"
+    done
+  '') ["wrapBinContentsPython"];
+
  /* doConfigure should be removed if not needed */
-  phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" "wrapBinContentsPython"];
+  phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" "wrapBinContentsPython" "fixScriptNames"];

  name = "gajim-" + version;
  meta = {
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@ -10,6 +10,8 @@ stdenv.mkDerivation {
    sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np";
  };

+  patches = [ ./fix-2.7.0.patch ];
+
  meta = {
    description = "SIPE plugin for Pidgin IM.";
    homepage = http://sipe.sourceforge.net/;
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch
@ -0,0 +1,27 @@
+From 8ad28171ac5c3fbd1917a2f52e75423c4d357b24 Mon Sep 17 00:00:00 2001
+From: David Brown <nix@davidb.org>
+Date: Thu, 3 Jun 2010 06:40:04 -0700
+Subject: [PATCH] Fix initializer for 2.7.0 release
+
+The release of 2.7.0 of pidgin/purple gained two extra fields in a
+structure.
+---
+ src/core/sipe.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/core/sipe.c b/src/core/sipe.c
+index 45a9015..19f4237 100644
+--- a/src/core/sipe.c
+++ b/src/core/sipe.c
+@@ -10683,6 +10683,8 @@ PurplePluginProtocolInfo prpl_info =
+ 	NULL,					/* get_media_caps */
+ #if PURPLE_VERSION_CHECK(2,7,0)
+ 	NULL,					/* get_moods */
+	NULL,					/* set_public_alias */
+	NULL,					/* get_public_alias */
+ #endif
+ #endif
+ #endif
+-- 
+1.7.1
+
--- 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.0";
+  name = "pidgin-2.7.1";
  src = fetchurl {
-    url = mirror://sourceforge/pidgin/pidgin-2.7.0.tar.bz2;
-    sha256 = "0gbq6n36h9a53rp1x41fakrbncxc27y84pn3a0lcz3nvfnpcnnfw";
+    url = mirror://sourceforge/pidgin/pidgin-2.7.1.tar.bz2;
+    sha256 = "1lcmpb86qsknkzwc1395r2aq09v8z6cr7d23jwi57mcs72ksa4pl";
  };

  inherit nss ncurses;
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@ -1,4 +1,5 @@
-{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, libICE, qca2, pkgconfig }:
+{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, 
+  libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all }:

 stdenv.mkDerivation rec {
  name = "psi-0.14";
@ -8,7 +9,8 @@ stdenv.mkDerivation rec {
    sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da";
  };

-  buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE qca2 pkgconfig];
+  buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE 
+    qca2 qca2_ossl pkgconfig];

  NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
  
@ -19,7 +21,24 @@ stdenv.mkDerivation rec {
      " --disable-bundled-qca"
    ];

+  psiMedia = (import ./psimedia.nix) {
+    inherit stdenv fetchurl qt4 speex gst_all liboil;
+  };
+
+  postInstall = ''
+    PSI_PLUGINS="$out/lib/psi/plugins"
+    ensureDir "$PSI_PLUGINS"
+    ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS"
+    PSI_QT_PLUGINS="$out/share/psi"
+    ensureDir "$PSI_QT_PLUGINS"/crypto
+    ln -s "${qca2_ossl}"/lib/qt4/plugins/crypto/*.so "$PSI_QT_PLUGINS"/crypto
+  '';
+
  meta = {
    description = "Psi, an XMPP (Jabber) client";
+    maintainers = with stdenv.lib.maintainers;
+      [raskin];
+    platforms = with stdenv.lib.platforms;
+      linux;
  };
 }
--- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
@ -0,0 +1,24 @@
+{stdenv, fetchurl, qt4, gst_all, liboil, speex}:
+
+stdenv.mkDerivation rec {
+  name = "psimedia";
+
+  src = fetchurl {
+    url = "http://delta.affinix.com/download/psimedia/psimedia-1.0.3.tar.bz2";
+    sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781";
+  };
+
+  buildInputs = [qt4 gst_all.gstreamer gst_all.gstPluginsBase liboil speex];
+
+  configurePhase = ''./configure'';
+
+  postBuild = ''
+    TARGET="$out/share/psi/plugins"
+    ensureDir "$TARGET"
+    cp gstprovider/*.so "$TARGET"/
+  '';
+
+  meta = {
+    description = "Psi Media, a plugin to provide Voice/Video over XMPP";
+  };
+}
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@ -1,4 +1,4 @@
-args: with args;
+{stdenv, fetchurl, openssl}:
 stdenv.mkDerivation {
  name = "msmtp-1.4.13";

@ -7,6 +7,8 @@ stdenv.mkDerivation {
    sha256 = "1x8q8dhcpnjym3icz6070l13hz98fvdvgc5j5psj4pmxbswx0r4p";
  };

+  buildInputs = [ openssl ];
+
  meta = { 
      description = "a MUA";
      homepage = http://msmtp.sourceforge.net/;
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@ -3,10 +3,10 @@ enchant, wv, librsvg, bzip2
 }:

 stdenv.mkDerivation {
-  name = "abiword-2.8.4";
+  name = "abiword-2.8.5";
  src = fetchurl {
-    url = http://www.abisource.org/downloads/abiword/2.8.4/source/abiword-2.8.4.tar.gz;
-    sha256 = "1v2f83cc8j6chsyzgjh903s6c8fkr7dy5s10bqigzfrqi9iv990l";
+    url = http://www.abisource.org/downloads/abiword/2.8.5/source/abiword-2.8.5.tar.gz;
+    sha256 = "0k82y1wd2lx4ifk8rbifbr301zqnrbx61b7x78b14n4k8x13srxa";
  };

  buildInputs = [pkgconfig gtk libglade librsvg bzip2
--- a/pkgs/applications/office/openoffice/OOo-3.1.1-HEADERFIX-1.patch
+++ b/pkgs/applications/office/openoffice/OOo-3.1.1-HEADERFIX-1.patch
@ -1,74 +0,0 @@
-Submitted By:            zippo zippo@oppiz.net
-Date:                    2009-09-23
-Initial Package Version: 3.1.1
-Upstream Status:         Unknown
-Origin:                  zippo@oppiz.net
-Description: Fixes missing headers, GCC-4.3.2 and corrects errors for Glib 2.10
-diff -Naur OOO310_m19/soltools/mkdepend/def.h OOO310_m19.new/soltools/mkdepend/def.h
--- OOO310_m19/soltools/mkdepend/def.h	2008-04-10 18:05:14.000000000 +0000
-+++ OOO310_m19.new/soltools/mkdepend/def.h	2009-09-23 01:17:01.913883308 +0000
-@@ -154,7 +154,7 @@
- 
- char			*copy();
- char			*base_name();
-char			*getline();
-+char			*get_line();
- char			*isdefined();
- struct filepointer	*getfile();
- struct inclist		*newinclude();
-diff -Naur OOO310_m19/soltools/mkdepend/main.c OOO310_m19.new/soltools/mkdepend/main.c
--- OOO310_m19/soltools/mkdepend/main.c	2008-07-22 17:24:34.000000000 +0000
-+++ OOO310_m19.new/soltools/mkdepend/main.c	2009-09-23 01:18:09.160646833 +0000
-@@ -548,7 +548,7 @@
-  * Get the next line.  We only return lines beginning with '#' since that
-  * is all this program is ever interested in.
-  */
-char *getline(filep)
-+char *get_line(filep)
- 	register struct filepointer	*filep;
- {
- 	register char	*p,	/* walking pointer */
-diff -Naur OOO310_m19/soltools/mkdepend/parse.c OOO310_m19.new/soltools/mkdepend/parse.c
--- OOO310_m19/soltools/mkdepend/parse.c	2008-04-10 18:06:39.000000000 +0000
-+++ OOO310_m19.new/soltools/mkdepend/parse.c	2009-09-23 01:18:54.183802453 +0000
-@@ -45,7 +45,7 @@
- 	register int	type;
- 	boolean recfailOK;
- 
-	while ((line = getline(filep))) {
-+	while ((line = get_line(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
- 		case IF:
- 		doif:
-@@ -168,7 +168,7 @@
- 	register char	*line;
- 	register int	type;
- 
-	while ((line = getline(filep))) {
-+	while ((line = get_line(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
- 		case IF:
- 		case IFFALSE:
-diff -Naur OOO310_m19/sw/source/core/doc/docbm.cxx OOO310_m19.new/sw/source/core/doc/docbm.cxx
--- OOO310_m19/sw/source/core/doc/docbm.cxx	2008-09-04 10:19:07.000000000 +0000
-+++ OOO310_m19.new/sw/source/core/doc/docbm.cxx	2009-09-23 12:32:08.011104664 +0000
-@@ -32,7 +32,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sw.hxx"
- 
-
-+#include <stdio.h>
- #include <tools/pstm.hxx>
- #include <svx/linkmgr.hxx>
- #include <fmtanchr.hxx>
-diff -Naur OOO310_m19/sw/source/filter/ww8/WW8TableInfo.cxx OOO310_m19.new/sw/source/filter/ww8/WW8TableInfo.cxx
--- OOO310_m19/sw/source/filter/ww8/WW8TableInfo.cxx	2009-04-21 09:51:46.000000000 +0000
-+++ OOO310_m19.new/sw/source/filter/ww8/WW8TableInfo.cxx	2009-09-23 12:51:12.882511596 +0000
-@@ -31,6 +31,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sw.hxx"
- 
-+#include <stdio.h>
- #include <iostream> 
- #include "WW8TableInfo.hxx"
- #include "swtable.hxx"
--- a/pkgs/applications/office/openoffice/get-go-src.nix
+++ b/pkgs/applications/office/openoffice/get-go-src.nix
@ -0,0 +1,54 @@
+# nix derivation that will create a bash script that will create the go-srcs.nix file.
+# 
+# it can be slightly improved so it downloads properly also the OpenOffice.org upstream package,
+# instead of only those 'additional' to the upstream code. By now the upstream oo.org code I wrote
+# manually in the go-oo.nix.
+#
+# I think this looks quite ugly, but the only way I've found to know what files the program will need,
+# and from what URLs, is running their './configure' with proper parameters and executing their
+# './download' script.
+
+let
+  pkgsFun = import /etc/nixos/nixpkgs;
+  pkgs = pkgsFun {};
+  downloadRoot = "http://download.services.openoffice.org/files/stable/";
+in
+with pkgs;
+
+lib.overrideDerivation go_oo (attrs: {
+  name = attrs.name + "-make-src";
+  src = attrs.src;
+
+  buildInputs = attrs.buildInputs ++ [ gawk ];
+
+  # Avoid downloading what is defined in go_oo
+  srcs_download = null;
+
+  phases = [ "unpackPhase" "configurePhase" "makesh" ];
+
+  makesh = ''
+    sed -i -e '/-x $WG/d' -e "s/WGET='''/WGET='echo XXX'/" download
+    ensureDir $out
+
+    set +e
+    ./download --all | grep XXX | 
+      sed '/bouncer/s,\(.*\)http.*version=\([0-9.]\+\).*lang=\([a-z0-9]\+\).*\( .*\),\1${downloadRoot}\2/OOo_\2_src_\3.tar.bz2\4,' |
+      awk '
+      BEGIN {
+        print "#!/bin/sh"
+        print "echo \"{fetchurl} : [\" > go-srcs.nix"
+      }
+      {
+         print "echo \"(fetchurl {\" >> go-srcs.nix"
+         print "echo \"  url = \\\"" $2 "\\\";\" >> go-srcs.nix"
+         print "echo \"  sha256 = \\\"`nix-prefetch-url " $2 "`\\\";\" >> go-srcs.nix"
+         if (NF > 3)
+           print "echo \"  name = \\\"" $4 "\\\";\" >> go-srcs.nix"
+        print "echo \"})\" >> go-srcs.nix"
+      }
+      END {
+        print "echo ] >> go-srcs.nix"
+      }' > $out/make-go-srcs-nix.sh
+    exit 0
+  '';
+})
--- a/pkgs/applications/office/openoffice/go-oo.nix
+++ b/pkgs/applications/office/openoffice/go-oo.nix
@ -10,28 +10,32 @@

 let
  langsSpaces = stdenv.lib.concatStringsSep " " langs;
+  tag = "OOO320_m19";
+  version = "3.2.1.3";
 in
 stdenv.mkDerivation rec {
-  name = "go-oo-3.2.0.10";
+  name = "go-oo-${version}";
  # builder = ./builder.sh;

-  downloadRoot = "http://download.services.openoffice.org/files/stable";
-
  src = fetchurl {
-      url = "http://download.go-oo.org/OOO320/ooo-build-3.2.0.10.tar.gz";
-      sha256 = "0g6n0m9pibn6cx12zslmknzy1p764nqj8vdf45l5flyls9aj3x21";
+      url = "http://download.go-oo.org/OOO320/ooo-build-${version}.tar.gz";
+      sha256 = "0c8y66ca9nsfbznjazblpszpvg20mgic2bnpffgqb6qlpji6iwd1";
    };

-  srcs_download = (import ./src.nix) fetchurl;
+  srcs_download = import ./go-srcs.nix { inherit fetchurl; };

  # Multi-CPU: --with-num-cpus=4 
+  # The '--with-tag=XXXX' string I took from their 'configure' script. I write it so it matches the
+  # logic in the script for "upstream version for X.X.X". Look for that string in the script.
+  # We need '--without-split' when downloading directly usptream openoffice src tarballs.
  configurePhase = ''
    sed -i -e '1s,/bin/bash,${bash}/bin/bash,' $(find bin -type f)
-    sed -i -e '1s,/usr/bin/perl,${perl}/bin/perl,' download.in bin/ooinstall bin/generate-bash-completion
+    sed -i -e '1s,/usr/bin/perl,${perl}/bin/perl,' download.in $(find bin -type f)
+    sed -i -e '1s,/usr/bin/python,${python}/bin/python,' bin/*.py
    echo "$distroFlags" > distro-configs/SUSE-11.1.conf.in

    ./configure --with-distro=SUSE-11.1 --with-system-libwpd --without-git --with-system-cairo \
-      --with-lang="${langsSpaces}"
+      --with-lang="${langsSpaces}" --with-tag=${tag} --without-split
  '';

  buildPhase = ''
@ -48,7 +52,7 @@ stdenv.mkDerivation rec {
    make build.prepare

    set -x
-    pushd build/ooo3*-*/
+    pushd build/${tag}
    # Fix svtools: hardcoded jpeg path
    sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk
    # Fix sysui: wants to create a tar for root
@ -61,6 +65,7 @@ stdenv.mkDerivation rec {
    sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, redland/redland/makefile.mk \
      redland/raptor/makefile.mk redland/rasqal/makefile.mk
    popd
+
    set +x
    make
  '';
@ -117,6 +122,7 @@ stdenv.mkDerivation rec {
    --without-system-mozilla
    --without-system-libwps
    --without-system-libwpg
+    --without-system-redland
  '';

  buildInputs = [
--- a/pkgs/applications/office/openoffice/go-srcs.nix
+++ b/pkgs/applications/office/openoffice/go-srcs.nix
@ -0,0 +1,66 @@
+{fetchurl} : [
+(fetchurl {
+  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_system.tar.bz2";
+  sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc";
+})
+(fetchurl {
+  url = "http://download.go-oo.org/src//seamonkey-1.1.14.source.tar.gz";
+  sha256 = "0fb0pv2w8583q65ja5x8wh6ah6i3kwwq99s4v8cn99g91v8xn9hr";
+})
+(fetchurl {
+  url = "http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.2.1.tar.bz2";
+  sha256 = "0wfq6xsiqdzmkq3zxhd0q4k7db9bhl027wy5z28pcnmv4li5h40b";
+})
+(fetchurl {
+  url = "http://archive.apache.org/dist/ant/binaries/apache-ant-1.7.0-bin.tar.gz";
+  sha256 = "1dnwzk1k8d5iinxsal3qskjagljx5ywwmwb4i6bymfmyr64qppn1";
+})
+(fetchurl {
+  url = "http://download.go-oo.org//SRC680/mdbtools-0.6pre1.tar.gz";
+  sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi";
+})
+(fetchurl {
+  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_core.tar.bz2";
+  sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i";
+})
+(fetchurl {
+  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_extensions.tar.bz2";
+  sha256 = "0d5byyg0ac0xsi22cw4d857rpd1r3mm2j13ajfydgsn2d2ka7nrj";
+})
+(fetchurl {
+  url = "http://download.go-oo.org//SRC680/extras-3.tar.bz2";
+  sha256 = "1s6cz92b2amfn135l6a2hras4qrd04kw5yyqli7xmb8xqa0m3y3c";
+})
+(fetchurl {
+  url = "http://download.go-oo.org//SRC680/biblio.tar.bz2";
+  sha256 = "02v2xbq771zi09qw3k4zih95m1rjns4pwwpl51n0m34c0a00lhf0";
+})
+(fetchurl {
+  url = "http://multidimalgorithm.googlecode.com/files//mdds_0.3.0.tar.bz2";
+  sha256 = "1zqxs2a1ah0vq2a5dypqclig2c85z0a8rz7b63vfsqxvd2258a2d";
+})
+(fetchurl {
+  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_binfilter.tar.bz2";
+  sha256 = "0nxh1rdw566i7nr5vjfxbankwy5lsd2maggcqz3m0chp7jgvsb6p";
+})
+(fetchurl {
+  url = "http://tools.openoffice.org/unowinreg_prebuild/680//unowinreg.dll";
+  sha256 = "0g3529nr0nfhn3cygn8x931pqxnqq88nfc5h829xncr1j8ifaqzm";
+})
+(fetchurl {
+  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_l10n.tar.bz2";
+  sha256 = "0m3i3czwqcyc2mibldp1zx34wxw7ls7akb3jak75nc6i3h7ykmsm";
+})
+(fetchurl {
+  url = "http://download.go-oo.org//SRC680/libwps-0.1.2.tar.gz";
+  sha256 = "1cdjmgpy0igrwlb5i1sm4s2yxvzbmqz6j7xnmmv3kpbx7z43zw78";
+})
+(fetchurl {
+  url = "http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz";
+  sha256 = "1qv5qqycaqrm8arprwf3vyk76fm6v7qabpx5qq58knp1xm72z98r";
+})
+(fetchurl {
+  url = "http://download.go-oo.org//DEV300/ooo_oxygen_images-2009-06-17.tar.gz";
+  sha256 = "0jhgjhm63cmjr59nhvdln1szgm36v6kkazy2388l7z6xjjrhxk1z";
+})
+]
--- a/pkgs/applications/office/openoffice/src.nix
+++ b/pkgs/applications/office/openoffice/src.nix
@ -1,141 +0,0 @@
-fetchurl:
-[
-  (fetchurl {
-    url = "http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.2.tar.bz2";
-    sha256 = "1v55fl0n8zisn6gih99fn1c5vp6wl6cf0qh1nwlcx9ia76jnjj9k";
-  })
-/*
-  (fetchurl {
-    url = "http://cairographics.org/releases//cairo-1.4.10.tar.gz";
-    sha256 = "0cji7shlnd3yg3939233p8imnrivykx4g39p3qr8r2a4c2k7hkjr";
-  })
-*/
-  (fetchurl {
-    url = "http://download.go-oo.org//SRC680/mdbtools-0.6pre1.tar.gz";
-    sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/artwork/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-artwork.tar.bz2";
-    sha256 = "1zfn1gjdbxychxb9xvfi9hchzqbp20f15nf06badgga5klllir8b";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/base/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-base.tar.bz2";
-    sha256 = "07gmicn9c2x16qzcfi0jh2z8mx0iz76vhskml7xkwv99vryy48im";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/bootstrap/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-bootstrap.tar.bz2";
-    sha256 = "070zmd25wysmf2rka07b8w02wkyxz7qa30kscd9b3pc8m0cgq0fl";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/calc/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-calc.tar.bz2";
-    sha256 = "0iwgmvffljmm1vbkjv36fq0riy7alk7r4gnfl5x9nrw7zic0xh29";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/components/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-components.tar.bz2";
-    sha256 = "19x6lhdbcazkicp4h3zs8sq7n9gc7z9c3xkx6266m15n2k4c8ms9";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/extras/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-extras.tar.bz2";
-    sha256 = "1lr8l0nxaqrhgcbb1vn08a8d4wzq032q2zl9a12dgjrnmgcx76s7";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/filters/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-filters.tar.bz2";
-    sha256 = "1p13w9gngc5wz40nhsx8igk8zygnwcacd3bgas3m2jv9ifazk9v3";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/help/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-help.tar.bz2";
-    sha256 = "0fqg8fpivgpyfqf0s085mjm09cmfzy684q1b58y62hg0f01wwr0k";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/impress/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-impress.tar.bz2";
-    sha256 = "1dhrdsak1jqydjfkylj6r7w1h886gbcn1g4wjh1kgkwk50bdamh5";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/libs-gui/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-libs-gui.tar.bz2";
-    sha256 = "0x5jf8bwzqkd76dpd7rh0fj1p4hmh8h9yshn8rfq6ss26bgwnmwr";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/libs-core/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-libs-core.tar.bz2";
-    sha256 = "1qaa1g9mrlpjv7fkv0c8qarbl162l99w0a92ydsj1lv86jg01xvx";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/libs-extern/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-libs-extern.tar.bz2";
-    sha256 = "0hxkba5yb1c09yyrqpw4llrr7xhpf5x08mnwgfdcfks690p1rzc9";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/postprocess/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-postprocess.tar.bz2";
-    sha256 = "1jkkxpc199y64a41y13s6ib6gyp6gas8gl4w95sx506xvj90qxi3";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/sdk/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-sdk.tar.bz2";
-    sha256 = "0211ak14sblmzswwa605q430gxxdjrqa5a2924r4lb1knrc9vlns";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/testing/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-testing.tar.bz2";
-    sha256 = "0i7bcxd791id2bbgnsakwnmr4xnzd5hdcydlnqx50mni5mcd13v1";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/ure/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-ure.tar.bz2";
-    sha256 = "16957l2npcbaizs29ly0xxfqaxinchnrvi720gggwhfp2mbl05ql";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/writer/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-writer.tar.bz2";
-    sha256 = "0lcdlwy2scs01glj8fi1q1ysmyvn7j70b91ciad3m32lrxmr8s67";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/libs-extern-sys/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-libs-extern-sys.tar.bz2";
-    sha256 = "0my3wh90xil3xpcjxi1q76v1bwi0rf62pzrf3pi3angd5y3hmysd";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/extensions/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-extensions.tar.bz2";
-    sha256 = "1qmyc2vb0n6fdl7p92cpvp972zm6ilafq5s5m21wgicqwfr34chv";
-  })
-  (fetchurl {
-    url = "http://download.go-oo.org//SRC680/extras-3.tar.bz2";
-    sha256 = "1s6cz92b2amfn135l6a2hras4qrd04kw5yyqli7xmb8xqa0m3y3c";
-  })
-  (fetchurl {
-    url = "http://download.go-oo.org//SRC680/biblio.tar.bz2";
-    sha256 = "02v2xbq771zi09qw3k4zih95m1rjns4pwwpl51n0m34c0a00lhf0";
-  })
-  (fetchurl {
-    url = "http://tools.openoffice.org/unowinreg_prebuild/680//unowinreg.dll";
-    sha256 = "0g3529nr0nfhn3cygn8x931pqxnqq88nfc5h829xncr1j8ifaqzm";
-  })
-  (fetchurl {
-    url = "http://cgit.freedesktop.org/ooo-build/l10n/snapshot/ooo/OOO320_m12.tar.bz2";
-    name = "ooo320-m12-l10n.tar.bz2";
-    sha256 = "0lknxxl0n4f383gxkljl1294zggfgaf2hbg3f6p4q6vr1byf3lww";
-  })
-  (fetchurl {
-    url = "http://download.go-oo.org//SRC680/libwps-0.1.2.tar.gz";
-    sha256 = "1cdjmgpy0igrwlb5i1sm4s2yxvzbmqz6j7xnmmv3kpbx7z43zw78";
-  })
-  (fetchurl {
-    url = "http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz";
-    sha256 = "1qv5qqycaqrm8arprwf3vyk76fm6v7qabpx5qq58knp1xm72z98r";
-  })
-  (fetchurl {
-    url = "http://download.go-oo.org//DEV300/ooo_oxygen_images-2009-06-17.tar.gz";
-    sha256 = "0jhgjhm63cmjr59nhvdln1szgm36v6kkazy2388l7z6xjjrhxk1z";
-  })
-]
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@ -1,13 +1,15 @@
-{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz} :
+{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} :
 stdenv.mkDerivation rec {
-  name = "gtkwave-3.3.5";
+  name = "gtkwave-3.3.6";

  src = fetchurl {
    url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "0vll02l3g990spc7yzwl16lbw18ybm7s9j3ffjq2v7949wng43l9";
+    sha256 = "0vlayjvhmijcg4pbjix9lm1d5n2wxzcn16lkm2ysgpc8q6987df8";
  };

-  buildInputs = [ gtk gperf pkgconfig bzip2 xz ];
+  buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy];
+
+  configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ];

  meta = {
    description = "Wave viewer for Unix and Win32";
--- a/pkgs/applications/science/electronics/xoscope/default.nix
+++ b/pkgs/applications/science/electronics/xoscope/default.nix
@ -0,0 +1,20 @@
+{stdenv, fetchurl, gtk, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = "xoscope-2.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/xoscope/${name}.tgz";
+    sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8";
+  };
+
+  buildInputs = [ gtk pkgconfig ];
+
+  meta = {
+    description = "Oscilloscope through the sound card";
+    homepage = http://xoscope.sourceforge.net;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, openssl}:

 let
-  version = "20100318142033";
+  version = "20100521162104";
 in

 stdenv.mkDerivation {
@ -9,7 +9,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
-    sha256 = "16kd9sg99s8v549n9ggr5ynjrz36i71fvj1r66djdbdclg5sxlxv";
+    sha256 = "0aym6r06194nnl5801lhihvjc9mhj7zl602xsz7dch8bnhln470f";
  };

  buildInputs = [ zlib openssl ];
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
       for prog in bin/gitk libexec/git-core/git-gui
       do
         wrapProgram "$out/$prog"                       \
-                     --set TK_LIBRARY "${tk}/lib/tk8.4" \
+                     --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" \
                     --prefix PATH : "${tk}/bin"
       done
     '' else ''
--- a/pkgs/applications/version-management/git-and-tools/git/git-git.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/git-git.nix
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {

   + (if guiSupport then ''
       # Wrap Tcl/Tk programs
-         wrapArgs="$wrapArgs --set TK_LIBRARY ${tk}/lib/tk8.4"
+         wrapArgs="$wrapArgs --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}"
         wrapArgs="$wrapArgs --prefix PATH : ${tk}/bin"
     '' else "")

--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
      hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py
      EOF
      # setting HG so that hgk can be run itself as well (not only hg view)
-      WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/tk8.4\"
+      WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\"
                --set HG \"$out/bin/hg\"
                --prefix PATH : \"${tk}/bin\" "
    ''
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@ -1,11 +1,11 @@
 {stdenv, fetchurl, libX11, libXinerama, patches ? []}:

 stdenv.mkDerivation rec {
-  name = "dwm-5.7.2";
+  name = "dwm-5.8.2";
 
  src = fetchurl {
    url = "http://dl.suckless.org/dwm/${name}.tar.gz";
-    sha256 = "1q6dpyi3fx09wxrclfmr4k6516gzd1aj2svyvrayr76sslrzxgrj";
+    sha256 = "0rlv72fls2k4s48a0mw7mxa05d4qdxgs8pqbkyqkpzz3jb3kn965";
  };
 
  buildInputs = [ libX11 libXinerama ];
--- a/pkgs/applications/window-managers/larswm/default.nix
+++ b/pkgs/applications/window-managers/larswm/default.nix
@ -12,7 +12,8 @@ stdenv.mkDerivation {

  configurePhase = ''
    xmkmf
-    makeFlags="BINDIR=$out/bin"
+    makeFlags="BINDIR=$out/bin MANPATH=$out/share/man"
+    installTargets="install install.man"
  '';

  meta = {
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@ -1,17 +1,17 @@
-{stdenv, mercurial, nix}: {url, tag ? null, md5}:
+{stdenv, mercurial, nix}: {name ? null, url, tag ? null, md5 ? null, sha256 ? null}:

 # TODO: statically check if mercurial as the https support if the url starts woth https.
 stdenv.mkDerivation {
-  name = "fetchhg";
+  name = "fetchhg" + (if (name != null) then "-${name}" else "");
  builder = ./builder.sh;
  buildInputs = [mercurial nix];

  # Nix <= 0.7 compatibility.
  id = md5;

-  outputHashAlgo = "md5";
+  outputHashAlgo = if (md5 != null) then "md5" else "sha256";
  outputHashMode = "recursive";
-  outputHash = md5;
+  outputHash = if (md5 != null) then md5 else sha256;
  
  inherit url tag;
 }
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@ -13,9 +13,11 @@ fi
 # cryptographic hash of the output anyway). 
 curl="curl \
 --location --max-redirs 20 \
+ --retry 3
 --disable-epsv \
 --cookie-jar cookies \
- --insecure"
+ --insecure \
+ $NIX_CURL_FLAGS"


 tryDownload() {
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@ -91,6 +91,9 @@ stdenv.mkDerivation {
    # by definition pure.
    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"

+    # This variable allows the user to pass additional options to curl
+    "NIX_CURL_FLAGS"
+
    # This variable allows the user to override hashedMirrors from the
    # command-line.
    "NIX_HASHED_MIRRORS"
--- a/pkgs/build-support/release/ant-build.nix
+++ b/pkgs/build-support/release/ant-build.nix
@ -5,10 +5,12 @@
 , jars ? []
 , jarWrappers ? []
 , antProperties ? []
+, antBuildInputs ? []
+, buildfile ? "build.xml"
 , ... } @ args:

 let
-  antFlags = stdenv.lib.concatMapStrings ({name, value}: "-D${name}=${value}" ) antProperties ;
+  antFlags = "-f ${buildfile} " + stdenv.lib.concatMapStrings ({name, value}: "-D${name}=${value}" ) antProperties ;
 in
 stdenv.mkDerivation (

@ -21,10 +23,13 @@ stdenv.mkDerivation (
    prePhases = 
      ["antSetupPhase"];

-    antSetupPhase = ''
+    antSetupPhase = with stdenv.lib; ''
      if test "$hydraAntLogger" != "" ; then
        export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/lib/java/*.jar | head -1`"
      fi
+      for abi in ${concatStringsSep " " (map (f: "`find ${f} -name '*.jar'`") antBuildInputs)}; do
+        export ANT_ARGS="$ANT_ARGS -lib $abi"
+      done
    '';

    installPhase = ''
@ -33,8 +38,10 @@ stdenv.mkDerivation (
           find . -name "*.jar" | xargs -I{} cp -v {} $out/lib/java
         '' else stdenv.lib.concatMapStrings (j: ''
           cp -v ${j} $out/lib/java
-           echo file jar $out/lib/java/${j} >> $out/nix-support/hydra-build-products
         '') jars }
+      for j in $out/lib/java/*.jar ; do
+        echo file jar $j >> $out/nix-support/hydra-build-products
+      done
    '';

    generateWrappersPhase = '' 
--- a/pkgs/build-support/upstream-updater/update-upstream-data.sh
+++ b/pkgs/build-support/upstream-updater/update-upstream-data.sh
@ -6,6 +6,11 @@ own_dir="$(cd "$(dirname "$0")"; sh -c pwd)"

 source "$own_dir/snippets.sh"

+[ -z "$1" ] && {
+  echo "Specify main expression filename."
+  exit 1;
+}
+
 main_file="$1"
 main_dir="$(cd "$(dirname "$main_file")" ; sh -c pwd)"
 file_name="$(basename "$main_file")"
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -1,4 +1,4 @@
-{pkgs}:
+{ pkgs }:

 with pkgs;

@ -7,47 +7,77 @@ rec {

  inherit (linuxPackages_2_6_32) kernel;

-  klibcShrunk = pkgs.klibcShrunk.override { klibc = klibc_15; };
-
-  kvm = pkgs.kvm76;
+  kvm = pkgs.qemu_kvm;


  modulesClosure = makeModulesClosure {
    inherit kernel;
-    rootModules = ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3" "unix"];
+    rootModules = [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3" "unix" "sd_mod" "ata_piix" ];
  };


-  # !!! should use the mount_cifs package in all-packages.nix here.
-  mountCifs = (makeStaticBinaries stdenv).mkDerivation {
-    name = "mount.cifs";
-    src = mount_cifs.src;
-    buildInputs = [nukeReferences];
-    buildCommand = ''
+  hd = "vda"; # either "sda" or "vda"
+
+
+  initrdUtils = runCommand "initrd-utils"
+    { buildInputs = [ nukeReferences ];
+      allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd
+    }
+    ''
      ensureDir $out/bin
-      gcc -Wall $src -o $out/bin/mount.cifs
-      strip $out/bin/mount.cifs
-      nuke-refs $out/bin/mount.cifs
-    '';
-    allowedReferences = []; # prevent accidents like glibc being included in the initrd
-  };
+      ensureDir $out/lib
+      
+      # Copy what we need from Glibc.
+      cp -p ${glibc}/lib/ld-linux*.so.? $out/lib
+      cp -p ${glibc}/lib/libc.so.* $out/lib
+      cp -p ${glibc}/lib/librt.so.* $out/lib
+      cp -p ${glibc}/lib/libdl.so.* $out/lib

+      # Copy some utillinux stuff.
+      cp ${utillinux}/bin/mount ${utillinux}/bin/umount $out/bin
+      cp -pd ${utillinux}/lib/libblkid*.so.* $out/lib
+      cp -pd ${utillinux}/lib/libuuid*.so.* $out/lib

+      # Copy some coreutils.
+      cp ${coreutils}/bin/basename $out/bin
+      cp ${coreutils}/bin/mkdir $out/bin
+      cp ${coreutils}/bin/mknod $out/bin
+      cp ${coreutils}/bin/cat $out/bin
+      cp ${coreutils}/bin/chroot $out/bin
+      cp ${coreutils}/bin/sleep $out/bin
+      cp ${coreutils}/bin/ln $out/bin
+
+      # Copy some other tools.
+      cp ${bash}/bin/bash $out/bin
+      cp ${module_init_tools}/sbin/insmod $out/bin/insmod
+      cp ${nettools}/sbin/ifconfig $out/bin
+      cp ${sysvinit}/sbin/halt $out/bin
+            
+      # Run patchelf to make the programs refer to the copied libraries.
+      for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done
+
+      for i in $out/bin/*; do
+          echo "patching $i..."
+          patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true
+      done
+    ''; # */
+
+    
  createDeviceNodes = dev:
    ''
      mknod ${dev}/null c 1 3
      mknod ${dev}/zero c 1 5
      mknod ${dev}/tty  c 5 0
-      . /sys/class/block/vda/uevent
-      mknod ${dev}/vda  b $MAJOR $MINOR
+      . /sys/class/block/${hd}/uevent
+      mknod ${dev}/${hd} b $MAJOR $MINOR
    '';

  
  stage1Init = writeScript "vm-run-stage1" ''
-    #! ${klibcShrunk}/bin/sh.shared -e
+    #! ${initrdUtils}/bin/bash -e
    echo START

-    export PATH=${klibcShrunk}/bin:${mountCifs}/bin
+    export PATH=${initrdUtils}/bin

    mkdir /etc
    echo -n > /etc/fstab
@ -82,39 +112,31 @@ rec {
          args="CIFSMaxBufSize=4194304"
          ;;
      esac
-      echo "loading module $i with args $args"
+      echo "loading module $(basename $i .ko)"
      insmod $i $args
    done

    mount -t tmpfs none /dev
    ${createDeviceNodes "/dev"}
    
-    ipconfig 10.0.2.15:::::eth0:none
+    ifconfig eth0 up 10.0.2.15

    mkdir /fs

    if test -z "$mountDisk"; then
      mount -t tmpfs none /fs
    else
-      mount -t ext2 /dev/vda /fs
+      mount -t ext2 /dev/${hd} /fs
    fi
-    
+
    mkdir -p /fs/hostfs
    
    mkdir -p /fs/dev
    mount -o bind /dev /fs/dev

-    n=.
-    echo "mounting host filesystem..."
-    while true; do
-      if mount.cifs //10.0.2.4/qemu /fs/hostfs -o guest,username=nobody; then
-        break
-      else
-        n=".$n"
-        test ''${#n} -le 10 || exit 1
-        sleep 1
-        echo "retrying..."
-      fi
+    for ((n = 0; n < 10; n++)); do
+      echo "mounting host filesystem, attempt $n..."
+      mount -t cifs //10.0.2.4/qemu /fs/hostfs -o guest,username=nobody && break
    done

    mkdir -p /fs/nix/store
@ -142,7 +164,7 @@ rec {
    mount -o remount,ro dummy /fs

    echo DONE
-    reboot
+    halt -d -p -f
  '';

  
@ -188,26 +210,42 @@ rec {


  qemuCommandLinux = ''
-    qemu-system-x86_64 -no-kvm-irqchip \
+    qemu-system-x86_64 \
      -nographic -no-reboot \
-      -net nic,model=virtio -net user -smb / \
-      -drive file=$diskImage,if=virtio,boot=on \
+      -net nic,model=virtio -chardev socket,id=samba,path=$TMPDIR/samba -net user,guestfwd=tcp:10.0.2.4:139-chardev:samba \
+      -drive file=$diskImage,if=virtio,boot=on,cache=writeback,werror=report \
      -kernel ${kernel}/bzImage \
      -initrd ${initrd}/initrd \
      -append "console=ttyS0 panic=1 command=${stage2Init} tmpDir=$TMPDIR out=$out mountDisk=$mountDisk" \
      $QEMU_OPTS
  '';

-  
+
  vmRunCommand = qemuCommand: writeText "vm-run" ''
    export > saved-env

-    PATH=${coreutils}/bin:${kvm}/bin:${samba}/sbin
+    PATH=${coreutils}/bin:${kvm}/bin

    diskImage=''${diskImage:-/dev/null}

    eval "$preVM"

+    cat > smb.conf <<EOF
+      [global]
+        private dir=$TMPDIR
+        smb ports=0
+        socket address=127.0.0.1
+        pid directory=$TMPDIR
+        lock directory=$TMPDIR
+        log file=$TMPDIR/log.smbd
+        smb passwd file=$TMPDIR/smbpasswd
+        security = share
+      [qemu]
+        path=/
+        read only=no
+        guest ok=yes
+    EOF
+
    # Write the command to start the VM to a file so that the user can
    # debug inside the VM if the build fails (when Nix is called with
    # the -K option to preserve the temporary build directory).
@ -215,6 +253,8 @@ rec {
    #! ${bash}/bin/sh
    diskImage=$diskImage
    TMPDIR=$TMPDIR
+    ${socat}/bin/socat unix-listen:$TMPDIR/samba system:'while true; do ${samba}/sbin/smbd -s $TMPDIR/smb.conf; done' > /dev/null 2>&1 &
+    while [ ! -e $TMPDIR/samba ]; do sleep 0.1; done # ugly
    ${qemuCommand}
    EOF

@ -244,8 +284,8 @@ rec {

  createRootFS = ''
    mkdir /mnt
-    ${e2fsprogs}/sbin/mke2fs -F /dev/vda
-    ${klibcShrunk}/bin/mount -t ext2 /dev/vda /mnt
+    ${e2fsprogs}/sbin/mke2fs -F /dev/${hd}
+    ${utillinux}/bin/mount -t ext2 /dev/${hd} /mnt

    if test -e /mnt/.debug; then
      exec ${bash}/bin/sh
@ -401,7 +441,8 @@ rec {

        # Make the Nix store available in /mnt, because that's where the RPMs live.
        mkdir -p /mnt/nix/store
-        ${klibcShrunk}/bin/mount -o bind /nix/store /mnt/nix/store
+        ${utillinux}/bin/mount -o bind /nix/store /mnt/nix/store
+        ${utillinux}/bin/mount -o bind /tmp /mnt/tmp
        
        echo "installing RPMs..."
        PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
@ -412,8 +453,9 @@ rec {
        
        rm /mnt/.debug
        
-        ${klibcShrunk}/bin/umount /mnt/nix/store
-        ${klibcShrunk}/bin/umount /mnt
+        ${utillinux}/bin/umount /mnt/nix/store
+        ${utillinux}/bin/umount /mnt/tmp
+        ${utillinux}/bin/umount /mnt
      '';

      passthru = {inherit fullName;};
@ -541,9 +583,9 @@ rec {

        # Make the Nix store available in /mnt, because that's where the .debs live.
        mkdir -p /mnt/inst/nix/store
-        ${klibcShrunk}/bin/mount -o bind /nix/store /mnt/inst/nix/store
-        ${klibcShrunk}/bin/mount -o bind /proc /mnt/proc
-        ${klibcShrunk}/bin/mount -o bind /dev /mnt/dev
+        ${utillinux}/bin/mount -o bind /nix/store /mnt/inst/nix/store
+        ${utillinux}/bin/mount -o bind /proc /mnt/proc
+        ${utillinux}/bin/mount -o bind /dev /mnt/dev
        
        # Misc. files/directories assumed by various packages.
        echo "initialising Dpkg DB..."
@ -580,10 +622,10 @@ rec {

        rm /mnt/.debug
        
-        ${klibcShrunk}/bin/umount /mnt/inst/nix/store
-        ${klibcShrunk}/bin/umount /mnt/proc
-        ${klibcShrunk}/bin/umount /mnt/dev
-        ${klibcShrunk}/bin/umount /mnt
+        ${utillinux}/bin/umount /mnt/inst/nix/store
+        ${utillinux}/bin/umount /mnt/proc
+        ${utillinux}/bin/umount /mnt/dev
+        ${utillinux}/bin/umount /mnt
      '';

      passthru = {inherit fullName;};
@ -950,21 +992,21 @@ rec {
    } // args);

    debian40i386 = args: makeImageFromDebDist ({
-      name = "debian-4.0r8-etch-i386";
-      fullName = "Debian 4.0r8 Etch (i386)";
+      name = "debian-4.0r9-etch-i386";
+      fullName = "Debian 4.0r9 Etch (i386)";
      packagesList = fetchurl {
        url = mirror://debian/dists/etch/main/binary-i386/Packages.bz2;
-        sha256 = "80ea57a7f106086c74470229998b07885d185dc62fe4a3200d2fffc5b2371f3d";
+        sha256 = "40eeeecc35e6895b6eb0bc601e38fe53fc985d1b1f3fea3766f34763d21f206f";
      };
      urlPrefix = mirror://debian;
    } // args);
        
    debian40x86_64 = args: makeImageFromDebDist ({
-      name = "debian-4.0r8-etch-amd64";
-      fullName = "Debian 4.0r8 Etch (amd64)";
+      name = "debian-4.0r9-etch-amd64";
+      fullName = "Debian 4.0r9 Etch (amd64)";
      packagesList = fetchurl {
        url = mirror://debian/dists/etch/main/binary-amd64/Packages.bz2;
-        sha256 = "d00114ef5e0c287273eebff7e7c4ca1aa0388a56c7d980a0a031e7782741e5ba";
+        sha256 = "cf1c4c7d72e0da45797b046011254d2bd83f5ecb7389c7f30d2561be3f5b2e49";
      };
      urlPrefix = mirror://debian;
    } // args);
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@ -14,7 +14,7 @@ rec {
  buildPatchelfRPM = buildRPM {
    name = "patchelf-rpm";
    src = patchelf.src;
-    diskImage = diskImages.fedora8i386;
+    diskImage = diskImages.fedora12i386;
  };

  
--- a/pkgs/desktops/gnome-2.28/default.nix
+++ b/pkgs/desktops/gnome-2.28/default.nix
@ -142,7 +142,7 @@ rec {

  gtk_doc = import ./platform/gtk-doc {
    inherit (pkgs) stdenv fetchurl pkgconfig perl python libxml2 libxslt;
-    inherit (pkgs) docbook_xml_dtd_43 docbook_xsl;
+    inherit (pkgs) docbook_xml_dtd_43 docbook_xsl dblatex;
    inherit gnome_doc_utils;
  };

--- a/pkgs/desktops/gnome-2.28/platform/gtk-doc/default.nix
+++ b/pkgs/desktops/gnome-2.28/platform/gtk-doc/default.nix
@ -1,12 +1,14 @@
-{stdenv, fetchurl, pkgconfig, perl, python, libxml2, libxslt, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils}:
+{ stdenv, fetchurl, pkgconfig, perl, python, libxml2, libxslt
+, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex }:

+let version = "1.15"; in
 stdenv.mkDerivation {
-  name = "gtk-doc-1.11";
+  name = "gtk-doc-${version}";
  src = fetchurl {
-    url = mirror://gnome/sources/gtk-doc/1.11/gtk-doc-1.11.tar.bz2;
-    sha256 = "08zz6gn90aqps84hfhdgarsilbdj0bbnj3wjm2x552n4i7gmq4wj";
+    url = "mirror://gnome/sources/gtk-doc/${version}/gtk-doc-${version}.tar.bz2";
+    sha256 = "0ca8wh67nyh574ahlfkx8k9w2bm4ji9yzxvi3afsicqdpyx77k2r";
  };
-  
+
  # maybe there is a better way to pass the needed dtd and xsl files
  # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
  preConfigure = ''
@ -23,5 +25,8 @@ stdenv.mkDerivation {
    configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper";
  '';

-  buildInputs = [ pkgconfig perl python libxml2 libxslt docbook_xml_dtd_43 gnome_doc_utils ];
+  buildInputs =
+   [ pkgconfig perl python libxml2 libxslt docbook_xml_dtd_43 docbook_xsl
+     gnome_doc_utils dblatex
+   ];
 }
--- a/pkgs/desktops/kde-4.4/accessibility/default.nix
+++ b/pkgs/desktops/kde-4.4/accessibility/default.nix
@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4, phonon}:

 stdenv.mkDerivation {
-  name = "kdeaccessibility-4.4.3";
+  name = "kdeaccessibility-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdeaccessibility-4.4.3.tar.bz2;
-    sha256 = "1j1v0bfl6kcapxwqa1ma19z61qx2vd4lx7b9dykkv7z3gq7c5y5m";
+    url = mirror://kde/stable/4.4.4/src/kdeaccessibility-4.4.4.tar.bz2;
+    sha256 = "0v3fbm7wp42fnyxzpk1vlp95z4jn9rf56i075p8g2xvz6gxxgh30";
  };
  # Missing: speechd, I was too lazy to implement this
  buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ];
--- a/pkgs/desktops/kde-4.4/admin/default.nix
+++ b/pkgs/desktops/kde-4.4/admin/default.nix
@ -3,11 +3,11 @@
 , kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:

 stdenv.mkDerivation {
-  name = "kdeadmin-4.4.3";
+  name = "kdeadmin-4.4.4";
  
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdeadmin-4.4.3.tar.bz2;
-    sha256 = "08s0fagxgdk6p00qxzizrhs9010f6s9rlz7w07ri86m9ps9yd6am";
+    url = mirror://kde/stable/4.4.4/src/kdeadmin-4.4.4.tar.bz2;
+    sha256 = "04jyvnwv8xwzchvzgns2db4bhr0fxis98am58icz6qva9nsgr6zh";
  };
  
  builder = ./builder.sh;
--- a/pkgs/desktops/kde-4.4/artwork/default.nix
+++ b/pkgs/desktops/kde-4.4/artwork/default.nix
@ -2,10 +2,10 @@
 , kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:

 stdenv.mkDerivation {
-  name = "kdeartwork-4.4.3";
+  name = "kdeartwork-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdeartwork-4.4.3.tar.bz2;
-    sha256 = "0ivfqg9nr5lqa1dppc0p6aw816jy8zqj308dv367jqh1qbapx0cl";
+    url = mirror://kde/stable/4.4.4/src/kdeartwork-4.4.4.tar.bz2;
+    sha256 = "1pn50kaf77wxzlnw2fabfwg9xxzcw7wlm85525w3all936k5m7yv";
  };
  buildInputs = [ cmake qt4 perl xscreensaver
                  kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
--- a/pkgs/desktops/kde-4.4/base-runtime/default.nix
+++ b/pkgs/desktops/kde-4.4/base-runtime/default.nix
@ -2,10 +2,10 @@
 , kdelibs, automoc4, phonon, strigi, soprano, cluceneCore, attica}:

 stdenv.mkDerivation {
-  name = "kdebase-runtime-4.4.3";
+  name = "kdebase-runtime-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdebase-runtime-4.4.3.tar.bz2;
-    sha256 = "1fyg804gl8hqzjicij8xs0gy7qdjnj6n4i8fxybk2wfn8mn5zgm1";
+    url = mirror://kde/stable/4.4.4/src/kdebase-runtime-4.4.4.tar.bz2;
+    sha256 = "1gxa05i6zvklxng6ak5vak05dyay8j8g2hmdhma2290lwgf8gbx8";
  };
 /*  CLUCENE_HOME=cluceneCore;*/
  # Still have to look into Soprano Virtuoso
--- a/pkgs/desktops/kde-4.4/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix
@ -6,10 +6,10 @@
 }:

 stdenv.mkDerivation {
-  name = "kdebase-workspace-4.4.3";
+  name = "kdebase-workspace-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdebase-workspace-4.4.3.tar.bz2;
-    sha256 = "0fcjk6bmswal02lwsywvv44x8qi8vr3vr08rlgp8v9rc5yqv4mkz";
+    url = mirror://kde/stable/4.4.4/src/kdebase-workspace-4.4.4.tar.bz2;
+    sha256 = "1ryy9bmghr8c9hc87i1scmxaw3zdy3gndwwp7qyn5zqzh0jg0b8k";
  };
  buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
    kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp
--- a/pkgs/desktops/kde-4.4/base/default.nix
+++ b/pkgs/desktops/kde-4.4/base/default.nix
@ -3,10 +3,10 @@
 , automoc4, phonon, strigi, qimageblitz, soprano}:

 stdenv.mkDerivation {
-  name = "kdebase-4.4.3";
+  name = "kdebase-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdebase-4.4.3.tar.bz2;
-    sha256 = "15adml1rlpsgdy7ynbgzh3rnlzi1ynz42dmbjqz5yrv6l2pbgjag";
+    url = mirror://kde/stable/4.4.4/src/kdebase-4.4.4.tar.bz2;
+    sha256 = "10cy6a65lb0164biijiqdwphd9isccac0fg1b66i58xsxpgn4x6w";
  };
  buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394
                  kdebase_workspace automoc4 phonon strigi qimageblitz soprano ];
--- a/pkgs/desktops/kde-4.4/bindings/default.nix
+++ b/pkgs/desktops/kde-4.4/bindings/default.nix
@ -6,10 +6,10 @@
 # some bindings are even broken.

 stdenv.mkDerivation {
-  name = "kdebindings-4.4.3";
+  name = "kdebindings-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdebindings-4.4.3.tar.bz2;
-    sha256 = "0gna0fwhm05pyxqanz68vvav7ahxzffwh2ry1zadfpzwmq5srnpg";
+    url = mirror://kde/stable/4.4.4/src/kdebindings-4.4.4.tar.bz2;
+    sha256 = "1wn5hxv1sc0qywgq2bx2brzljlmw7kybbf2hcyiz322air753zdw";
  };
  #builder = ./builder.sh;
  
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@ -282,10 +282,10 @@ pkgs.recurseIntoAttrs (rec {
  };
  
  koffice = import ./extragear/koffice {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew;
-    inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd;
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 giflib libxml2 libxslt boost glew;
+    inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf;
    inherit kdelibs kdepimlibs;
-    inherit automoc4 phonon qimageblitz qca2 eigen;
+    inherit automoc4 phonon qimageblitz qca2 eigen soprano;
    poppler = pkgs.popplerQt4;
  };
  
--- a/pkgs/desktops/kde-4.4/edu/default.nix
+++ b/pkgs/desktops/kde-4.4/edu/default.nix
@ -3,10 +3,10 @@
 , kdelibs, automoc4, phonon, eigen, attica}:

 stdenv.mkDerivation {
-  name = "kdeedu-4.4.3";
+  name = "kdeedu-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdeedu-4.4.3.tar.bz2;
-    sha256 = "17hb1j7dy5ccgmna26cabng0z48qdhl8z0w2grm83a1a9szq2y4x";
+    url = mirror://kde/stable/4.4.4/src/kdeedu-4.4.4.tar.bz2;
+    sha256 = "0rdpay0xs5j0k5r2m5yxm89ls5x7rzj9k758axz22r6wv1xynvz0";
  };
 #TODO: facile, indi, boost.python, cfitsio, R, qalculate
  buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl xplanet
--- a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix
@ -2,10 +2,10 @@
 , kdelibs, automoc4, phonon, strigi, soprano, qca2}:

 stdenv.mkDerivation {
-  name = "amarok-2.3.0";
+  name = "amarok-2.3.1";
  src = fetchurl {
-    url = mirror://kde/stable/amarok/2.3.0/src/amarok-2.3.0.tar.bz2;
-    sha256 = "1a2c6qy2ik9l7r1lxm82h49acvzxsxxlnlgzwhlrhi27p3sk0xpw";
+    url = mirror://kde/stable/amarok/2.3.1/src/amarok-2.3.1.tar.bz2;
+    sha256 = "0wjaic35bpv6dnnv2wwrbbsqbpng5cn7xfd3ykx25yjg9d6kzvrz";
  };
  inherit mysql loudmouth;
  QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
--- a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
@ -1,16 +1,16 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
-, shared_mime_info, poppler, gsl, gmm, wv2, libwpd
-, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen}:
+, shared_mime_info, poppler, gsl, gmm, wv2, libwpd, giflib, libgsf
+, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen, soprano}:

 stdenv.mkDerivation {
-  name = "koffice-2.1.2";
+  name = "koffice-2.2.0";
  src = fetchurl {
-    url = mirror://kde/stable/koffice-2.1.2/koffice-2.1.2.tar.bz2;
-    sha256 = "1nmp2kmksk6vjw9bk04lnl8ld43hf4s0ras6vali725innvkn8v4";
+    url = mirror://kde/stable/koffice-2.2.0/koffice-2.2.0.tar.bz2;
+    sha256 = "0qa73grmn4c2d7zs5p0sxg6dws8hpg8v2vgp6frhj55l0sk3kqba";
  }; 
  buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info 
-                  poppler gsl gmm wv2 libwpd
-                  kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen ];
+                  poppler gsl gmm wv2 libwpd giflib libgsf stdenv.gcc.libc
+                  kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen soprano ];
  meta = {
    description = "KDE integrated Office Suite";
    license = "GPL";
--- a/pkgs/desktops/kde-4.4/games/default.nix
+++ b/pkgs/desktops/kde-4.4/games/default.nix
@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, phonon, qca2}:

 stdenv.mkDerivation {
-  name = "kdegames-4.4.3";
+  name = "kdegames-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdegames-4.4.3.tar.bz2;
-    sha256 = "0i14zd0jxbgrvxgpwq80ghfbhcj9awq1rh7g5716j514wl25nqpl";
+    url = mirror://kde/stable/4.4.4/src/kdegames-4.4.4.tar.bz2;
+    sha256 = "0zs7r9bc7az6px1745jkrqzsgv6lmhvn1rdsw3jpzcb8qk8qk5wv";
  };
  buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 phonon qca2 ];
  meta = {
--- a/pkgs/desktops/kde-4.4/graphics/default.nix
+++ b/pkgs/desktops/kde-4.4/graphics/default.nix
@ -3,10 +3,10 @@
 , kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}:

 stdenv.mkDerivation {
-  name = "kdegraphics-4.4.3";
+  name = "kdegraphics-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdegraphics-4.4.3.tar.bz2;
-    sha256 = "0f7mw91fr2gx5ycdpb4b3c4d382933fqfhpsfvifpphkg1p0hy54";
+    url = mirror://kde/stable/4.4.4/src/kdegraphics-4.4.4.tar.bz2;
+    sha256 = "1czrasc3ppk4waxsv4mcps25lbdvdspwgnsnad32b0qq0dls3mn1";
  };
  buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib
                  shared_mime_info stdenv.gcc.libc libXxf86vm
--- a/pkgs/desktops/kde-4.4/l10n/default.nix
+++ b/pkgs/desktops/kde-4.4/l10n/default.nix
@ -4,7 +4,7 @@
 let

  deriv = attr : stdenv.mkDerivation {
-    name = "kde-l10n-${attr.lang}-4.4.3";
+    name = "kde-l10n-${attr.lang}-4.4.4";
    src = fetchurl {
      url = attr.url;
      sha256 = attr.sha256;
@ -23,344 +23,344 @@ in

  ar = deriv {
    lang = "ar";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ar-4.4.3.tar.bz2";
-    sha256 = "1gnrnkkmchfwjdc712fkh6apl17d2nmnyyliim8k935s5nx40469";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ar-4.4.4.tar.bz2";
+    sha256 = "0x5ravkd2pba64vc0ss0r98plmxan07pkvqv1nc0h3bkrkv6bcm0";
  };

  bg = deriv {
    lang = "bg";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-bg-4.4.3.tar.bz2";
-    sha256 = "1zqb07b77lpbk36xgz9s2hrxjwaayqcmp13apqnpbxdjfi98c40p";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-bg-4.4.4.tar.bz2";
+    sha256 = "1xvx4c3v3pifpqq3qd3xkrhrc9xnkg5hhczd30akrphq8551z2sc";
  };

  ca = deriv {
    lang = "ca";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ca-4.4.3.tar.bz2";
-    sha256 = "1y4kp45mm2bqd7sh4p94q7z737n7d56sfca01l4k2z6if2mfdqyv";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ca-4.4.4.tar.bz2";
+    sha256 = "0klixkxm1kgynpnzp8glxpj236x5n9p0nbd8ml3xzbk2pfamyay4";
  };

  cs = deriv {
    lang = "cs";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-cs-4.4.3.tar.bz2";
-    sha256 = "01drz8cxaqh6vf1pk6pp18bdv4a5imgc1ajsv6cybc2sa63wff3m";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-cs-4.4.4.tar.bz2";
+    sha256 = "0lzsddqwr3wr0fa33rfcqim3p708c5hbwlazzs1xckwgl4ww97ri";
  };

  csb = deriv {
    lang = "csb";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-csb-4.4.3.tar.bz2";
-    sha256 = "1slii5r0s7s8wgmh3j0lxk5k7crpqyn3cyn0shh3fycpi3dhazlh";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-csb-4.4.4.tar.bz2";
+    sha256 = "0qr1l01xvjgvg1qjm8j01vpaiz61md9d78qmz3384f72q9iz6jbk";
  };

  da = deriv {
    lang = "da";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-da-4.4.3.tar.bz2";
-    sha256 = "17kjf2np54kg0s7gimsf4mh93zjvvs2drasb4ayw9phkdcs4a5b0";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-da-4.4.4.tar.bz2";
+    sha256 = "0rvsap9y23mi16mfjq46dhw0628mia8k7criywdhkxhhv4dkmm1w";
  };

  de = deriv {
    lang = "de";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-de-4.4.3.tar.bz2";
-    sha256 = "0v14qf47cvldxg2rlwgakxliamn04x77df48d7g1hzwapvd9s0dd";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-de-4.4.4.tar.bz2";
+    sha256 = "0n9mlkvpl0xyyaxc4sjcrkj9x6n08qiljv01xh8mwwzd2v7pyprh";
  };

  el = deriv {
    lang = "el";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-el-4.4.3.tar.bz2";
-    sha256 = "03bf7lrm2bkxq2q0h18c4ksa3pbxr5yv9363z0396px4zy6srn3p";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-el-4.4.4.tar.bz2";
+    sha256 = "08w17ym9gfbfxavhnd4l2cvlkz0n93d842a5q2nddgd5fx74572w";
  };

  en_GB = deriv {
    lang = "en_GB";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-en_GB-4.4.3.tar.bz2";
-    sha256 = "0jzvybpq9nnnw8cqp3izj7x804gd05q4mzjl8pxvv56s622zdda4";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-en_GB-4.4.4.tar.bz2";
+    sha256 = "042mcshf5829vc6ix4rng0vkfl0y36yq4zyamnrawzp6b23y5i5m";
  };

  eo = deriv {
    lang = "eo";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-eo-4.4.3.tar.bz2";
-    sha256 = "1br75zkyrl0imk0bnr4prcm4w4xmkg8qnjs2yn6842d8m4ffy2q0";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-eo-4.4.4.tar.bz2";
+    sha256 = "0dsl6aqawyyv4fhr88cj9gmmccppyrwch4vggdnsj9hm7mq8lvcb";
  };

  es = deriv {
    lang = "es";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-es-4.4.3.tar.bz2";
-    sha256 = "1vxjxgsvb3fr904nv6s84b0a0nbchv7599gfnirwbdklglbla85h";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-es-4.4.4.tar.bz2";
+    sha256 = "0yd0cabrbbhmj8p0w9x38aii1w9xhxx08bp2vi0hdk9fw83pa298";
  };

  et = deriv {
    lang = "et";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-et-4.4.3.tar.bz2";
-    sha256 = "0r6l1b1pfkry45g5wmii4d5ysalg9w8544dkbib374wjn9zm26qc";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-et-4.4.4.tar.bz2";
+    sha256 = "175731akqds7z2mx9lscy56da2pbwqj4abk6i41l5hs3dfwlcgs8";
  };

  eu = deriv {
    lang = "eu";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-eu-4.4.3.tar.bz2";
-    sha256 = "0rpdalv8bhmvv0cgf4wjdnlqamjqil7sl1brqv74p2dlhlsz03n7";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-eu-4.4.4.tar.bz2";
+    sha256 = "1783nw4hyxzs3sn1dgnqj7krp35ffzfqnw9jyn5hxrz0filzw4cm";
  };

  fi = deriv {
    lang = "fi";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-fi-4.4.3.tar.bz2";
-    sha256 = "1m5czzfmjg9gvw0jyfa875gb7h33yb179vgissddfjmmhap0yypn";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-fi-4.4.4.tar.bz2";
+    sha256 = "066hc5p8vka8kl7ascb9vwvxjspxnysjhj4v3brs070prakv63d8";
  };

  fr = deriv {
    lang = "fr";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-fr-4.4.3.tar.bz2";
-    sha256 = "1whk3a40cc2yiq7biql5klhl2k9h1bi3pilm0yskl0x6x8cdsn3d";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-fr-4.4.4.tar.bz2";
+    sha256 = "1b9w0hicgg3rxfgwf11rajcjml5h181llks8p7blasmbcsvccrri";
  };

  fy = deriv {
    lang = "fy";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-fy-4.4.3.tar.bz2";
-    sha256 = "1xwk1jqalj47iky3cda7z053jsihi0hf4k7sh2cdgvy50n5wj8bi";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-fy-4.4.4.tar.bz2";
+    sha256 = "1iwnmpv2dpvmmp5a8iwc07ag8ry3sjdmcx2w87la3drwmbx319gq";
  };

  ga = deriv {
    lang = "ga";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ga-4.4.3.tar.bz2";
-    sha256 = "0y3p8kj1fm88s5g7md6fwf3hlk5fshaywyw2l5bvx9vrhdv757f1";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ga-4.4.4.tar.bz2";
+    sha256 = "1lvnimdndh9zqq69a6s8pyszrw5x08p4qikrq7mhgjh4v44crk3q";
  };

  gl = deriv {
    lang = "gl";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-gl-4.4.3.tar.bz2";
-    sha256 = "0j8f4185hq162d4xvk0qzv5drqz1sfx7k2pamqp9vf87js193m1v";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-gl-4.4.4.tar.bz2";
+    sha256 = "1n7y15fgi940r07vm26h30ijhq50w6l8a12a3mbsc1fyz8lnkf1k";
  };

  gu = deriv {
    lang = "gu";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-gu-4.4.3.tar.bz2";
-    sha256 = "141gdz79g2g13c36ci0pzk582s9kj7s47brzamidw683ndjvsarq";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-gu-4.4.4.tar.bz2";
+    sha256 = "1594rdmk2b59zah8s8v7g1d5r761cqk7ynxs7mi7lf644xy03b2p";
  };

  he = deriv {
    lang = "he";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-he-4.4.3.tar.bz2";
-    sha256 = "0safk2vzpr3v1kbm236d4ayvqqa4i5zz8jppabr2zbak522sk6nf";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-he-4.4.4.tar.bz2";
+    sha256 = "091c56g2h2hbxhpd0l9xsbbs2pdmsy4a8bisii7vm943q158pc23";
  };

  hi = deriv {
    lang = "hi";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-hi-4.4.3.tar.bz2";
-    sha256 = "08n1id22k46cnd8jkqczhxp33cz33bay1mkq1zqbwk4nxn9n5b42";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-hi-4.4.4.tar.bz2";
+    sha256 = "17095ija6vnx70cpahpw2ynpp2jb4jrr4dfpx7yp68lnqwyaqa8b";
  };

  hr = deriv {
    lang = "hr";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-hr-4.4.3.tar.bz2";
-    sha256 = "061m5z4fnv7h67g05izdghrpa9bh0f3pk89s7wpk2w41pdpzk98j";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-hr-4.4.4.tar.bz2";
+    sha256 = "1bpzsm10shippwj0w01y6jjf38bl97kmbbj06h6dzd7p4dk0km5b";
  };

  hu = deriv {
    lang = "hu";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-hu-4.4.3.tar.bz2";
-    sha256 = "00jk5ccq7ds9gcx4qb08i85cll9qs0wprw949412hbylwwj7c0qm";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-hu-4.4.4.tar.bz2";
+    sha256 = "1032m9a5g4y9x7lfhbnm1zl63m10vcikykza2ix5ks2q8ca9123h";
  };

  id = deriv {
    lang = "id";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-id-4.4.3.tar.bz2";
-    sha256 = "0c64s38vzwjfdjanljspxqaishmw0c7qz7z2s4gc70bws02dz87b";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-id-4.4.4.tar.bz2";
+    sha256 = "1rrqzgz58hshf7s01xp335bxpc28vsgkd18wcl0v69hf4gh36fa3";
  };

  is = deriv {
    lang = "is";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-is-4.4.3.tar.bz2";
-    sha256 = "17kv9lkiy60kfk9v535fpnx3v2v4vvnjyk0qqp0nigyg2sa2ylhl";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-is-4.4.4.tar.bz2";
+    sha256 = "01lkvaffpxv8ba8z6csxqb1kqxqj5r1idxw4qxbqw7dj8cjqj3d2";
  };

  it = deriv {
    lang = "it";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-it-4.4.3.tar.bz2";
-    sha256 = "17czl01vskisy5fsyk774rdsdrf86pihqqrf6r80flpgd5wf33ym";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-it-4.4.4.tar.bz2";
+    sha256 = "0bfjk9lhwls9gyiy0ify3hr5jqjy5wcnlbh44mzf78c3y8snngga";
  };

  ja = deriv {
    lang = "ja";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ja-4.4.3.tar.bz2";
-    sha256 = "0124xnkkwxdjfmpqbascqfsd3v82r2f4vjjp11yzp8fzfz41qqzz";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ja-4.4.4.tar.bz2";
+    sha256 = "06j5ksv1660hd7bp9q942igi6wm47a4w6grx2q6lbvxc41ms5wk4";
  };

  kk = deriv {
    lang = "kk";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-kk-4.4.3.tar.bz2";
-    sha256 = "1kyzmw0x7cvhf7bgryvk1c0sqg0cw6qnzalrky451brf82r5k4fk";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-kk-4.4.4.tar.bz2";
+    sha256 = "0vm5l5xrs1x9jy9zkjf43xfnxi2wc366j9y797pp04mh5rgdd2vv";
  };

  km = deriv {
    lang = "km";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-km-4.4.3.tar.bz2";
-    sha256 = "0jyc03zw15bynpjn1ddnb8xzjl2vkkf017yb5g5i5a5jxwp04ca4";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-km-4.4.4.tar.bz2";
+    sha256 = "0ihzc62wkhindzl2fawcmvk87wbnbdm4f09pr092n6w2l8k8wz9b";
  };

  kn = deriv {
    lang = "kn";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-kn-4.4.3.tar.bz2";
-    sha256 = "09wkq79g7rayvv3khx3g8hmzqmlq7pa95wzvixyrdnh9fwk0mm36";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-kn-4.4.4.tar.bz2";
+    sha256 = "15xxpb6c6g1v9girss9aimcbszdbq4ccsbq396hfn46kzxybzhjh";
  };

  ko = deriv {
    lang = "ko";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ko-4.4.3.tar.bz2";
-    sha256 = "0dhkly119cgrmyil0c7zci77hf5w5k2pjaqgz9xx5g2k9jxf8f9q";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ko-4.4.4.tar.bz2";
+    sha256 = "0fzgyqajhjmlr9ibbd4jri00ccjji7m9bg02dw739w4rkvn5k6j1";
  };

  lt = deriv {
    lang = "lt";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-lt-4.4.3.tar.bz2";
-    sha256 = "1z4gimw4wdig1x0y8h780a2msdsy8rrpaqh8a5vpskjrx67y0pnh";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-lt-4.4.4.tar.bz2";
+    sha256 = "126nnk3c1rkfhpy1nbsxkhad6bazbv6x9bh6kpqd9clwh8k35ya4";
  };

  lv = deriv {
    lang = "lv";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-lv-4.4.3.tar.bz2";
-    sha256 = "1gfh2bamgbsxd042gjnw7x41qw6svw8dq6vz842lkkygdfplk679";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-lv-4.4.4.tar.bz2";
+    sha256 = "1n4szkfmyrzh6x3a85byzpn53lp8d4m0abp8k5kn2iksxh9z5mkl";
  };

  mai = deriv {
    lang = "mai";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-mai-4.4.3.tar.bz2";
-    sha256 = "0bx7wzqm2h3gsinpx0njsmb1x6s1jpj5v6cny5vrjawdm30zbxp4";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-mai-4.4.4.tar.bz2";
+    sha256 = "0r65y0vxjbl9ghl7mg4dg58w0rbrlbhrllc6cyvv32xwjbi0qc3c";
  };

  mk = deriv {
    lang = "mk";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-mk-4.4.3.tar.bz2";
-    sha256 = "0yjhi7v4xfbcxp6z8ycfxqixx2prmv6d05bvlaas4l83vc4i62w7";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-mk-4.4.4.tar.bz2";
+    sha256 = "05whf03nlklz63qkgzmg6f7phj128q0lxyqbwvdnrv20v5pbld65";
  };

  ml = deriv {
    lang = "ml";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ml-4.4.3.tar.bz2";
-    sha256 = "1bd4bb5q70w6k5yqnx2ndrchi745jszih9mi9xsj6v6m8zsn285c";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ml-4.4.4.tar.bz2";
+    sha256 = "1c572ygyhdnb3dl464v9zg6nb3l533qpkv4a54v7afswy6n61cil";
  };

  nb = deriv {
    lang = "nb";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nb-4.4.3.tar.bz2";
-    sha256 = "0l4wab6c5sx10a9scimbw4nsmfy58jm7rgrb94sv2v34awnkysji";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-nb-4.4.4.tar.bz2";
+    sha256 = "0zl9m90arm5dn1nmapm5ignrx4pm46vyiid0p100id59yjwpk3a9";
  };

  nds = deriv {
    lang = "nds";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nds-4.4.3.tar.bz2";
-    sha256 = "0njih51wyj21dk2m7z2165w5ywk3v3w6zqdnvjby489q1laqi9hc";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-nds-4.4.4.tar.bz2";
+    sha256 = "1cx54i2xl3zwlkq83xs1q0siap0hddqd4c4s0nqwgwp78vg9x0mw";
  };

  nl = deriv {
    lang = "nl";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nl-4.4.3.tar.bz2";
-    sha256 = "11hwijl2x8m9ianr5sniig1rqfdks7z72xaax9n922qf4i8v6n5g";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-nl-4.4.4.tar.bz2";
+    sha256 = "0ydkr8ywkkndaik1l6v860zq6mfgdw8l8n0rgjkhs6ikvyd4gk5d";
  };

  nn = deriv {
    lang = "nn";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nn-4.4.3.tar.bz2";
-    sha256 = "1wzvaj5im4kwgwxlbig2pdckiijdks3za5ixjc00axk0zkf16604";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-nn-4.4.4.tar.bz2";
+    sha256 = "0vb5fgjkn0jcwsb173gwrr5kr5ihi885g09fb7j92dbpdp1fk4gc";
  };

  pa = deriv {
    lang = "pa";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pa-4.4.3.tar.bz2";
-    sha256 = "1zdvzk49x9f1fn87sglw5hm2pfjplx94kxra0qyhvy7v899bmixq";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-pa-4.4.4.tar.bz2";
+    sha256 = "0jn94b9f3bb7gv5anprcghmhn1wj6vzv8biflqzqk7bx6q07k70d";
  };

  pl = deriv {
    lang = "pl";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pl-4.4.3.tar.bz2";
-    sha256 = "0fwfc1h3iwmzl52b1wk1bpxghvy0a8ipp26c813jpv5pqnds777w";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-pl-4.4.4.tar.bz2";
+    sha256 = "0p4hd5g2wkqahg79l9n2x7xy647kbf14jz00p8wpbxnbd2hvp333";
  };

  pt = deriv {
    lang = "pt";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pt-4.4.3.tar.bz2";
-    sha256 = "0ccswd7lvkpfd2hpzmlvg2dwylzaf1kp0r2dv080308cnji45j28";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-pt-4.4.4.tar.bz2";
+    sha256 = "0b0hk7sps0967dn4ryj43ihmbg3glspxd88f77z8ydccxi9zma2k";
  };

  pt_BR = deriv {
    lang = "pt_BR";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pt_BR-4.4.3.tar.bz2";
-    sha256 = "1a2fwnlj9pcxjy9fkcciiry42fi7wpdkb5qhim5v1vg1j4ah6zz8";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-pt_BR-4.4.4.tar.bz2";
+    sha256 = "1b9iy2mcm3l825kclrbs7sdsvgg5phi37aby3az8f25vh6mk80w9";
  };

  ro = deriv {
    lang = "ro";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ro-4.4.3.tar.bz2";
-    sha256 = "1f3ikjg19g2lnbrwcryvi4pz0hdy4prq91jw2s1a8cadh3yjr0bz";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ro-4.4.4.tar.bz2";
+    sha256 = "0da5awwls7h3pngq66gab420wlvmjj20pa5zhlmk2y1xdv917ysd";
  };

  ru = deriv {
    lang = "ru";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ru-4.4.3.tar.bz2";
-    sha256 = "0f888p973amz0nfahk48ayp20nc76f2rnxhdf4xr0y6rk3a5q3ah";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ru-4.4.4.tar.bz2";
+    sha256 = "0dxs3dzg80vw5gqs8gfj9hkrvh10qm55gjzxj12ks1nwlq5j39wp";
  };

  si = deriv {
    lang = "si";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-si-4.4.3.tar.bz2";
-    sha256 = "08yfm46abd58fralkyc7mfg20hmk34y5xpnqi09g2xys1ab630bq";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-si-4.4.4.tar.bz2";
+    sha256 = "14qppy24c4h7d96b0pc3m1jahkzpd1gxidrpi3cnvniw3qidr88n";
  };

  sk = deriv {
    lang = "sk";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sk-4.4.3.tar.bz2";
-    sha256 = "1nnr8mwz24nlc0cy4jkwam7bvdk71vqd0w4ncfjbqi31p69bq12w";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-sk-4.4.4.tar.bz2";
+    sha256 = "1vf5dz45nqzg3cdwny9v59nwx0ja25bvwcrhrlqm7q4xl7g8iz8p";
  };

  sl = deriv {
    lang = "sl";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sl-4.4.3.tar.bz2";
-    sha256 = "06j62vh78a32ygawvb81d5jsz8canw2w973cjay4qi104ibl8x7q";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-sl-4.4.4.tar.bz2";
+    sha256 = "0nvp20hwdpci4gfdgag6j32dvm7a9j21x3kcvs4saals7gfqy1bh";
  };

  sr = deriv {
    lang = "sr";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sr-4.4.3.tar.bz2";
-    sha256 = "1yyrqdagfssclj0amw7hnsgdsm1ma3jx03m75kz1xz4dwx044b2q";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-sr-4.4.4.tar.bz2";
+    sha256 = "0mw9b6bvgp6mfgzcjx9ircqajna7zf1k2wrp61l0v2cipj4apj5b";
  };

  sv = deriv {
    lang = "sv";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sv-4.4.3.tar.bz2";
-    sha256 = "1gynji087fk4iy0410qlh92j1z61mqafbkvw3gy6s82ava77i6i3";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-sv-4.4.4.tar.bz2";
+    sha256 = "1sp500d8r7zxql4k0jbavxng6vhwcplvkzfwcvrgvq9326mn5x29";
  };

  tg = deriv {
    lang = "tg";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-tg-4.4.3.tar.bz2";
-    sha256 = "0vg1sfpyvsi81qaiqb0cln21dvvvck7zvbzyic7cb0028a3619wr";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-tg-4.4.4.tar.bz2";
+    sha256 = "0abfl8y4m2y8nk46445376g55xsb51rzjg4jsqzzz6xqmxnhkz79";
  };

  tr = deriv {
    lang = "tr";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-tr-4.4.3.tar.bz2";
-    sha256 = "0lc8sj6lqidjrhhwipi98kkvc3y0bnn6d04j9dhf2z972bcfpfbp";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-tr-4.4.4.tar.bz2";
+    sha256 = "00kgm1a9q5jx6cq3flvrnasj1lwgcqf2kac6wa7qlqpy4nqw2vfm";
  };

  uk = deriv {
    lang = "uk";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-uk-4.4.3.tar.bz2";
-    sha256 = "1qkpd4qms5gx2lgmciwqbpdrvh251dlgrckzxxd3ch1z8ns2d3xa";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-uk-4.4.4.tar.bz2";
+    sha256 = "0l1r2xphq8rlnjf0hqdplsk47a35p6sxvdp9g9vg26gfhd7156zq";
  };

  wa = deriv {
    lang = "wa";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-wa-4.4.3.tar.bz2";
-    sha256 = "1f8pm69dlx1wvn56km2skk1xm602jfk0984fzhqhpdkkmji8cijn";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-wa-4.4.4.tar.bz2";
+    sha256 = "17yijs2mk7sr87lms7wajvxxrf888gbz75z9fza6kp6mlvbjc1a0";
  };

  zh_CN = deriv {
    lang = "zh_CN";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-zh_CN-4.4.3.tar.bz2";
-    sha256 = "0103wgjqnw542n1492ll7psmly84rxc7q68r6zmszmd2s6nbhlvm";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-zh_CN-4.4.4.tar.bz2";
+    sha256 = "1qjr3jlr539lm2mkgn2bma98zdy91frih2bfzl1jxrdp0swnkzh5";
  };

  zh_TW = deriv {
    lang = "zh_TW";
-    url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-zh_TW-4.4.3.tar.bz2";
-    sha256 = "08bnljg956948gfm380dlqllj090bv1gpc0y2w7gpq3cd3mqd0xv";
+    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-zh_TW-4.4.4.tar.bz2";
+    sha256 = "1s6dg6imqjb4wxljd1jblwp6kqkzcnybhndfbzhsb691ivi42mh5";
  };

 }
--- a/pkgs/desktops/kde-4.4/libs/default.nix
+++ b/pkgs/desktops/kde-4.4/libs/default.nix
@ -5,11 +5,11 @@
 }:

 stdenv.mkDerivation {
-  name = "kdelibs-4.4.3";
+  name = "kdelibs-4.4.4";

  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdelibs-4.4.3.tar.bz2;
-    sha256 = "0a049wgfl01g029ayg7pvw8fssp74p5d69d94lmfcrlzbwa0zwlk";
+    url = mirror://kde/stable/4.4.4/src/kdelibs-4.4.4.tar.bz2;
+    sha256 = "1jwvdzgmb3kjb57yqxn8iybm5ywfb4qzf8l7fpnab2xyn73a023g";
  };

  buildInputs = [
--- a/pkgs/desktops/kde-4.4/multimedia/default.nix
+++ b/pkgs/desktops/kde-4.4/multimedia/default.nix
@ -2,10 +2,10 @@
 , kdelibs, automoc4, phonon}:

 stdenv.mkDerivation {
-  name = "kdemultimedia-4.4.3";
+  name = "kdemultimedia-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdemultimedia-4.4.3.tar.bz2;
-    sha256 = "0lpwmplwiy6j9rc8vhwp95c64ym7hc8zh6zm41578pvdqgdy6y5j";
+    url = mirror://kde/stable/4.4.4/src/kdemultimedia-4.4.4.tar.bz2;
+    sha256 = "1cvin5cwzp6z9x2sgjnwqd328m60qn508z9xka9v8zxgbmays3cc";
  };
  buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia lame
                  kdelibs automoc4 phonon ];
--- a/pkgs/desktops/kde-4.4/network/default.nix
+++ b/pkgs/desktops/kde-4.4/network/default.nix
@ -4,16 +4,15 @@
 , kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}:

 stdenv.mkDerivation {
-  name = "kdenetwork-4.4.3";
+  name = "kdenetwork-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdenetwork-4.4.3.tar.bz2;
-    sha256 = "1p2cx7vr811vrx4d0sqchgz5jy195rw2nbg01brk8i0ihiqfqycg";
+    url = mirror://kde/stable/4.4.4/src/kdenetwork-4.4.4.tar.bz2;
+    sha256 = "13aqgr59wm3iackifymd0vmhwd8p998al2bzalvviz5ganmxzyps";
  };
  buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
                  libvncserver libmsn giflib gpgme boost stdenv.gcc.libc libv4l
                  libotr libXi libXtst libXdamage libXxf86vm
                  kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ];
-  patches = [ ./kget-cve.patch ];
  meta = {
    description = "KDE network utilities";
    longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
--- a/pkgs/desktops/kde-4.4/network/kget-cve.patch
+++ b/pkgs/desktops/kde-4.4/network/kget-cve.patch
@ -1,212 +0,0 @@
-Index: kget/transfer-plugins/metalink/metalink.cpp
-===================================================================
--- a/kget/transfer-plugins/metalink/metalink.cpp	(revision 1124973)
-+++ b/kget/transfer-plugins/metalink/metalink.cpp	(revision 1124974)
-@@ -99,6 +99,7 @@
- void Metalink::metalinkInit(const KUrl &src, const QByteArray &data)
- {
-     kDebug(5001);
-+
-     bool justDownloaded = !m_localMetalinkLocation.isValid();
-     if (!src.isEmpty())
-     {
-@@ -121,7 +122,9 @@
-     //error
-     if (!m_metalink.isValid())
-     {
-        kDebug(5001) << "Unknown error when trying to load the .metalink-file";
-+        kError(5001) << "Unknown error when trying to load the .metalink-file. Metalink is not valid.";
-+        setStatus(Job::Aborted);
-+        setTransferChange(Tc_Status, true);
-         return;
-     }
- 
-@@ -202,7 +205,7 @@
-     if (!m_dataSourceFactory.size())
-     {
-         KMessageBox::error(0, i18n("Download failed, no working URLs were found."), i18n("Error"));
-        setStatus(Job::Aborted, i18n("An error occurred...."), SmallIcon("document-preview"));
-+        setStatus(Job::Aborted);
-         setTransferChange(Tc_Status, true);
-         return;
-     }
-@@ -227,16 +230,29 @@
-         ui.treeView->hideColumn(FileItem::SignatureVerified);
-         dialog->setMainWidget(widget);
-         dialog->setCaption(i18n("File Selection"));
-        dialog->setButtons(KDialog::Ok);
-        connect(dialog, SIGNAL(finished()), this, SLOT(filesSelected()));
-+        dialog->setButtons(KDialog::Ok | KDialog::Cancel);
-+        connect(dialog, SIGNAL(finished(int)), this, SLOT(fileDlgFinished(int)));
- 
-         dialog->show();
-     }
- }
- 
-void Metalink::filesSelected()
-+void Metalink::fileDlgFinished(int result)
- {
-+    //BEGIN HACK if the dialog was not accepted untick every file, so that the download does not start
-+    //generally setStatus should do the job as well, but does not as it appears
-+    if (result != QDialog::Accepted) {
-+        for (int row = 0; row < fileModel()->rowCount(); ++row) {
-+            QModelIndex index = fileModel()->index(row, FileItem::File);
-+            if (index.isValid()) {
-+                fileModel()->setData(index, Qt::Unchecked, Qt::CheckStateRole);
-+            }
-+        }
-+    }
-+    //END
-+
-     QModelIndexList files = fileModel()->fileIndexes(FileItem::File);
-+    int numFilesSelected = 0;
-     foreach (const QModelIndex &index, files)
-     {
-         const KUrl dest = fileModel()->getUrl(index);
-@@ -244,6 +260,9 @@
-         if (m_dataSourceFactory.contains(dest))
-         {
-             m_dataSourceFactory[dest]->setDoDownload(doDownload);
-+            if (doDownload) {
-+                ++numFilesSelected;
-+            }
-         }
-     }
- 
-@@ -252,9 +271,15 @@
-     processedSizeChanged();
-     speedChanged();
- 
-+    //no files selected to download or dialog rejected, stop the download
-+    if (!numFilesSelected  || (result != QDialog::Accepted)) {
-+         setStatus(Job::Stopped);//FIXME
-+         setTransferChange(Tc_Status, true);
-+        return;
-+    }
-+
-     //some files may be set to download, so start them as long as the transfer is not stopped
-    if (status() != Job::Stopped)
-    {
-+    if (status() != Job::Stopped) {
-         startMetalink();
-     }
- }
-Index: kget/transfer-plugins/metalink/metalink.h
-===================================================================
--- a/kget/transfer-plugins/metalink/metalink.h	(revision 1124973)
-+++ b/kget/transfer-plugins/metalink/metalink.h	(revision 1124974)
-@@ -81,7 +81,7 @@
- 
-     private Q_SLOTS:
-         void metalinkInit(const KUrl &url = KUrl(), const QByteArray &data = QByteArray());
-        void filesSelected();
-+        void fileDlgFinished(int result);
-         void totalSizeChanged(KIO::filesize_t size);
-         void processedSizeChanged();
-         void speedChanged();
-Index: kget/ui/metalinkcreator/metalinker.h
-===================================================================
--- a/kget/ui/metalinkcreator/metalinker.h	(revision 1124973)
-+++ b/kget/ui/metalinkcreator/metalinker.h	(revision 1124974)
-@@ -259,6 +259,14 @@
-         KIO::filesize_t size;
-         CommonData data;
-         Resources resources;
-+
-+    private:
-+        /**
-+         * Controlls if the name attribute is valid, i.e. it is not empty and
-+         * does not contain any directory traversal directives or information,
-+         * as described in the Metalink 4.0 specification 4.1.2.1.
-+         */
-+        bool isValidNameAttribute() const;
- };
- 
- class Files
-Index: kget/ui/metalinkcreator/metalinker.cpp
-===================================================================
--- a/kget/ui/metalinkcreator/metalinker.cpp	(revision 1124973)
-+++ b/kget/ui/metalinkcreator/metalinker.cpp	(revision 1124974)
-@@ -528,14 +528,14 @@
- 
- bool KGetMetalink::File::isValid() const
- {
-    return !name.isEmpty() && resources.isValid();
-+    return isValidNameAttribute() && resources.isValid();
- }
- 
- void KGetMetalink::File::load(const QDomElement &e)
- {
-     data.load(e);
- 
-    name = e.attribute("name");
-+    name = QUrl::fromPercentEncoding(e.attribute("name").toAscii());
-     size = e.firstChildElement("size").text().toULongLong();
- 
-     verification.load(e);
-@@ -575,6 +575,22 @@
-     resources.clear();
- }
- 
-+
-+bool KGetMetalink::File::isValidNameAttribute() const
-+{
-+    if (name.isEmpty()) {
-+        kError(5001) << "Name attribute of Metalink::File is empty.";
-+        return false;
-+    }
-+
-+    if (name.contains(QRegExp("$(\\.\\.?)?/")) || name.contains("/../") || name.endsWith("/..")) {
-+        kError(5001) << "Name attribute of Metalink::File contains directory traversal directives:" << name;
-+        return false;
-+    }
-+
-+    return true;
-+}
-+
- #ifdef HAVE_NEPOMUK
- QHash<QUrl, Nepomuk::Variant> KGetMetalink::File::properties() const
- {
-@@ -584,13 +600,28 @@
- 
- bool KGetMetalink::Files::isValid() const
- {
-    bool isValid = !files.empty();
-    foreach (const File &file, files)
-    {
-        isValid &= file.isValid();
-+    if (files.isEmpty()) {
-+        return false;
-     }
- 
-    return isValid;
-+    QStringList fileNames;
-+    foreach (const File &file, files) {
-+        fileNames << file.name;
-+        if (!file.isValid()) {
-+            return false;
-+        }
-+    }
-+
-+    //The value of name must be unique for each file
-+    while (!fileNames.isEmpty()) {
-+        const QString fileName = fileNames.takeFirst();
-+        if (fileNames.contains(fileName)) {
-+            kError(5001) << "Metalink::File name" << fileName << "exists multiple times.";
-+            return false;
-+        }
-+    }
-+
-+    return true;
- }
- 
- void KGetMetalink::Files::load(const QDomElement &e)
-@@ -751,7 +782,7 @@
- 
-     for (QDomElement elem = filesElem.firstChildElement("file"); !elem.isNull(); elem = elem.nextSiblingElement("file")) {
-         File file;
-        file.name = elem.attribute("name");
-+        file.name = QUrl::fromPercentEncoding(elem.attribute("name").toAscii());
-         file.size = elem.firstChildElement("size").text().toULongLong();
- 
-         file.data = parseCommonData(elem);
--- a/pkgs/desktops/kde-4.4/oxygen-icons/default.nix
+++ b/pkgs/desktops/kde-4.4/oxygen-icons/default.nix
@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake}:

 stdenv.mkDerivation {
-  name = "oxygen-icons-4.4.3";
+  name = "oxygen-icons-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/oxygen-icons-4.4.3.tar.bz2;
-    sha256 = "1pqz6l8zdijcz4r2qrkx92skcqbijiip90m2j3aiawr1m6rv2l0j";
+    url = mirror://kde/stable/4.4.4/src/oxygen-icons-4.4.4.tar.bz2;
+    sha256 = "103001rxixpm4gb0bwdqvm9j1ygfjm25r11gz73hvyqss2v22zh4";
  };
  buildInputs = [ cmake ];
  meta = {
--- a/pkgs/desktops/kde-4.4/pim-runtime/default.nix
+++ b/pkgs/desktops/kde-4.4/pim-runtime/default.nix
@ -3,10 +3,10 @@
 , automoc4, phonon, akonadi, soprano, strigi}:

 stdenv.mkDerivation {
-  name = "kdepim-runtime-4.4.3";
+  name = "kdepim-runtime-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdepim-runtime-4.4.3.tar.bz2;
-    sha256 = "128azx9bw2fzc9780kf9pzvf745y8kflyb2vrb7mdwmskbr0gm3g";
+    url = mirror://kde/stable/4.4.4/src/kdepim-runtime-4.4.4.tar.bz2;
+    sha256 = "1ibpc6xmcn0gvzy4fywipc1z1dpwj256aijm4a56xkz0m9xayw9h";
  };
  buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
                  kdelibs kdepimlibs
--- a/pkgs/desktops/kde-4.4/pim/default.nix
+++ b/pkgs/desktops/kde-4.4/pim/default.nix
@ -3,10 +3,10 @@
 , kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:

 stdenv.mkDerivation {
-  name = "kdepim-4.4.3";
+  name = "kdepim-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdepim-4.4.3.tar.bz2;
-    sha256 = "0lpr9q1p89hw22d545yc9ih8m5wmnzc7j7m9cvliyalkk0ys5lqa";
+    url = mirror://kde/stable/4.4.4/src/kdepim-4.4.4.tar.bz2;
+    sha256 = "0632b78r40kjazlk0g78a7k8v8ql3bcin85nr1g7frxllmqk9vjv";
  };
  builder = ./builder.sh;  
  buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
--- a/pkgs/desktops/kde-4.4/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.4/pimlibs/default.nix
@ -2,10 +2,10 @@
 , kdelibs, automoc4, phonon, akonadi}:

 stdenv.mkDerivation {
-  name = "kdepimlibs-4.4.3";
+  name = "kdepimlibs-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdepimlibs-4.4.3.tar.bz2;
-    sha256 = "1q95zwkncady9lviz7bs9pnp1fkqlmnp33vj446m3krwjdh19b4c";
+    url = mirror://kde/stable/4.4.4/src/kdepimlibs-4.4.4.tar.bz2;
+    sha256 = "013xqj7jljz20n412g3s4rzjn1ax774wvrqs9p5zi5kjycfndfpf";
  };
  buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap shared_mime_info
                  kdelibs automoc4 phonon akonadi ];
--- a/pkgs/desktops/kde-4.4/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.4/plasma-addons/default.nix
@ -3,10 +3,10 @@
 , automoc4, phonon, soprano, eigen, qimageblitz, attica}:

 stdenv.mkDerivation {
-  name = "kdeplasma-addons-4.4.3";
+  name = "kdeplasma-addons-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdeplasma-addons-4.4.3.tar.bz2;
-    sha256 = "00pr74x0q88wn7a4v6m35djcd29yw870fd6dgklqp1zs5yrn0p97";
+    url = mirror://kde/stable/4.4.4/src/kdeplasma-addons-4.4.4.tar.bz2;
+    sha256 = "0pmll98l9d1yh8yfsfqd970bs346xkfi2h4a6vxmm643xsr59d2d";
  };
  inherit kdebase_workspace;
  builder = ./builder.sh;
--- a/pkgs/desktops/kde-4.4/sdk/default.nix
+++ b/pkgs/desktops/kde-4.4/sdk/default.nix
@ -3,10 +3,10 @@
 , kdelibs, kdepimlibs, automoc4, phonon, strigi}:

 stdenv.mkDerivation {
-  name = "kdesdk-4.4.3";
+  name = "kdesdk-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdesdk-4.4.3.tar.bz2;
-    sha256 = "01wqyixni9sb4330b1cvaysaf7jsvmy9ijjryv8ixnaam3gkxzs7";
+    url = mirror://kde/stable/4.4.4/src/kdesdk-4.4.4.tar.bz2;
+    sha256 = "18ncywimkg5iy58wsgqarx2s1w63xcxxspzxwcxsp46wia80wfr3";
  };
  builder=./builder.sh;
  inherit aprutil;
--- a/pkgs/desktops/kde-4.4/toys/default.nix
+++ b/pkgs/desktops/kde-4.4/toys/default.nix
@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}:

 stdenv.mkDerivation {
-  name = "kdetoys-4.4.3";
+  name = "kdetoys-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdetoys-4.4.3.tar.bz2;
-    sha256 = "0x99qkmbbskdnznzidh52sh4hnfzvq8a3363gzs532wmabv1gnl6";
+    url = mirror://kde/stable/4.4.4/src/kdetoys-4.4.4.tar.bz2;
+    sha256 = "16q5fyvl3j3n6f90kw172rz12m3rf6si3wka3wpgbzz3dcl8hda8";
  };
  buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ];
  meta = {
--- a/pkgs/desktops/kde-4.4/utils/default.nix
+++ b/pkgs/desktops/kde-4.4/utils/default.nix
@ -3,11 +3,11 @@
 , kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}:

 stdenv.mkDerivation {
-  name = "kdeutils-4.4.3";
+  name = "kdeutils-4.4.4";
  
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdeutils-4.4.3.tar.bz2;
-    sha256 = "1yncgljnvw7fvvcazr3f75634czjdzxg0s3kchscvxhfq632p4g5";
+    url = mirror://kde/stable/4.4.4/src/kdeutils-4.4.4.tar.bz2;
+    sha256 = "1vdpa360wmk6gr84xgmpfyjzf2l5dsxacyq29c6dmg6n7cziq85c";
  };
  
  builder = ./builder.sh;
--- a/pkgs/desktops/kde-4.4/webdev/default.nix
+++ b/pkgs/desktops/kde-4.4/webdev/default.nix
@ -2,10 +2,10 @@
 , kdelibs, kdepimlibs, automoc4, phonon}:

 stdenv.mkDerivation {
-  name = "kdewebdev-4.4.3";
+  name = "kdewebdev-4.4.4";
  src = fetchurl {
-    url = mirror://kde/stable/4.4.3/src/kdewebdev-4.4.3.tar.bz2;
-    sha256 = "1b1ip3b5lb3z2lrs5rslkzhjl942dh3srjxmkwwcfcg6md8h8ph5";
+    url = mirror://kde/stable/4.4.4/src/kdewebdev-4.4.4.tar.bz2;
+    sha256 = "1jdc55kvv8kr9s05iyp94cl7n7lsph9flyn499jvzbxd6lq366zi";
  };
  buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ];
  meta = {
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@ -0,0 +1,28 @@
+x@{stdenv, fetchurl, builderDefsPackage, ...}:
+builderDefsPackage
+(a :  
+let 
+  s = import ./src-for-default.nix;
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ [];
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+  configureFlags = ["--enable-shared"];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "Gambit Scheme to C compiler";
+    maintainers = [
+      a.lib.maintainers.raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux ++ freebsd;
+  };
+}) x
--- a/pkgs/development/compilers/gambit/src-for-default.nix
+++ b/pkgs/development/compilers/gambit/src-for-default.nix
@ -0,0 +1,9 @@
+rec {
+   version="v4_6_0";
+   name="gambit-v4_6_0";
+   hash="1hnczygq25r6hi1l6lh1sd4g382j2z0ji5bdd01lhr4i07dcvipd";
+   url="http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/gambc-${version}-devel.tgz";
+   advertisedUrl="http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/gambc-v4_6_0-devel.tgz";
+  
+  
+}
--- a/pkgs/development/compilers/gambit/src-info-for-default.nix
+++ b/pkgs/development/compilers/gambit/src-info-for-default.nix
@ -0,0 +1,7 @@
+{
+  downloadPage = "http://dynamo.iro.umontreal.ca/~gambit/wiki/index.php/Main_Page";
+  baseName = "gambit";
+  sourceRegexp = "[.]tgz";
+  versionExtractorSedScript = ''s/.*-(v[_0-9]+)-devel[.].*/\1/'';
+  versionReferenceCreator = ''$(replaceAllVersionOccurences)'';
+}
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@ -245,7 +245,7 @@ stdenv.mkDerivation ({


  passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl
-      enableMultilib; };
+      enableMultilib version; };

  meta = {
    homepage = http://gcc.gnu.org/;
--- a/pkgs/development/compilers/gcc-4.5/default.nix
+++ b/pkgs/development/compilers/gcc-4.5/default.nix
@ -136,7 +136,7 @@ stdenv.mkDerivation ({
  };

  patches =
-    [ ./softfp-hurd.patch ]
+    [ ./softfp-hurd.patch ./dragonegg-2.7.patch ]
    ++ optional (cross != null) ./libstdc++-target.patch
    ++ optional noSysDirs ./no-sys-dirs.patch
    # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
@ -190,8 +190,10 @@ stdenv.mkDerivation ({
    ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""}
    ${if langJava then
      "--with-ecj-jar=${javaEcj} " +
-      "--enable-java-home --with-java-home=\${prefix} " +
-      "--with-jvm-root-dir=\${prefix}/jdk"
+
+      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
+      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
+      "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre "
      else ""}
    ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
    ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
@ -202,6 +204,8 @@ stdenv.mkDerivation ({
    --disable-libstdcxx-pch
    --without-included-gettext
    --with-system-zlib
+    --enable-lto
+    --enable-plugin
    --enable-languages=${
      concatStrings (intersperse ","
        (  optional langC        "c"
@ -273,7 +277,7 @@ stdenv.mkDerivation ({
    else null;

  passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl
-      enableMultilib; };
+      enableMultilib version; };

  meta = {
    homepage = http://gcc.gnu.org/;
--- a/pkgs/development/compilers/gcc-4.5/dragonegg-2.7.patch
+++ b/pkgs/development/compilers/gcc-4.5/dragonegg-2.7.patch
@ -0,0 +1,46 @@
+Index: mainline/gcc/config/i386/i386.c
+===================================================================
+--- mainline.orig/gcc/config/i386/i386.c	2010-04-02 09:11:58.733574308 +0200
+++ mainline/gcc/config/i386/i386.c	2010-04-02 09:29:11.276111437 +0200
+@@ -4992,7 +4992,8 @@
+    case, we return the original mode and warn ABI change if CUM isn't
+    NULL.  */
+ 
+-static enum machine_mode
+extern enum machine_mode type_natural_mode (const_tree, CUMULATIVE_ARGS *);
+enum machine_mode
+ type_natural_mode (const_tree type, CUMULATIVE_ARGS *cum)
+ {
+   enum machine_mode mode = TYPE_MODE (type);
+@@ -5123,7 +5124,9 @@
+    See the x86-64 PS ABI for details.
+ */
+ 
+-static int
+extern int classify_argument (enum machine_mode, const_tree,
+                              enum x86_64_reg_class [MAX_CLASSES], int);
+int
+ classify_argument (enum machine_mode mode, const_tree type,
+ 		   enum x86_64_reg_class classes[MAX_CLASSES], int bit_offset)
+ {
+@@ -5504,7 +5507,9 @@
+ 
+ /* Examine the argument and return set number of register required in each
+    class.  Return 0 iff parameter should be passed in memory.  */
+-static int
+extern int examine_argument (enum machine_mode, const_tree, int,
+                             int *, int *);
+int
+ examine_argument (enum machine_mode mode, const_tree type, int in_return,
+ 		  int *int_nregs, int *sse_nregs)
+ {
+@@ -6186,7 +6191,8 @@
+ 
+ /* Return true when TYPE should be 128bit aligned for 32bit argument passing
+    ABI.  */
+-static bool
+extern bool contains_aligned_value_p (tree);
+bool
+ contains_aligned_value_p (tree type)
+ {
+   enum machine_mode mode = TYPE_MODE (type);
--- a/pkgs/development/compilers/go/cgo-set-local-to-match-gcc-error-messages.patch
+++ b/pkgs/development/compilers/go/cgo-set-local-to-match-gcc-error-messages.patch
@ -1,13 +0,0 @@
-diff -r 21cae7efdcc6 src/cmd/cgo/main.go
--- a/src/cmd/cgo/main.go	Sat Nov 14 12:23:24 2009 -0800
-+++ b/src/cmd/cgo/main.go	Sun Nov 15 00:00:09 2009 +0100
-@@ -52,6 +52,9 @@
- 		fatal("unknown architecture %s", arch)
- 	}
- 
-+	// Define the language of gcc error messages.
-+	os.Setenv("LC_ALL", "C");
-+
- 	p := openProg(input);
- 	for _, cref := range p.Crefs {
- 		// Convert C.ulong to C.unsigned long, etc.
--- a/pkgs/development/compilers/go/default.nix
+++ b/pkgs/development/compilers/go/default.nix
@ -1,37 +1,50 @@
-{stdenv, fetchhg, bison, glibc, ed, which, bash, makeWrapper, ...}:
+{stdenv, fetchhg, bison, glibc, ed, which, bash, makeWrapper, perl, ...}:

 let
-  version = "2009-11-12";
-  md5 = "66e5803c8dc2855b339151918b6b0de5";
+  version = "2010-06-09";
+  sha256 = "b607879b333ef100466c726a13cc69ed143566a3c1af59f6d33a6e90b9d0c917";
+
+  loader386 = "${glibc}/lib/ld-linux.so.2";
+  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
 in

 stdenv.mkDerivation {
-  name = "Go-" + version;
+  name = "go-" + version;

  # No tarball yet.
  src = fetchhg {
    url = https://go.googlecode.com/hg/;
    tag = "release." + version;
-    inherit md5;
+    inherit sha256;
  };

  buildInputs = [ bison glibc ed which bash makeWrapper ];

-  patches = [
-    ./disable-system-dependent-tests.patch
-    ./cgo-set-local-to-match-gcc-error-messages.patch
-  ];
-
  prePatch = ''
    patchShebangs ./ # replace /bin/bash
    # only for 386 build
    # !!! substituteInPlace does not seems to be effective.
-    sed -i 's,/lib/ld-linux.so.2,${glibc}/lib/ld-linux.so.2,' src/cmd/8l/asm.c
+    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
+    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
    sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo.go
+    sed -i 's,/bin/ed,${ed}/bin/ed,' src/cmd/6l/mkenam
+
+    sed -i -e 's,/bin/cat,${stdenv.coreutils}/bin/cat,' \
+      -e 's,/bin/echo,${stdenv.coreutils}/bin/echo,' \
+      src/pkg/exec/exec_test.go
+
+    # Disabling the 'os/http/net' tests (they want files not available in
+    # chroot builds)
+    sed -i -e '/^NOTEST=/a\\tos\\\n\thttp\\\n\tnet\\' src/pkg/Makefile
+
+    sed -i -e 's,/bin:/usr/bin:/usr/local/bin,'$PATH, test/run
+    sed -i -e 's,/usr/bin/perl,${perl}/bin/perl,' test/errchk
  '';

  GOOS = "linux";
-  GOARCH = "386";
+  GOARCH = if (stdenv.system == "i686-linux") then "386"
+          else if (stdenv.system == "x86_64-linux") then "amd64"
+          else throw "Unsupported system";

  installPhase = ''
    ensureDir "$out/bin"
@ -64,13 +77,13 @@ stdenv.mkDerivation {
    # Copy the emacs configuration for Go files.
    ensureDir "$out/share/emacs/site-lisp"
    cp ./misc/emacs/* $out/share/emacs/site-lisp/ # */
-
  '';

  meta = {
    homepage = http://golang.org/;
    description = "The Go Programming language";
    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ pierron ];
+    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
+    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/development/compilers/go/disable-system-dependent-tests.patch
+++ b/pkgs/development/compilers/go/disable-system-dependent-tests.patch
@ -1,30 +0,0 @@
-diff -r cb140bac9ab0 src/pkg/Makefile
--- a/src/pkg/Makefile	Thu Nov 12 14:55:26 2009 -0800
-+++ b/src/pkg/Makefile	Mon Nov 16 11:50:34 2009 +0100
-@@ -100,12 +100,15 @@
- 
- NOTEST=\
- 	debug/proc\
-+	exec\
- 	go/ast\
- 	go/doc\
- 	go/token\
- 	hash\
- 	image\
-+	log\
- 	malloc\
-+	os\
- 	rand\
- 	runtime\
- 	syscall\
-diff -r cb140bac9ab0 src/run.bash
--- a/src/run.bash	Thu Nov 12 14:55:26 2009 -0800
-+++ b/src/run.bash	Mon Nov 16 11:50:34 2009 +0100
-@@ -69,7 +69,3 @@
- ./timing.sh -test
- ) || exit $?
- 
-(xcd ../test
-./run
-) || exit $?
-
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@ -3,44 +3,44 @@ args: with args;
 let

    src_haxe_swflib = {
-      # REGION AUTO UPDATE:                             { name = "haxe_swflib"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/swflib"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe_swflib-F_23-45-43.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_swflib-F_23-45-43.tar.gz"; sha256 = "a77ce2dda48d28f82b48b96f71404edbf7f58e4c3058b425a473c08d260e0816"; });
+      # REGION AUTO UPDATE:                                { name = "haxe_swflib"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/swflib"; groups = "haxe_group"; }
+      src = sourceFromHead "haxe_swflib-F_10-43-46.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_swflib-F_10-43-46.tar.gz"; sha256 = "a63de75e48bf500ef0e8ef715d178d32f0ef113ded8c21bbca698a8cc70e7b58"; });
      # END
    }.src;

    src_haxe_extc = { 
-      # REGION AUTO UPDATE:                             { name = "haxe_extc"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extc"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe_extc-F_23-45-44.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extc-F_23-45-44.tar.gz"; sha256 = "dd49eb771d52f4d67ca1ebdab1ced9a251dc5799f91896c33bd234690997820f"; });
+      # REGION AUTO UPDATE:                                { name = "haxe_extc"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extc"; groups = "haxe_group"; }
+      src = sourceFromHead "haxe_extc-F_10-43-47.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extc-F_10-43-47.tar.gz"; sha256 = "d0a9980527d62ac6cfe27925ddb0964d334ec382f813fdfb8bd6c59fbbede730"; });
      # END
    }.src;

    src_haxe_extlib_dev = { 
-      # REGION AUTO UPDATE:                             { name = "haxe_extlib_dev"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extlib-dev"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe_extlib_dev-F_23-45-46.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extlib_dev-F_23-45-46.tar.gz"; sha256 = "0a3566b6119de9063441cecd553248f3bfc00360edd7143f13b3ab0dbc57b310"; });
+      # REGION AUTO UPDATE:                                { name = "haxe_extlib_dev"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extlib-dev"; groups = "haxe_group"; }
+      src = sourceFromHead "haxe_extlib_dev-F_10-43-48.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extlib_dev-F_10-43-48.tar.gz"; sha256 = "6b9037230e2615dd5e22f4e7f4165c84f2816bc526957683afc945394fcdf67e"; });
      # END
    }.src;

    src_haxe_xml_light = { 
-      # REGION AUTO UPDATE:                             { name = "haxe_xml_light"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/xml-light"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe_xml_light-F_23-45-47.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_xml_light-F_23-45-47.tar.gz"; sha256 = "8e1b5a7f1afcb7a6cd8bcac794c3714305ce94a98e989ccf23a38defb6205ed2"; });
+      # REGION AUTO UPDATE:                                { name = "haxe_xml_light"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/xml-light"; groups = "haxe_group"; }
+      src = sourceFromHead "haxe_xml_light-F_10-43-48.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_xml_light-F_10-43-48.tar.gz"; sha256 = "be29d9e22ad0dbcb3d447cbbc14907aff5f89bb562b8db369659d299f3a5b44f"; });
      # END
    }.src;

    src_haxe_neko_include = { 
-      # REGION AUTO UPDATE:                             { name = "haxe_neko_include"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko/libs/include/ocaml"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe_neko_include-F_23-45-48.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_neko_include-F_23-45-48.tar.gz"; sha256 = "78441ec5a20f25c751afeb46e0ea61db6350794f6c5959264059914682c521a9"; });
+      # REGION AUTO UPDATE:                                { name = "haxe_neko_include"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko/libs/include/ocaml"; groups = "haxe_group"; }
+      src = sourceFromHead "haxe_neko_include-F_10-43-49.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_neko_include-F_10-43-49.tar.gz"; sha256 = "e49efc1b348fa6e0f6fb40079a2d380b947d9ebda31843bc293f3cc77f8453db"; });
      # END
    }.src;

    src_haxe = {
-      # REGION AUTO UPDATE:    { name="haxe-read-only"; type="svn"; url="http://haxe.googlecode.com/svn/trunk"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe-read-only-3207.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe-read-only-3207.tar.gz"; sha256 = "2d315ca69fac69674eb562e1349fdebefb0dca4a91eb4ee28371230aaaf60df1"; });
+      # REGION AUTO UPDATE:       { name="haxe-read-only"; type="svn"; url="http://haxe.googlecode.com/svn/trunk"; groups = "haxe_group"; }
+      src = sourceFromHead "haxe-read-only-3220.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe-read-only-3220.tar.gz"; sha256 = "2b6702dca95d0829e539cea07b8224e3848e584a425ce8f8e0984a7a2bf7b1f8"; });
      # END
    }.src;

@ -56,9 +56,11 @@ let
      inherit zlib;

      buildPhase = ''
+        set -x
        mkdir -p ocaml/{swflib,extc,extlib-dev,xml-light} neko/libs

        # strange setup. install.ml seems to co the same repo again into haxe directory!
+        mkdir haxe
        tar xfz $src --strip-components=1 -C haxe

        t(){ tar xfz $1 -C $2 --strip-components=2; }
--- a/pkgs/development/compilers/jdk/default.nix
+++ b/pkgs/development/compilers/jdk/default.nix
@ -1,9 +1,11 @@
 args:

 if args.stdenv.system == "i686-linux" || args.stdenv.system == "x86_64-linux" then
-  (import ./jdk6-linux.nix) args
+  (import ./jdk6-linux.nix) ( removeAttrs args ["cabextract"] )
 else if args.stdenv.system == "powerpc-linux" then
-  (import ./jdk5-ibm-powerpc-linux.nix) (removeAttrs args ["pluginSupport" "xlibs" "installjdk"])
+  (import ./jdk5-ibm-powerpc-linux.nix) (removeAttrs args ["pluginSupport" "xlibs" "installjdk" "cabextract"])
+else if args.stdenv.system == "i686-cygwin" then
+  (import ./jdk6-cygwin.nix) (removeAttrs args ["pluginSupport" "xlibs" "installjdk" "xlibs"])
 else
  abort "the JDK is not supported on this platform"

--- a/pkgs/development/compilers/jdk/jdk6-cygwin.nix
+++ b/pkgs/development/compilers/jdk/jdk6-cygwin.nix
@ -0,0 +1,46 @@
+{ stdenv
+, fetchurl
+, unzip
+, cabextract
+, ...
+}:
+
+assert stdenv.system == "i686-cygwin";
+
+stdenv.mkDerivation rec {
+  name = "jdk-1.6.0_20";
+
+  src = fetchurl {
+    url = file:///tmp/jdk-6u20-windows-i586.exe ;
+    sha256 = "0w4afz8a9gi1iyhh47gvhiy59dfrzx0fnmywdff3v5cx696w25fh";
+  };
+
+  buildInputs = [unzip cabextract]; 
+
+  buildCommand = ''
+    cabextract ${src}
+    mkdir -p $out
+    unzip -d $out tools.zip
+    find $out -name '*.exe' | xargs chmod a+x 
+    find $out -name '*.dll' | xargs chmod a+x 
+
+    cd $out
+    $out/bin/unpack200.exe ./jre/lib/jsse.pack ./jre/lib/jsse.jar
+    $out/bin/unpack200.exe ./jre/lib/javaws.pack ./jre/lib/javaws.jar
+    $out/bin/unpack200.exe ./jre/lib/plugin.pack ./jre/lib/plugin.jar
+    $out/bin/unpack200.exe ./jre/lib/charsets.pack ./jre/lib/charsets.jar
+    $out/bin/unpack200.exe ./jre/lib/deploy.pack ./jre/lib/deploy.jar
+    $out/bin/unpack200.exe ./jre/lib/rt.pack ./jre/lib/rt.jar
+    $out/bin/unpack200.exe ./jre/lib/ext/localedata.pack ./jre/lib/ext/localedata.jar
+    $out/bin/unpack200.exe ./lib/tools.pack ./lib/tools.jar
+
+    rm ./jre/lib/jsse.pack \
+       ./jre/lib/javaws.pack \
+       ./jre/lib/plugin.pack \
+       ./jre/lib/charsets.pack \
+       ./jre/lib/deploy.pack \
+       ./jre/lib/rt.pack \
+       ./jre/lib/ext/localedata.pack \
+       ./lib/tools.pack
+  '';
+}
--- a/pkgs/development/compilers/llvm/builder.sh
+++ b/pkgs/development/compilers/llvm/builder.sh
@ -1,84 +0,0 @@
-source $stdenv/setup
-
-
-export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
-mkdir $NIX_FIXINC_DUMMY
-
-export X_CFLAGS="-I${gmp}/include -I${mpfr}/include -L${gmp}/lib -L${mpfr}/lib";
-
-# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad
-# Thing.
-export CPP="gcc -E"
-
-
-if test "$noSysDirs" = "1"; then
-
-    if test -e $NIX_GCC/nix-support/orig-libc; then
-
-        # Figure out what extra flags to pass to the gcc compilers
-        # being generated to make sure that they use our glibc.
-        extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"
-        extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"
-
-        # Use *real* header files, otherwise a limits.h is generated
-        # that does not include Glibc's limits.h (notably missing
-        # SSIZE_MAX, which breaks the build).
-        export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include
-        
-    else
-        # Hack: support impure environments.
-        extraCFlags="-isystem /usr/include"
-        extraLDFlags="-L/usr/lib64 -L/usr/lib"
-        export NIX_FIXINC_DUMMY=/usr/include
-    fi
-
-    extraCFlags="-g0 $extraCFlags"
-    extraLDFlags="--strip-debug $extraLDFlags"
-
-    export NIX_EXTRA_CFLAGS=$extraCFlags
-    for i in $extraLDFlags; do
-        export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i"
-    done
-
-    makeFlagsArray=( \
-        NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
-        SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
-        LIMITS_H_TEST=true \
-        X_CFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \
-        LDFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \
-        LDFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \
-        )
-fi
-
-
-preConfigure() {
-    # Perform the build in a different directory.
-    mkdir ../build
-    cd ../build
-    configureScript=../$sourceRoot/configure
-}
-
-
-postInstall() {
-    # Remove precompiled headers for now.  They are very big and
-    # probably not very useful yet.
-    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
-
-    # Remove `fixincl' to prevent a retained dependency on the
-    # previous gcc.
-    rm -rf $out/libexec/gcc/*/*/install-tools
-
-    # Get rid of some "fixed" header files
-    rm -rf $out/lib/gcc/*/*/include/root
-}
-
-
-if test -z "$staticCompiler"; then
-    if test -z "$profiledCompiler"; then
-        buildFlags="bootstrap $buildFlags"
-    else    
-        buildFlags="profiledbootstrap $buildFlags"
-    fi
-fi
-
-genericBuild
--- a/pkgs/development/compilers/llvm/clang-include-paths.patch
+++ b/pkgs/development/compilers/llvm/clang-include-paths.patch
@ -0,0 +1,205 @@
+diff --git a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
+index cd749d2..b5591f6 100644
+--- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp
+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
+@@ -393,51 +393,7 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple) {
+       AddPath(*i, System, false, false, false);
+     return;
+   }
+-  llvm::Triple::OSType os = triple.getOS();
+-  switch (os) {
+-  case llvm::Triple::Win32:
+-    {
+-      std::string VSDir;
+-      std::string WindowsSDKDir;
+-      if (getVisualStudioDir(VSDir)) {
+-        AddPath(VSDir + "\\VC\\include", System, false, false, false);
+-        if (getWindowsSDKDir(WindowsSDKDir))
+-          AddPath(WindowsSDKDir, System, false, false, false);
+-        else
+-          AddPath(VSDir + "\\VC\\PlatformSDK\\Include",
+-            System, false, false, false);
+-      }
+-      else {
+-          // Default install paths.
+-        AddPath("C:/Program Files/Microsoft Visual Studio 9.0/VC/include",
+-          System, false, false, false);
+-        AddPath(
+-        "C:/Program Files/Microsoft Visual Studio 9.0/VC/PlatformSDK/Include",
+-          System, false, false, false);
+-        AddPath("C:/Program Files/Microsoft Visual Studio 8/VC/include",
+-          System, false, false, false);
+-        AddPath(
+-        "C:/Program Files/Microsoft Visual Studio 8/VC/PlatformSDK/Include",
+-          System, false, false, false);
+-          // For some clang developers.
+-        AddPath("G:/Program Files/Microsoft Visual Studio 9.0/VC/include",
+-          System, false, false, false);
+-        AddPath(
+-        "G:/Program Files/Microsoft Visual Studio 9.0/VC/PlatformSDK/Include",
+-          System, false, false, false);
+-      }
+-    }
+-    break;
+-  case llvm::Triple::MinGW64:
+-  case llvm::Triple::MinGW32:
+-    AddPath("c:/mingw/include", System, true, false, false);
+-    break;
+-  default:
+-    break;
+-  }
+-
+-  AddPath("/usr/local/include", System, true, false, false);
+-  AddPath("/usr/include", System, false, false, false);
+  AddPath(C_INCLUDE_PATH, System, false, false, false);
+ }
+ 
+ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple) {
+@@ -453,144 +409,9 @@ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths(const llvm::Triple &tripl
+                                   CXX_INCLUDE_32BIT_DIR, CXX_INCLUDE_64BIT_DIR, triple);
+     return;
+   }
+-  // FIXME: temporary hack: hard-coded paths.
+-  switch (os) {
+-  case llvm::Triple::Cygwin:
+-    AddPath("/lib/gcc/i686-pc-cygwin/3.4.4/include",
+-        System, true, false, false);
+-    AddPath("/lib/gcc/i686-pc-cygwin/3.4.4/include/c++",
+-        System, true, false, false);
+-    break;
+-  case llvm::Triple::MinGW64:
+-    // Try gcc 4.4.0
+-    AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw64", "4.4.0");
+-    // Try gcc 4.3.0
+-    AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw64", "4.3.0");
+-    // Fall through.
+-  case llvm::Triple::MinGW32:
+-    // Try gcc 4.4.0
+-    AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.4.0");
+-    // Try gcc 4.3.0
+-    AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.3.0");
+-    break;
+-  case llvm::Triple::Darwin:
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
+-                                "i686-apple-darwin10", "", "x86_64", triple);
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
+-                                "i686-apple-darwin8", "", "", triple);
+-    break;
+-  case llvm::Triple::DragonFly:
+-    AddPath("/usr/include/c++/4.1", System, true, false, false);
+-    break;
+-  case llvm::Triple::Linux:
+-    // Exherbo (2010-01-25)
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.3",
+-                                "x86_64-pc-linux-gnu", "32", "", triple);
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.3",
+-                                "i686-pc-linux-gnu", "", "", triple);
+-    // Debian sid
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4",
+-                                "x86_64-linux-gnu", "32", "", triple);
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4",
+-                                "i486-linux-gnu", "64", "", triple);
+-    // Ubuntu 7.10 - Gutsy Gibbon
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.1.3",
+-                                "i486-linux-gnu", "", "", triple);
+-    // Ubuntu 9.04
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.3",
+-                                "x86_64-linux-gnu","32", "", triple);
+-    // Ubuntu 9.10
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.1",
+-                                "x86_64-linux-gnu", "32", "", triple);
+-    // Fedora 8
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.1.2",
+-                                "i386-redhat-linux", "", "", triple);
+-    // Fedora 9
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.0",
+-                                "i386-redhat-linux", "", "", triple);
+-    // Fedora 10
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.2",
+-                                "i386-redhat-linux","", "", triple);
+-
+-    // Fedora 10 x86_64
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.2",
+-                                "x86_64-redhat-linux", "32", "", triple);
+-
+-    // Fedora 11
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.1",
+-                                "i586-redhat-linux","", "", triple);
+-
+-    // Fedora 12
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.2",
+-                                "i686-redhat-linux","", "", triple);
+-
+-    // Fedora 12 (February-2010+)
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.3",
+-                                "i686-redhat-linux","", "", triple);
+-      
+-    // openSUSE 11.1 32 bit
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
+-                                "i586-suse-linux", "", "", triple);
+-    // openSUSE 11.1 64 bit
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
+-                                "x86_64-suse-linux", "32", "", triple);
+-    // openSUSE 11.2
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4",
+-                                "i586-suse-linux", "", "", triple);
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4",
+-                                "x86_64-suse-linux", "", "", triple);
+-    // Arch Linux 2008-06-24
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.1",
+-                                "i686-pc-linux-gnu", "", "", triple);
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.1",
+-                                "x86_64-unknown-linux-gnu", "", "", triple);
+-    // Gentoo x86 2009.1 stable
+-    AddGnuCPlusPlusIncludePaths(
+-      "/usr/lib/gcc/i686-pc-linux-gnu/4.3.4/include/g++-v4",
+-      "i686-pc-linux-gnu", "", "", triple);
+-    // Gentoo x86 2009.0 stable
+-    AddGnuCPlusPlusIncludePaths(
+-      "/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4",
+-      "i686-pc-linux-gnu", "", "", triple);
+-    // Gentoo x86 2008.0 stable
+-    AddGnuCPlusPlusIncludePaths(
+-      "/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/include/g++-v4",
+-      "i686-pc-linux-gnu", "", "", triple);
+-    // Ubuntu 8.10
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
+-                                "i486-pc-linux-gnu", "", "", triple);
+-    // Ubuntu 9.04
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
+-                                "i486-linux-gnu","", "", triple);
+-    // Gentoo amd64 stable
+-    AddGnuCPlusPlusIncludePaths(
+-        "/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/include/g++-v4",
+-        "i686-pc-linux-gnu", "", "", triple);
+-        
+-    // Gentoo amd64 gcc 4.3.2
+-    AddGnuCPlusPlusIncludePaths(
+-        "/usr/lib/gcc/x86_64-pc-linux-gnu/4.3.2/include/g++-v4",
+-        "x86_64-pc-linux-gnu", "", "", triple);
+-        
+-    // Gentoo amd64 gcc 4.4.3
+-    AddGnuCPlusPlusIncludePaths(
+-        "/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.3/include/g++-v4",
+-        "x86_64-pc-linux-gnu", "32", "", triple);
+-    
+-    break;
+-  case llvm::Triple::FreeBSD:
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2", "", "", "", triple);
+-    break;
+-  case llvm::Triple::Solaris:
+-    // Solaris - Fall though..
+-  case llvm::Triple::AuroraUX:
+-    // AuroraUX
+-    AddGnuCPlusPlusIncludePaths("/opt/gcc4/include/c++/4.2.4",
+-                                "i386-pc-solaris2.11", "", "", triple);
+-    break;
+-  default:
+-    break;
+-  }
+  AddGnuCPlusPlusIncludePaths(
+      CPP_INCLUDE_PATH,
+      CPP_HOST, "", "", triple);
+ }
+ 
+ void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang,
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@ -1,11 +1,67 @@
-{stdenv, fetchurl, gcc, flex, perl, libtool }:
+{stdenv, fetchurl, fetchsvn, gcc, flex, perl, libtool, groff
+, buildClang ? false}:

-stdenv.mkDerivation {
-  name = "llvm-2.2";
+stdenv.mkDerivation ({
+  name = "llvm-2.7";
  src = fetchurl {
-    url    = http://llvm.org/releases/2.2/llvm-2.2.tar.gz;
-    sha256 = "788d871aec139e0c61d49533d0252b21c4cd030e91405491ee8cb9b2d0311072";
+    url    = http://llvm.org/releases/2.7/llvm-2.7.tgz;
+    sha256 = "19dwvfyxr851fjfsaxbm56gdj9mlivr37bv6h41hd8q3hpf4nrlr";
  };

-  buildInputs = [ gcc flex perl libtool ];
+  buildInputs = [ gcc flex perl libtool groff ];
+
+  configureFlags = [ "--enable-optimized" "--enable-shared" ];
+
+  meta = {
+    homepage = http://llvm.org/;
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; all;
+  };
 }
+//
+(if buildClang then 
+  # I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not
+  # evaluate properly (in the preConfigure below)
+  assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+  let
+    triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
+              else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
+              else throw "System not supported";
+  in {
+    name = "clang-2.7";
+
+    srcClang = fetchsvn {
+      url = http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_27;
+      rev = 105900;
+      sha256 = "fe79988950319b62d3bca34848424f20a3f33c8182507df222f2ac93fbacf671";
+    };
+
+    prePatch = ''
+      pushd tools
+      cp -R "$srcClang" clang
+      chmod u+w -R clang
+      popd
+    '';
+
+    patches = [ ./clang-include-paths.patch ];
+
+    # Set up the header file paths
+    preConfigure = ''
+      sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \
+        -e 's,CPP_HOST,"${triplet}",' \
+        -e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \
+        tools/clang/lib/Frontend/InitHeaderSearch.cpp
+    '';
+
+    meta = {
+      homepage = http://clang.llvm.org/;
+      description = "A C language family frontend for LLVM";
+      license = "BSD";
+      maintainers = with stdenv.lib.maintainers; [viric];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  }
+else {}
+))
--- a/pkgs/development/compilers/llvm/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/dragonegg.nix
@ -0,0 +1,30 @@
+{stdenv, fetchsvn, llvm, gmp, mpfr, mpc}:
+
+stdenv.mkDerivation rec {
+  name = "dragonegg-2.7";
+
+  src = fetchsvn {
+    url = http://llvm.org/svn/llvm-project/dragonegg/branches/release_27;
+    rev = 105882;
+    sha256 = "0j0mj3zm1nd8kaj3b28b3w2dlzc1xbywq4mcdxk5nq4yds6rx5np";
+  };
+
+  # The gcc the plugin will be built for (the same used building dragonegg)
+  GCC = "gcc";
+
+  buildInputs = [ llvm gmp mpfr mpc ];
+
+  installPhase = ''
+    ensureDir $out/lib $out/share/doc/${name}
+    cp -d dragonegg.so $out/lib
+    cp README COPYING $out/share/doc/${name}
+  '';
+
+  meta = {
+    homepage = http://dragonegg.llvm.org/;
+    description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM";
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
--- a/pkgs/development/compilers/llvm/llvm-gcc.nix
+++ b/pkgs/development/compilers/llvm/llvm-gcc.nix
@ -1,67 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://llvm.org/releases/2.2/llvm-gcc4.2-2.2.source.tar.gz;
-    sha256 = "11vjn8wn76cq63jam7y5ralq1b12r6cdipf22nsnzw90srb49qkp";
-  };
-
-  buildInputs = [llvm bison flex perl libtool];
-  configureFlags = [ " --enable-languages=c,c++ " ];
-  makeFlags = [" -f Makefile "];
-
-  phaseNames = [ "doPatch" "preConfigure" "doConfigure" 
-    "doMakeInstall" "postInstall"];
-
-  patches = [ ./no-sys-dirs.patch ];
-
-  preConfigure = fullDepEntry (''
-
-    sed -e 's,^LLVMSRCDIR.*,LLVMSRCDIR := dummy,' \
-        -e 's,\$(LLVMSRCDIR)/include,${llvm}/include,g' \
-        -e 's,^LLVMOBJDIR.*,LLVMOBJDIR := dummy,' \
-        -e 's,\$(LLVMOBJDIR)/include,${llvm}/include,g' \
-        -e 's,^LLVMBINPATH.*,LLVMBINPATH = ${llvm}/bin,' \
-        -i gcc/Makefile.in 
-
-    cd ..
-    mkdir obj install
-    cd obj
-
-    export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
-    mkdir $NIX_FIXINC_DUMMY
-
-    export CPP="gcc -E"
-
-    # Figure out what extra flags to pass to the gcc compilers
-    # being generated to make sure that they use our glibc.
-    extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"
-    extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"
-
-    # Use *real* header files, otherwise a limits.h is generated
-    # that does not include Glibc's limits.h (notably missing
-    # SSIZE_MAX, which breaks the build).
-    export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include
-
-    extraCFlags="-g0 $extraCFlags"
-    extraLDFlags="--strip-debug $extraLDFlags"
-
-    export NIX_EXTRA_CFLAGS=$extraCFlags
-    for i in $extraLDFlags; do
-        export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i"
-    done
-
-  '') ["doUnpack" "minInit"];
-  configureCommand = "$(ls ../llvm-gcc*.*.source/configure)";
-
-  postInstall = fullDepEntry (''
-    mv $out/bin/gcc $out/bin/llvm-gcc
-    mv $out/bin/g++ $out/bin/llvm-g++
-  '')["doMakeInstall" "minInit"];
-  
-  name = "llvm-gcc42-2.2";
-  meta = {
-    description = "LLVM GCC frontend";
-  };
-}
-
-  
--- a/pkgs/development/compilers/llvm/no-sys-dirs.patch
+++ b/pkgs/development/compilers/llvm/no-sys-dirs.patch
@ -1,139 +0,0 @@
-diff -rc gcc-4.2.0-orig/Makefile.in gcc-4.2.0/Makefile.in
-*** gcc-4.2.0-orig/Makefile.in	2006-12-29 18:47:06.000000000 +0100
--- gcc-4.2.0/Makefile.in	2007-05-20 21:06:42.000000000 +0200
-***************
-*** 364,369 ****
--- 364,377 ----
-  @host_makefile_frag@
-  ###
-  
-+ CFLAGS += $(NIX_EXTRA_CFLAGS)
-+ CPPFLAGS_FOR_TARGET += $(NIX_EXTRA_CFLAGS)
-+ CXXFLAGS += $(NIX_EXTRA_CFLAGS)
-+ LDFLAGS += $(NIX_EXTRA_LDFLAGS)
-+ LDFLAGS_FOR_TARGET += $(NIX_EXTRA_LDFLAGS)
-+ BOOT_CFLAGS += $(NIX_EXTRA_CFLAGS)
-+ BOOT_LDFLAGS += $(NIX_EXTRA_LDFLAGS)
-+ 
-  # This is the list of directories that may be needed in RPATH_ENVVAR
-  # so that prorgams built for the target machine work.
-  TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(HOST_LIB_PATH_gcc)
-diff -rc gcc-4.2.0-orig/gcc/Makefile.in gcc-4.2.0/gcc/Makefile.in
-*** gcc-4.2.0-orig/gcc/Makefile.in	2007-03-12 05:40:09.000000000 +0100
--- gcc-4.2.0/gcc/Makefile.in	2007-05-20 19:35:13.000000000 +0200
-***************
-*** 396,402 ****
-  MD5_H	    = $(srcdir)/../include/md5.h
-  
-  # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
-! NATIVE_SYSTEM_HEADER_DIR = /usr/include
-  # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
-  CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
-  
--- 396,406 ----
-  MD5_H	    = $(srcdir)/../include/md5.h
-  
-  # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
-! # Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
-! # `fixinc' from fixing header files in /usr/include.  However,
-! # NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
-! # it to some dummy directory.
-! NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
-  # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
-  CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
-  
-***************
-*** 3066,3072 ****
-    -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-    -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
-    -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
-!   -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
-    -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
-    -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
-    @TARGET_SYSTEM_ROOT_DEFINE@
--- 3070,3076 ----
-    -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-    -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
-    -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
-!   -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
-    -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
-    -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
-    @TARGET_SYSTEM_ROOT_DEFINE@
-diff -rc gcc-4.2.0-orig/gcc/cppdefault.c gcc-4.2.0/gcc/cppdefault.c
-*** gcc-4.2.0-orig/gcc/cppdefault.c	2006-01-20 22:00:03.000000000 +0100
--- gcc-4.2.0/gcc/cppdefault.c	2007-05-20 17:16:44.000000000 +0200
-***************
-*** 41,46 ****
--- 41,50 ----
-  # undef CROSS_INCLUDE_DIR
-  #endif
-  
-+ #undef LOCAL_INCLUDE_DIR
-+ #undef SYSTEM_INCLUDE_DIR
-+ #undef STANDARD_INCLUDE_DIR
-+ 
-  /* APPLE LOCAL begin mainline 4.3 2006-12-13 CROSS_DIRECTORY_STRUCTURE 4697325 */
-  #if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
-  /* APPLE LOCAL end mainline 4.3 2006-12-13 CROSS_DIRECTORY_STRUCTURE 4697325 */
-diff -rc gcc-4.2.0-orig/gcc/gcc.c gcc-4.2.0/gcc/gcc.c
-*** gcc-4.2.0-orig/gcc/gcc.c	2007-03-05 21:37:05.000000000 +0100
--- gcc-4.2.0/gcc/gcc.c	2007-05-20 17:49:48.000000000 +0200
-***************
-*** 1449,1458 ****
-  /* Default prefixes to attach to command names.  */
-  
-  #ifndef STANDARD_STARTFILE_PREFIX_1
-! #define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-  #endif
-  #ifndef STANDARD_STARTFILE_PREFIX_2
-! #define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
-  #endif
-  
-  #ifdef CROSS_COMPILE  /* Don't use these prefixes for a cross compiler.  */
--- 1449,1458 ----
-  /* Default prefixes to attach to command names.  */
-  
-  #ifndef STANDARD_STARTFILE_PREFIX_1
-! #define STANDARD_STARTFILE_PREFIX_1 ""
-  #endif
-  #ifndef STANDARD_STARTFILE_PREFIX_2
-! #define STANDARD_STARTFILE_PREFIX_2 ""
-  #endif
-  
-  #ifdef CROSS_COMPILE  /* Don't use these prefixes for a cross compiler.  */
-***************
-*** 1473,1480 ****
-  #endif
-  
-  static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX;
-! static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/";
-! static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/";
-  static const char *md_exec_prefix = MD_EXEC_PREFIX;
-  
-  static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
--- 1473,1480 ----
-  #endif
-  
-  static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX;
-! static const char *const standard_exec_prefix_1 = "/no-such-path/";
-! static const char *const standard_exec_prefix_2 = "/no-such-path/";
-  static const char *md_exec_prefix = MD_EXEC_PREFIX;
-  
-  static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
-diff -rc gcc-4.2.0-orig/ltconfig gcc-4.2.0/ltconfig
-*** gcc-4.2.0-orig/ltconfig	2007-02-14 18:08:35.000000000 +0100
--- gcc-4.2.0/ltconfig	2007-05-20 22:16:24.000000000 +0200
-***************
-*** 2322,2327 ****
--- 2322,2332 ----
-  # A language-specific compiler.
-  CC=$CC
-  
-+ # Ugly hack to get libmudflap (and possibly other libraries) to build.
-+ # Libtool filters out \`-B' flags when linking (why?), so the \`-B' flag
-+ # to Glibc gets lost.  Here we forcibly add it to any invocation.
-+ CC="\$CC $NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS"
-+ 
-  # Is the compiler the GNU C compiler?
-  with_gcc=$with_gcc
-  
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@ -14,11 +14,16 @@ composableDerivation {} ( fixed : {

  name = "neko-cvs";

-  # REGION AUTO UPDATE:              { name="neko"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko"; groups = "haxe_group"; }
-  src = sourceFromHead "neko-F_23-45-39.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_23-45-39.tar.gz"; sha256 = "fc74720da7a80cc6f0f9ea9842df8a5fa78858f742171365fae66f0b9975d228"; });
+  # REGION AUTO UPDATE:                        { name="neko"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko"; groups = "haxe_group"; }
+  src = sourceFromHead "neko-F_16-06-48.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_16-06-48.tar.gz"; sha256 = "e952582a26099b7a5568d0798839a6d349331510ffe6d7936b4537d60b6ccf26"; });
  # END

+  # # REGION AUTO UPDATE:           { name="neko_git"; type="git"; url=""; }
+  # src = sourceFromHead "neko_git-3abfb2f6d68cc301f9795e10c75734e293b4cfa9.tar.gz"
+  #              (throw "source not not published yet: neko_git");
+  # # END
+
  # optionally remove apache mysql like gentoo does?
  # they just remove libs/{apache,mod_neko}
  buildInputs = [boehmgc pkgconfig makeWrapper] ++ libs;
--- a/pkgs/development/interpreters/guile/1.9.nix
+++ b/pkgs/development/interpreters/guile/1.9.nix
@ -7,11 +7,11 @@
 else stdenv.mkDerivation)

 rec {
-  name = "guile-1.9.10";  # This is a beta release!
+  name = "guile-1.9.11";  # This is a beta release!

  src = fetchurl {
    url = "ftp://alpha.gnu.org/gnu/guile/${name}.tar.gz";
-    sha256 = "0vdvxkwm0xi65cw77a3yzjvwp3s66p2cpgqgqvp8w46r4amv1zpy";
+    sha256 = "13wff9944brzhi2afs4pzwndqcwhi4gg61qwahycr1d72v0wzmjp";
  };

  buildInputs =
--- a/pkgs/development/interpreters/php_configurable/default.nix
+++ b/pkgs/development/interpreters/php_configurable/default.nix
@ -1,10 +1,16 @@
-let version = "5.2.11"; in
-
 args: with args;

-let inherit (args.composableDerivation) composableDerivation edf wwf; in
+let

-composableDerivation {} ( fixed : {
+  inherit (args.composableDerivation) composableDerivation edf wwf;
+
+in
+
+composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
+
+  # choose a different version this way:
+  # php.merge { version = "5.3.2"; }
+  version = "5.2.11";

  name = "php_configurable-${version}";

@ -34,7 +40,10 @@ composableDerivation {} ( fixed : {
      };

      libxml2 = {
-        configureFlags = ["--with-libxml-dir=${libxml2}"];
+        configureFlags = [
+          "--with-libxml-dir=${libxml2}"
+          "--with-iconv-dir=${libiconv}"
+          ];
        buildInputs = [ libxml2 ];
      };
    
@ -75,7 +84,7 @@ composableDerivation {} ( fixed : {

      gd = {
        configureFlags = ["--with-gd=${args.gd}"];
-        buildInputs = [gd];
+        buildInputs = [gd libpng libjpeg ];
      };

      soap = {
@ -138,12 +147,17 @@ composableDerivation {} ( fixed : {

  installPhase = ''
    unset installPhase; installPhase;
-    cp php.ini-recommended $iniFile
+    cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0
+        then "recommended" /* < PHP 5.3 */
+        else "production" /* >= PHP 5.3 */
+    } $iniFile
  '';

  src = args.fetchurl {
    url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    md5 = "286bf34630f5643c25ebcedfec5e0a09";
+    md5 = if version == "5.3.2" then "46f500816125202c48a458d0133254a4"
+          else if version == "5.2.11" then "286bf34630f5643c25ebcedfec5e0a09"
+          else throw "set md5 sum of php source file" ;
    name = "php-${version}.tar.bz2";
  };

--- a/Show More
+++ b/Show More