Updating irssi

From trunk@21476

svn path=/nixpkgs/branches/mass-update-01/; revision=21574

pkgs/applications/editors/eclipse/default.nix

@@ -55,5 +55,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.eclipse.org/;
     description = "A extensible multi-language software development environment";
+    longDescription = ''
+    '';
   };
 }

pkgs/applications/graphics/ImageMagick/default.nix

@@ -1,8 +1,25 @@
-args: with args;
+{ stdenv
+, fetchurl
+, bzip2
+, freetype
+, graphviz
+, ghostscript
+, libjpeg
+, libpng
+, libtiff
+, libxml2
+, zlib
+, libtool
+, jasper
+, libX11
+, tetex ? null
+, librsvg ? null
+}:
 
-let version = "6.5.9-1"; in
-
-stdenv.mkDerivation (rec {
+let
+  version = "6.5.9-1";
+in
+stdenv.mkDerivation rec {
   name = "ImageMagick-${version}";
 
   src = fetchurl {
@@ -13,22 +30,20 @@ stdenv.mkDerivation (rec {
   configureFlags = ''
     --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts
     --with-gslib
-    ${if args ? tetex then "--with-frozenpaths" else ""}
+    ${if tetex != null then "--with-frozenpaths" else ""}
   '';
 
   buildInputs =
-    [ bzip2 freetype ghostscript graphviz libjpeg libpng
-      libtiff libX11 libxml2 zlib libtool
-    ]
-    ++ stdenv.lib.optional (args ? tetex) args.tetex
-    ++ stdenv.lib.optional (args ? librsvg) args.librsvg;
+    [ bzip2 freetype graphviz ghostscript libjpeg libpng
+      libtiff libxml2 zlib tetex librsvg libtool jasper libX11
+    ];
 
-  preConfigure = if args ? tetex then
+  preConfigure = if tetex != null then
     ''
-      export DVIDecodeDelegate=${args.tetex}/bin/dvips
+      export DVIDecodeDelegate=${tetex}/bin/dvips
     '' else "";
 
   meta = {
     homepage = http://www.imagemagick.org;
   };
-})
+}

pkgs/applications/misc/djvulibre/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, useQt3 ? true, libjpeg, libtiff, libpng, ghostscript
+{ stdenv, fetchurl, lib, useQt3 ? false, libjpeg, libtiff, libpng, ghostscript
 , libungif, zlib, x11, libX11, mesa, qt3 }:
 
 stdenv.mkDerivation {

pkgs/applications/misc/ikiwiki/default.nix

@@ -1,24 +1,26 @@
-{stdenv, fetchurl, perl, gettext, makeWrapper, lib,
+{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick,
   TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
-  CGISession, CGIFormBuilder, DBFile, LocaleGettext
+  CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
   , git ? null
   , monotone ? null
   , extraUtils ? []
   }:
 
-stdenv.mkDerivation rec {
-  name = "ikiwiki_3.20100312";
+let
+  name = "ikiwiki";
+  version = "3.20100427";
+in
+stdenv.mkDerivation {
+  name = "${name}-${version}";
 
   src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}.tar.gz";
-    sha256 = "1pzjl4iplizzspsl237996j1ma6yp9jagbqf3d43kbhv1ai0v3ci";
+    url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
+    sha256 = "b00567628657c52ed5a5388e47af370b0f2cdfa82d3eaf1b0020f0e07d218b8f";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
-    TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext ]
-    ++
-    (lib.optional (monotone != null) monotone)
-    ;
+    TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
+    RpcXML XMLSimple PerlMagick git monotone];
 
   patchPhase = ''
     sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
@@ -34,16 +36,15 @@ stdenv.mkDerivation rec {
   postInstall = ''
     for a in $out/bin/*; do
       wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \
-      ${lib.optionalString (git != null) 
+      ${lib.optionalString (git != null)
         ''--prefix PATH : ${git}/bin \''}
-      ${lib.optionalString (monotone != null) 
+      ${lib.optionalString (monotone != null)
         ''--prefix PATH : ${monotone}/bin \''}
       ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
-
     done
   '';
 
-  meta = { 
+  meta = {
     description = "Wiki compiler, storing pages and history in a RCS";
     homepage = http://ikiwiki.info/;
     license = "GPLv2+";

pkgs/applications/misc/sakura/default.nix

@@ -1,15 +1,11 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext }:
+{ stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext, perl }:
 stdenv.mkDerivation rec {
-  name = "sakura-2.3.6";
+  name = "sakura-2.3.8";
   src = fetchurl {
     url = "http://www.pleyades.net/david/projects/sakura/${name}.tar.bz2";
-    sha256 = "0g6v1filixy4zcz1fabjz0zpdicgzxkc8rh06jxfch5pk9dq4x5j";
+    sha256 = "1gfjh1xxqgna0njh0pd4srnbmj67ir4b13slrdri6bm80shfbz8l";
   };
-  # FIXME
-  patchPhase = ''
-    sed -i "s:INSTALL (FILES sakura.1:#INSTALL (FILES sakura.1:" CMakeLists.txt
-  '';
-  buildInputs = [ cmake pkgconfig gtk vte pixman gettext ];
+  buildInputs = [ cmake pkgconfig gtk vte pixman gettext perl ];
   meta = {
     homepage = "http://www.pleyades.net/david/sakura.php";
     description = "A terminal emulator based on GTK and VTE";

pkgs/applications/misc/xterm/default.nix

@@ -10,10 +10,21 @@ stdenv.mkDerivation rec {
     freetype pkgconfig libXft luit];
   configureFlags = "--enable-wide-chars --enable-256-color
     --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit
-    --enable-mini-luit";
+    --enable-mini-luit --with-tty-group=tty";
+
+  # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp',
+  # decided by the sysadmin to allow the xterm reporting to /var/run/utmp
+  # If we used the configure option, that would have affected the xterm installation,
+  # (setgid with the given group set), and at build time the environment even doesn't have
+  # groups, and the builder will end up removing any setgid.
+  postConfigure = ''
+    echo '#define USE_UTMP_SETGID 1'
+  '';
 
   meta = {
     homepage = http://invisible-island.net/xterm;
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
-

pkgs/applications/networking/browsers/conkeror/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, unzip }:
+stdenv.mkDerivation {
+  name = "conkeror-0.9.2";
+  src = fetchurl {
+    url = http://repo.or.cz/w/conkeror.git/snapshot/efacc207b0d6c7b3899fc584c9f48547b18da076.zip;
+    sha256 = "1bkrrskrmhpx2xp90zgi5jrz4akynkxv2nzk5hzg0a17ikdi5ql8";
+  };
+  buildInputs = [ unzip ];
+  installPhase = ''
+    cp -r . $out
+  '';
+  meta = {
+    description = "A keyboard-oriented, customizable, extensible web browser";
+    longDescription = ''
+      Conkeror is a keyboard-oriented, highly-customizable, highly-extensible
+      web browser based on Mozilla XULRunner, written mainly in JavaScript,
+      and inspired by exceptional software such as Emacs and vi. Conkeror
+      features a sophisticated keyboard system, allowing users to run commands
+      and interact with content in powerful and novel ways. It is
+      self-documenting, featuring a powerful interactive help system.
+    '';
+    homepage = http://conkeror.org/;
+    license = [ "MPLv1.1" "GPLv2" "LGPLv2.1" ];
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix

@@ -77,10 +77,7 @@ stdenv.mkDerivation {
       libXext libXrender libXt gtk glib pango atk
     ];
 
-  buildPhase = stdenv.lib.optionalString debug
-    ''
-      tar xfz plugin/debugger/libflashplayer.so.tar.gz
-    '';
+  buildPhase = ":";
 
   meta = {
     description = "Adobe Flash Player browser plugin";

pkgs/applications/networking/irc/irssi/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, ncurses, glib, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "irssi-0.8.14";
+  name = "irssi-0.8.15";
   
   src = fetchurl {
     url = "http://irssi.org/files/${name}.tar.bz2";
-    sha256 = "0a6zizpqb4yyk7c9sxvqcj8jx20qrnfr2kwqbsckryz63kmp1sk3";
+    sha256 = "19m0aah9bhc70dnhh7kpydbsz5n35l0l9knxav1df0sic3xicbf1";
   };
   
   buildInputs = [pkgconfig ncurses glib openssl];

pkgs/applications/networking/mailreaders/thunderbird/3.x.nix

@@ -10,14 +10,14 @@
     
 }:
 
-let version = "3.0"; in
+let version = "3.0.4"; in
 
 stdenv.mkDerivation {
   name = "thunderbird-${version}";
 
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "7a8a08f011901b4c0b737de2d7a226242935543d";
+    sha1 = "5a6e89096da61a520e5cecb61f8afeb981f90412";
   };
 
   buildInputs =

pkgs/applications/networking/sniffers/wireshark/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
 
 stdenv.mkDerivation {
-  name = "wireshark-1.3.2";
+  name = "wireshark-1.3.4";
   src = fetchurl {
-    url = http://www.wireshark.org/download/src/wireshark-1.3.2.tar.gz;
-    sha256 = "0sq0mk0iqsgcgd2gqspyfmjiql00d3ghq43qxywd8qb2jxfv1q5r";
+    url = http://media-2.cacetech.com/wireshark/src/wireshark-1.3.4.tar.bz2;
+    sha256 = "00pyr3izg5dg8kr4sayp0fq8q360syfhs2nvj6b4ff1mdal7ra3x";
   };
   configureFlags = "--with-pcap=${libpcap}";
   buildInputs = [perl pkgconfig gtk libpcap flex bison];

pkgs/applications/version-management/darcs/darcs-2.nix

@@ -1,16 +1,20 @@
-{cabal, html, mtl, parsec, regexCompat, curl, haskeline, hashedStorage} :
+{cabal, html, mtl, parsec, regexCompat, curl, haskeline, hashedStorage, zlib} :
 
 cabal.mkDerivation (self : {
   pname = "darcs";
   name = self.fname;
-  version = "2.3.1";
-  sha256 = "14821bb2db4975cb4db2c5cc4f085069b936da591b7b71592befc9e07f17d214";
+  version = "2.4.1";
+  sha256 = "6ac0e84d2eca160e6e33755679dfb185d9b5f9f5bdc43f99db326210aabbc4aa";
 
-  extraBuildInputs = [html parsec regexCompat curl haskeline hashedStorage];
+  extraBuildInputs = [
+    html parsec regexCompat curl haskeline hashedStorage zlib
+  ];
 
   meta = {
     homepage = http://darcs.net/;
     description = "Patch-based version management system";
+    license = "GPL";
+    maintainers = [self.stdenv.lib.maintainers.andres];
   };
 
 })

pkgs/applications/version-management/subversion/default.nix

@@ -19,20 +19,19 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.6.9";
+  version = "1.6.11";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
-    sha1 = "477aa89e60de7974ac0aa921cc369b4c2907693c";
+    sha256 = "177565kvn9kq3i8xrvh86cwl7098v2ymhmvjq11x6w04wc501gb4";
   };
 
-  buildInputs = [zlib apr aprutil sqlite]
+  buildInputs = [ zlib apr aprutil sqlite ]
     ++ stdenv.lib.optional httpSupport neon
     ++ stdenv.lib.optional pythonBindings python
-    ++ stdenv.lib.optional perlBindings perl
-    ;
+    ++ stdenv.lib.optional perlBindings perl;
 
   configureFlags = ''
     --disable-keychain
@@ -42,7 +41,6 @@ stdenv.mkDerivation rec {
     ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
     --with-zlib=${zlib}
     --with-sqlite=${sqlite}
-    --disable-neon-version-check
   '';
 
   preBuild = ''
@@ -72,7 +70,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A version control system intended to be a compelling replacement for CVS in the open source community";
-    homepage = http://subversion.tigris.org/;
+    homepage = http://subversion.apache.org/;
     maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.all;
   };

pkgs/applications/video/MPlayer/default.nix

@@ -6,6 +6,8 @@
 , cdparanoia ? null, cddaSupport ? true
 , amrnb ? null, amrwb ? null, amrSupport ? false
 , jackaudioSupport ? false, jackaudio ? null
+, x264Support ? false, x264 ? null
+, xvidSupport ? false, xvidcore ? null
 , mesa, pkgconfig, unzip
 }:
 
@@ -61,11 +63,14 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
     ++ stdenv.lib.optional cddaSupport cdparanoia
     ++ stdenv.lib.optional jackaudioSupport jackaudio
-    ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ];
+    ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ]
+    ++ stdenv.lib.optional x264Support x264
+    ++ stdenv.lib.optional xvidSupport xvidcore;
 
   configureFlags = ''
     ${if cacaSupport then "--enable-caca" else "--disable-caca"}
     ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""}
+    ${if x264Support then "--enable-x264 --extra-libs=-lx264" else ""}
     --codecsdir=${codecs}
     --enable-runtime-cpudetection
     --enable-x11

pkgs/applications/video/vlc/default.nix

@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "vlc-1.0.5";
+  name = "vlc-1.0.6";
 
   src = fetchurl {
-    url = http://download.videolan.org/pub/videolan/vlc/1.0.5/vlc-1.0.5.tar.bz2;
-    sha256 = "1kbd43y6sy6lg1xgl1j4mid6rdx6sszkm8c14hwqrfvgjd69kwgp";
+    url = http://download.videolan.org/pub/videolan/vlc/1.0.6/vlc-1.0.6.tar.bz2;
+    sha256 = "0hhqbr0hwm07pimdy4rfmf3k3d6iz6icmrndirnp888hg8z968gm";
   };
 
   buildInputs = [

pkgs/build-support/fetchurl/default.nix

@@ -1,4 +1,4 @@
-{stdenv, curl}: # Note that `curl' may be `null', in case of the native stdenv.
+{stdenv, curl, writeScript}: # Note that `curl' may be `null', in case of the native stdenv.
 
 let
 
@@ -23,7 +23,7 @@ let
     else [] /* backwards compatibility */;
 
 in
-      
+
 { # URL to fetch.
   url ? ""
 
@@ -45,6 +45,12 @@ in
 , # If set, don't download the file, but write a list of all possible
   # URLs (resulting from resolving mirror:// URLs) to $out.
   showURLs ? false
+
+, # If set, down't download file but tell user how to download it.
+  restricted ? false
+
+, # Used only if restricted. Should contain instructions how to fetch the file.
+  message ? ""
 }:
 
 assert urls != [] -> url == "";
@@ -56,34 +62,55 @@ assert showURLs || (outputHash != "" && outputHashAlgo != "")
 let
 
   urls_ = if urls != [] then urls else [url];
-
-in
-
-stdenv.mkDerivation {
-  name =
-    if showURLs then "urls"
+  name_ = if showURLs then "urls"
     else if name != "" then name
     else baseNameOf (toString (builtins.head urls_));
-    
+  hashAlgo_ = if outputHashAlgo != "" then outputHashAlgo else
+    if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
+  hash_ = if outputHash != "" then outputHash else
+    if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
+in
+
+stdenv.mkDerivation ({
+  name = name_;
+  outputHashAlgo = hashAlgo_;
+  outputHash = hash_;
+  urls = urls_;
+
+  # Compatibility with Nix <= 0.7.
+  id = md5;
+
+  inherit showURLs mirrorsFile;
+}
+// (if (!showURLs && restricted) then rec {
+  builder = writeScript "restrict-message" ''
+source ${stdenv}/setup
+cat <<_EOF_
+${message_}
+_EOF_
+  '';
+  message_ = if message != "" then message else ''
+  You have to download ${name_} from ${stdenv.lib.concatStringsSep " " urls_} yourself,
+  and add it to the store using either
+    nix-store --add-fixed ${hashAlgo_} ${name_}
+  or
+    ${if hashAlgo_ != "sha256" then "NIX_HASH_ALGO=${hashAlgo_} " else
+      ""}nix-prefetch-url file://path/to/${name_}
+  '';
+}
+else {
   builder = ./builder.sh;
-  
+
   buildInputs = [curl];
 
-  urls = urls_;
 
   # If set, prefer the content-addressable mirrors
   # (http://nixos.org/tarballs) over the original URLs.
   preferHashedMirrors = true;
 
-  # Compatibility with Nix <= 0.7.
-  id = md5;
 
   # New-style output content requirements.
-  outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
-      if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
-  outputHash = if outputHash != "" then outputHash else
-      if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
-  
+
   impureEnvVars = [
     # We borrow these environment variables from the caller to allow
     # easy proxy configuration.  This is impure, but a fixed-output
@@ -95,6 +122,5 @@ stdenv.mkDerivation {
     # command-line.
     "NIX_HASHED_MIRRORS"
   ] ++ (map (site: "NIX_MIRRORS_${site}") sites);
-
-  inherit showURLs mirrorsFile;
-}
+})
+)

pkgs/desktops/kde-4.4/base-workspace/builder.sh

@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-myPatchPhase()
-{
-    sed -i -e "s|\${PYTHON_SITE_PACKAGES_DIR}|$out/lib/python2.6/site-packages|" plasma/generic/scriptengines/python/CMakeLists.txt
-}
-patchPhase=myPatchPhase
-genericBuild

pkgs/desktops/kde-4.4/base-workspace/default.nix

@@ -11,10 +11,14 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.4.2/src/kdebase-workspace-4.4.2.tar.bz2;
     sha256 = "1g8rnpwpihk6sgvils9cafxz017d23ksg5i9x9275ilydslbsclc";
   };
-  buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs kdepimlibs kdebindings libpthreadstubs boost libusb stdenv.gcc.libc
-                  libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver
-                  lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ];
-  builder = ./builder.sh;
+  buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
+    kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp
+    libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
+    phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs ];
+  patchPhase=''
+    sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \
+      plasma/generic/scriptengines/python/CMakeLists.txt
+  '';
   meta = {
     description = "KDE Workspace";
     longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";

pkgs/desktops/kde-4.4/default.nix

@@ -102,8 +102,7 @@ pkgs.recurseIntoAttrs (rec {
   };
   
   kdeadmin = import ./admin {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 system_config_printer;
-    inherit (pkgs.pythonPackages) pycups rhpl;
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer;
     inherit kdelibs kdepimlibs kdebindings;
     inherit automoc4 phonon;
   };
@@ -123,7 +122,7 @@ pkgs.recurseIntoAttrs (rec {
   
   kdeedu = import ./edu {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt openbabel boost;
-    inherit (pkgs) readline gmm gsl facile ocaml xplanet;
+    inherit (pkgs) readline gmm gsl xplanet libspectre;
     inherit kdelibs attica;
     inherit automoc4 phonon eigen;
   };
@@ -187,8 +186,7 @@ pkgs.recurseIntoAttrs (rec {
   };
     
   kdeutils = import ./utils {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 system_config_printer;
-    inherit (pkgs.pythonPackages) pycups rhpl;
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups rhpl system_config_printer;
     inherit kdelibs kdepimlibs kdebase kdebindings;
     inherit automoc4 phonon qimageblitz qca2;
   };
@@ -222,9 +220,10 @@ pkgs.recurseIntoAttrs (rec {
   };
 
   digikam = import ./extragear/digikam {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 lcms jasper libgphoto2 gettext;
-    inherit kdelibs kdepimlibs kdegraphics;
-    inherit automoc4 phonon qimageblitz qca2 eigen;
+    inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext
+      liblqr1 lensfun;
+    inherit kdelibs kdepimlibs kdegraphics kdeedu;
+    inherit automoc4 phonon qimageblitz qca2 eigen soprano;
   };
 
   filelight = import ./extragear/filelight {
@@ -233,6 +232,12 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon qimageblitz;
   };
 
+  kdenlive = import ./extragear/kdenlive {
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl mlt gettext shared_mime_info;
+    inherit kdelibs soprano;
+    inherit automoc4 phonon;
+  };
+
   kdesvn = import ./extragear/kdesvn {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4;
     inherit kdelibs;

pkgs/desktops/kde-4.4/edu/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
-, facile, ocaml, xplanet
+, xplanet, libspectre
 , kdelibs, automoc4, phonon, eigen, attica}:
 
 stdenv.mkDerivation {
@@ -8,8 +8,9 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.4.2/src/kdeedu-4.4.2.tar.bz2;
     sha256 = "0fgqsizp1vm0yp6nirbqbxj0kvbqvnb8q3wxzav4hhn85r294ps7";
   };
-  buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet
-                  kdelibs automoc4 phonon eigen attica ];
+#TODO: facile, indi, boost.python, cfitsio, R, qalculate
+  buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl xplanet
+                  kdelibs automoc4 phonon eigen attica libspectre ];
   meta = {
     description = "KDE Educative software";
     license = "GPL";

pkgs/desktops/kde-4.4/extragear/digikam/default.nix

@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
-kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext}:
+{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
+kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
+liblqr1, lensfun }:
 
 stdenv.mkDerivation rec {
   name = "digikam-1.2.0";
@@ -10,13 +11,13 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
-    lcms jasper libgphoto2 kdepimlibs gettext ];
+    lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun ];
   cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
   meta = {
     description = "Photo Management Program";
     license = "GPL";
     homepage = http://www.digikam.org;
-    maintainers = [ lib.maintainers.viric ];
-    platforms = with lib.platforms; linux;
+    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/desktops/kde-4.4/extragear/filelight/default.nix

@@ -14,5 +14,6 @@ stdenv.mkDerivation {
     license = "GPL";
     homepage = http://www.methylblue.com/filelight/;
     maintainers = [ lib.maintainers.viric ];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt, gettext,
+shared_mime_info, soprano}:
+
+stdenv.mkDerivation {
+  name = "kdenlive-0.7.7.1";
+  src = fetchurl {
+    url = mirror://sourceforge/kdenlive/kdenlive-0.7.7.1.tar.gz;
+    sha256 = "047kpzfdmipgnnkbdhcpy5c0kqgpg7yn3qhyd7inlplmyd3i1pfx";
+  };
+
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext
+    shared_mime_info soprano ];
+
+  meta = {
+    description = "Free and open source video editor";
+    license = "GPLv2+";
+    homepage = http://www.kdenlive.org/;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix

@@ -11,4 +11,12 @@ stdenv.mkDerivation {
 
   # kdebase allows having a konqueror plugin built
   buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext kdebase ];
+
+  meta = {
+    homepage = http://kdiff3.sourceforge.net/;
+    license = "GPLv2+";
+    description = "Compares and merges 2 or 3 files or directories";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
 }

pkgs/desktops/kde-4.4/support/polkit-qt/default.nix

@@ -6,7 +6,8 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-0.9.3.tar.bz2;
     sha256 = "08mz8p98nlxnxy1l751jg1010vgjq2f2d6n4cj27jvihqkpbaixn";
   };
-  buildInputs = [ cmake qt4 policykit automoc4 ];
+  buildInputs = [ cmake automoc4 ];
+  propagatedBuildInputs = [ qt4 policykit ];
   meta = {
     description = "Qt PolicyKit bindings";
     license = "LGPL";

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

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   configureFlags="--no-separate-debug-info --with-qca=${qca2}
     --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib";
   preConfigure=''
-    configureFlags="$configureFlags --plugins-path=$out/plugins"
+    configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins"
   '';
   patches = [ ./ossl-remove-whirlpool.patch ];
   meta = {

pkgs/development/compilers/ehc/default.nix

@@ -1,60 +1,36 @@
-{stdenv, coreutils, fetchsvn, m4, libtool, ghc, uulib, uuagc, llvm}:
+{stdenv, coreutils, glibc, fetchsvn, m4, libtool, ghc, uulib, uuagc, mtl, network, binary, llvm, fgl}:
 
 stdenv.mkDerivation (rec {
-  name = "ehc-svn-1042";
+  revision = "1996";
+  name = "ehc-svn-${revision}";
   homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome/";
 
   src = fetchsvn {
-          url = https://svn.cs.uu.nl:12443/repos/EHC/trunk/EHC;
-          rev = "1042";
-          sha256 = "7a9e5d1d57825caa4664686d9a5c0d9b5ebb870095817d77bb7b97869718ed5b";
+          url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC;
+          rev = revision;
+          sha256 = "92c658cd15dd513ccaeb81341f2680056276a46d053330f66c0214d10a6729e2";
   };
 
-  buildInputs = [coreutils m4 ghc libtool uulib uuagc llvm];
+  propagatedBuildInputs = [mtl network binary fgl];
+  buildInputs = [coreutils m4 ghc libtool uulib uuagc];
 
+  # --force is required because the dependencies are not properly
+  # detected by Nix, being located in several package config files
+  configureFlags = [
+    "--with-cabal-config-options=--ghc-pkg-options=--force"
+    "--with-cpp-ehc-options=-I${glibc}/include"
+  ];
+
+  # EHC builds packages during compilation; these are by default
+  # installed in the user-specific package config file. We do not
+  # want that, and hack the build process to use a temporary package
+  # configuration file instead.
   preConfigure = ''
-    find src -name files\*.mk -exec sed -i -- "s/--user//g" '{}' \;
+    p=`pwd`/ehc-local-packages
+    echo '[]' > $p
+    sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in
+    sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in
     sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk
-    echo "RTS_GCC_CC_OPTS := -std=gnu99" >> mk/shared.mk.in
-  '';
-
-  buildFlags = "100/ehc 100/ehclib";
-
-  installPhase = ''
-    cd bin
-
-    # install executables
-    echo "installing executables..."
-    mkdir -p $out/bin-ehc
-    for i in *; do
-      if [[ -d $i ]]; then
-        cp $i/ehc $out/bin-ehc/ehc-$i
-      fi;
-    done
-
-    # install runtime support
-    cp -r ../install/* $out
-
-    # install prelude
-    echo "installing prelude..."
-    mkdir -p $out/lib-ehc
-    for i in *; do
-      if [[ -d ../build/$i/ehclib/ehcbase ]]; then
-        mkdir -p $out/lib-ehc/$i
-        cp -r ../build/$i/ehclib/ehcbase $out/lib-ehc/$i
-      fi;
-    done
-
-    # generate wrappers
-    echo "generating wrappers..."
-    mkdir -p $out/bin
-    for i in *; do
-      if [[ -d $i ]]; then
-        echo '#!'"$SHELL" > $out/bin/ehc-$i
-        echo "exec \"$out/bin-ehc/ehc-$i\" --use-inplace=0 -P $out/lib-ehc/$i/ehcbase" '"$@"' >> $out/bin/ehc-$i
-        chmod 751 $out/bin/ehc-$i
-      fi;
-    done
   '';
 
   meta = {

pkgs/development/compilers/gcc-4.4/update-gcc.sh

@@ -20,16 +20,17 @@ options["core"]="/* langC */ true"
 options["g++"]="langCC"
 options["fortran"]="langFortran"
 options["java"]="langJava"
+options["ada"]="langAda"
 
 cat > "$out"<<EOF
 /* Automatically generated by \`$(basename $0)', do not edit.
    For GCC ${version}.  */
-{ fetchurl, optional, version, langC, langCC, langFortran, langJava }:
+{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }:
 
 assert version == "${version}";
 EOF
 
-for component in core g++ fortran java
+for component in core g++ fortran java ada
 do
     dir="ftp.gnu.org/gnu/gcc/gcc-${version}"
     file="gcc-${component}-${version}.tar.bz2"

pkgs/development/compilers/gcc-4.5/builder.sh

@@ -0,0 +1,171 @@
+source $stdenv/setup
+
+
+export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
+mkdir $NIX_FIXINC_DUMMY
+
+
+# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad
+# Thing.
+export CPP="gcc -E"
+
+if test "$staticCompiler" = "1"; then
+    EXTRA_LDFLAGS="-static"
+else
+    EXTRA_LDFLAGS=""
+fi
+
+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.
+        extraFlags="$(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
+
+        # The path to the Glibc binaries such as `crti.o'.
+        glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib"
+        
+    else
+        # Hack: support impure environments.
+        extraFlags="-isystem /usr/include"
+        extraLDFlags="-L/usr/lib64 -L/usr/lib"
+        glibc_libdir="/usr/lib"
+        export NIX_FIXINC_DUMMY=/usr/include
+    fi
+
+    extraFlags="-g0 -O2 -I$NIX_FIXINC_DUMMY $extraFlags"
+    extraLDFlags="--strip-debug -L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
+
+    EXTRA_FLAGS="$extraFlags"
+    for i in $extraLDFlags; do
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i"
+    done
+
+    if test -n "$targetConfig"; then
+        # Cross-compiling, we need gcc not to read ./specs in order to build
+        # the g++ compiler (after the specs for the cross-gcc are created).
+        # Having LIBRARY_PATH= makes gcc read the specs from ., and the build
+        # breaks. Having this variable comes from the default.nix code to bring
+        # gcj in.
+        unset LIBRARY_PATH
+        unset CPATH
+        if test -z "$crossStageStatic"; then
+            EXTRA_FLAGS_TARGET="-g0 -O2 -B${libcCross}/lib -idirafter ${libcCross}/include"
+            EXTRA_LDFLAGS_TARGET="-Wl,-L${libcCross}/lib"
+        fi
+    else
+        EXTRA_FLAGS_TARGET="$EXTRA_FLAGS"
+        EXTRA_LDFLAGS_TARGET="$EXTRA_LDFLAGS"
+    fi
+
+    # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find
+    # the startfiles.
+    # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx
+    # for the startfiles.
+    makeFlagsArray=( \
+        "${makeFlagsArray[@]}" \
+        NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
+        SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
+        CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
+        CFLAGS_FOR_TARGET="$EXTRA_FLAGS_TARGET $EXTRA_LDFLAGS_TARGET" \
+        FLAGS_FOR_TARGET="$EXTRA_FLAGS_TARGET $EXTRA_LDFLAGS_TARGET" \
+        LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
+        LDFLAGS_FOR_TARGET="$EXTRA_FLAGS_TARGET $EXTRA_LDFLAGS_TARGET" \
+        )
+
+    if test -z "$targetConfig"; then
+        makeFlagsArray=( \
+            "${makeFlagsArray[@]}" \
+            BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
+            BOOT_LDFLAGS="$EXTRA_FLAGS_TARGET $EXTRA_LDFLAGS_TARGET" \
+            )
+    fi
+
+    if test -n "$targetConfig" -a "$crossStageStatic" == 1; then
+        # We don't want the gcc build to assume there will be a libc providing
+        # limits.h in this stagae
+        makeFlagsArray=( \
+            "${makeFlagsArray[@]}" \
+            LIMITS_H_TEST=false \
+            )
+    else
+        makeFlagsArray=( \
+            "${makeFlagsArray[@]}" \
+            LIMITS_H_TEST=true \
+            )
+    fi
+fi
+
+if test -n "$targetConfig"; then
+    # The host strip will destroy some important details of the objects
+    dontStrip=1
+fi
+
+preConfigure() {
+    if test -n "$newlibSrc"; then
+        tar xvf "$newlibSrc" -C ..
+        ln -s ../newlib-*/newlib newlib
+        # Patch to get armvt5el working:
+        sed -i -e 's/ arm)/ arm*)/' newlib/configure.host
+    fi
+    # Bug - they packaged zlib
+    if test -d "zlib"; then
+        # This breaks the build without-headers, which should build only
+        # the target libgcc as target libraries.
+        # See 'configure:5370'
+        rm -Rf zlib
+    fi
+
+    # 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
+    rm -rf $out/lib/gcc/*/*/install-tools
+
+    # Get rid of some "fixed" header files
+    rm -rf $out/lib/gcc/*/*/include/root
+
+    # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
+    for i in $out/bin/*-gcc*; do
+        if cmp -s $out/bin/gcc $i; then
+            ln -sfn gcc $i
+        fi
+    done
+
+    for i in $out/bin/*-c++* $out/bin/*-g++*; do
+        if cmp -s $out/bin/g++ $i; then
+            ln -sfn g++ $i
+        fi
+    done
+
+    eval "$postInstallGhdl"
+}
+
+
+if test -z "$targetConfig"; then
+    if test -z "$profiledCompiler"; then
+        buildFlags="bootstrap $buildFlags"
+    else    
+        buildFlags="profiledbootstrap $buildFlags"
+    fi
+fi
+
+genericBuild

pkgs/development/compilers/gcc-4.5/default.nix

@@ -0,0 +1,263 @@
+{ stdenv, fetchurl, noSysDirs
+, langC ? true, langCC ? true, langFortran ? false, langTreelang ? false
+, langJava ? false
+, langAda ? false
+, langVhdl ? false
+, profiledCompiler ? false
+, staticCompiler ? false
+, enableShared ? true
+, texinfo ? null
+, gmp, mpfr, mpc, gettext, which
+, libelf                      # optional, for link-time optimizations (LTO)
+, ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework
+, bison ? null, flex ? null
+, zlib ? null, boehmgc ? null
+, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
+, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
+, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
+, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
+, gnatboot ? null
+, enableMultilib ? false
+, name ? "gcc"
+, cross ? null
+, binutilsCross ? null
+, libcCross ? null
+, crossStageStatic ? true
+, gnat ? null
+}:
+
+assert langTreelang -> bison != null && flex != null;
+assert langJava     -> zip != null && unzip != null
+                       && zlib != null && boehmgc != null;
+assert langAda      -> gnatboot != null;
+assert langVhdl     -> gnat != null;
+
+# LTO needs libelf and zlib.
+assert libelf != null -> zlib != null;
+
+with stdenv.lib;
+
+let version = "4.5.0";
+    javaEcj = fetchurl {
+      # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
+      # `configure' time.
+
+      # XXX: Eventually we might want to take it from upstream.
+      url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
+      sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
+    };
+
+    # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
+    # binary distribution here to allow the whole chain to be bootstrapped.
+    javaAntlr = fetchurl {
+      url = http://www.antlr.org/download/antlr-3.1.3.jar;
+      sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09";
+    };
+
+    xlibs = [
+      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
+      xproto renderproto xextproto inputproto randrproto
+    ];
+
+    javaAwtGtk = langJava && gtk != null;
+
+    /* Cross-gcc settings */
+    gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross;
+    gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross;
+    gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross;
+    withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
+    withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
+    withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+
+    crossConfigureFlags =
+      "--target=${cross.config}" +
+      withArch +
+      withCpu +
+      withAbi +
+      (if crossStageStatic then
+        " --disable-libssp --disable-nls" +
+        " --without-headers" +
+        " --disable-threads " +
+        " --disable-libmudflap " +
+        " --disable-libgomp " +
+        " --disable-shared" +
+        " --disable-decimal-float" # libdecnumber requires libc
+        else
+        " --with-headers=${libcCross}/include" +
+        " --enable-__cxa_atexit" +
+        " --enable-long-long" +
+        " --enable-threads=posix" +
+        " --enable-nls" +
+        " --disable-decimal-float" # No final libdecnumber (it may work only in 386)
+        );
+    stageNameAddon = if (crossStageStatic) then "-stage-static" else
+      "-stage-final";
+    crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else "";
+
+in
+
+# We need all these X libraries when building AWT with GTK+.
+assert gtk != null -> (filter (x: x == null) xlibs) == [];
+
+stdenv.mkDerivation ({
+  name = "${name}-${version}" + crossNameAddon;
+
+  builder = ./builder.sh;
+
+  src = (import ./sources.nix) {
+    inherit fetchurl optional version;
+    inherit langC langCC langFortran langJava langAda;
+  };
+
+  patches =
+    [ ]
+    ++ optional noSysDirs ./no-sys-dirs.patch
+    # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
+    # target libraries and tools.
+    ++ optional langAda ./gnat-cflags.patch
+    ++ optional langVhdl ./ghdl-ortho-cflags.patch
+    ++ optional (cross != null && cross.arch == "sparc64") ./pr41818.patch;
+
+  inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic
+    libcCross;
+
+  buildInputs = [ texinfo gmp mpfr mpc libelf gettext which ]
+    ++ (optional (ppl != null) ppl)
+    ++ (optional (cloogppl != null) cloogppl)
+    ++ (optionals langTreelang [bison flex])
+    ++ (optional (zlib != null) zlib)
+    ++ (optional (boehmgc != null) boehmgc)
+    ++ (optionals langJava [zip unzip])
+    ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs)
+    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals langAda [gnatboot])
+    ++ (optionals langVhdl [gnat])
+    ;
+
+  configureFlags = "
+    ${if enableMultilib then "" else "--disable-multilib"}
+    ${if enableShared then "" else "--disable-shared"}
+    ${if ppl != null then "--with-ppl=${ppl}" else ""}
+    ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""}
+    ${if langJava then "--with-ecj-jar=${javaEcj}" else ""}
+    ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+    ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
+    --with-gmp=${gmp}
+    --with-mpfr=${mpfr}
+    --with-mpc=${mpc}
+    ${if (libelf != null) then "--with-libelf=${libelf}" else ""}
+    --disable-libstdcxx-pch
+    --without-included-gettext
+    --with-system-zlib
+    --enable-languages=${
+      concatStrings (intersperse ","
+        (  optional langC        "c"
+        ++ optional langCC       "c++"
+        ++ optional langFortran  "fortran"
+        ++ optional langJava     "java"
+        ++ optional langTreelang "treelang"
+        ++ optional langAda      "ada"
+        ++ optional langVhdl     "vhdl"
+        )
+      )
+    }
+    ${if langAda then " --enable-libada" else ""}
+    ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
+    ${if cross != null then crossConfigureFlags else ""}
+  ";
+
+  targetConfig = if (cross != null) then cross.config else null;
+
+  # Needed for the cross compilation to work
+  AR = "ar";
+  LD = "ld";
+  CC = "gcc";
+
+  # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find
+  # the library headers and binaries, regarless of the language being
+  # compiled.
+
+  # Note: When building the Java AWT GTK+ peer, the build system doesn't
+  # honor `--with-gmp' et al., e.g., when building
+  # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just
+  # add them to $CPATH and $LIBRARY_PATH in this case.
+  #
+  # Likewise, the LTO code doesn't find zlib.
+
+  CPATH = concatStrings
+            (intersperse ":" (map (x: x + "/include")
+                                  (optionals (zlib != null) [ zlib ]
+                                   ++ optionals langJava [ boehmgc ]
+                                   ++ optionals javaAwtGtk xlibs
+                                   ++ optionals javaAwtGtk [ gmp mpfr ])));
+
+  LIBRARY_PATH = concatStrings
+                   (intersperse ":" (map (x: x + "/lib")
+                                         (optionals (zlib != null) [ zlib ]
+                                          ++ optionals langJava [ boehmgc ]
+                                          ++ optionals javaAwtGtk xlibs
+                                          ++ optionals javaAwtGtk [ gmp mpfr ])));
+
+
+  passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl
+      enableMultilib; };
+
+  meta = {
+    homepage = http://gcc.gnu.org/;
+    license = "GPLv3+";  # runtime support libraries are typically LGPLv3+
+    description = "GNU Compiler Collection, version ${version}";
+
+    longDescription = ''
+      The GNU Compiler Collection includes compiler front ends for C, C++,
+      Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
+      as libraries for these languages (libstdc++, libgcj, libgomp,...).
+
+      GCC development is a part of the GNU Project, aiming to improve the
+      compiler used in the GNU system including the GNU/Linux variant.
+    '';
+
+    maintainers = [
+      stdenv.lib.maintainers.ludo
+      stdenv.lib.maintainers.viric
+    ];
+
+    # Volunteers needed for the {Cyg,Dar}win ports of *PPL.
+    # gnatboot is not available out of linux platforms, so we disable the darwin build
+    # for the gnat (ada compiler).
+    platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ];
+  };
+}
+// (if langVhdl then rec {
+  name = "ghdl-0.29";
+
+  ghdlSrc = fetchurl {
+    url = "http://ghdl.free.fr/ghdl-0.29.tar.bz2";
+    sha256 = "15mlinr1lwljwll9ampzcfcrk9bk0qpdks1kxlvb70xf9zhh2jva";
+  };
+
+  # Ghdl has some timestamps checks, storing file timestamps in '.cf' files.
+  # As we will change the timestamps to 1970-01-01 00:00:01, we also set the
+  # content of that .cf to that value. This way ghdl does not complain on
+  # the installed object files from the basic libraries (ieee, ...)
+  postInstallGhdl = ''
+    pushd $out
+    find . -name "*.cf" -exec \
+        sed 's/[0-9]*\.000" /19700101000001.000" /g' -i {} \;
+    popd
+  '';
+
+  postUnpack = ''
+    tar xvf ${ghdlSrc}
+    mv ghdl-*/vhdl gcc*/gcc
+    rm -Rf ghdl-*
+  '';
+
+  meta = {
+    homepage = "http://ghdl.free.fr/";
+    license = "GPLv2+";
+    description = "Complete VHDL simulator, using the GCC technology (gcc ${version})";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+
+} else {}))

pkgs/development/compilers/gcc-4.5/ghdl-ortho-cflags.patch

@@ -0,0 +1,111 @@
+diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in
+index 8f481df..681ac59 100644
+--- a/gcc/vhdl/Make-lang.in
++++ b/gcc/vhdl/Make-lang.in
+@@ -96,7 +96,7 @@ AGCC_GCCOBJ_DIR=../
+ AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \
+  -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \
+  -I$(AGCC_GCCSRC_DIR)/libcpp/include
+-AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS)
++AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) $(CFLAGS) $(INCLUDES)
+ 
+ AGCC_LOCAL_OBJS=ortho-lang.o
+ 
+@@ -140,7 +140,7 @@ ghdl$(exeext): force
+ 
+ # Ghdl libraries.
+ ghdllib: ghdl$(exeext) $(GCC_PASSES) force
+-	$(MAKE_IN_VHDL) GRT_FLAGS="-O -g" ghdllib
++	$(MAKE_IN_VHDL) GRT_FLAGS="-O -g $(CFLAGS)" ghdllib
+ 
+ # Build hooks:
+ 
+diff --git a/gcc/vhdl/Makefile.in b/gcc/vhdl/Makefile.in
+index d754c6c..07abc4a 100644
+--- a/gcc/vhdl/Makefile.in
++++ b/gcc/vhdl/Makefile.in
+@@ -80,7 +80,8 @@ T_CPPFLAGS =
+ X_ADAFLAGS =
+ T_ADAFLAGS =
+ 
+-ADAC = $(CC)
++# Never use the bootstrapped compiler, as it may not be built for ada
++ADAC = gcc
+ 
+ ECHO = echo
+ CHMOD = chmod
+diff --git a/gcc/vhdl/ortho-lang.c b/gcc/vhdl/ortho-lang.c
+index 84aeb92..8eddd42 100644
+--- a/gcc/vhdl/ortho-lang.c
++++ b/gcc/vhdl/ortho-lang.c
+@@ -16,6 +16,7 @@
+ #include "options.h"
+ #include "real.h"
+-#include "tree-gimple.h"
++#include "gimple.h"
++#include "tree.h"
+ #include "function.h"
+ #include "cgraph.h"
+ #include "target.h"
+@@ -680,38 +681,10 @@ type_for_mode (enum machine_mode mode, int unsignedp)
+ 
+ const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
+ 
+-/* Tree code classes.  */
+-
+-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,
+-
+-const enum tree_code_class tree_code_type[] = {
+-#include "tree.def"
+-  'x'
+-};
+-#undef DEFTREECODE
+-
+-/* Table indexed by tree code giving number of expression
+-   operands beyond the fixed part of the node structure.
+-   Not used for types or decls.  */
+-
+-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,
+-
+-const unsigned char tree_code_length[] = {
+-#include "tree.def"
+-  0
+-};
+-#undef DEFTREECODE
+-
+-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) NAME,
+-const char * const tree_code_name[] = {
+-#include "tree.def"
+-  "@@dummy"
+-};
+-#undef DEFTREECODE
+ 
+ union lang_tree_node 
+   GTY((desc ("0"),
+-       chain_next ("(union lang_tree_node *) GENERIC_NEXT (&%h.generic)")))
++       chain_next ("(union lang_tree_node *) TREE_CHAIN (&%h.generic)")))
+ {
+   union tree_node GTY ((tag ("0"))) generic;
+ };
+@@ -1162,7 +1135,7 @@ new_access_type (tree dtype)
+       res = make_node (POINTER_TYPE);
+       TREE_TYPE (res) = NULL_TREE;
+       /* Seems necessary.  */
+-      TYPE_MODE (res) = Pmode;
++      SET_TYPE_MODE (res, Pmode);
+       layout_type (res);
+       return res;
+     }
+diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in
+index e201f64..f36fb97 100644
+--- a/gcc/vhdl/Make-lang.in
++++ b/gcc/vhdl/Make-lang.in
+@@ -132,7 +132,7 @@ ghdl1$(exeext): $(AGCC_OBJS) $(AGCC_DEPS) force
+ 	 -cargs $(CFLAGS) $(GHDL_ADAFLAGS)
+ 	$(GNATMAKE) -o $@ -aI$(srcdir)/vhdl -aOvhdl ortho_gcc-main \
+ 	 -bargs -E -cargs $(CFLAGS) $(GHDL_ADAFLAGS) \
+-	 -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS)
++	 -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS) $(CLOOGLIBS) $(PPLLIBS)
+ 
+ # The driver for ghdl.
+ ghdl$(exeext): force

pkgs/development/compilers/gcc-4.5/gnat-cflags.patch

@@ -0,0 +1,33 @@
+diff --git a/libada/Makefile.in b/libada/Makefile.in
+index f5057a0..337e0c6 100644
+--- a/libada/Makefile.in
++++ b/libada/Makefile.in
+@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN)
+ WARN_CFLAGS = @warn_cflags@
+ 
+ TARGET_LIBGCC2_CFLAGS=
+-GNATLIBCFLAGS= -g -O2
++GNATLIBCFLAGS= -g -O2 $(CFLAGS)
+ GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
+ 	-DIN_RTS @have_getipinfo@
+ 
+--- a/gcc/ada/gcc-interface/Makefile.in
++++ b/gcc/ada/gcc-interface/Makefile.in
+@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata
+ SOME_ADAFLAGS =-gnata
+ FORCE_DEBUG_ADAFLAGS = -g
+ GNATLIBFLAGS = -gnatpg -nostdinc
+-GNATLIBCFLAGS = -g -O2
++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
+ # Pretend that _Unwind_GetIPInfo is available for the target by default.  This
+ # should be autodetected during the configuration of libada and passed down to
+ # here, but we need something for --disable-libada and hope for the best.
+@@ -1838,7 +1838,7 @@ ADA_INCLUDE_SRCS =\
+ 
+ LIBGNAT=../$(RTSDIR)/libgnat.a
+ 
+-GCC_LINK=$(CC) -static-libgcc $(ADA_INCLUDES)
++GCC_LINK=$(CC) -static-libgcc $(CFLAGS_FOR_TARGET) $(ADA_INCLUDES)
+ 
+ # when compiling the tools, the runtime has to be first on the path so that
+ # it hides the runtime files lying with the rest of the sources

pkgs/development/compilers/gcc-4.5/java-jvgenmain-link.patch

@@ -0,0 +1,17 @@
+The `jvgenmain' executable must be linked against `vec.o', among others,
+since it uses its vector API.
+
+--- gcc-4.3.3/gcc/java/Make-lang.in	2008-12-05 00:00:19.000000000 +0100
++++ gcc-4.3.3/gcc/java/Make-lang.in	2009-07-03 16:11:41.000000000 +0200
+@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB
+ 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \
+ 		$(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS)
+ 
+-jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS)
++jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL)
+ 	rm -f $@
+-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS)
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS)
+ 
+ #
+ # Build hooks:

pkgs/development/compilers/gcc-4.5/no-sys-dirs.patch

@@ -0,0 +1,54 @@
+diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c
+--- gcc-4.3.1-orig/gcc/cppdefault.c	2007-07-26 10:37:01.000000000 +0200
++++ gcc-4.3.1/gcc/cppdefault.c	2008-06-25 17:48:23.000000000 +0200
+@@ -41,6 +41,10 @@
+ # undef CROSS_INCLUDE_DIR
+ #endif
+ 
++#undef LOCAL_INCLUDE_DIR
++#undef SYSTEM_INCLUDE_DIR
++#undef STANDARD_INCLUDE_DIR
++
+ const struct default_include cpp_include_defaults[]
+ #ifdef INCLUDE_DEFAULTS
+ = INCLUDE_DEFAULTS;
+diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c
+--- gcc-4.3.1-orig/gcc/gcc.c	2008-03-02 23:55:19.000000000 +0100
++++ gcc-4.3.1/gcc/gcc.c	2008-06-25 17:52:53.000000000 +0200
+@@ -1478,10 +1478,10 @@
+ /* Default prefixes to attach to command names.  */
+ 
+ #ifndef STANDARD_STARTFILE_PREFIX_1
+-#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
++#define STANDARD_STARTFILE_PREFIX_1 ""
+ #endif
+ #ifndef STANDARD_STARTFILE_PREFIX_2
+-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
++#define STANDARD_STARTFILE_PREFIX_2 ""
+ #endif
+ 
+ #ifdef CROSS_DIRECTORY_STRUCTURE  /* Don't use these prefixes for a cross compiler.  */
+--- gcc-4.3.1-orig/gcc/Makefile.in	2008-05-11 20:54:15.000000000 +0200
++++ gcc-4.3.1/gcc/Makefile.in	2008-06-25 17:48:23.000000000 +0200
+@@ -378,7 +378,11 @@
+ MD5_H	    = $(srcdir)/../include/md5.h
+ 
+ # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
+-NATIVE_SYSTEM_HEADER_DIR = /usr/include
++# 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@
+ 
+@@ -3277,7 +3281,7 @@
+   -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)\" \
++  -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
+   -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
+   -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+   -DPREFIX=\"$(prefix)/\" \

pkgs/development/compilers/gcc-4.5/pr41818.patch

@@ -0,0 +1,26 @@
+From <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818>.  This fixes compilation
+of the sparc64-linux-gnu cross-compiler with shared libraries.
+
+--- trunk/Makefile.in	2010/01/07 19:21:46	155705
++++ trunk/Makefile.in	2010/01/07 19:53:50	155706
+@@ -259,7 +259,7 @@
+ # directories built for the target.
+ TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
+ # This is the list of variables to export in the environment when
+-# configuring subdirectories for the host system.
++# configuring subdirectories for the target system.
+ BASE_TARGET_EXPORTS = \
+ 	$(BASE_EXPORTS) \
+ 	AR="$(AR_FOR_TARGET)"; export AR; \
+@@ -281,7 +281,10 @@
+ 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
+ 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+ 	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
+-	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
++@if gcc-bootstrap
++	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
++@endif gcc-bootstrap
++	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+ 
+ RAW_CXX_TARGET_EXPORTS = \
+ 	$(BASE_TARGET_EXPORTS) \

pkgs/development/compilers/gcc-4.5/sources.nix

@@ -0,0 +1,26 @@
+/* Automatically generated by `update-gcc.sh', do not edit.
+   For GCC 4.5.0.  */
+{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }:
+
+assert version == "4.5.0";
+optional /* langC */ true (fetchurl {
+  url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
+  sha256 = "19ykzyd938d4pblsihrsalk9ch1s23z57s0r5an8sqs7acv51r0g";
+}) ++
+optional langCC (fetchurl {
+  url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
+  sha256 = "0hialil4v2hi7klr14x6h5z7b9ryzzy9kchr96s2p9hmsm7famlk";
+}) ++
+optional langFortran (fetchurl {
+  url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
+  sha256 = "0anby974dikygjmxr6h1pd9s24fdps84fki1dijzhqqvq6lr3hbb";
+}) ++
+optional langJava (fetchurl {
+  url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
+  sha256 = "0mlbxyhj7svjgby5vrpc49l2vk0k0878nlx0ap6jqq7xdyysvlcn";
+}) ++
+optional langAda (fetchurl {
+  url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
+  sha256 = "1yar842bixmh2n9siy8s383lg8mz611xjdbbacgcznwab601czzv";
+}) ++
+[]

pkgs/development/compilers/gcc-4.5/update-gcc.sh

@@ -0,0 +1 @@
+../gcc-4.4/update-gcc.sh

pkgs/development/compilers/ghc/6.12.1.nix

@@ -5,6 +5,7 @@ stdenv.mkDerivation rec {
   
   name = "ghc-${version}";
   
+  # TODO: Does this have to be here, or can it go to meta?
   homepage = "http://haskell.org/ghc";
 
   src = fetchurl {
@@ -34,11 +35,14 @@ stdenv.mkDerivation rec {
   meta = {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [
+      stdenv.lib.maintainers.marcweber
+      stdenv.lib.maintainers.andres
+    ];
     platforms = stdenv.lib.platforms.linux;
   };
 
-
+  # TODO: requires a comment as to what it does and why it is needed.
   passthru = {
     corePackages = [
        [ "Cabal" "1.8.0.2" ]

pkgs/development/compilers/ghc/6.12.2.nix

@@ -0,0 +1,84 @@
+{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
+
+stdenv.mkDerivation rec {
+  version = "6.12.2";
+  
+  name = "ghc-${version}";
+  
+  # TODO: Does this have to be here, or can it go to meta?
+  homepage = "http://haskell.org/ghc";
+
+  src = fetchurl {
+    url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
+    sha256 = "7f1e39f0b3ddaca35b55cd430ca058d1c4678445a7177391c9cb6342b7c41a30";
+  };
+
+  buildInputs = [ghc perl gmp ncurses];
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+  '';
+
+  configureFlags=[
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags=["-S" "--keep-file-symbols"];
+
+  meta = {
+    inherit homepage;
+    description = "The Glasgow Haskell Compiler";
+    maintainers = [
+      stdenv.lib.maintainers.marcweber
+      stdenv.lib.maintainers.andres
+    ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+  # TODO: requires a comment as to what it does and why it is needed.
+  passthru = {
+    corePackages = [
+       [ "Cabal" "1.8.0.2" ]
+       [ "array" "0.3.0.0" ]
+       [ "base" "3.0.3.2" ]
+       [ "base" "4.2.0.0" ]
+       [ "bin-package-db" "0.0.0.0" ]
+       [ "bytestring" "0.9.1.5" ]
+       [ "containers" "0.3.0.0" ]
+       [ "directory" "1.0.1.0" ]
+       [ "dph-base" "0.4.0" ]
+       [ "dph-par" "0.4.0" ]
+       [ "dph-prim-interface" "0.4.0" ]
+       [ "dph-prim-par" "0.4.0" ]
+       [ "dph-prim-seq" "0.4.0" ]
+       [ "dph-seq" "0.4.0" ]
+       [ "extensible-exceptions" "0.1.1.1" ]
+       [ "ffi" "1.0" ]
+       [ "filepath" "1.1.0.3" ]
+       [ "ghc" "6.12.1" ]
+       [ "ghc-binary" "0.5.0.2" ]
+       [ "ghc-prim" "0.2.0.0" ]
+       [ "haskell98" "1.0.1.1" ]
+       [ "hpc" "0.5.0.4" ]
+       [ "integer-gmp" "0.2.0.0" ]
+       [ "old-locale" "1.0.0.2" ]
+       [ "old-time" "1.0.0.3" ]
+       [ "pretty" "1.0.1.1" ]
+       [ "process" "1.0.1.2" ]
+       [ "random" "1.0.0.2" ]
+       [ "rts" "1.0" ]
+       [ "syb" "0.1.0.2" ]
+       [ "template-haskell" "2.4.0.0" ]
+       [ "time" "1.1.4" ]
+       [ "unix" "2.4.0.0" ]
+       [ "utf8-string" "0.3.4" ]
+    ];
+  };
+}

pkgs/development/compilers/ghc/wrapper.nix

@@ -20,6 +20,9 @@ stdenv.mkDerivation {
     for prg in ghc-pkg ghc-pkg-${ghc.version}; do
       makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" --package-conf=)"
     done
+    for prg in hp2ps hpc hasktags hsc2hs; do
+      test -x $ghc/bin/$prg && ln -s $ghc/bin/$prg $out/bin/$prg
+    done
     cat >> $out/bin/ghc-packages << EOF
     #! /bin/bash -e
     declare -A GHC_PACKAGES_HASH # using bash4 hashs to get uniq paths
@@ -45,5 +48,6 @@ stdenv.mkDerivation {
   GHCGetPackages = ./ghc-get-packages.sh;
 
   inherit ghc;
+  inherit (ghc) meta;
   ghcVersion = ghc.version;
 }

pkgs/development/compilers/mit-scheme/default.nix

@@ -1,16 +1,37 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, gnum4 }:
 
-let version = "9.0.1"; in
+let
+  version = "9.0.1";
+  bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
+in
 stdenv.mkDerivation {
   name = "mit-scheme-${version}";
 
-  src = fetchurl {
-    url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz";
-    sha256 = "1g2mifrx0bvag0hlrbk81rkrlm1pbn688zw8b9d2i0sl5g2p1ril";
-  };
+  # MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from
+  # the platform-specific tarballs, which contain pre-built binaries.  It
+  # leads to more efficient code than when building the tarball that contains
+  # generated C code instead of those binaries.
+  src =
+    if stdenv.isi686
+    then fetchurl {
+      url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz";
+      sha256 = "0cfj3bawjdnpa7cbqh2f23hfpjpmryypmzkhndvdbi79a65fl0n2";
+    } else if stdenv.isx86_64
+    then fetchurl {
+      url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz";
+      sha256 = "0p188d7n0iqdgvra6qv5apvcsv0z2p97ry7xz5216zkc364i6mmr";
+    } else fetchurl {
+      url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz";
+      sha256 = "1g2mifrx0bvag0hlrbk81rkrlm1pbn688zw8b9d2i0sl5g2p1ril";
+    };
 
   preConfigure = "cd src";
-  buildPhase = "./etc/make-liarc.sh --prefix=$out";
+  buildPhase =
+    if bootstrapFromC
+    then "./etc/make-liarc.sh --prefix=$out"
+    else "make compile-microcode";
+
+  buildInputs = [ gnum4 ];
 
   # XXX: The `check' target doesn't exist.
   doCheck = false;
@@ -31,6 +52,9 @@ stdenv.mkDerivation {
     license = "GPLv2+";
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+
+    # Build fails on Cygwin and Darwin:
+    # <http://article.gmane.org/gmane.lisp.scheme.mit-scheme.devel/489>.
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd;
   };
 }

pkgs/development/compilers/yasm/default.nix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "yasm-1.0.0";
+  
+  src = fetchurl {
+    url = http://www.tortall.net/projects/yasm/releases/yasm-1.0.0.tar.gz;
+    sha256 = "0nd95r9y5r3p9mvdyj1yhvlz9zjw0id1g470c7i1p3p0x0n6zc06";
+  };
+
+  meta = {
+    homepage = http://www.tortall.net/projects/yasm/;
+    description = "Complete rewrite of the NASM assembler";
+    license = "BSD";
+  };
+}

pkgs/development/interpreters/python-new/2.5/default.nix

@@ -1,682 +0,0 @@
-# the nix-python way..
-
-# By default python looks in the $prefix/lib/python-$version/site-packages directory
-# and reads the .pth files to add the library paths to sys.path. 
-# Using PYHTONPATH is not enough because it doesn't make python read the .pth files
-# telling python where to find additional modules. PYTHONUSERBASE would suffice, but
-# it only supports *one* user location. That's why I've added the new env var NIX_PYTHON_SITES
-# containing a colon separated list of modules telling python where to look
-# for imports and also read the .pth files
-
-# TODO optimize py modules automatically (gentoo has a ebuild function called python_mod_optimize ?)
-
-p: # p = pkgs
-let 
-  inherit (builtins) isAttrs hasAttr;
-  inherit (p) lib fetchurl stdenv getConfig sourceFromHead;
-  inherit (p.composableDerivation) composableDerivation;
-  # withName prevents  nix-env -qa \* from aborting (pythonLibStub is a derivation but hasn't a name)
-  withName = lib.mapAttrs (n : v : if (isAttrs v && (!hasAttr "name" v)) then null else v);
-in
-  withName ( lib.fix ( t : { # t = this attrs
-
-    version = "2.5";
-    versionAttr = "python25";
-
-    # see pythonFull.
-    pythonMinimal = ( (import ./python.nix) {
-      name = "python-${t.version}";
-      inherit composableDerivation;
-      inherit (p) fetchurl stdenv lib bzip2 ncurses;
-      inherit  (p) zlib sqlite db4 readline openssl gdbm;
-    });
-
-    # python wiht all features enabled.
-    # if you really need a stripped version we should add __overides
-    # so that you can replace it the way it's done in all-packages.nix
-    pythonFull = t.pythonMinimal.merge {
-     name = "python-${t.version}-full";
-      cfg = {
-        zlibSupport = true;
-        sqliteSupport = true;
-        db4Support = true;
-        readlineSupport = true;
-        opensslSupport = true;
-        gdbmSupport = true;
-      };
-    };
-
-    # python wrapper. You should install this
-    # It automatically wrapps python adding NIX_PYTHON_SITES so that you can use all the libraries
-    # when running the wrapper from the console.
-    # configuration:
-    # python25 = { wrapperLibs = let p = pkgs.python25New; in [ p.wxPython25 p.name p.name2 ]; }; 
-    # python25 = { wrapperLibs = [ "all" ]; }; # install all libraries provided by this file
-    # TODO: does pydoc find stuff from libraries?
-    pythonWrapper = stdenv.mkDerivation {
-      name = "${t.pythonFull.name}-wrapper";
-      # [1] using full because I feel installing various versions isn't any better
-      phases = "buildPhase";
-      buildInputs = [ p.makeWrapper ] 
-        ++ lib.concatMap (x: if x == "all" then t.all else [x]) (getConfig [t.versionAttr "wrapperLibs"] []);
-
-      buildPhase = ''
-        ensureDir $out/bin
-
-        for prog in python pydoc; do
-          echo ========= prog $prog
-          cat >> $out/bin/$prog << EOF
-          export NIX_PYTHON_SITES=\$NIX_PYTHON_SITES:$NIX_PYTHON_SITES
-          exec ${t.pythonFull}/bin/$prog "\$@"
-        EOF
-          echo chmod +x
-          chmod +x $out/bin/$prog
-        done
-      '';
-    };
-
-    ### basic support for installing python libraries
-    # set pyCheck to a small python snippet importing all modules of this python
-    # lib to verify it works
-    # You can define { python25 { debugCmd = "DISPLAY=:0.0 pathtoxterm"; }
-    # in your config for easier debugging..
-    pythonLibStub = composableDerivation {} {
-        propagatedBuildInputs = [ t.pythonFull ]; # see [1]
-        postPhases = ["postAll"]; # using new name so that you dno't override this phase by accident
-        # ensure phases are run or a non zero exit status is caused (if there are any syntax errors such as eval "while")
-        postAll = ''
-          ensureDir $out/nix-support
-          echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook 
-          # run check
-          if [ -n "$pyCheck" ]; then
-             ( . $out/nix-support/setup-hook
-                 mkdir $TMP/new-test; cd $TMP/new-test
-                 echo PYTHONPATH=$PYTHONPATH
-                 echo NIX_PYTHON_SITES=$NIX_PYTHON_SITES
-                 script="$(echo -e "import sys\nprint sys.path\npyCheck\nprint \"check ok\"")"
-                 script="''${script/pyCheck/$pyCheck}"
-                 echo "check script is"; echo "$script"
-                 echo "$script" | python || { ${ getConfig [t.versionAttr "debugCmd"] ":"} ; echo "pycheck failed"; exit 1; }
-             )
-           fi'';
-        passthru = {
-          libPython = t.version; # used to find all python libraries fitting this version (-> see name all below)
-        };
-        mergeAttrBy = {
-          postPhases = lib.concat;
-          pyCheck = x : y : "${x}\n${y}";
-        };
-    };
-
-    # same as pythonLibStub, but runs default python setup.py actions
-    pythonLibSetup = t.pythonLibStub.merge {
-      buildPhase = ''python setup.py $setupFlags build'';
-      installPhase = ''python setup.py $setupFlags install --prefix=$out'';
-      mergeAttrBy = {
-        setupFlags = lib.concat;
-      };
-    };
-
-    ### python libraries:
-
-    wxPythonBaseFun = (t.pythonLibSetup.merge (a :
-      let inherit (a.fixed.passthru) wxGTK;  inherit (a.fixed) version; in
-        {
-          buildInputs = [p.pkgconfig wxGTK (wxGTK.gtk)];
-          setupFlags=["WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=0 BUILD_OGL=0 UNICODE=1"];
-          configurePhase = ''cd wxPython'';
-          pyCheck = "import wx";
-          name = "wxPython-${version}";
-          meta = { # 2.6.x and 2.8.x
-            description="A blending of the wxWindows C++ class library with Python";
-            homepage="http://www.wxpython.org/";
-            license="wxWinLL-3";
-          };
-        }
-    )).merge;
-
-    wxPython26 = t.wxPythonBaseFun {
-      version = "2.6.3.3";
-      passthru = { wxGTK = p.wxGTK26; };
-      src = fetchurl {
-        url = mirror://sourceforge/wxpython/wxPython-src-2.6.3.3.tar.bz2;
-        md5 = "66b9c5f8e20a9505c39dab1a1234daa9";
-      };
-    };
-
-    # compilation errors
-    #wxPython28 = t.wxPythonBaseFun {
-    #  version = "2.8.9.1";
-    #  passthru = { wxGTK = wxGTK28; };
-    #  src = fetchurl {
-    #    url = mirror://sourceforge.net/sourceforge/wxpython/wxPython-src-2.8.9.1.tar.bz2;
-    #    sha256 = "1yp7l2c2lfpwc2x5lk5pawmzq2bqajzhbzqs1p10jd211slwhjsq";
-    #  };
-    #};
-
-    # couldn't download source
-    #foursuite = pythonLibSetup.merge {
-    #  version = "1.0.2";
-    #  name = "4suite-${version}";
-    #  src = fetchurl {
-    #    url = "mirror://sourceforge/foursuite/4Suite-XML-${version}.tar.bz2";
-    #    sha256 = "0g5cyqxhhiqnvqk457k8sb97r18pwgx6gff18q5296xd3zf4cias";
-    #  };
-    #};
-
-    #bsddb3 = t.pythonLibSetup.merge {
-    #  version = "1.0.2";
-    #  name = "bsddb3-4.5.0";
-    #  setupFlags = ["--berkeley-db=${p.db4}"];
-    #  src = fetchurl {
-    #    url = mirror://sourceforge/pybsddb/bsddb3-4.5.0.tar.gz;
-    #    sha256 = "1h09kij32iikr9racp5p7qrb4li2gf2hs0lyq6d312qarja4d45v";
-    #  };
-    #};
-
-  # pyglib contains import reference to pygtk! So its best to install both at
-  # the same time. I don't want to patch this.
-  # You can install both into different store paths, however you won't be able
-  # to import gtk because after pygtk.require sys.path contains to 
-  # /nix/store/*-pygobject/**/gtk-2.0 (should be pygtk/**/gtk-2.0 instead)
-
-  # gnome python is added here as well because it is loaded after
-  # pygtk.require('2.0') as well. So the pygtk lib path is added to sys.path only.
-  # We could make extra derivations for that. But on the other hand that would require
-  # patching pygtk to another */gtk2.0 directory to sys.path for each NIX_PYTHON_SITES.
-  # If you install dozens of python packages this might be bloat.
-  # So  I think the overhead of installing these packages into the same store path should be prefered.
-  pygtkBaseFun = (t.pythonLibStub.merge (a :
-    let inherit (a.fixed.passthru) glib gtk; in lib.mergeAttrsByFuncDefaults [
-    {
-      unpackPhase = "true";
-      configurePhase = "true";
-      patchPhase = "true";
-      buildPhase = "true";
-      installPhase = ''
-        unset unpackPhase
-        unset configurePhase
-        unset buildPhase
-        unset installPhase
-        export G2CONF="--enable-gconf" # hack, should be specified somewhere else
-        for srcs in $pygobjectSrc $pygtkSrc $pySrcs; do
-          cd $TMP; mkdir "$(basename $srcs)"; cd "$(basename $srcs)"; unpackFile $srcs
-          cd *
-          configurePhase; buildPhase; installPhase
-            addToEnv $out # pygtk has to know about pygobject
-            PATH=$out/bin:$PATH # gnome-python nees pygtk-codegen
-        done
-      '';
-      mergeAttrBy = {
-        phases = lib.concat;
-        pySrcs = lib.concat;
-        pyCheck = x : y : "${x}\n${y}";
-      };
-    }
-    # pygobject
-    {
-      flags = {
-        libffi = { buildInputs = [p.libffi];};
-      };
-      cfg = {
-        libffiSupport = true;
-      };
-      pyCheck = "import gobject";
-      passthru = {
-        pygobjectVersion = "2.15.4";
-      };
-      pygobjectSrc = fetchurl {
-        url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.15/pygobject-2.15.4.tar.bz2";
-        sha256 = "19vxczy01xyss2f5aqf93al3jzrxn50srgzkl4w7ivdz50rnjin7";
-      };
-      buildInputs = [ p.glibc ]; # requires ld-config
-
-      propagatedBuildInputs = [ p.pkgconfig glib gtk ];
-    }
-    # pygtk
-    {
-      propagatedBuildInputs = [ t.pycairo ];
-      flags = {
-        cairo = {
-          propagatedBuildInputs = [ p.cairo ];
-          pyCheck = "import cairo";
-        }; # TODO add pyCheck
-        glade = {
-          propagatedBuildInputs = [ p.gnome.libglade ];
-          pyCheck = "from gtk import glade";
-        };
-      };
-      pyCheck = ''
-        import pygtk; pygtk.require('2.0')
-        import gtk
-        import gconf
-      '';
-      cfg = {
-        gladeSupport = true;
-        cairoSupport = true;
-      };
-    }
-    # gnome-python
-    {
-      #name = "gnome-python-2.22.3";
-      buildInputs = [ p.pkgconfig  p.gnome.libgnome ];
-      propagatedBuildInputs = [ p.gnome.GConf ];
-      pySrcs = [(fetchurl {
-        url = http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.22/gnome-python-2.22.3.tar.bz2;
-        sha256 = "0ndm3cns9381mm6d8jxxfd931fk93nqfcszy38p1bz501bs3wxm1";
-      })];
-    }
-    # gnome-desktop or gnome-python-extras desktop containing egg.trayicon needed by istanbul
-    {
-      # name = "gnome-desktop-2.24.0";
-      buildInputs = [ p.pkgconfig ];
-      propagatedBuildInputs = [ p.gnome.GConf ];
-      pySrcs = [(fetchurl {
-        url = http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.24/gnome-python-desktop-2.24.0.tar.bz2;
-        sha256 = "16514gmv42ygjh5ggzsis697m73pgg7ydz11h487932kkzv4mmlg";
-      })];
-      pyCheck = "import egg.trayicon";
-    }
-    {
-      # name = "gnome-python-extras-2.13";
-      buildInputs = [ p.pkgconfig ];
-      propagatedBuildInputs = [ p.gnome.GConf ];
-      pySrcs = [(fetchurl {
-        url = http://ftp.gnome.org/pub/GNOME/sources/gnome-python-extras/2.13/gnome-python-extras-2.13.3.tar.gz;
-        sha256 = "0vj0289snagrnvbmrs1camwmrc93xgpw650iavj6mq7a3wqcra0b";
-      })];
-    }
-  ]));
-
-  #pygtk213 = t.pygtkBaseFun {
-  #  version = "2.13.0";
-  #  pygtkSrc = fetchurl {
-  #    url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.13/pygtk-2.13.0.tar.bz2;
-  #    sha256 = "0644ll48hi8kwfng37b0k5qgb0fbiy298r7sxd4j7ag7lj4bgic0";
-  #  };
-  #  passthru = { inherit (p.gtkLibs) glib gitk; };
-  #  pyCheck = ''
-  #    import pygtk; pygtk.require('2.0')
-  #    import gtk
-  #  '';
-  #};
-
-  pygtk212 = t.pygtkBaseFun.merge (a : {
-    version = "2.12.1";
-    name = "pygobject-${a.fixed.passthru.pygobjectVersion}-and-pygtk-${a.fixed.version}";
-    pygtkSrc = fetchurl { 
-      url = http://ftp.acc.umu.se/pub/GNOME/sources/pygtk/2.12/pygtk-2.12.1.tar.bz2;
-      sha256 = "0gg13xgr7y9sppw8bdys042928nc66czn74g60333c4my95ys021";
-    };
-    passthru = { inherit (p.gtkLibs) glib gtk; };
-    pyCheck = ''
-      import pygtk; pygtk.require('2.0')
-      import gtk
-    '';
-  });
-
-  pycairo = t.pythonLibStub.merge {
-    name = "pycairo-1.8.0";
-    buildInputs = [ p.pkgconfig p.cairo p.x11 ];
-    src = fetchurl {
-      url = http://www.cairographics.org/releases/pycairo-1.6.4.tar.gz;
-      md5 = "2c3aa21e6e610321498f9f81f7b625df";
-    };
-    pyCheck = "import cairo";
-  };
-
-  gstPython = t.pythonLibStub.merge {
-    name = "gst-python-0.10.13";
-    src = fetchurl {
-      url = http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.13.tar.gz;
-      sha256 = "0yin36acr5ryfpmhlb4rlagabgxrjcmbpizwrc8csadmxzmigb86";
-    };
-    buildInputs =[ p.flex2535 p.pkgconfig];
-    flags = {
-      pluginsGood = { propagatedBuildInputs = [p.gst_all.gstPluginsGood]; };
-      ffmpeg = { propagatedBuildInputs = [p.gst_all.gstFfmpeg]; };
-    };
-    cfg = {
-      pluginsGoodSupport = true;
-      ffmpegSupport = true;
-    };
-    propagatedBuildInputs = [
-          t.pygtk212
-          p.gst_all.gstreamer
-          p.gst_all.gstPluginsBase
-          p.gst_all.gnonlin
-        ];
-    # this check fails while building: It succeeds running as normal user
-    /*
-    Traceback (most recent call last):
-      File "<stdin>", line 5, in <module>
-      File "/nix/store/hnc51h035phlk68i1qmr5a8kc73dfvhp-gst-python-0.10.13/lib/python2.5/site-packages/gst-0.10/gst/__init__.py", line 170, in <module>
-        from _gst import *
-    RuntimeError: can't initialize module gst: Error re-scanning registry , child terminated by signal
-    */
-    pyCheck = ''
-      #import pygst
-      #pygst.require('0.10')
-      #import gst
-    '';
-    meta = {
-      description = "python gstreamer bindings";
-      homepage = http://gstreamer.freedesktop.org/modules/gst-python.html;
-      license = "GPLv2.1";
-    };
-  };
-
-  pygoocanvas = t.pythonLibStub.merge {
-    src = p.fetchurl {
-      url = http://download.berlios.de/pygoocanvas/pygoocanvas-0.10.0.tar.gz;
-      sha256 = "0pxznzdscbhvn8102vrqy3r1g6ss4sgs8wwy6y4c5g26rrp7l55d";
-    };
-    propagatedBuildInputs = [ t.pygtk212 ];
-    buildInputs = [ p.pkgconfig p.goocanvas ];
-    pyCheck = "import goocanvas";
-    name = "pygoocanvas-0.10.0";
-    meta = {
-      description = "";
-      homepage = http://developer.berlios.de/projects/pygoocanvas/;
-      license = "LGPL";
-    };
-  };
-
-  setuptools = t.pythonLibSetup.merge {
-    name = "setuptools-0.6c9";
-    postUnpack = ''
-      ensureDir $out/lib/python2.5/site-packages
-      export PYTHONPATH="$out/lib/python${t.version}/site-packages" # shut up installation script
-
-      # setuptools tries to write to the installation location, so ensure it exists
-      # and it requires PYTHONPATH to be set to that location (maybe its better to patch it. - I'm lazy)
-      ensureDir $out/nix-support
-      cat >> $out/nix-support/setup-hook << EOF
-      ensureDir \$out/lib/python${t.version}/site-packages
-      export PYTHONPATH="\$out/lib/python${t.version}/site-packages" # shut up installation script
-      EOF
-    '';
-    src = p.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c9.tar.gz";
-      md5 = "3864c01d9c719c8924c455714492295e";
-    };
-  };
-
-  zopeInterface = t.pythonLibSetup.merge rec {
-    version = "3.3.0";
-    name = "zope.interface-${version}";
-    buildInputs = [ t.setuptools ];
-    src = p.fetchurl {
-      url = "http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-${version}.tar.gz";
-      sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0";
-    };
-    pyCheck = "from zope.interface import Interface, Attribute";
-  };
-
-  dbusPython = t.pythonLibStub.merge rec {
-    version = "0.83.0";
-    name = "dbus-python-0.83.0";
-    buildInputs = [ p.pkgconfig ];
-    propagatedBuildInputs = [ p.dbus p.dbus_glib ];
-    src = fetchurl {
-      url = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.83.0.tar.gz";
-      sha256 = "14b1fwq9jyvg9qbbrmpk1264s9shm9n638hsgmkh9fn2lmd1vpc9";
-    };
-    pyCheck = "import dbus";
-    meta = { 
-      description = "";
-      homepage = http://freedesktop.org/wiki/Software/DBusBindings;
-      license = [ "GPLv2" "AFL-2.1" ];
-    };
-  };
-
-  pythonXlib = t.pythonLibSetup.merge {
-    name = "python-xlib-0.14";
-    src = fetchurl {
-      url = http://puzzle.dl.sourceforge.net/sourceforge/python-xlib/python-xlib-0.14.tar.gz;
-      sha256 = "1sv0447j0rx8cgs3jhjl695p5pv13ihglcjlrrz1kq05lsvb0wa7";
-    };
-    meta = {
-      description = "tries to be a fully functional X client library beeing entirely written in python";
-      license = [ "GPL" ];
-      homepage = http://python-xlib.sourceforge.net/;
-    };
-  };
-
-  mechanize = t.pythonLibSetup.merge {
-    name = "mechanize-0.1.11";
-    buildInputs = [ t.setuptools ];
-    src = fetchurl {
-      url = http://wwwsearch.sourceforge.net/mechanize/src/mechanize-0.1.11.tar.gz;
-      sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2";
-    };
-    meta = {
-      description = "Stateful programmatic web browsing in Python, after Andy Lester's Perl module WWW::Mechanize";
-      homepage = http://wwwsearch.sourceforge.net/mechanize/;
-      license = ["BSD" "ZPL 2.1"];
-    };
-    pyCheck = "from mechanize import Browser";
-  };
-
-  pexpect = t.pythonLibSetup.merge {
-    name = "pexpect-2.3";
-    src = fetchurl {
-      url = mirror://sourceforge/pexpect/pexpect-2.3.tar.gz;
-      sha256 = "0x8bfjjqygriry1iyygm5048ykl5qpbpzqfp6i8dhkslm3ryf5fk";
-    };
-    meta = {
-      description = "tcl expect as python library";
-      homepage = http://www.noah.org/wiki/Pexpect;
-      license = "MIT";
-    };
-  };
-
-  # unmantained ? (gentoo/ debian even do have python-3* patches)
-  pyxml = t.pythonLibSetup.merge {
-    name = "pyxml-0.8.4";
-    src = fetchurl {
-      url = mirror://sourceforge/pyxml/PyXML-0.8.4.tar.gz;
-      sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz";
-    };
-    meta = { 
-      description = "python xml package";
-      homepage = http://sourceforge.net/projects/pyxml/;
-      license = "Python License"; # (CNRI Python License);
-    };
-  };
-
-  /*
-  # untested
-  libxml2dom = t.pythonLibSetup.merge {
-    name = "libxml2dom-0.4.7";
-    buildInputs = [ p.libxml2 ];
-    src = fetchurl {
-      url = http://www.boddie.org.uk/python/downloads/libxml2dom-0.4.7.tar.gz;
-      sha256 = "0zh68adxn4l4b6q99jl1pi00171ah2marbbs8qfww4wpjavfw844";
-    };
-    pyCheck = "import libxml2dom.svg";
-    meta = {
-      description = "provides a traditional DOM wrapper around the Python bindings for libxml2";
-      homepage = http://www.boddie.org.uk/python/libxml2dom.html;
-      license = "LGPL3+";
-    };
-  };
-  */
-
-  fpconst = t.pythonLibSetup.merge {
-    name = "fpconst-0.7.3";
-    pyCheck = "import fpconst";
-    src = fetchurl {
-      url="mirror://sourceforge/rsoap/fpconst-0.7.3.tar.gz";
-      sha256 = "1a5c2e4a1ecefd9981988cea15068699eccbc55e350af3471e782083d390c727";
-    };
-    meta = {
-      description="Python Module for handling IEEE 754 floating point special values";
-      homepage="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/";
-      license = "GPLv2";
-    };
-  };
-
-  soappy = t.pythonLibSetup.merge {
-    name = "soappy-0.12";
-    pyCheck = "from SOAPpy import WSDL";
-    propagatedBuildInputs = [ t.fpconst ];
-    # REGION AUTO UPDATE:   { name="pywebcvs"; type = "svn"; url = "https://pywebsvcs.svn.sourceforge.net/svnroot/pywebsvcs/trunk"; }
-    src = sourceFromHead "pywebcvs-1493.tar.gz"
-                 (fetchurl { url = "http://mawercer.de/~nix/repos/pywebcvs-1493.tar.gz"; sha256 = "54e9faca87d8a59a22e06374b8416555cf76d3f411fa2be168ad542c2d8e6fc1"; });
-    # END
-    postUnpack = "sourceRoot=$sourceRoot/SOAPpy";
-    /* The release is buggy. I can't get list of dedicated netboots from ovh ?
-    src = fetchurl {
-      url = "http://switch.dl.sourceforge.net/sourceforge/pywebsvcs/SOAPpy-0.12.0.tar.gz";
-      sha256 = "02a0wpir0gl0n9cl7a5hxliwsywvcw847i5in7i14i57kk6dl7rd";
-    };
-    patches = [ ./gentoo-python-2.5-compat.patch ];
-    */
-    meta = {
-      description = "SOAP implementation for Python";
-      homepage="http://pywebsvcs.sourceforge.net/";
-      license = "BSD";
-    };
-  };
-
-  sqlalchemy05 = t.pythonLibSetup.merge {
-    name = "sqlalchemy-0.5.5-svn-trunk";
-    pyCheck = ''
-      import sqlalchemy
-      import sqlalchemy.orm
-      import sqlalchemy.orm.collections
-    '';
-    # REGION AUTO UPDATE:   { name="sqlalchemy05"; type = "svn"; url="http://svn.sqlalchemy.org/sqlalchemy/trunk"; }
-    src = sourceFromHead "sqlalchemy05-6076.tar.gz"
-                 (fetchurl { url = "http://mawercer.de/~nix/repos/sqlalchemy05-6076.tar.gz"; sha256 = "f35e6475996f7591d49affbc935c40b4c93e4cdaff86a50af9321774de2025b2"; });
-    # END
-    meta = { 
-      description = "sql orm wrapper for python";
-      homepage = http://www.sqlalchemy.org;
-      license = "MIT";
-    };
-    postPhases = ["installMigration"];
-
-    buildInputs = [ t.setuptools /* required for migration lib */ ];
-
-    /* impure ? I don't care right now
-      Reading http://pypi.python.org/simple/decorator/
-      Reading http://www.phyast.pitt.edu/~micheles/python/documentation.html
-      Best match: decorator 3.0.1
-      Downloading http://pypi.python.org/packages/source/d/decorator/decorator-3.0.1.tar.gz#md5=c4130a467be7f71154976c84af4a04c6
-
-      iElectric: column.alter could be broken ..
-    */
-    installMigration =
-    let src = {
-      # REGION AUTO UPDATE:   { name="sqlalchemyMigrate"; type = "svn"; url="http://sqlalchemy-migrate.googlecode.com/svn/trunk"; }
-      src = sourceFromHead "sqlalchemyMigrate-569.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/sqlalchemyMigrate-569.tar.gz"; sha256 = "3b076b33aa13bb2923e719489fd7988a5660bd8d8e87dac03f453b510e2695f4"; });
-      # END
-    }.src; in
-    ''
-      cd $TMP
-      mkdir migrate
-      cd migrate
-      unpackFile ${src}
-      cd *
-      python setup.py $setupFlags build
-      python setup.py $setupFlags install --prefix=$out
-      echo "import migrate.changeset.schema" | python
-    '';
-
-      /*
-
-      mv $out/lib/python2.5/site-packages/sqlalchemy_migrate-0.5.5.dev_r0-py2.5.egg/* \
-         $out/lib/python2.5/site-packages
-         */
-  };
-
-  /* doesn't work on its own, its included in sqlalchemy05 for that reason.
-  sqlalchemyMigrate = t.pythonLibSetup.merge {
-    name = "sqlalchemy-migrate-svn";
-    buildInputs = [ t.setuptools t.sqlalchemy05 ];
-    pyCheck = ''
-      import migrate
-      import migrate.changeset
-      import migrate.changeset.schema
-    '';
-    # REGION AUTO UPDATE:   { name="sqlalchemyMigrate"; type = "svn"; url="http://sqlalchemy-migrate.googlecode.com/svn/trunk"; }
-    src = sourceFromHead "sqlalchemyMigrate-569.tar.gz"
-                 (fetchurl { url = "http://mawercer.de/~nix/repos/sqlalchemyMigrate-569.tar.gz"; sha256 = "2bfbd41e31c9dce4434ca4cb209338ccef1fd0394999b18111be838b79db703b"; });
-    # END
-    meta = { 
-      description = "sqlalchemy database versioning and scheme migration";
-      homepage = http://packages.python.org/sqlalchemy-migrate/download.html;
-      license = "MIT";
-    };
-  };
-  */
-
-  ### python applications
-
-  pythonExStub = composableDerivation {} {
-    buildInputs = [p.makeWrapper];
-    postPhases = ["wrapExecutables"];
-    propagatedBuildInputs = [ t.pythonFull ]; # see [1]
-
-    # adding $out to NIX_PYTHON_SITES because some of those executables seem to come with extra libs
-    wrapExecutables = ''
-      for prog in $out/bin/*; do
-      wrapProgram "$prog" \
-                   --set NIX_PYTHON_SITES "$NIX_PYTHON_SITES:$out" \
-                   --set PYTHONPATH "\$PYTHONPATH:$out"
-      done
-    '';
-  };
-
-  pitivi = t.pythonExStub.merge {
-    name = "pitivi-0.11.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/sources/pitivi/0.11/pitivi-0.11.2.tar.bz2;
-      sha256 = "0d3bqgfp60qm5bf904k477bd8jhxizj1klv84wbxsz9vhjwx9zcl";
-    };
-    buildInputs = [ t.pygtk212 t.gstPython t.pygoocanvas t.zopeInterface t.dbusPython
-      p.intltool p.gettext p.makeWrapper p.gettext ];
-    # why do have to add gtk-2.0 explicitely?
-    meta = {
-        description = "A non-linear video editor using the GStreamer multimedia framework";
-        homepage = http://www.pitivi.org/wiki/Downloads;
-        license = "LGPL-2.1";
-    };
-    postInstall = ''
-      # set the python which has been used to compile this package
-      sed -i -e 's@#!.*@#!'"$(which python)@" $out/bin/pitivi
-    '';
-  };
-
-  istanbul = t.pythonExStub.merge {
-    name = "istanbul-0.2.2";
-    buildInputs = [ t.pygtk212 t.gstPython /*t.gnomePython (contained in gtk) t.gnomePythonExtras */ t.pythonXlib
-      p.perl p.perlXMLParser p.gettext];
-    # gstPython can't be imported when building (TODO).. so just run true instead of python
-    configurePhase = ''./configure --prefix=""''; # DESTDIR is set below
-    postUnpack = ''
-      sed -i 's/$PYTHON/true/' istanbul-0.2.2/configure
-      mkdir -p $out/bin
-      export DESTDIR="$out"
-    '';
-    src = fetchurl {
-      url = http://zaheer.merali.org/istanbul-0.2.2.tar.bz2;
-      sha256 = "1mdc82d0xs9pyavs616bz0ywq3zwy3h5y0ydjl6kvcgixii29aiv";
-    };
-    postInstall = "chmod a+x $out/bin/istanbul";
-    meta = {
-      description = "A non-linear video editor using the GStreamer multimedia framework";
-      homepage = http://live.gnome.org/Istanbul;
-      license = "LGPLv2";
-    };
-  };
-
-  all = lib.filter (x:
-                   (isAttrs x)
-                && ((lib.maybeAttr "libPython" false x) == t.version)
-                && (lib.maybeAttr "name" false x != false) # don't collect pythonLibStub etc
-        ) (lib.flattenAttrs (removeAttrs t ["all"])); # nix is not yet lazy enough, so I've to remove all first
-}))

pkgs/development/interpreters/python-new/2.5/gentoo-python-2.5-compat.patch

@@ -1,72 +0,0 @@
-diff --git a/SOAPpy/Client.py b/SOAPpy/Client.py
-index 7437049..13ba160 100644
---- a/SOAPpy/Client.py
-+++ b/SOAPpy/Client.py
-@@ -40,11 +40,11 @@
- ################################################################################
- """
- 
-+from __future__ import nested_scopes
-+
- ident = '$Id: Client.py,v 1.27 2005/02/21 20:27:09 warnes Exp $'
- from version import __version__
- 
--from __future__ import nested_scopes
--
- #import xml.sax
- import urllib
- from types import *
-diff --git a/SOAPpy/GSIServer.py b/SOAPpy/GSIServer.py
-index 48c1303..c7ad13d 100644
---- a/SOAPpy/GSIServer.py
-+++ b/SOAPpy/GSIServer.py
-@@ -43,11 +43,11 @@ GSIServer - Contributed by Ivan R. Judson <judson@mcs.anl.gov>
- ################################################################################
- """
- 
-+from __future__ import nested_scopes
-+
- ident = '$Id: GSIServer.py,v 1.5 2005/02/15 16:32:22 warnes Exp $'
- from version import __version__
- 
--from __future__ import nested_scopes
--
- #import xml.sax
- import re
- import socket
-diff --git a/SOAPpy/Server.py b/SOAPpy/Server.py
-index b28153d..76ce0b4 100644
---- a/SOAPpy/Server.py
-+++ b/SOAPpy/Server.py
-@@ -40,11 +40,11 @@
- ################################################################################
- """
- 
-+from __future__ import nested_scopes
-+
- ident = '$Id: Server.py,v 1.21 2005/02/15 16:32:22 warnes Exp $'
- from version import __version__
- 
--from __future__ import nested_scopes
--
- #import xml.sax
- import re
- import socket
-diff --git a/SOAPpy/Types.py b/SOAPpy/Types.py
-index 6cc5456..62d44b2 100644
---- a/SOAPpy/Types.py
-+++ b/SOAPpy/Types.py
-@@ -33,11 +33,11 @@
- ################################################################################
- """
- 
-+from __future__ import nested_scopes
-+
- ident = '$Id: Types.py,v 1.19 2005/02/22 04:29:43 warnes Exp $'
- from version import __version__
- 
--from __future__ import nested_scopes
--
- import UserList
- import base64
- import cgi

pkgs/development/interpreters/python-new/2.5/nix-find-sites-2.5.patch

@@ -1,33 +0,0 @@
---- a/site.py    2008-11-19 14:48:49.000000000 +0100
---- Python-2.5-orig/Lib/site.py	2008-05-10 19:36:24.000000000 +0200
-+++ Python-2.5/Lib/site.py	2008-11-17 05:37:02.000000000 +0100
-@@ -390,6 +390,20 @@
-     except ImportError:
-         pass
- 
-+def addnixsitepackages(known_paths):
-+    """
-+    used to add multiple site packages for /nix/store to sys.path also
-+    evaluating the .pth files (http://docs.python.org/library/site.html#module-site)
-+    """
-+    env_nix_sites = os.environ.get("NIX_PYTHON_SITES", None)
-+    if env_nix_sites:
-+      for path in env_nix_sites.split(":"):
-+        
-+          NIX_SITE = os.path.join(path, "lib",
-+                                 "python" + sys.version[:3],
-+                                 "site-packages")
-+          addsitedir(NIX_SITE, known_paths)
-+    return known_paths
- 
- def main():
-     abs__file__()
-@@ -400,6 +414,7 @@
-     paths_in_sys = addsitepackages(paths_in_sys)
-     if sys.platform == 'os2emx':
-         setBEGINLIBPATH()
-+    paths_in_sys = addnixsitepackages(paths_in_sys)
-     setquit()
-     setcopyright()
-     sethelper()
-

pkgs/development/interpreters/python-new/2.5/python.nix

@@ -1,68 +0,0 @@
-args: with args;
-let inherit (lib) optional prepareDerivationArgs concatStringsSep fix;  in
-
-composableDerivation {
-  mkDerivation = attr : stdenv.mkDerivation ( attr // {
-      C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") attr.buildInputs);
-      LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") attr.buildInputs);
-    });
-  } {
-
-    postPhases = ["runCheck"];
-
-    mergeAttrBy = { pyCheck = x : y : "${x}\n${y}"; };
-
-    # should be last because it sources setup-hook of this package itself
-    runCheck = ''
-      PATH=$out/bin:$PATH; . $out/nix-support/setup-hook;
-      echo -e "import sys\n$pyCheck\nprint \"import pyCheck ok\"" | python
-    '';
-
-    inherit (args) name;
-
-    # everything can be overriden by composedArgsAndFun additional args 
-    # assuming that if a module can be loaded that it does also work..
-    flags = {
-      zlib = { buildInputs = [ zlib ]; pyCheck = "import zlib"; };
-      gdbm = { buildInputs = [ gdbm ]; pyCheck = "import gdbm"; };
-      sqlite = { buildInputs = [ sqlite ]; pyCheck = "import sqlite3"; };
-      db4 = { buildInputs = [ db4 ]; }; # TODO add pyCheck
-      readline = { buildInputs = [ readline ]; }; # doesn't work yet (?)
-      openssl = { buildInputs = [ openssl ]; pyCheck ="import socket\nsocket.ssl"; };
-    };
-
-    src = fetchurl {
-      url = http://www.python.org/ftp/python/2.5.2/Python-2.5.2.tar.bz2;
-      sha256 = "0gh8bvs56vdv8qmlfmiwyczjpldj0y3zbzd0zyhyjfd0c8m0xy7j";
-    };
-
-    configureFlags = ["--enable-shared" "--with-wctype-functions"];
-
-    buildInputs =
-      optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
-      [bzip2 ncurses];
-
-    patches = [
-      # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
-      ./search-path.patch
-
-
-      # make python know about libraries reading .pth files
-      # http://docs.python.org/library/site.html#module-site
-      # TODO: think about security (see the other code contained in site.py)
-      ./nix-find-sites-2.5.patch
-    ];
-
-    preConfigure = ''
-      # Purity.
-      for i in /usr /sw /opt /pkg; do 
-        substituteInPlace ./setup.py --replace $i /no-such-path
-      done
-      export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"
-    '';
-    
-    postInstall = "
-      rm -rf $out/lib/python2.5/test
-    ";
-
-  }

pkgs/development/interpreters/python-new/2.5/search-path.patch

@@ -1,28 +0,0 @@
-diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py
-*** Python-2.4.4-orig/setup.py	2006-10-08 19:41:25.000000000 +0200
---- Python-2.4.4/setup.py	2007-05-27 16:04:54.000000000 +0200
-***************
-*** 279,288 ****
-          # Check for AtheOS which has libraries in non-standard locations
-          if platform == 'atheos':
-              lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
--             lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-              inc_dirs += ['/system/include', '/atheos/autolnk/include']
--             inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-  
-          # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-          if platform in ['osf1', 'unixware7', 'openunix8']:
-              lib_dirs += ['/usr/ccs/lib']
---- 279,289 ----
-          # Check for AtheOS which has libraries in non-standard locations
-          if platform == 'atheos':
-              lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
-              inc_dirs += ['/system/include', '/atheos/autolnk/include']
-  
-+         lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-+         inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-+         
-          # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-          if platform in ['osf1', 'unixware7', 'openunix8']:
-              lib_dirs += ['/usr/ccs/lib']
-

pkgs/development/interpreters/python/3.1/default.nix

@@ -12,8 +12,9 @@
 , sw_vers ? null
 }:
 
-# I haven't spend much time on this derivation. So some of these settings may not apply to python-3.1
-# 
+# This derivation is mostly identical to the one that builds Python 2.x.
+# Some of these settings may not apply to the latest version. A general
+# cleanup might be worthwile.
 
 assert zlibSupport -> zlib != null;
 assert gdbmSupport -> gdbm != null;
@@ -47,7 +48,7 @@ let
 in
 
 stdenv.mkDerivation ( {
-  name = "python-${version}";
+  name = "python3-${version}";
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";

pkgs/development/libraries/SDL_gfx/default.nix

@@ -0,0 +1,44 @@
+{stdenv, fetchurl, SDL} :
+
+stdenv.mkDerivation rec {
+  name = "SDL_gfx-2.0.20";
+
+  src = fetchurl {
+    url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz";
+    sha256 = "0dyc1sj0ymv2ghmlgwfb2c6r07scbgmi2dfhmnddsb27y8wjqz4q";
+  };
+
+  buildInputs = [ SDL ] ;
+
+  configureFlags = "--disable-mmx";
+
+  postInstall = "ln -s $out/include/SDL/*.h $out/include/";
+
+  meta = {
+    description = "SDL graphics drawing primitives and support functions";
+
+    longDescription =
+      '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code
+	 which provided basic drawing routines such as lines, circles or
+	 polygons and SDL_rotozoom which implemented a interpolating
+	 rotozoomer for SDL surfaces.
+
+	 The current components of the SDL_gfx library are:
+
+	    * Graphic Primitives (SDL_gfxPrimitves.h)
+	    * Rotozoomer (SDL_rotozoom.h)
+	    * Framerate control (SDL_framerate.h)
+	    * MMX image filters (SDL_imageFilter.h)
+	    * Custom Blit functions (SDL_gfxBlitFunc.h)
+
+	 The library is backwards compatible to the above mentioned
+         code. Its is written in plain C and can be used in C++ code.
+       '';
+
+    homepage = https://sourceforge.net/projects/sdlgfx/;
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.bjg ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/development/libraries/ffmpeg/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, faad2, libtheora, speex, libvorbis}:
+{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore}:
 
 stdenv.mkDerivation {
   name = "ffmpeg-0.5.1";
@@ -22,9 +22,11 @@ stdenv.mkDerivation {
     --enable-libtheora
     --enable-libvorbis
     --enable-libspeex
+    --enable-libx264
+    --enable-libxvid
   '';
 
-  buildInputs = [faad2 libtheora speex libvorbis];
+  buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore];
 
   meta = {
     homepage = http://www.ffmpeg.org/;

pkgs/development/libraries/freeglut/default.nix

@@ -2,12 +2,14 @@
 
 stdenv.mkDerivation {
   name = "freeglut-2.4.0";
-  
+
   src = fetchurl {
     url = mirror://sourceforge/freeglut/freeglut-2.4.0.tar.gz;
     sha256 = "0lmhh5p19rw4wisr0jsl7nsa2hxdaasj0vxk5ri83crhp982v7r6";
   };
 
+  configureFlags = "--" + (if stdenv.isDarwin then "disable" else "enable") + "-warnings";
+
   buildInputs = [x11 mesa];
   patches = ./freeglut-gcc-4.2.patch;
 }

pkgs/development/libraries/glpk/default.nix

@@ -0,0 +1,29 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "glpk-4.43";
+
+  src = fetchurl {
+    url = "mirror://gnu/glpk/${name}.tar.gz";
+    sha256 = "3be5f9c2cc355b39570ddb1b86a2ccc40fb52f81588f953f22c2ed29e3278e27";
+  };
+
+  doCheck = true;
+
+  meta = {
+    description = "The GNU Linear Programming Kit";
+
+    longDescription =
+      '' The GNU Linear Programming Kit is intended for solving large
+         scale linear programming problems by means of the revised
+         simplex method.  It is a set of routines written in the ANSI C
+         programming language and organized in the form of a library.
+      '';
+
+    homepage = http://www.gnu.org/software/glpk/;
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.bjg ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/development/libraries/gpgme/default.nix

@@ -1,10 +1,11 @@
-args: with args;
+{stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan}:
 
-stdenv.mkDerivation {
-  name = "gpgme-1.1.4";
+stdenv.mkDerivation rec {
+  name = "gpgme-1.3.0";
   src = fetchurl {
-    url = ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.bz2;
-    sha256 = "0ncrv7p33rjq1avkxpp9x0gz6wna9y3b3dmw6nv366n5mgvxmpg8";
+    url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
+    sha256 = "18g6wgiacnbj437yfsczbjxaf041ljia48dnv2qgcqb0sky41q3l";
   };
-  buildInputs = [libgpgerror gnupg gnupg2 pkgconfig glib pth];
+  buildInputs = [libgpgerror gnupg pkgconfig glib pth libassuan];
+  configureFlags = "--with-gpg=${gnupg}/bin/gpg2";
 }

pkgs/development/libraries/gsasl/default.nix

@@ -0,0 +1,29 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "gsasl-1.4.4";
+
+  src = fetchurl {
+    url = "mirror://gnu/gsasl/${name}.tar.gz";
+    sha256 = "0xd9irff42dd5i4cr74dy0yd9ijjv9nkg6c2l1328grsn8zifwdc";
+  };
+
+  doCheck = true;
+
+  meta = {
+    description = "GNU SASL, Simple Authentication and Security Layer library";
+
+    longDescription =
+      '' GNU SASL is a library that implements the IETF Simple 
+         Authentication and Security Layer (SASL) framework and 
+         some SASL mechanisms. SASL is used in network servers 
+         (e.g. IMAP, SMTP, etc.) to authenticate peers. 
+       '';
+
+    homepage = http://www.gnu.org/software/gsasl/;
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.bjg ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/development/libraries/gss/default.nix

@@ -0,0 +1,29 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "gss-1.0.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/gss/${name}.tar.gz";
+    sha256 = "0rcbzg19m7bddvbhjqv1iwyydkj61czb0xr691mkj0i5p4d4bakk";
+  };
+
+  doCheck = true;
+
+  meta = {
+    description = "GNU GSS Generic Security Service";
+
+    longDescription =
+      '' GSS is an implementation of the Generic Security Service Application
+         Program Interface (GSS-API). GSS-API is used by network servers to 
+         provide security services, e.g., to authenticate SMTP/IMAP clients 
+         against SMTP/IMAP servers. 
+       '';
+
+    homepage = http://www.gnu.org/software/gss/;
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.bjg ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/development/libraries/haskell/cabal/cabal.nix

@@ -1,6 +1,6 @@
 # generic builder for Cabal packages
 
-attrs :
+{stdenv, fetchurl, lib, ghc, enableLibraryProfiling ? false} :
 {
   mkDerivation =
     transform :
@@ -17,11 +17,14 @@ attrs :
             # all packages with haskell- to avoid name clashes for libraries;
             # if that is not desired (for applications), name can be set to
             # fname.
-            name = "haskell-${self.pname}-ghc${attrs.ghc.ghc.version}-${self.version}";
+            name = if enableLibraryProfiling then
+                     "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}-profiling"
+                   else
+                     "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}";
 
             # the default download location for Cabal packages is Hackage,
             # you still have to specify the checksum
-            src = attrs.fetchurl {
+            src = fetchurl {
               url = "http://hackage.haskell.org/packages/archive/${self.pname}/${self.version}/${self.fname}.tar.gz";
               inherit (self) sha256;
             };
@@ -29,7 +32,7 @@ attrs :
             # default buildInputs are just ghc, if more buildInputs are required
             # buildInputs can be extended by the client by using extraBuildInputs,
             # but often propagatedBuildInputs is preferable anyway
-            buildInputs = [attrs.ghc] ++ self.extraBuildInputs;
+            buildInputs = [ghc] ++ self.extraBuildInputs;
             extraBuildInputs = [];
 
             # we make sure that propagatedBuildInputs is defined, so that we don't
@@ -39,6 +42,10 @@ attrs :
             # library directories that have to be added to the Cabal files
             extraLibDirs = [];
 
+            libraryProfiling =
+              if enableLibraryProfiling then ["--enable-library-profiling"]
+                                        else ["--disable-library-profiling"];
+
             # compiles Setup and configures
             configurePhase = ''
               eval "$preConfigure"
@@ -55,7 +62,7 @@ attrs :
                 done
               done
 
-              ./Setup configure --verbose --prefix="$out" $extraLibDirs $configureFlags
+              ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags
 
               eval "$postConfigure"
             '';
@@ -82,7 +89,7 @@ attrs :
 
               ensureDir $out/bin # necessary to get it added to PATH
 
-              local confDir=$out/lib/ghc-pkgs/ghc-${attrs.ghc.ghc.version}
+              local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version}
               local installedPkgConf=$confDir/${self.fname}.installedconf
               local pkgConf=$confDir/${self.fname}.conf
               ensureDir $confDir
@@ -100,7 +107,7 @@ attrs :
 
             # We inherit stdenv and ghc so that they can be used
             # in Cabal derivations.
-            inherit (attrs) stdenv ghc;
+            inherit stdenv ghc;
           };
-    in  attrs.stdenv.mkDerivation ((rec { f = dtransform f // transform f; }).f);
+    in  stdenv.mkDerivation ((rec { f = dtransform f // transform f; }).f);
 }

pkgs/development/libraries/haskell/gdiff/default.nix

@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "gdiff";
+  version = "1.0";
+  sha256 = "35257b1090cf78f95d24c7a89920863c1d824652311fa5793693d7d06d96517b";
+  meta = {
+    description = "Generic diff and patch";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+

pkgs/development/libraries/haskell/hashed-storage/default.nix

@@ -1,12 +1,13 @@
-{cabal, mtl, zlib, mmap}:
+{cabal, mtl, zlib, mmap, binary, dataenc}:
 
 cabal.mkDerivation (self : {
   pname = "hashed-storage";
-  version = "0.3.8";
-  sha256 = "1f379dcb00a56c0b330eeabb1f069ef294bcf1f3dc18980e93b8b228e577fdb1";
-  propagatedBuildInputs = [mtl zlib mmap];
+  version = "0.4.11";
+  sha256 = "c719f9b86c5a517324ce3448fcb4b6377ccbfa085268b396bec47b8bbcfbde1b";
+  propagatedBuildInputs = [mtl zlib mmap binary dataenc];
   meta = {
     description = "Hashed file storage support code";
+    maintainers = [self.stdenv.lib.maintainers.andres];
   };
 })  
 

pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix

@@ -16,6 +16,7 @@ cabal.mkDerivation (self : {
   ];
   meta = {
     description = "Haskell Platform meta package";
+    maintainers = [self.stdenv.lib.maintainers.andres];
   };
 })  
 

pkgs/development/libraries/haskell/haskell-platform/default.nix

@@ -16,6 +16,7 @@ cabal.mkDerivation (self : {
   ];
   meta = {
     description = "Haskell Platform meta package";
+    maintainers = [self.stdenv.lib.maintainers.andres];
   };
 })  
 

pkgs/development/libraries/kerberos/heimdal.nix

@@ -1,14 +1,14 @@
-args: with args;
+{stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl} :
 
 stdenv.mkDerivation rec {
-  name = "heimdal-1.0.2";
+  name = "heimdal-1.3.2";
 
   src = fetchurl {
     urls = [
       "http://www.h5l.org/dist/src/${name}.tar.gz"
       "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
     ];
-    sha256 = "1h4x41lpv2abpv5l3yjd58pfzs0kkp5sbnih9iykhwd6sii1iig5";
+    sha256 = "0qwcq79nffsv9iyz4cf854l85i3x1cq79rxb34prpmjbfvs3ynwn";
   };
 
   ## ugly, X should be made an option

pkgs/development/libraries/lensfun/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }:
+
+stdenv.mkDerivation rec {
+  name = "lensfun-0.2.5";
+
+  src = fetchurl {
+    url = "http://download.berlios.de/lensfun/${name}.tar.bz2";
+    sha256 = "11zvi3lk60iljync3a495h9la7makx6lf22fbvr4lwc933mrh562";
+  };
+
+  patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure";
+
+  buildInputs = [ pkgconfig glib zlib libpng ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.all;
+    maintainers = [ maintainers.urkud ];
+    license = "LGPL3";
+    description = "An opensource database of photographic lenses and their
+      characteristics";
+  };
+}

pkgs/development/libraries/libassuan/default.nix

@@ -1,14 +1,14 @@
-{ fetchurl, stdenv, pth }:
+{ fetchurl, stdenv, pth, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libassuan-1.0.5";
+  name = "libassuan-2.0.0";
 
   src = fetchurl {
     url = "mirror://gnupg/libassuan/${name}.tar.bz2";
-    sha256 = "1xar8i5jmah75wa9my4x7vkc5b6nmzd2p6k9kmpdg9hsv04292y5";
+    sha256 = "13vzs4jxscnlskwzd3wpqwnfb5f0hwqc75rbi8j9f42bs6q08apx";
   };
 
-  propagatedBuildInputs = [ pth ];
+  propagatedBuildInputs = [ pth libgpgerror ];
 
   doCheck = true;
 

pkgs/development/libraries/libassuan1/default.nix

@@ -0,0 +1,28 @@
+{ fetchurl, stdenv, pth }:
+
+stdenv.mkDerivation rec {
+  name = "libassuan-1.0.5";
+
+  src = fetchurl {
+    url = "mirror://gnupg/libassuan/${name}.tar.bz2";
+    sha256 = "1xar8i5jmah75wa9my4x7vkc5b6nmzd2p6k9kmpdg9hsv04292y5";
+  };
+
+  propagatedBuildInputs = [ pth ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Libassuan, the IPC library used by GnuPG and related software";
+
+    longDescription = ''
+      Libassuan is a small library implementing the so-called Assuan
+      protocol.  This protocol is used for IPC between most newer
+      GnuPG components.  Both, server and client side functions are
+      provided.
+    '';
+
+    homepage = http://gnupg.org;
+    license = "LGPLv2+";
+  };
+}

pkgs/development/libraries/libdrm/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, libpthreadstubs}:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.18";
+  name = "libdrm-2.4.20";
   
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "015nxrb2wvyqlxvwaqq40v46nj96sk71p2n4dh4h5djwzx7v9ign";
+    sha256 = "1faw8587741j15k0lx01wdi194s55l9n1qdfdq35km6175l33d94";
   };
 
   buildInputs = [ pkgconfig libpthreadstubs ];

pkgs/development/libraries/libedit/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
   name = "libedit-20090923-3.0";
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "02j66qbd1c9wfghpjb8dzshkcj4i0n9xanxy81552j3is9ilxjka";
   };
 
+  postInstall = ''
+    sed -i s/-lcurses/-lncurses/g $out/lib/pkgconfig/libedit.pc
+  '';
+
   propagatedBuildInputs = [ ncurses ];
 
   meta = {

pkgs/development/libraries/libelf/default.nix

@@ -0,0 +1,23 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "libelf-0.8.13";
+
+  src = fetchurl {
+    url = "http://www.mr511.de/software/${name}.tar.gz";
+    sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr";
+  };
+
+  doCheck = true;
+
+  meta = {
+    description = "Libelf, an ELF object file access library";
+
+    homepage = http://www.mr511.de/software/english.html;
+
+    license = "LGPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}

pkgs/development/libraries/libksba/default.nix

@@ -1,11 +1,11 @@
-args: with args;
+{ stdenv, fetchurl, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libksba-1.0.2";
+  name = "libksba-1.0.7";
 
   src = fetchurl {
-    url = "ftp://ftp.gnupg.org/gcrypt/libksba/${name}.tar.bz2";
-    sha256 = "1jkjh1daaykkrfq0s4vv8ddf0w8agdvspg9qm0ghjidlrfnsfiwh";
+    url = "mirror://gnupg/libksba/${name}.tar.bz2";
+    sha256 = "1biabl4ijaf0jyl4zf3qrhcs0iaq9pypjibp8wgnim3n3kg0bdda";
   };
 
   propagatedBuildInputs = [libgpgerror];

pkgs/development/libraries/liblqr-1/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, glib }:
+
+stdenv.mkDerivation rec {
+  name = "liblqr-1-0.4.1";
+  src = fetchurl {
+    url = "${meta.homepage}/local--files/en:download-page/${name}.tar.bz2";
+    sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib ];
+  configureFlags = "--enable-install-man";
+
+  meta = with stdenv.lib; {
+    homepage = http://liblqr.wikidot.com;
+    description = "Seam-carving C/C++ library called Liquid Rescaling";
+    platforms = platforms.all;
+    maintainers = [ maintainers.urkud ];
+  };
+}

pkgs/development/libraries/libpcap/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "libpcap-1.1.0";
+  name = "libpcap-1.1.1";
   
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "073hy17pvm203c0z3zpkp1b37sblcgf49c6a03az7kbniizbc07b";
+    sha256 = "11asds0r0vd9skbwfbgb1d2hqxr1d92kif4qhhqx2mbyahawm32h";
   };
   
   buildNativeInputs = [ flex bison ];

pkgs/development/libraries/mesa/default.nix

@@ -1,26 +1,28 @@
-{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat }:
+{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
 else
 
 stdenv.mkDerivation {
-  name = "mesa-7.6.1";
-  
+  name = "mesa-7.8.1";
+
   src = fetchurl {
-    url = ftp://ftp.freedesktop.org/pub/mesa/7.6.1/MesaLib-7.6.1.tar.bz2;
-    md5 = "7db4617e9e10ad3aca1b64339fd71b7d";
+    url = ftp://ftp.freedesktop.org/pub/mesa/7.8.1/MesaLib-7.8.1.tar.bz2;
+    sha256 = "1yh717x4qxmild1s15qyv68irkrbm5gi4273052v8pfppxd6xd5h";
   };
 
-  configureFlags = "--disable-gallium";
-  
+  configureFlags = "--disable-gallium"
+                 + (if stdenv.isDarwin then " --disable-egl" else "");
+
   buildInputs =
     [ pkgconfig expat x11 libdrm xlibs.glproto
       xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
+      lipo
     ];
-  
+
   passthru = { inherit libdrm; };
-  
+
   meta = {
     description = "An open source implementation of OpenGL";
     homepage = http://www.mesa3d.org/;

pkgs/development/libraries/mlt/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchurl, SDL, qt, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate,
+libvorbis, sox}:
+
+stdenv.mkDerivation {
+  name = "mlt-0.5.4";
+
+  src = fetchurl {
+    url = mirror://sourceforge/mlt/mlt-0.5.4.tar.gz;
+    sha256 = "12s5znbm6q45r33ymyw1bak3d41xhh72gh9i1pdsgvddr0pizshj";
+  };
+
+  buildInputs = [ qt SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];
+
+  # Mostly taken from:
+  # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
+  configureFlags = [ "--enable-gpl" "--avformat-swscale" ];
+
+  meta = {
+    homepage = http://www.mltframework.org/;
+    description = "Open source multimedia framework, designed for television broadcasting";
+    license = "GPLv2+";
+  };
+}

pkgs/development/libraries/mpc/default.nix

@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, gmp, mpfr }:
+
+stdenv.mkDerivation rec {
+  name = "mpc-0.8.1";
+
+  src = fetchurl {
+    url = "http://www.multiprecision.org/mpc/download/${name}.tar.gz";
+    sha256 = "1r73zqw8lnf0bkfsxn0znbwbfyacg94pd0l4aaixh7r5awvn0r76";
+  };
+
+  buildInputs = [ gmp mpfr ];
+
+  doCheck = true;
+
+  meta = {
+    description = "MPC, a library for multiprecision complex arithmetic with exact rounding";
+
+    longDescription =
+      '' MPC is a C library for the arithmetic of complex numbers with
+         arbitrarily high precision and correct rounding of the result.  It is
+         built upon and follows the same principles as GNU MPFR.
+      '';
+
+    homepage = http://mpc.multiprecision.org/;
+    license = "LGPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}

pkgs/development/libraries/neon/0.26.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2
+{ stdenv, fetchurl, libxml2, pkgconfig
 , compressionSupport ? true, zlib ? null
 , sslSupport ? true, openssl ? null
 }:
@@ -14,11 +14,13 @@ stdenv.mkDerivation {
     sha256 = "1pjrn5wb18gy419293hmwd02blmh36aaxsrgajm9nkkkjzqakncj";
   };
    
-  buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib;
+  buildInputs = [libxml2]
+    ++ stdenv.lib.optional compressionSupport zlib
+    ++ (if sslSupport then [ openssl pkgconfig ] else []);
 
   configureFlags = ''
     ${if compressionSupport then "--with-zlib" else "--without-zlib"}
-    ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"}
+    ${if sslSupport then "--with-ssl" else "--without-ssl"}
     --enable-shared
   '';
 

pkgs/development/libraries/neon/0.28.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2
+{ stdenv, fetchurl, libxml2, pkgconfig
 , compressionSupport ? true, zlib ? null
 , sslSupport ? true, openssl ? null
 , static ? false
@@ -17,13 +17,14 @@ stdenv.mkDerivation rec {
     sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6";
   };
 
-  buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib;
+  buildInputs = [libxml2 pkgconfig openssl]
+    ++ stdenv.lib.optional compressionSupport zlib;
 
   configureFlags = ''
     ${if shared then "--enable-shared" else "--disable-shared"}
     ${if static then "--enable-static" else "--disable-static"}
     ${if compressionSupport then "--with-zlib" else "--without-zlib"}
-    ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"}
+    ${if sslSupport then "--with-ssl" else "--without-ssl"}
     --enable-shared
   '';
 

pkgs/development/libraries/neon/0.29.nix

@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, libxml2, pkgconfig
+, compressionSupport ? true, zlib ? null
+, sslSupport ? true, openssl ? null
+, static ? false
+, shared ? true
+}:
+
+assert compressionSupport -> zlib != null;
+assert sslSupport -> openssl != null;
+assert static || shared;
+
+stdenv.mkDerivation rec {
+  name = "neon-0.29.3";
+
+  src = fetchurl {
+    url = "http://www.webdav.org/neon/${name}.tar.gz";
+    sha256 = "1d1c6zhr00yvg0fbhpkq8kmsq9cchr112ii9rl39gdybyflh9444";
+  };
+
+  buildInputs = [libxml2 pkgconfig openssl]
+    ++ stdenv.lib.optional compressionSupport zlib;
+
+  configureFlags = ''
+    ${if shared then "--enable-shared" else "--disable-shared"}
+    ${if static then "--enable-static" else "--disable-static"}
+    ${if compressionSupport then "--with-zlib" else "--without-zlib"}
+    ${if sslSupport then "--with-ssl" else "--without-ssl"}
+    --enable-shared
+  '';
+
+  passthru = {inherit compressionSupport sslSupport;};
+
+  meta = {
+    description = "An HTTP and WebDAV client library";
+    homepage = http://www.webdav.org/neon/;
+  };
+}

pkgs/development/libraries/openssl/1.x.nix

@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, perl }:
+
+let
+  opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
+    (throw "openssl needs its platform name cross building" null)
+    stdenv.cross;
+in
+
+stdenv.mkDerivation (rec {
+  name = "openssl-1.0.0";
+
+  src = fetchurl {
+    url = "http://www.openssl.org/source/${name}.tar.gz";
+    sha1 = "3f800ea9fa3da1c0f576d689be7dca3d55a4cb62";
+  };
+
+  buildNativeInputs = [ perl ];
+
+  configureScript = "./config";
+
+  configureFlags="--libdir=lib shared";
+
+  crossAttrs = {
+    preConfigure=''
+      export cross=$crossSystem-
+    '';
+    configureFlags="--libdir=lib ${opensslCrossSystem} shared";
+    buildPhase = ''
+      make CC=$crossConfig-gcc \
+        AR="$crossConfig-ar r" \
+        RANLIB=$crossConfig-ranlib
+    '';
+  };
+
+  meta = {
+    homepage = http://www.openssl.org/;
+    description = "A cryptographic library that implements the SSL and TLS protocols";
+  };
+}
+//
+(if stdenv.isDarwin then {
+  patches = ./darwin-arch.patch;
+}
+else { })
+)

pkgs/development/libraries/openssl/darwin-arch-1.patch

@@ -0,0 +1,16 @@
+The patch is specific to nix: MacOS gcc supports -arch.
+--- a/Configure
++++ b/Configure
+@@ -549,9 +549,9 @@ my %table=(
+ "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
+ "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+-"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+-"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
++"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
++"debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
++"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+
+ ##### A/UX

pkgs/development/libraries/openssl/darwin-arch.patch

@@ -1,24 +1,30 @@
-diff -rc openssl-0.9.8k/Configure openssl-0.9.8k-new/Configure
-*** openssl-0.9.8k/Configure	Mon Feb 16 09:44:22 2009
---- openssl-0.9.8k-new/Configure	Fri Nov 27 13:41:58 2009
+Removed -arch flags for darwin as they are not supported by gcc-darwin.
+
+diff -rc openssl-0.9.8n/Configure openssl-0.9.8n-new/Configure
+*** openssl-0.9.8n/Configure	Mon Nov  9 15:14:26 2009
+--- openssl-0.9.8n-new/Configure	Thu Apr 29 10:16:15 2010
 ***************
-*** 518,526 ****
+*** 523,533 ****
+  
+  ##### MacOS X (a.k.a. Rhapsody or Darwin) setup
   "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
-  "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-  "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+! "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+! "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 ! "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-  "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-! "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+! "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+! "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
   "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
   
   ##### A/UX
---- 518,526 ----
+--- 523,533 ----
+  
+  ##### MacOS X (a.k.a. Rhapsody or Darwin) setup
   "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
-  "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-  "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+! "darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common: -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+! "darwin64-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 ! "darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-  "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-! "darwin64-x86_64-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+! "debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+! "darwin64-x86_64-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
   "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
   
   ##### A/UX

pkgs/development/libraries/openssl/default.nix

@@ -6,16 +6,14 @@ let
     stdenv.cross;
 in
 
-stdenv.mkDerivation rec {
-  name = "openssl-0.9.8l";
+stdenv.mkDerivation ( rec {
+  name = "openssl-0.9.8n";
   
   src = fetchurl {
     url = "http://www.openssl.org/source/${name}.tar.gz";
-    sha1 = "d3fb6ec89532ab40646b65af179bb1770f7ca28f";
+    sha256 = "008z1h09pa6dfxs4wgbqj5i1clw4v82b1waqvwanb1kb6wlbq6mh";
   };
 
-  patches = [ ./darwin-arch.patch ];
-  
   buildNativeInputs = [ perl ];
 
   configureScript = "./config";
@@ -38,4 +36,4 @@ stdenv.mkDerivation rec {
     homepage = http://www.openssl.org/;
     description = "A cryptographic library that implements the SSL and TLS protocols";
   };
-}
+} // (if stdenv.isDarwin then { patches = [./darwin-arch.patch]; } else {}) )

pkgs/development/libraries/poppler/GDir-const.patch

@@ -4,7 +4,7 @@ diff -ur poppler-0.6.1/goo/gfile.cc poppler-0.6.1-patched/goo/gfile.cc
 @@ -634,7 +634,7 @@
    delete name;
  }
- 
+
 -GDir::GDir(char *name, GBool doStatA) {
 +GDir::GDir(const char *name, GBool doStatA) {
    path = new GooString(name);
@@ -16,7 +16,7 @@ diff -ur poppler-0.6.1/goo/gfile.h poppler-0.6.1-patched/goo/gfile.h
 @@ -117,7 +117,7 @@
  class GDir {
  public:
- 
+
 -  GDir(char *name, GBool doStatA = gTrue);
 +  GDir(const char *name, GBool doStatA = gTrue);
    ~GDir();

pkgs/development/libraries/poppler/default.nix

@@ -1,34 +1,38 @@
-{ fetchurl, stdenv, qt4Support ? false, qt4 ? null
-, cairo, freetype, fontconfig, zlib, libjpeg
-, pkgconfig, glib, gtk }:
+{ fetchurl, stdenv, useQt4 ? false, qt4 ? null
+, useGlib ? true, glib ? null, gtk ? null
+, useLibxml ? true, libxml2 ? null
+, cairo, freetype, fontconfig, libjpeg, libpng
+, pkgconfig, cmake}:
 
-assert qt4Support -> (qt4 != null);
+assert useQt4 -> (qt4 != null);
+assert useGlib -> (glib != null && gtk != null);
+assert useLibxml -> (libxml2 != null);
 
 stdenv.mkDerivation rec {
-  name = "poppler-0.12.3";
+  name = "poppler-0.12.4";
 
   src = fetchurl {
     url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "1k7vilpz0ipnmw9dfpb3rqkhlm4rqcnkn3bhhp14di2h55nzwkvs";
+    sha256 = "0yl55410xbgwlpbbjg9v9909mlwmzb54pdl25zlhkjscpma2myia";
   };
 
-  buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk]
-    ++ (if qt4Support then [qt4] else []);
+  buildInputs = [pkgconfig cmake];
+  propagatedBuildInputs = [freetype fontconfig libjpeg libpng]
+    ++ stdenv.lib.optional useGlib [glib gtk cairo]
+    ++ stdenv.lib.optional useLibxml libxml2
+    ++ stdenv.lib.optional useQt4 qt4;
 
-  configureFlags =
-    ''
-      --enable-exceptions --enable-cairo --enable-splash
-      --enable-poppler-glib --enable-zlib --enable-xpdf-headers
-    ''
-    + (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler");
+  configureFlags = " -DENABLE_XPDF_HEADERS=ON -DUSE_EXCEPTIONS=ON "
+    + (if useLibxml then " -DENABLE_ABIWORD=ON " else " -DENABLE_ABIWORD=OFF ")
+    + (if useGlib then " -DWITH_GLIB=ON -DBUILD_GTK_TESTS=ON " else " -DWITH_GLIB=OFF ")
+    + (if useQt4 then " -DWITH_Qt4=ON -DBUILD_QT4_TESTS=ON " else " -DWITH_Qt4=OFF ");
 
-  patches = [ ./GDir-const.patch ];
-
-  preConfigure = "sed -e '/jpeg_incdirs/s@/usr@${libjpeg}@' -i configure";
+  patches = [ ./GDir-const.patch ] ++ stdenv.lib.optional useGlib ./layer.patch;
 
   # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files
   # such as `../../../test/unittestcases/UseNone.pdf'.
-  doCheck = !qt4Support;
+  doCheck = !useQt4;
+  checkTarget = "test";
 
   meta = {
     homepage = http://poppler.freedesktop.org/;

pkgs/development/libraries/poppler/layer.patch

@@ -0,0 +1,39 @@
+Source: upstream commit eb082274694aadb80dd16caea65d7f0a1adf8b46
+diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
+index 28cc1ab..206610b 100644
+--- a/glib/CMakeLists.txt
++++ b/glib/CMakeLists.txt
+@@ -18,9 +18,9 @@ endif (GDK_FOUND)
+
+ configure_file(poppler-features.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h @ONLY)
+
+-if (GTK_FOUND)
++if (GTK_FOUND AND BUILD_GTK_TESTS)
+   add_subdirectory(demo)
+-endif (GTK_FOUND)
++endif (GTK_FOUND AND BUILD_GTK_TESTS)
+
+ set(poppler_glib_public_headers
+   poppler-action.h
+@@ -30,6 +30,7 @@ set(poppler_glib_public_headers
+   poppler-attachment.h
+   poppler-form-field.h
+   poppler-annot.h
++  poppler-layer.h
+   poppler.h
+ )
+
+@@ -107,11 +108,11 @@ install(FILES
+   DESTINATION include/poppler/glib)
+
+
+-if (GDK_FOUND)
++if (GDK_FOUND AND BUILD_GTK_TESTS)
+   set(test_poppler_glib_SRCS
+     test-poppler-glib.cc
+   )
+   poppler_add_test(test-poppler-glib BUILD_GTK_TESTS ${test_poppler_glib_SRCS})
+   target_link_libraries(test-poppler-glib poppler-glib ${GDK2_LIBRARIES})
+-endif (GDK_FOUND)
++endif (GDK_FOUND AND BUILD_GTK_TESTS)
+

pkgs/development/libraries/qt-4.6/default.nix

@@ -1,10 +1,12 @@
 { stdenv, fetchurl, lib
 , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu
 , libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
-, zlib, libjpeg, mysql, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
-, buildDemos ? false, buildExamples ? false, keepDocumentation ? false}:
+, zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
+, mysql, postgresql
+, perl, coreutils, libXi, sqlite, alsaLib
+, buildDemos ? false, buildExamples ? false, useDocs ? true}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "qt-4.6.2";
   
   src = fetchurl {
@@ -12,16 +14,24 @@ stdenv.mkDerivation {
     sha256 = "1bpz59y907zz2p67mnf5ckvxh7n2glr6pz1f9fmngkkdn3fm2vqp";
   };
   
-  setupHook = ./setup-hook.sh;
-
   preConfigure = '' 
     export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
+    configureFlags+="
+      -docdir $out/share/doc/${name}
+      -plugindir $out/lib/qt4/plugins
+      -examplesdir $out/share/doc/${name}/examples
+      -demosdir $out/share/doc/${name}/demos
+      -datadir $out/share/qt4
+    "
   '';
   
   propagatedBuildInputs = [
+    alsaLib
+    sqlite
     libXft 
     libXrender 
     libXrandr 
+    libXi
     randrproto 
     xextproto
     libXinerama 
@@ -30,6 +40,7 @@ stdenv.mkDerivation {
     zlib 
     libjpeg 
     mysql 
+    postgresql
     libpng 
     which 
     mesa
@@ -48,6 +59,8 @@ stdenv.mkDerivation {
     libtiff
   ];
 
+  buildInputs = [ perl ];
+
   # libQtNetwork will call libQtCore for it to dlopen openssl.
   NIX_LDFLAGS = "-rpath ${openssl}/lib";
   # Don't shrink the rpath, to keep ${openssl} in it.
@@ -59,29 +72,27 @@ stdenv.mkDerivation {
     -v -no-separate-debug-info -release
     -system-zlib -system-libpng -system-libjpeg -fast
     -qt-gif -confirm-license -opensource
-    -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
+    -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql -system-sqlite
     -qdbus -cups -glib -xfixes -dbus-linked
     -fontconfig -I${freetype}/include/freetype2
+    -exceptions -xmlpatterns
     ${if buildDemos == true then "" else "-nomake demos"}
     ${if buildExamples == true then "" else "-nomake examples"}
+    ${if useDocs then "" else "-nomake docs"}
   '';
     
   patchPhase = ''
     substituteInPlace configure --replace /bin/pwd pwd
+    substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
     sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
   '';
 
-  # Remove the documentation: it takes up >= 130 MB, which is more
-  # than half of the installed size.  Ideally we should put this in a
-  # separate package (as well as the Qt Designer).
-  postInstall = ''
-    ${if keepDocumentation == false then "rm -rf $out/doc" else ""}
-  '';
+  postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else "";
 
   meta = {
-    homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp;
+    homepage = http://qt.nokia.com/products;
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = with lib.maintainers; [ sander urkud ];
   };
 }

pkgs/development/libraries/qtscriptgenerator/default.nix

@@ -19,7 +19,8 @@ stdenv.mkDerivation {
     cd generator
     qmake
     make
-    ./generator
+    # Set QTDIR, see http://code.google.com/p/qtscriptgenerator/issues/detail?id=38
+    QTDIR=${qt4} ./generator
     cd ../qtbindings
     qmake
     make

pkgs/development/libraries/wtk/builder.sh

@@ -1,23 +1,8 @@
 source $stdenv/setup
 
-if ! test -e "$pathname"; then
-    echo ""
-    echo "SORRY!"
-    echo "You should download \`$(basename $pathname)' from Sun and place it in $(dirname $pathname)."
-    echo "Blame Sun, not us."
-    echo ""
-    exit 1
-fi
-
-actual=$(md5sum -b $pathname | cut -c1-32)
-if test "$actual" != "$md5"; then
-    echo "hash is $actual, expected $md5"
-    exit 1
-fi
-
 mkdir unzipped
 pushd unzipped
-unzip $pathname || true
+unzip $src || true
 popd
 
 ensureDir $out

pkgs/development/libraries/wtk/default.nix

@@ -2,11 +2,15 @@
 
 assert stdenv.system == "i686-linux";
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "sun-java-wtk-2.5.2_01";
 
-  pathname = "/tmp/sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh";
-  md5 = "6b70b6e6d426eac121db8a087991589f";
+  src = fetchurl {
+    url = meta.homepage;
+    name = "sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh";
+    restricted = true;
+    md5 = "6b70b6e6d426eac121db8a087991589f";
+  };
 
   builder = ./builder.sh;
 

pkgs/development/libraries/wxGTK-2.8/default.nix

@@ -9,11 +9,11 @@ assert gtk.libpng != null;
 assert gtk.libpng.zlib != null;
 
 stdenv.mkDerivation {
-  name = "wxGTK-2.8.10";
+  name = "wxGTK-2.8.11";
 
   src = fetchurl {
-    url = mirror://sourceforge/wxwindows/wxGTK-2.8.10.tar.gz;
-    sha256 = "1hygkrwa71kzdbz029igkxsqyb14y6vsllqafjgm9b7v91nq49r8";
+    url = mirror://sourceforge/wxwindows/wxGTK-2.8.11.tar.gz;
+    sha256 = "149waiwwzw238avkhj8vmm1394nw45fa02b7cf1mqwc3jdd1pfz6";
   };
 
   buildInputs = [

pkgs/development/libraries/x264/default.nix

@@ -1,16 +1,21 @@
-args:
-args.stdenv.mkDerivation rec {
-  version = "snapshot-20080521-2245";
+{stdenv, fetchurl, yasm}:
+
+stdenv.mkDerivation rec {
+  version = "snapshot-20100429-2245";
   name = "x264-${version}";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
-    sha256 = "07khxih1lmhvrzlaksqmaghbi8w2yyjrjcw867gi2y4z1h0ndhks";
+    sha256 = "16b24mc63zyp4h4fqyvgzbdclnhpay4l72yfqzwnzsnlby94zwcj";
   };
 
-  configureFlags= if args.stdenv.system == "x86_64-linux" then ["--enable-pic"] else [];
+  patchPhase = ''
+    sed -i s,/bin/bash,${stdenv.shell}, configure version.sh
+  '';
 
-  buildInputs =(with args; []);
+  configureFlags = [ "--enable-shared" ];
+
+  buildInputs = [ yasm ];
 
   meta = { 
       description = "library for encoding H264/AVC video streams";

pkgs/development/libraries/xvidcore/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchurl, nasm}:
+
+stdenv.mkDerivation rec {
+  name = "xvidcore-1.2.2";
+  
+  src = fetchurl {
+    url = http://downloads.xvid.org/downloads/xvidcore-1.2.2.tar.bz2;
+    sha256 = "04bd1clv90i5pdwh6mz3mskyzmxyx5l2nx7lyyb8nhw9whnn0ap4";
+  };
+
+  preConfigure = ''
+    cd build/generic
+  '';
+
+  buildInputs = [ nasm ];
+  
+  meta = {
+    description = "MPEG-4 video codec for PC";
+    homepage = http://www.xvid.org/;
+    license = "GPLv2+";
+  };
+}
+