Merge trunk

svn path=/nixpkgs/branches/libpng15/; revision=31205

pkgs/applications/editors/emacs-modes/magit/default.nix

@@ -1,22 +1,19 @@
 { stdenv, fetchurl, emacs, texinfo }:
 
 let
-  version = "1.0.0";
+  version = "1.1.0";
 in
 stdenv.mkDerivation {
   name = "magit-${version}";
 
   src = fetchurl {
     url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz";
-    sha256 = "1hfdl90d96zin31v8x4p8zx5f0x0i5i9hccysx6q3prdgw9r6wzq";
+    sha256 = "8e147e1f2e69938232f859daf712515b46aa367d7b7d90b42538e083f52a72b4";
   };
 
   buildInputs = [emacs texinfo];
 
-  configurePhase =
+  configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )";
-    '' sed -i Makefile \
-           -e "s|^PREFIX=.*$|PREFIX=$out|g ; s|/etc/emacs/|$out/etc/emacs/|"
-    '';
 
   meta = {
     description = "Magit, an Emacs interface to Git";
@@ -34,7 +31,7 @@ stdenv.mkDerivation {
     '';
 
     license = "GPLv3+";
-    homepage = "http://github.com/philjackson/magit";
+    homepage = "https://github.com/magit/magit";
     platforms = stdenv.lib.platforms.all;
     maintainers = with stdenv.lib.maintainers; [ simons ludo ];
   };

pkgs/applications/graphics/digikam/default.nix

@@ -1,22 +1,28 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
 kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
-liblqr1, lensfun, pkgconfig }:
+liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
+shared_desktop_ontologies, marble }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-1.5.0";
+  name = "digikam-2.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/digikam/${name}.tar.bz2";
-    sha256 = "1vvzw132aw2c1z2v1zc3aqa99kvg501krr2law35ri12zkqjsvaz";
+    sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc";
   };
 
   buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
     lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
-    pkgconfig ];
+    pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies
+    marble ];
 
   KDEDIRS=kdeedu;
 
-  patches = [ ./include.diff ];
+  # Make digikam find some FindXXXX.cmake
+  preConfigure = ''
+    cp ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules;
+    cp ${marble}/share/apps/cmake/modules/FindMarble.cmake cmake/modules;
+  '';
 
   meta = {
     description = "Photo Management Program";

pkgs/applications/graphics/digikam/include.diff

@@ -1,12 +0,0 @@
-diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-index 9ee36cc..c6e5c00 100644
---- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-+++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS)
- 
-     INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/
-                          ${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/
-+						 ${LIBMARBLEWIDGET_INCLUDE_DIR}/..
-                          ${QT_INCLUDE_DIR}
-                        )
- 

pkgs/applications/misc/calibre/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt4, icu
+, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite
 , pil, makeWrapper, unrar, chmlib, pythonPackages, xz
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.8.30";
+  name = "calibre-0.8.32";
 
   src = fetchurl {
     url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz";
-    sha256 = "1w94kaynxiksjfi6wqlvwnryl08f8m0ylqwgzwkz1hjznqiji282";
+    sha256 = "0d0zq4sr0qm8jarg0ps24lfizb4hyb57pjsp81y1sb5nzjki7jml";
   };
 
   inherit python;
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
     [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
       fontconfig podofo qt4 pil chmlib icu
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
-      pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
+      pythonPackages.cssutils pythonPackages.beautifulsoap
+      pythonPackages.sqlite3 sqlite
     ];
 
   installPhase = ''
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
       $out/lib/calibre/calibre/ebooks/metadata/*.py
       $out/lib/calibre/calibre/ebooks/rtf2xml/*.py"
 
-    sed -i "s/env python/python/" $PYFILES
+    sed -i "s/env python[0-9.]*/python/" $PYFILES
     for a in $out/bin/*; do
       wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH --prefix LD_LIBRARY_PATH : ${unrar}/lib
     done

pkgs/applications/misc/kde-wacomtablet/default.nix

@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, automoc4, cmake, kdelibs }:
+{ stdenv, fetchurl, kdelibs, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "wacomtablet-1.2.5";
+  name = "wacomtablet-1.3.5";
 
   src = fetchurl {
-    url = "http://kde-apps.org/CONTENT/content-files/114856-${name}.tar.gz";
+    url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.5.tar.bz2";
-    sha256 = "11hfab6sqmhvd0m1grc9m9yfi0p7rk0bycj9wqgkgbc8cwgps6sf";
+    sha256 = "0dgsp3izx2v44f6j8mhxc6zybjn5sj9038w6b4v2fgix47fri0ja";
   };
 
-  buildInputs = [ automoc4 cmake kdelibs ];
+  buildInputs = [ kdelibs ];
+
+  buildNativeInputs = [ gettext ];
 
   meta = with stdenv.lib; {
     description = "KDE Wacom graphic tablet configuration tool";
-    license = "GPLv2";
+    license = licenses.gpl2Plus;
     homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu maintainers.urkud ];

pkgs/applications/misc/krusader/default.nix

@@ -1,12 +1,12 @@
-{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kde_baseapps, automoc4, phonon}:
+{stdenv, fetchurl, gettext, kdelibs, kde_baseapps}:
 
 stdenv.mkDerivation rec {
-  name = "krusader-2.2.0-beta1";
+  name = "krusader-2.4.0-beta1";
   src = fetchurl {
     url = "mirror://sourceforge/krusader/${name}.tar.bz2";
-    sha256 = "0rbk0hw8p1bb03w74gspljbzhvpbs3dcr6ckp38gh5r80mcmqfbs";
+    sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6";
   };
-  buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kde_baseapps ];
+  buildInputs = [ gettext kdelibs kde_baseapps ];
   meta = {
     description = "Norton/Total Commander clone for KDE";
     license = "GPL";

pkgs/applications/misc/rsibreak/default.nix

@@ -1,12 +1,20 @@
-{ stdenv, fetchurl, cmake, kdelibs, kdebase_workspace }:
+{ stdenv, fetchurl, kdelibs, kdebase_workspace, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "rsibreak-0.10";
+  name = "rsibreak-0.11";
 
   src = fetchurl {
-    url = "http://www.rsibreak.org/files/${name}.tar.bz2";
+    url = "${meta.homepage}/files/${name}.tar.bz2";
-    sha256 = "02vvwmzhvc9jfrzmnfn3cygx63yx7g360lcslwj1vikzkg834ik0";
+    sha256 = "1yrf73r8mixskh8b531wb8dfs9z7rrw010xsrflhjhjmqh94h8mw";
   };
 
-  buildInputs = [ cmake kdelibs kdebase_workspace ];
+  buildNativeInputs = [ gettext ];
+
+  buildInputs = [ kdelibs kdebase_workspace ];
+
+  meta = {
+    homepage = http://www.rsibreak.org/;
+    description = "Repetitive Strain Injury prevention";
+    inherit (kdelibs.meta) platforms maintainers;
+  };
 }

pkgs/applications/misc/taskwarrior/default.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "task-warrior-1.9.4";
+
+  src = fetchurl {
+    url = http://www.taskwarrior.org/download/task-1.9.4.tar.gz;
+    sha256 = "0jnk30k1b2j3nx39il70jmj6p49wxp6cl4awd8hw71gqkcf6480h";
+  };
+
+  meta = {
+    description = "Command-line todo list manager";
+    homepage = http://taskwarrior.org/;
+    license = "GPLv2+";
+  };
+}

pkgs/applications/misc/taskwarrior/unstable.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, lua5 }:
+
+stdenv.mkDerivation {
+  name = "task-warrior-2.0.0.beta4";
+
+  src = fetchurl {
+    url = http://www.taskwarrior.org/download/task-2.0.0.beta4.tar.gz;
+    sha256 = "1c9n6b5ly3m5kminnsvqgmjxdkb68w4av9kdnh47dw4sj3gwrn1w";
+  };
+
+  NIX_LDFLAGS = "-ldl";
+
+  buildInputs = [ cmake lua5 ];
+
+  meta = {
+    description = "Command-line todo list manager";
+    homepage = http://taskwarrior.org/;
+    license = "MIT";
+  };
+}

pkgs/applications/misc/yakuake/default.nix

@@ -1,14 +1,20 @@
-{ stdenv, fetchurl, kdelibs, cmake, gettext, perl, automoc4, qt4, phonon }:
+{ stdenv, fetchurl, kdelibs, gettext }:
 
-stdenv.mkDerivation rec {
+let
-  name = "yakuake-2.9.7";
+  pname = "yakuake";
+  version = "2.9.8";
+in
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://download.berlios.de/yakuake/${name}.tar.bz2";
+    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.bz2";
-    sha256 = "0azzvbh3jwz8yhn6gqd46ya7589sadfjyysw230vlf0zlfipdlvd";
+    sha256 = "0a9x3nmala8nl4xl3h7rcd76f5j7b7r74jc5cfbayc6jgkjdynd3";
   };
 
-  buildInputs = [ kdelibs cmake gettext perl automoc4 qt4 phonon ];
+  buildInputs = [ kdelibs ];
+
+  buildNativeInputs = [ gettext ];
 
   meta = {
     homepage = http://yakuake.kde.org;

pkgs/applications/networking/browsers/firefox/5.0.nix

@@ -1,165 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite
-
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Shiretoko" or whatever, enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-}:
-
-assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
-
-rec {
-
-  firefoxVersion = "5.0.1";
-  
-  xulVersion = "5.0.1"; # this attribute is used by other packages
-
-  
-  src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "c93b3513e160d87535a9d61c5e06a6a701e9cd3e";
-  };
-
-  
-  commonConfigureFlags =
-    [ "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      # "--with-system-nss"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
-      "--enable-system-sqlite"
-      "--disable-crashreporter"
-      "--disable-tests"
-      "--disable-necko-wifi" # maybe we want to enable this at some point
-      "--disable-installer" 
-      "--disable-updater"
-    ];
-
-
-  xulrunner = stdenv.mkDerivation rec {
-    name = "xulrunner-${xulVersion}";
-    
-    inherit src;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
-        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
-        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
-	xlibs.libXScrnSaver xlibs.scrnsaverproto
-	xlibs.libXext xlibs.xextproto sqlite
-      ];
-
-    configureFlags =
-      [ "--enable-application=xulrunner"
-        "--disable-javaxpcom"
-      ] ++ commonConfigureFlags;
-
-    enableParallelBuilding = true;
-      
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure =
-      ''
-        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-          stdenv.lib.concatStringsSep ":" 
-            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-        }' ';'
-      '';
-
-    # !!! Temporary hack.
-    preBuild =
-      ''
-        export NIX_ENFORCE_PURITY=
-      '';
-
-    installFlags = "SKIP_GRE_REGISTRATION=1";
-
-    postInstall = ''
-      # Fix some references to /bin paths in the Xulrunner shell script.
-      substituteInPlace $out/bin/xulrunner \
-          --replace /bin/pwd "$(type -tP pwd)" \
-          --replace /bin/ls "$(type -tP ls)"
-
-      # Fix run-mozilla.sh search
-      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
-      echo libDir: $libDir
-      test -n "$libDir"
-      cd $out/bin
-      mv xulrunner ../lib/$libDir/
-
-      for i in $out/lib/$libDir/*; do 
-          file $i;
-          if file $i | grep executable &>/dev/null; then 
-              ln -s $i $out/bin
-          fi;
-      done;
-      rm -f $out/bin/run-mozilla.sh
-    ''; # */
-
-    meta = {
-      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.org/firefox/;
-    };
-
-    passthru = { inherit gtk; version = xulVersion; };
-  };
-
-
-  firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}";
-
-    inherit src;
-
-    enableParallelBuilding = true;
-      
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
-        dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
-        xlibs.pixman yasm mesa sqlite
-      ];
-
-    propagatedBuildInputs = [xulrunner];
-
-    configureFlags =
-      [ "--enable-application=browser"
-        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-        "--enable-chrome-format=jar"
-      ]
-      ++ commonConfigureFlags
-      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure =
-      ''
-        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-          stdenv.lib.concatStringsSep ":" 
-            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-        }' ';'
-      '';
-
-    postInstall =
-      ''
-        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
-      ''; # */
-
-    meta = {
-      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.org/firefox/;
-    };
-
-    passthru = {
-      inherit gtk xulrunner nspr;
-      isFirefox3Like = true;
-    };
-  };
-}

pkgs/applications/networking/browsers/firefox/7.0.nix

@@ -1,184 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite
-
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Shiretoko" or whatever, enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-}:
-
-assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
-
-rec {
-
-  firefoxVersion = "7.0.1";
-  
-  xulVersion = "7.0.1"; # this attribute is used by other packages
-
-  
-  src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "94bbc7152832371dc0be82f411730df043c5c6ac";
-  };
-  
-  commonConfigureFlags =
-    [ "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      # "--with-system-nss"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
-      "--enable-system-sqlite"
-      "--disable-crashreporter"
-      "--disable-tests"
-      "--disable-necko-wifi" # maybe we want to enable this at some point
-      "--disable-installer" 
-      "--disable-updater"
-    ];
-
-
-  xulrunner = stdenv.mkDerivation rec {
-    name = "xulrunner-${xulVersion}";
-    
-    inherit src;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
-        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
-        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
-        xlibs.libXScrnSaver xlibs.scrnsaverproto
-        xlibs.libXext xlibs.xextproto sqlite
-      ];
-
-    configureFlags =
-      [ "--enable-application=xulrunner"
-        "--disable-javaxpcom"
-      ] ++ commonConfigureFlags;
-
-    enableParallelBuilding = true;
-      
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure =
-      ''
-        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-          stdenv.lib.concatStringsSep ":" 
-            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-        }' ';'
-        cp -i security/coreconf/Linux{2.6,3.0}.mk
-        cp -i security/coreconf/Linux{2.6,3.1}.mk
-        cp -i security/coreconf/Linux{2.6,3.2}.mk
-        cp -i security/coreconf/Linux{2.6,3.3}.mk
-
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
-      '';
-
-    # !!! Temporary hack.
-    preBuild =
-      ''
-        export NIX_ENFORCE_PURITY=
-      '';
-
-    installFlags = "SKIP_GRE_REGISTRATION=1";
-
-    postInstall = ''
-      # Fix some references to /bin paths in the Xulrunner shell script.
-      substituteInPlace $out/bin/xulrunner \
-          --replace /bin/pwd "$(type -tP pwd)" \
-          --replace /bin/ls "$(type -tP ls)"
-
-      # Fix run-mozilla.sh search
-      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
-      echo libDir: $libDir
-      test -n "$libDir"
-      cd $out/bin
-      mv xulrunner ../lib/$libDir/
-
-      for i in $out/lib/$libDir/*; do 
-          file $i;
-          if file $i | grep executable &>/dev/null; then 
-              echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
-              chmod a+x "$out/bin/$(basename "$i")";
-          fi;
-      done;
-      for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
-              patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
-      done;
-      rm -f $out/bin/run-mozilla.sh
-    ''; # */
-
-    meta = {
-      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = { inherit gtk; version = xulVersion; };
-  };
-
-
-  firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}";
-
-    inherit src;
-
-    enableParallelBuilding = true;
-      
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
-        dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
-        xlibs.pixman yasm mesa sqlite file
-      ];
-
-    propagatedBuildInputs = [xulrunner];
-
-    configureFlags =
-      [ "--enable-application=browser"
-        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-        "--enable-chrome-format=jar"
-	"--disable-elf-hack"
-      ]
-      ++ commonConfigureFlags
-      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure =
-      ''
-        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-          stdenv.lib.concatStringsSep ":" 
-            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-        }' ';'
-      '';
-
-    postInstall =
-      ''
-        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
-        for j in $out/bin/*; do 
-	    i="$(readlink "$j")";
-            file $i;
-            if file $i | grep executable &>/dev/null; then 
-	        rm "$out/bin/$(basename "$i")"
-                echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
-                chmod a+x "$out/bin/$(basename "$i")"
-            fi;
-        done;
-      ''; # */
-
-    meta = {
-      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = {
-      inherit gtk xulrunner nspr;
-      isFirefox3Like = true;
-    };
-  };
-}

pkgs/applications/networking/browsers/firefox/9.0.nix

@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "9.0b1";
+  firefoxVersion = "9.0";
   
   xulVersion = "9.0"; # this attribute is used by other packages
 
   
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha256 = "0mvm0bjzghqywh54fnk5qhz7fjm5d8y952sf59ypq64bhs5dh009";
+    sha1 = "f79324ec6205e4c23d51d8ab2e790de1b2541657";
   };
   
   commonConfigureFlags =

pkgs/applications/science/electronics/kicad/default.nix

@@ -1,28 +1,26 @@
-{stdenv, fetchsvn, unzip, cmake, mesa, wxGTK, zlib, libX11, gettext}:
+{stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, wxGTK, zlib, libX11,
+gettext}:
 
 stdenv.mkDerivation rec {
-  name = "kicad-svn-2518";
+  name = "kicad-20110708";
 
-  src = fetchsvn {
+  src = fetchurl {
-    url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad;
+    url = ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad_sources-2011-07-08-BZR3044.zip;
-    rev = 2518;
+    sha256 = "1gr75zcf55p3xpbg1gdkdpbh5x11bawc9rcff4fskwjyc3vfiv6a";
-    sha256 = "05z4fnkvvy91d0krf72q8xyislwh3zg8k0gy9w18caizbla5sih5";
   };
 
-  srcLibrary = fetchsvn {
+  srcLibrary = fetchbzr {
-    url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad-library;
+    url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";
-    rev = 2518;
+    revision = 112;
-    sha256 = "05sfmbp1z3hjxzcspj4vpprww5bxc6hq4alcjlc1vg6cvx2qgb9s";
+    sha256 = "49fa9ad90759cfaf522c2a62665f033688b9d84d02f31c6b2505c08a217ad312";
   };
 
+  cmakeFlags = "-DKICAD_TESTING_VERSION=ON";
+
   # They say they only support installs to /usr or /usr/local,
   # so we have to handle this.
   patchPhase = ''
     sed -i -e 's,/usr/local/kicad,'$out,g common/gestfich.cpp
-    pushd internat/ca
-    sed -i -e s/iso-8859-1/utf-8/ kicad.po
-    msgfmt -o kicad.mo kicad.po
-    popd
   '';
 
   enableParallelBuilding = true;

pkgs/applications/science/logic/hol_light/default.nix

@@ -9,11 +9,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "hol_light-20111204";
+  name = "hol_light-20111224";
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "114";
+    rev = "116";
-    sha256 = "a9203a0118caf5d0ca7621abafab4af6245e1c1ae6ba628ead7c6f69aa86d9d3";
+    sha256 = "c840cc2dfeb2088484692cb0073e6a7bb85e3e44e95aee1e0f5a8e223f7ccae6";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];

pkgs/applications/science/math/maxima/default.nix

@@ -2,7 +2,7 @@
 
 let
   name    = "maxima";
-  version = "5.25.1";
+  version = "5.26.0";
 
   searchPath =
     stdenv.lib.makeSearchPath "bin"
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "8e98ad742151e52edb56337bd62c8a9749f7b598cb6ed4e991980e0e6f89706a";
+    sha256 = "887105c99a91122f3e622472aa39bdd1ca8ed6198cf09b49917f63f8396dced9";
   };
 
   buildInputs = [sbcl texinfo perl makeWrapper];
@@ -29,8 +29,9 @@ stdenv.mkDerivation {
     ln -s ../maxima/${version}/doc $out/share/doc/maxima
   '';
 
-  # The regression test suite has minor failures, but curiously enough
+  # Failures in the regression test suite are not going to abort the
-  # this doesn't seem to abort the build process:
+  # build process. We run the suite mostly so that potential errors show
+  # up in the build log. See also:
   # <http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933>.
   doCheck = true;
 

pkgs/applications/version-management/veracity/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="1.1.0.10565";
+   version="1.5.0.10647";
-   name="veracity-1.1.0.10565";
+   name="veracity-1.5.0.10647";
-   hash="0sx12zzc60pdvzhf8ax2lisnw0rsrvnrk2500y1vfqhwxh2r04id";
+   hash="1b10npyxxg9592wigfpv66h17bzbsg2hqcfm7imyn941a34qrkd3";
-   url="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-${version}.tar.gz";
+   url="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-1.1.0.10565.tar.gz";
+   advertisedUrl="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-1.5.0.10647.tar.gz";
   
   
 }

pkgs/applications/window-managers/awesome/default.nix

@@ -1,10 +1,12 @@
 {stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua
 , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
+, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau
+, libXdmcp, pixman, doxygen
 , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
 , docbook_xml_dtd_45, libxslt, coreutils}:
 
 let
-  version = "3.4.9";
+  version = "3.4.11";
 in
 
 stdenv.mkDerivation rec {
@@ -12,11 +14,12 @@ stdenv.mkDerivation rec {
  
   src = fetchurl {
     url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "0382v482904xv295l0gvhwzc64b7631miiv8wyq7jxmwqf2vfbp7";
+    sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d";
   };
  
   buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
-    imlib2 libxcb libxdg_basedir xcbutil libstartup_notification libev
+    imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm
+    libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
     asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ];
 
   # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
@@ -27,10 +30,17 @@ stdenv.mkDerivation rec {
     sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
     # Remove the 'root' PATH override (I don't know why they have that)
     sed /WHOAMI/d -i utils/awsetbg
+    # Russian manpages fail to be generated:
+    #  [ 56%] Generating manpages/ru/man1/awesome.1.xml
+    #  asciidoc: ERROR: <stdin>: line 3: name section expected
+    #  asciidoc: FAILED: <stdin>: line 3: section title expected
+    #  make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
+    substituteInPlace CMakeLists.txt \
+      --replace "set(AWE_MAN_LANGS es fr de ru)" \
+                "set(AWE_MAN_LANGS es fr de)"
   '';
 
-  patches = [ ./cmake284.patch ];
+  # XXX: maybe not needed anymore
-
   # Somehow libev does not get into the rpath, although it should.
   # Something may be wrong in the gcc wrapper.
   preBuild = ''

pkgs/build-support/vm/rpm/rpm-closure.pl

@@ -1,5 +1,6 @@
 use strict;
 use XML::Simple;
+use List::Util qw(min);
 
 my @packagesFiles = ();
 my @urlPrefixes = ();
@@ -13,6 +14,44 @@ while(-f $ARGV[0]) {
     push(@urlPrefixes, $urlPrefix);
 }
 
+
+sub rpmvercmp {
+    my ($version1, $version2) = @_;
+    my @vercmps1 = split /\./, $version1;
+    my @vercmps2 = split /\./, $version2;
+    my $l1 = scalar(@vercmps1);
+    my $l2 = scalar(@vercmps2);
+    my $l = min($l1, $l2);
+
+    for(my $i=0; $i<$l; $i++) {
+        my $v1 = $vercmps1[$i];
+        my $v2 = $vercmps2[$i];
+
+        if($v1 =~ /^[0-9]*$/ && $v2 =~ /^[0-9]*$/) {
+	    if ( int($v1) > int($v2) ) {
+		return 1;
+	    }
+	    elsif ( int($v1) < int($v2) ) {
+		return -1;
+	    }
+	} else {
+	    if ( $v1 gt $v2 ) {
+		return 1;
+	    }
+	    elsif ( $v1 lt $v2 ) {
+		return -1;
+	    }
+	}
+    }
+    if($l1 == $l2) {
+        return 0;
+    } elsif ($l1 > $l2) {
+        return 1;
+    } elsif ($l1 < $l2) {
+        return -1;
+    }
+}
+
 my @toplevelPkgs = @ARGV;
 
 my @archs = split ' ', ($ENV{'archs'} or "");
@@ -36,7 +75,8 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
         if (defined $pkgs{$pkg->{name}}) {
             my $earlierPkg = $pkgs{$pkg->{name}};
             print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n";
-            if ($earlierPkg->{'time'}->{file} <= $pkg->{'time'}->{file}) {
+            #   <version epoch="0" ver="1.28.0" rel="2.el6"/>
+            if (rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver}) >= 0) {
                 print STDERR "WARNING: replaced package $pkg->{name} with newer one\n";
                 $pkg->{urlPrefix} = $urlPrefixes[$i];
                 $pkgs{$pkg->{name}} = $pkg;

pkgs/desktops/kde-4.7/kdelibs.nix

@@ -3,7 +3,7 @@
 , xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
 , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
-, getopt, udev, herqq, phonon, gettext
+, getopt, udev, herqq, phonon, libjpeg
 }:
 
 kde {
@@ -11,7 +11,7 @@ kde {
     [
       acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
       libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
-      shared_desktop_ontologies udev xz libxml2
+      shared_desktop_ontologies udev xz libxml2 libjpeg
     ];
 
   propagatedBuildInputs = [ qt4 soprano strigi phonon ];

pkgs/development/compilers/clean/default.nix

@@ -1,16 +1,16 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "clean-2.3";
+  name = "clean-2.4";
 
   src =
     if stdenv.system == "i686-linux" then (fetchurl {
-      url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_boot.tar.gz";
+      url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_boot.tar.gz";
-      sha256 = "0rrjpqdbqwbx7n8v35wi3wpm6lpv9zd1n5q50byb2h0ljqw31j9h";
+      sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5";
     })
     else if stdenv.system == "x86_64-linux" then (fetchurl {
-        url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_64_boot.tar.gz";
+        url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz";
-        sha256 = "0bvkaiwcaa1p6h1bl4bgnia1yd0j8nq6sb1yiwar74y2m1wwmjqj";
+        sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r";
     })
     else throw "Architecture not supported";
 

pkgs/development/compilers/ghc/head.nix

@@ -1,19 +1,17 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
+{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
 
 stdenv.mkDerivation rec {
-  version = "7.3.20110910";
+  version = "7.4.0.20111219";
 
   name = "ghc-${version}";
 
-  # TODO: Does this have to be here, or can it go to meta?
-  homepage = "http://haskell.org/ghc";
-
   src = fetchurl {
-    url = "${homepage}/dist/current/dist/${name}-src.tar.bz2";
+    url = "http://haskell.org/ghc/dist/7.4.1-rc1/${name}-src.tar.bz2";
-    sha256 = "1y8ixh6vcbqxqddc872kjfzxj94q4dhyaprdv7kv2yzwgp49qza5";
+    sha256 = "11imfag07wr9s5vf12yh6bz4hjfbw20i1c7n8py9fa4vx7va676n";
   };
 
-  buildInputs = [ghc perl gmp ncurses];
+  buildInputs = [ghc perl gmp ncurses] ++
+    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
@@ -22,6 +20,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '';
 
   configureFlags=[
@@ -33,11 +32,12 @@ stdenv.mkDerivation rec {
   stripDebugFlags=["-S" "--keep-file-symbols"];
 
   meta = {
-    inherit homepage;
+    homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = [
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
+      stdenv.lib.maintainers.simons
     ];
     platforms = ghc.meta.platforms;
   };

pkgs/development/compilers/llvm/clang-include-paths.patch

@@ -1,39 +1,49 @@
-diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
+diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp
---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2011-03-21 20:24:04.000000000 -0400
+--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp	2011-11-17 02:40:32.000000000 -0500
-+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2011-10-18 12:09:50.624355551 -0400
++++ clang-3.0.src/lib/Driver/ToolChains.cpp	2011-12-19 06:29:27.562428830 -0500
-@@ -438,6 +438,7 @@
+@@ -1926,14 +1926,17 @@
- 
+   if (DriverArgs.hasArg(options::OPT_nostdinc))
- void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
-                                             const HeaderSearchOptions &HSOpts) {
-+#if 0
-   llvm::Triple::OSType os = triple.getOS();
- 
-   switch (os) {
-@@ -559,6 +560,8 @@
-   }
- 
-   AddPath("/usr/include", System, false, false, false);
-+#endif
-+  AddPath(C_INCLUDE_PATH, System, false, false, false);
- }
- 
- void InitHeaderSearch::
-@@ -577,6 +580,7 @@
-                                   triple);
      return;
+ 
++#if 0
+   if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
+     addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
+ 
++#endif
+   if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
+     llvm::sys::Path P(D.ResourceDir);
+     P.appendComponent("include");
+     addSystemInclude(DriverArgs, CC1Args, P.str());
    }
 +#if 0
-   // FIXME: temporary hack: hard-coded paths.
+ 
-   switch (os) {
+   if (DriverArgs.hasArg(options::OPT_nostdlibinc))
-   case llvm::Triple::Cygwin:
+     return;
-@@ -847,6 +851,10 @@
+@@ -1998,6 +2001,8 @@
-   default:
+     return;
-     break;
+ 
-   }
+   addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include");
 +#endif
-+  AddGnuCPlusPlusIncludePaths(
++  addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + C_INCLUDE_PATH);
-+      CPP_INCLUDE_PATH,
-+      CPP_HOST, "", "", triple);
  }
  
- void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang,
+ static bool addLibStdCXXIncludePaths(Twine Base, Twine TargetArchDir,
+@@ -2030,6 +2035,7 @@
+   bool IsTarget64Bit = (TargetArch == llvm::Triple::x86_64 ||
+                         TargetArch == llvm::Triple::ppc64);
+ 
++#if 0
+   StringRef CxxIncludeRoot(CXX_INCLUDE_ROOT);
+   if (!CxxIncludeRoot.empty()) {
+     StringRef CxxIncludeArch(CXX_INCLUDE_ARCH);
+@@ -2072,6 +2078,10 @@
+                              GCCInstallation.getTriple() + Suffix,
+                              DriverArgs, CC1Args);
+   }
++#endif
++    addLibStdCXXIncludePaths(CPP_INCLUDE_PATH,
++                             CPP_HOST,
++                             DriverArgs, CC1Args);
+ }
+ 
+ /// DragonFly - DragonFly tool chain which can call as(1) and ld(1) directly.

pkgs/development/compilers/llvm/clang-ld-flags.patch

@@ -1,33 +1,26 @@
-diff -Naur a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp
+diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp
---- a/tools/clang/lib/Driver/ToolChains.cpp	2011-03-21 17:29:27.000000000 -0400
+--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp	2011-11-17 02:40:32.000000000 -0500
-+++ b/tools/clang/lib/Driver/ToolChains.cpp	2011-10-18 19:43:48.999590771 -0400
++++ clang-3.0.src/lib/Driver/ToolChains.cpp	2011-12-19 05:32:38.695513475 -0500
-@@ -1482,12 +1482,9 @@
+@@ -1800,6 +1800,7 @@
-     Lib = Lib64;
-   }
  
--  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld");
+   Linker = GetProgramPath("ld");
--  if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists)
--    Linker = LinkerPath.str();
--  else
--    Linker = GetProgramPath("ld");
-+  Linker = GetProgramPath("ld");
  
 +#if 0
    LinuxDistro Distro = DetectLinuxDistro(Arch);
  
-   if (IsUbuntu(Distro)) {
+   if (IsOpenSuse(Distro) || IsUbuntu(Distro)) {
-@@ -1531,6 +1528,7 @@
+@@ -1882,6 +1883,7 @@
-   Paths.push_back(Base + "/../../..");
+   addPathIfExists(SysRoot + "/lib", Paths);
-   if (Arch == getArch() && IsUbuntu(Distro))
+   addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
-     Paths.push_back("/usr/lib/" + GccTriple);
+   addPathIfExists(SysRoot + "/usr/lib", Paths);
 +#endif
  }
  
  bool Linux::HasNativeLLVMSupport() const {
-diff -Naur a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp
+diff -Naur clang-3.0.src-orig/lib/Driver/Tools.cpp clang-3.0.src/lib/Driver/Tools.cpp
---- a/tools/clang/lib/Driver/Tools.cpp	2011-03-06 18:31:01.000000000 -0500
+--- clang-3.0.src-orig/lib/Driver/Tools.cpp	2011-11-07 05:27:39.000000000 -0500
-+++ b/tools/clang/lib/Driver/Tools.cpp	2011-10-18 18:44:00.799604267 -0400
++++ clang-3.0.src/lib/Driver/Tools.cpp	2011-12-19 05:34:44.075325534 -0500
-@@ -3619,6 +3619,7 @@
+@@ -4306,6 +4306,7 @@
        ToolChain.getArch() == llvm::Triple::thumb ||
        (!Args.hasArg(options::OPT_static) &&
         !Args.hasArg(options::OPT_shared))) {
@@ -35,8 +28,8 @@ diff -Naur a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp
      CmdArgs.push_back("-dynamic-linker");
      if (ToolChain.getArch() == llvm::Triple::x86)
        CmdArgs.push_back("/lib/ld-linux.so.2");
-@@ -3627,6 +3628,7 @@
+@@ -4318,6 +4319,7 @@
-       CmdArgs.push_back("/lib/ld-linux.so.3");
+       CmdArgs.push_back("/lib64/ld64.so.1");
      else
        CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
 +#endif

pkgs/development/compilers/llvm/clang-system-llvm-libs.patch

@@ -1,42 +0,0 @@
-diff -Naur llvm-2.9-orig/Makefile.rules llvm-2.9/Makefile.rules
---- llvm-2.9-orig/Makefile.rules	2011-03-25 02:26:58.000000000 -0400
-+++ llvm-2.9/Makefile.rules	2011-10-19 15:31:38.538674143 -0400
-@@ -941,7 +941,7 @@
- 	@echo "*** llvm-config doesn't exist - rebuilding it."
- 	@$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config
- 
--$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
-+$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT):
- 
- ifeq ($(ENABLE_SHARED), 1)
- # We can take the "auto-import" feature to get rid of using dllimport.
-@@ -1137,7 +1137,7 @@
- else
- SharedLibKindMessage := "Shared Library"
- endif
--$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(SharedLibDir)/.dir
-+$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(SharedLibDir)/.dir
- 	$(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \
- 	  $(notdir $@)
- 	$(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \
-@@ -1411,7 +1411,7 @@
- $(ToolBuildPath): $(ToolDir)/.dir
- endif
- 
--$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
-+$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths)
- 	$(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg)
- 	$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
- 	$(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)
-diff -Naur llvm-2.9-orig/unittests/Makefile.unittest llvm-2.9/unittests/Makefile.unittest
---- llvm-2.9-orig/unittests/Makefile.unittest	2011-02-04 12:12:18.000000000 -0500
-+++ llvm-2.9/unittests/Makefile.unittest	2011-10-19 15:47:27.100035616 -0400
-@@ -47,7 +47,7 @@
-   Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)"
- endif
- 
--$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
-+$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths)
- 	$(Echo) Linking $(BuildMode) unit test $(TESTNAME) $(StripWarnMsg)
- 	$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
- 	$(TESTLIBS) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)

pkgs/development/compilers/llvm/clang-tblgen.patch

@@ -1,134 +0,0 @@
-diff -Naur a/tools/clang/include/clang/AST/Makefile b/tools/clang/include/clang/AST/Makefile
---- a/tools/clang/include/clang/AST/Makefile	2010-08-18 19:23:40.000000000 -0400
-+++ b/tools/clang/include/clang/AST/Makefile	2011-10-19 14:19:21.420750346 -0400
-@@ -6,24 +6,24 @@
- 
- include $(CLANG_LEVEL)/Makefile
- 
--$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
-+$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td \
-                               $(ObjDir)/.dir
- 	$(Echo) "Building Clang attribute classes with tblgen"
- 	$(Verb) $(TableGen) -gen-clang-attr-classes -o $(call SYSPATH, $@) \
- 		-I $(PROJ_SRC_DIR)/../../ $<
- 
--$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
-+$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td \
-                               $(ObjDir)/.dir
- 	$(Echo) "Building Clang attribute implementations with tblgen"
- 	$(Verb) $(TableGen) -gen-clang-attr-impl -o $(call SYSPATH, $@) \
- 		-I $(PROJ_SRC_DIR)/../../ $<
- 
--$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td $(TBLGEN) \
-+$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td \
-                               $(ObjDir)/.dir
- 	$(Echo) "Building Clang statement node tables with tblgen"
- 	$(Verb) $(TableGen) -gen-clang-stmt-nodes -o $(call SYSPATH, $@) $<
- 
--$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td $(TBLGEN) \
-+$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td \
-                               $(ObjDir)/.dir
- 	$(Echo) "Building Clang declaration node tables with tblgen"
- 	$(Verb) $(TableGen) -gen-clang-decl-nodes -o $(call SYSPATH, $@) $<
-diff -Naur a/tools/clang/include/clang/Basic/Makefile b/tools/clang/include/clang/Basic/Makefile
---- a/tools/clang/include/clang/Basic/Makefile	2010-09-09 16:27:36.000000000 -0400
-+++ b/tools/clang/include/clang/Basic/Makefile	2011-10-19 14:17:54.950837324 -0400
-@@ -29,20 +29,20 @@
- CLANG_HAS_VERSION_PATCHLEVEL := 1
- endif
- 
--$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(TBLGEN) $(ObjDir)/.dir
-+$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(ObjDir)/.dir
- 	$(Echo) "Building Clang $(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) diagnostic tables with tblgen"
- 	$(Verb) $(TableGen) -gen-clang-diags-defs -clang-component=$(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) -o $(call SYSPATH, $@) $<
- 
--$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(TBLGEN) $(ObjDir)/.dir
-+$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(ObjDir)/.dir
- 	$(Echo) "Building Clang diagnostic groups with tblgen"
- 	$(Verb) $(TableGen) -gen-clang-diag-groups -o $(call SYSPATH, $@) $<
- 
--$(ObjDir)/AttrList.inc.tmp : Attr.td $(TBLGEN) $(ObjDir)/.dir
-+$(ObjDir)/AttrList.inc.tmp : Attr.td $(ObjDir)/.dir
- 	$(Echo) "Building Clang attribute list with tblgen"
- 	$(Verb) $(TableGen) -gen-clang-attr-list -o $(call SYSPATH, $@) \
- 	  -I $(PROJ_SRC_DIR)/../.. $<
- 
--$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(TBLGEN) $(ObjDir)/.dir
-+$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(ObjDir)/.dir
- 	$(Echo) "Building Clang arm_neon.inc with tblgen"
- 	$(Verb) $(TableGen) -gen-arm-neon-sema -o $(call SYSPATH, $@) $<
- 
-diff -Naur a/tools/clang/include/clang/Driver/Makefile b/tools/clang/include/clang/Driver/Makefile
---- a/tools/clang/include/clang/Driver/Makefile	2010-06-08 16:34:18.000000000 -0400
-+++ b/tools/clang/include/clang/Driver/Makefile	2011-10-19 14:25:33.739369159 -0400
-@@ -5,14 +5,14 @@
- 
- include $(CLANG_LEVEL)/Makefile
- 
--$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
-+$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(ObjDir)/.dir
- 	$(Echo) "Building Clang Driver Option tables with tblgen"
- 	$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
- 
--$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
-+$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(ObjDir)/.dir
- 	$(Echo) "Building Clang CC1 Option tables with tblgen"
- 	$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
- 
--$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
-+$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(ObjDir)/.dir
- 	$(Echo) "Building Clang CC1 Assembler Option tables with tblgen"
- 	$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
-diff -Naur a/tools/clang/include/clang/Lex/Makefile b/tools/clang/include/clang/Lex/Makefile
---- a/tools/clang/include/clang/Lex/Makefile	2010-10-19 22:31:43.000000000 -0400
-+++ b/tools/clang/include/clang/Lex/Makefile	2011-10-19 14:18:25.082807086 -0400
-@@ -6,7 +6,7 @@
- 
- include $(CLANG_LEVEL)/Makefile
- 
--$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
-+$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td \
-                                   $(ObjDir)/.dir
- 	$(Echo) "Building Clang attribute spellings with tblgen"
- 	$(Verb) $(TableGen) -gen-clang-attr-spelling-list -o $(call SYSPATH, $@) \
-diff -Naur a/tools/clang/include/clang/Serialization/Makefile b/tools/clang/include/clang/Serialization/Makefile
---- a/tools/clang/include/clang/Serialization/Makefile	2010-08-18 19:23:40.000000000 -0400
-+++ b/tools/clang/include/clang/Serialization/Makefile	2011-10-19 14:25:05.764398164 -0400
-@@ -6,13 +6,13 @@
- 
- include $(CLANG_LEVEL)/Makefile
- 
--$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
-+$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td \
-                               $(ObjDir)/.dir
- 	$(Echo) "Building Clang PCH reader with tblgen"
- 	$(Verb) $(TableGen) -gen-clang-attr-pch-read -o $(call SYSPATH, $@) \
- 		-I $(PROJ_SRC_DIR)/../../ $<
- 
--$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
-+$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td \
-                               $(ObjDir)/.dir
- 	$(Echo) "Building Clang PCH writer with tblgen"
- 	$(Verb) $(TableGen) -gen-clang-attr-pch-write -o $(call SYSPATH, $@) \
-diff -Naur a/tools/clang/lib/Headers/Makefile b/tools/clang/lib/Headers/Makefile
---- a/tools/clang/lib/Headers/Makefile	2010-07-21 21:19:36.000000000 -0400
-+++ b/tools/clang/lib/Headers/Makefile	2011-10-19 14:15:18.520993127 -0400
-@@ -49,6 +49,6 @@
- 
- install-local:: $(INSTHEADERS)
- 
--$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(TBLGEN) $(ObjDir)/.dir
-+$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(ObjDir)/.dir
- 	$(Echo) "Building Clang arm_neon.h.inc with tblgen"
- 	$(Verb) $(TableGen) -gen-arm-neon -o $(call SYSPATH, $@) $<
-diff -Naur a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile
---- a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile	2011-02-15 02:42:38.000000000 -0500
-+++ b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile	2011-10-19 14:15:58.240953760 -0400
-@@ -19,6 +19,6 @@
- 
- include $(CLANG_LEVEL)/Makefile
- 
--$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(TBLGEN) $(ObjDir)/.dir
-+$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(ObjDir)/.dir
- 	$(Echo) "Building Clang SA Checkers tables with tblgen"
- 	$(Verb) $(TableGen) -gen-clang-sa-checkers -I $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include -o $(call SYSPATH, $@) $<

pkgs/development/compilers/llvm/clang.nix

@@ -1,51 +1,31 @@
-{ stdenv, fetchurl, perl, groff, llvm }:
+{ stdenv, fetchurl, perl, groff, llvm, cmake, darwinInstallNameToolUtility }:
 
-assert stdenv.isLinux && stdenv.gcc.gcc != null;
+let version = "3.0"; in
-
-let version = "2.9"; in
 
 stdenv.mkDerivation {
   name = "clang-${version}";
 
-  src = llvm.src;
+  buildInputs = [ perl llvm groff cmake ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
 
-  buildInputs = [ perl llvm groff ];
+  patches = stdenv.lib.optionals (stdenv.gcc.libc != null) 
+    [ ./clang-include-paths.patch ./clang-ld-flags.patch ];
 
-  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]
+  postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) ''
-    ++ stdenv.lib.optionals (stdenv.gcc ? clang) [
-      "--with-built-clang=yes"
-      "CXX=clang++"
-    ];
-
-  srcClang = fetchurl {
-      url = "http://llvm.org/releases/${version}/clang-${version}.tgz";
-      sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h";
-  };
-
-  prePatch = ''
-    pushd tools
-    unpackFile $srcClang
-    mv clang-${version} clang
-    popd
-    find
-  '';
-
-  patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ./clang-tblgen.patch ./clang-system-llvm-libs.patch ];
-
-  buildFlags = [ "TableGen=tblgen" "LLVM_CONFIG=llvm-config" ];
-
-  preBuild = ''
     sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
-      -e 's,CPP_HOST,"'$(${stdenv.gcc.gcc}/bin/gcc -dumpmachine)'",' \
+      -e 's,CPP_HOST,"'$(${stdenv.gcc}/bin/cc -dumpmachine)'",' \
       -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \
-      tools/clang/lib/Frontend/InitHeaderSearch.cpp
+      lib/Driver/ToolChains.cpp
-
-    pushd utils/unittest
-    make
-    popd
-    cd tools/clang
   '';
 
+  cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" ];
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+      url = "http://llvm.org/releases/${version}/clang-${version}.tar.gz";
+      sha256 = "0v8j9rgmb7w74ihc44zfxa22q17c946n5b6prwl38z3d6pd74kmn";
+  };
+
   passthru = { gcc = stdenv.gcc.gcc; };
 
   meta = {
@@ -53,6 +33,7 @@ stdenv.mkDerivation {
     description = "A C language family frontend for LLVM";
     license = "BSD";
     maintainers = with stdenv.lib.maintainers; [viric shlevy];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; all;
   };
 }
+

pkgs/development/compilers/llvm/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, groff, darwinSwVersUtility }:
+{ stdenv, fetchurl, perl, groff, darwinSwVersUtility, darwinInstallNameToolUtility, cmake }:
 
 let version = "3.0"; in
 
@@ -10,14 +10,10 @@ stdenv.mkDerivation {
     sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji";
   };
 
-  buildInputs = [ perl groff ] ++
+  buildInputs = [ perl groff cmake ] ++
-    stdenv.lib.optional stdenv.isDarwin darwinSwVersUtility;
+    stdenv.lib.optionals stdenv.isDarwin [ darwinSwVersUtility darwinInstallNameToolUtility ];
 
-  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
-    ++ stdenv.lib.optionals (stdenv.gcc ? clang) [
-      "--with-built-clang=yes"
-      "CXX=clang++"
-    ];
 
   enableParallelBuilding = true;
 

pkgs/development/compilers/ocaml/ber-metaocaml-003.nix

@@ -0,0 +1,63 @@
+{ stdenv, fetchurl, ncurses, x11 }:
+
+let
+   useX11 = stdenv.isi686 || stdenv.isx86_64;
+   useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips;
+   inherit (stdenv.lib) optionals optionalString;
+in
+
+stdenv.mkDerivation rec {
+  
+  name = "ber-metaocaml-003";
+  
+  src = fetchurl {
+    url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.2.tar.bz2";
+    sha256 = "0hw1yp1mmfyn1pmda232d0ry69m7ln1z0fn5lgi8nz3y1mx3iww6";
+  };
+
+  metaocaml = fetchurl {
+    url = "http://okmij.org/ftp/ML/ber-metaocaml.tar.gz";
+    sha256 = "1kq1if25c1wvcdiy4g46xk05dkc1am2gc4qvmg4x19wvvaz09gzf";
+  };
+
+  # Needed to avoid a SIGBUS on the final executable on mips
+  NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else "";
+
+  patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ];
+
+  prefixKey = "-prefix ";
+  configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
+  buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt";
+  buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
+  installFlags = "-i";
+  installTargets = "install"; # + optionalString useNativeCompilers " installopt";
+  prePatch = ''
+    CAT=$(type -tp cat)
+    sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
+    patch -p0 < ${./mips64.patch}
+  '';
+  postConfigure = ''
+    tar -xvzf $metaocaml
+    cd ${name}
+    make patch
+    cd ..
+  '';
+  postBuild = ''
+    ensureDir $out/include
+    ln -sv $out/lib/ocaml/caml $out/include/caml
+  '';
+  postInstall = ''
+    cd ${name}
+    make all
+    make install
+    make test
+    make test-compile
+    cd ..
+  '';
+
+  meta = {
+    homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml";
+    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run";
+  };
+}

pkgs/development/compilers/ocaml/metaocaml-3.09.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, x11, ncurses }:
+
+stdenv.mkDerivation (rec {
+  
+  name = "metaocaml-3.09-alpha-30";
+  
+  src = fetchurl {
+    url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz";
+    sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd";
+  };
+
+  prefixKey = "-prefix ";
+  configureFlags = ["-no-tk" "-x11lib" x11];
+  buildFlags = "world bootstrap world.opt";
+  buildInputs = [x11 ncurses];
+  installTargets = "install installopt"; 
+  patchPhase = ''
+    CAT=$(type -tp cat)
+    sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
+  '';
+  postBuild = ''
+    ensureDir $out/include
+    ln -sv $out/lib/ocaml/caml $out/include/caml
+  '';
+
+  meta = {
+    homepage = http://www.metaocaml.org/;
+    license = "QPL, LGPL2 (library part)";
+    desctiption = "A compiled, type-safe, multi-stage programming language";
+  };
+
+})

pkgs/development/compilers/uhc/default.nix

@@ -3,7 +3,7 @@
 }:
 
 let
-  revision = "2375";
+  revision = "2381";
 in
 stdenv.mkDerivation {
   name = "uhc-svn-${revision}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchsvn {
      url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC";
      rev = revision;
-     sha256 = "bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619";
+     sha256 = "37598f49cda8ff67b0b4d1c75b0bf50bfcd29a92b08ea427c5071080e368c4bc";
   };
 
   propagatedBuildInputs = [mtl network binary fgl syb];

pkgs/development/libraries/haskell/HTTP/4000.1.2.nix

@@ -0,0 +1,18 @@
+{ cabal, mtl, network, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "HTTP";
+  version = "4000.1.2";
+  sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8";
+  buildDepends = [ mtl network parsec ];
+  meta = {
+    homepage = "http://projects.haskell.org/http/";
+    description = "A library for client-side HTTP";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/HTTP/4000.2.2.nix

@@ -0,0 +1,18 @@
+{ cabal, mtl, network, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "HTTP";
+  version = "4000.2.2";
+  sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh";
+  buildDepends = [ mtl network parsec ];
+  meta = {
+    homepage = "https://github.com/haskell/HTTP";
+    description = "A library for client-side HTTP";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ListLike";
-  version = "3.1.2";
+  version = "3.1.4";
-  sha256 = "1fa2y8yc0ppmh37alc20a75gpb90i8s3pgnh3kg8n0577gvhjhzz";
+  sha256 = "0cpj7vqlazs2yzh0ffhlg69kdb18xyicybfw614nlqfhhrp53lj9";
   isLibrary = true;
   isExecutable = true;
   meta = {

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "NanoProlog";
-  version = "0.2.3.3";
+  version = "0.3";
-  sha256 = "0008xpahqbs2djchlw1bslhqqhbc0n7ql7pqm4g7lh8xd3ampxba";
+  sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ ListLike uuParsinglib ];

pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix

@@ -1,12 +1,12 @@
-{ cabal, extensibleExceptions, mtl, random }:
+{ cabal, extensibleExceptions, random }:
 
 cabal.mkDerivation (self: {
   pname = "QuickCheck";
-  version = "2.1.0.3";
+  version = "2.4.2";
-  sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1";
+  sha256 = "17qp73sdp780lha3i6xdsrvgshqz47qwldqknadc0w3vmscw61bg";
-  buildDepends = [ extensibleExceptions mtl random ];
+  buildDepends = [ extensibleExceptions random ];
   meta = {
-    homepage = "http://www.cs.chalmers.se/~koen";
+    homepage = "http://code.haskell.org/QuickCheck";
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

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

@@ -1,14 +1,14 @@
-{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, dlist
+{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl
-, hashable, mtl, syb, text, time, unorderedContainers, vector
+, syb, text, time, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.4.0.0";
+  version = "0.5.0.0";
-  sha256 = "1j0m7hh82ab7lg757wq75k28llfd1igawmg4g2qdia5gimm652pa";
+  sha256 = "1n7c0kf6rdf5p76mjcxlqrzhnfz4b1zkkbxk9w94hibb0s4kwxv6";
   buildDepends = [
-    attoparsec blazeBuilder blazeTextual deepseq dlist hashable mtl syb
+    attoparsec blazeBuilder deepseq dlist hashable mtl syb text time
-    text time unorderedContainers vector
+    unorderedContainers vector
   ];
   meta = {
     homepage = "https://github.com/bos/aeson";

pkgs/development/libraries/haskell/asn1-data/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "asn1-data";
-  version = "0.6.1.1";
+  version = "0.6.1.2";
-  sha256 = "13l7gcrgngr2bdr7hxh1wbsh21q7nc5bdknz0gpzjf65297g44an";
+  sha256 = "1655fp71l8qjif4p6c1y2xk8r0gj58djg7np5zwwm6jlj780773r";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/attoparsec-conduit/default.nix

@@ -0,0 +1,18 @@
+{ cabal, attoparsec, conduit, text, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "attoparsec-conduit";
+  version = "0.0.0";
+  sha256 = "1cwmi86faisg10l15w8mz3619phvrn2hl10blr6pziv1k8c3ncj7";
+  buildDepends = [ attoparsec conduit text transformers ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Turn attoparsec parsers into sinks";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "0.10.3.1";
+  version = "0.10.4";
-  sha256 = "01xqqnvy2xjcgnp5qq5xiqm1whxywa31cgd79mm290i2r4baiq8s";
+  sha256 = "0bjxlnc2qf1900ch9cnab26qz6a0vdz5nz1dwrjby1n5xqqzjd7x";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeBuilder caseInsensitive
     enumerator failure httpEnumerator httpTypes network random RSA SHA
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
     xmlEnumerator
   ];
   meta = {
-    homepage = "http://github.com/snoyberg/authenticate/tree/master";
+    homepage = "http://github.com/yesodweb/authenticate";
     description = "Authentication methods for Haskell web applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

pkgs/development/libraries/haskell/base-unicode-symbols/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "base-unicode-symbols";
-  version = "0.2.2.2";
+  version = "0.2.2.3";
-  sha256 = "13bn580r3wk7g5bq8ry04i2lvrcf576wjzlr0imli8rklkx8k3b8";
+  sha256 = "0803ncdydkxivn4kcjfn9v0lm43xg47y5iws7lajhhyg6v4zq08j";
   meta = {
     homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
     description = "Unicode alternatives for common functions and operators";

pkgs/development/libraries/haskell/base16-bytestring/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "base16-bytestring";
-  version = "0.1.1.3";
+  version = "0.1.1.4";
-  sha256 = "0v08fnkykvd6y6in6f9a808vk2gfd9pf0wd7rr28z6wwxm5d2x6l";
+  sha256 = "061rxlw5kjwj0s08kml46qpw602xwwp05285gpad8c7baw5mzxlr";
   meta = {
     homepage = "http://github.com/bos/base16-bytestring";
     description = "Fast base16 (hex) encoding and decoding for ByteStrings";

pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix

@@ -0,0 +1,18 @@
+{ cabal, blazeBuilder, conduit, text, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "blaze-builder-conduit";
+  version = "0.0.0";
+  sha256 = "022j78sj9cs4xcbvxz0f2lga0rhxcwaj1mkxn0019rbx3lix1nh3";
+  buildDepends = [ blazeBuilder conduit text transformers ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Convert streams of builders to streams of bytestrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/blaze-html/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.4.2.2";
+  version = "0.4.3.1";
-  sha256 = "1fg0qgqml7ar3m0as9sk9zc260j2jvdsf5cdfrsify5l62ip060f";
+  sha256 = "0yhwlwmjy3jagxscz2i0yjfy6akqpamn9c35ffxcgpr0kj6qlpfp";
   buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";

pkgs/development/libraries/haskell/blaze-textual/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-textual";
-  version = "0.2.0.5";
+  version = "0.2.0.6";
-  sha256 = "0rl41idjmrw227yi2x6nk2rlm93rgzz2y7jvz2yvmya2ihrppzjf";
+  sha256 = "1699fj9zig6ids9bdjn5v0gqhnyx5dkzi542gkx1gs8943c94737";
   buildDepends = [ blazeBuilder text time vector ];
   meta = {
     homepage = "http://github.com/bos/blaze-textual";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bmp";
-  version = "1.1.2.1";
+  version = "1.2.0.2";
-  sha256 = "01w0fbfzdmrfnmnkjkg9paagfkzsjn57rx7lf2npzp95rmljplkb";
+  sha256 = "0y1fjbhk73dj260wd1jhcf12fkh4maba4iwkzdg2087s9saxvljk";
   buildDepends = [ binary ];
   meta = {
     homepage = "http://code.ouroborus.net/bmp";

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

@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "byteorder";
+  version = "1.0.3";
+  sha256 = "056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way";
+  meta = {
+    homepage = "http://community.haskell.org/~aslatter/code/byteorder";
+    description = "Exposes the native endianness or byte ordering of the system";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "colour";
-  version = "2.3.1";
+  version = "2.3.2";
-  sha256 = "58cf12b8abf7d01a752b1b778b64cc406903874702e3475d65c2aa35689fa49b";
+  sha256 = "1j0y8cfdzhzjid1hg50qvh5nsa6kfnxcwxaizxyk73z60dn8g9b6";
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Colour";
     description = "A model for human colour/color perception";
-    license = "unknown";
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [
       self.stdenv.lib.maintainers.andres

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

@@ -0,0 +1,22 @@
+{ cabal, liftedBase, monadControl, text, transformers
+, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "conduit";
+  version = "0.0.0.1";
+  sha256 = "0l3q9jj0dpbn2ixjx6d9m6ss92dmfgd5xc7wgfpb9d0kfk2li0sv";
+  buildDepends = [
+    liftedBase monadControl text transformers transformersBase
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "A pull-based approach to streaming data";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/data-accessor/data-accessor.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-accessor";
-  version = "0.2.2";
+  version = "0.2.2.1";
-  sha256 = "1jqd0qlv1yab83d5pdbzjw6q4a2kvbsar6kgczq0f0xn9gxm0qci";
+  sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Record_access";

pkgs/development/libraries/haskell/data-object-yaml/default.nix

@@ -1,20 +1,19 @@
-{ cabal, convertibleText, dataObject, enumerator, failure, text
+{ cabal, conduit, convertibleText, dataObject, failure, text
 , transformers, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "data-object-yaml";
-  version = "0.3.3.6";
+  version = "0.3.4";
-  sha256 = "0hha52nrxb539bvdz6ksn9sxmksfwmjhh7h8mp223s340vxrlpk3";
+  sha256 = "1wx6m7mjmdks8ym6dh117bhkdks4d1jlfchqif0svcwg04qnfczd";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    convertibleText dataObject enumerator failure text transformers
+    conduit convertibleText dataObject failure text transformers yaml
-    yaml
   ];
   meta = {
     homepage = "http://github.com/snoyberg/data-object-yaml";
-    description = "Serialize data to and from Yaml files";
+    description = "Serialize data to and from Yaml files (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dataenc";
-  version = "0.14.0.2";
+  version = "0.14.0.3";
-  sha256 = "1zym24259d053b7vbxir2l7229gilkg81vvc0wf9605873j6gw5b";
+  sha256 = "1k6k9cpx5ma32gvzf2mdbz4kfiblwfah9875qr13zkl4has9y0pd";
   isLibrary = true;
   isExecutable = true;
   meta = {

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "derive";
-  version = "2.5.4";
+  version = "2.5.5";
-  sha256 = "0gmj24qzh3vyvp0a44v4mf1qpkrg4d9q0m15d0yfbyzrimyjx1c7";
+  sha256 = "1vv7y2jfyxq2abh4avyjwia309a6rylbyiqia1m0ka7zwv2rxd6y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ haskellSrcExts syb transformers uniplate ];

pkgs/development/libraries/haskell/double-conversion/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "double-conversion";
-  version = "0.2.0.3";
+  version = "0.2.0.4";
-  sha256 = "17ny1gvd622rnqjvlrmcpgw3wlabrsc6d046d4ii6xv299z97qw9";
+  sha256 = "00rb8n2ky20ah9ry398jagi9gb0gz40yjfalh35cpckmg30z199x";
   buildDepends = [ text ];
   meta = {
     homepage = "https://github.com/bos/double-conversion";

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

@@ -0,0 +1,18 @@
+{ cabal, baseUnicodeSymbols, dlist }:
+
+cabal.mkDerivation (self: {
+  pname = "dstring";
+  version = "0.4.0.3";
+  sha256 = "0wzj1wzls7w79ac84sc5msblh2dmfmcxm77drpdqdirl1pwdlq9c";
+  buildDepends = [ baseUnicodeSymbols dlist ];
+  meta = {
+    homepage = "https://github.com/basvandijk/dstring";
+    description = "Difference strings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "enumerator";
-  version = "0.4.16";
+  version = "0.4.17";
-  sha256 = "16556x3km4si7gvprf7xmsiqw1ygjwavhbgh32fmzf7709bpqnhs";
+  sha256 = "009h9phdgnkbvz5fri81b895y2hbmw5x7z67rnn31j87khbhnfz9";
   buildDepends = [ text transformers ];
   meta = {
     homepage = "https://john-millikin.com/software/enumerator/";

pkgs/development/libraries/haskell/fast-logger/default.nix

@@ -0,0 +1,17 @@
+{ cabal, blazeBuilder }:
+
+cabal.mkDerivation (self: {
+  pname = "fast-logger";
+  version = "0.0.1";
+  sha256 = "19ff2dhkh62i1ljsl90wnsblzk30dz0yx4kw5gk1hb22md7hakim";
+  buildDepends = [ blazeBuilder ];
+  meta = {
+    description = "A fast logging system";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.0.4";
+  version = "1.1.0.1";
-  sha256 = "051ryqjzc74lnlbdd1ngxgqj56p43ls5xhafmldnyhkv75x59svw";
+  sha256 = "0nzqx1d4hwailfkcb9g03hagws9j6valqd5yp7972kmhbq0c8h3s";
   buildDepends = [ mtl transformers ];
   meta = {
     description = "First class accessor labels";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.5.2.1";
+  version = "1.6.0.1";
-  sha256 = "1mwk9gnkbjr76f9g79ixxlwzpsvmhflp5c8a0584fyypjg2r33n3";
+  sha256 = "0yy8yl2s3n0kyr14bcxp1hjzh3wlrhc0xp2ngl3wbz1hbzyrsdlf";
   buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "0.10.5";
+  version = "0.10.6";
-  sha256 = "0kizy0qij6zbayrbb3gr4iqys1551ax5c8w5lvh6chg3ypl1i1m3";
+  sha256 = "0ai00jwbq5nnrgcfhz3sxm2jm2jvz7qbj56lr0wlc3z818a22ams";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];

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

@@ -0,0 +1,42 @@
+{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
+ haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix,
+ stm, syb, deepseq, text, transformers, mtl, xhtml, zlib,
+ cabalInstall, alex, happy, haddock, ghc}:
+
+# This is just a meta-package. Because upstream fails to provide proper versioned
+# release tarballs that can be used for the purpose of verifying this package, we
+# just create it on the fly from a simple Setup.hs file and a .cabal file that we
+# store directly in the nixpkgs repository.
+
+cabal.mkDerivation (self : {
+  pname = "haskell-platform";
+  version = "2011.4.0.0";
+  cabalFile = ./haskell-platform-2011.4.0.0.cabal;
+  setupFile = ./Setup.hs;
+  src = null;
+  propagatedBuildInputs = [
+    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
+    haskellSrc html network parallel parsec regexBase regexCompat regexPosix
+    stm syb deepseq text transformers mtl xhtml zlib
+    cabalInstall alex happy ghc haddock
+  ];
+  unpackPhase = ''
+    sourceRoot=haskell-platform
+    mkdir $sourceRoot
+    cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal
+    cp ${self.setupFile} $sourceRoot/Setup.hs
+    touch $sourceRoot/LICENSE
+  '';
+  noHaddock = true;
+  meta = {
+    homepage = "http://haskell.org/platform";
+    description = "Haskell Platform meta package";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
+

pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal

@@ -0,0 +1,90 @@
+name:                haskell-platform
+version:             2011.4.0.0
+homepage:            http://haskell.org/platform
+license:             BSD3
+license-file:        LICENSE
+author:              libraries@haskell.org
+maintainer:          haskell-platform@projects.haskell.org
+category:            System
+synopsis:            The Haskell Platform
+description:
+    The Haskell Platform (HP) is the blessed set of libraries and tools on
+    which to build further Haskell libraries and applications. It is
+    intended to provide a comprehensive, stable, and quality tested base for
+    Haskell projects to work from.
+    .
+    This version specifies the following additional developer tools be
+    installed, for a system to be in full compliance:
+    . 
+    * cabal-install
+    * alex
+    * happy
+    * haddock
+
+cabal-version:       >= 1.8
+build-type:          Custom
+tested-with:         GHC ==7.0.4
+
+library
+  build-depends:
+    -- ghc 7.x
+    -- Core libraries: provided by every ghc installation
+    -- We don't include "non-API" packages here.
+    -- array                    ==0.3.0.2
+    -- base                     ==4.3.1.0
+    -- bytestring               ==0.9.1.10
+    -- Cabal                    ==1.10.2.0
+    -- containers               ==0.4.0.0
+    -- directory                ==1.1.0.0
+    -- extensible-exceptions    ==0.1.1.2
+    -- filepath                 ==1.2.0.0
+    -- haskell2010              ==1.0.0.0
+    -- haskell98                ==1.1.0.1
+    -- hpc                      ==0.5.0.6
+    -- old-locale               ==1.0.0.2
+    -- old-time                 ==1.0.0.6
+    -- pretty                   ==1.0.1.2
+    -- process                  ==1.0.1.5
+    -- random                   ==1.0.0.3
+    -- template-haskell         ==2.5.0.0
+    -- time                     ==1.2.0.3
+    -- unix                     ==XXX 2.4.2.0
+    -- Win32                    ==XXX 2.2.0.1
+
+    -- Libraries in addition to what GHC provides:
+    -- Note: newer versions of cgi need monad-catchio.
+    cgi                         ==3001.1.7.4,
+    fgl                         ==5.4.2.4,
+    GLUT                        ==2.1.2.1,
+    haskell-src                 ==1.0.1.4,
+    html                        ==1.0.1.2,
+    HUnit                       ==1.2.4.2,
+    network                     ==2.3.0.5,
+    OpenGL                      ==2.2.3.0,
+    parallel                    ==3.1.0.1,
+    parsec                      ==3.1.1,
+    QuickCheck                  ==2.4.1.1,
+    regex-base                  ==0.93.2,
+    regex-compat                ==0.95.1,
+    regex-posix                 ==0.95.1,
+    stm                         ==2.2.0.1,
+    syb                         ==0.3.3,
+    xhtml                       ==3000.2.0.4,
+    zlib                        ==0.5.3.1,
+    HTTP                        ==4000.1.2,
+    deepseq                     ==1.1.0.2,
+
+    -- 2011.1 proposals:
+    text                        ==0.11.1.5,
+    transformers                ==0.2.2.0,
+    mtl                         ==2.0.1.0
+
+  -- Depending on programs does not work, they are not registered
+  -- We list them to help distro packaging.
+  build-tools:
+    cabal-install ==0.10.2,
+    alex          ==2.3.5,
+    happy         ==1.18.6
+    -- hscolour      ==1.17       
+  --  haddock       ==2.9.2     -- need to use the one shipped with ghc
+

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

@@ -1,14 +1,10 @@
-{ cabal, binary, blas, gsl, HUnit, liblapack, QuickCheck, random
+{ cabal, binary, blas, gsl, liblapack, storableComplex, vector }:
-, storableComplex, vector
-}:
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.12.0.2";
+  version = "0.13.0.0";
-  sha256 = "08i3vi0vs6wpyvjsjpqrxp8lw0f89cgzwv1j27y7i2yfp4xmrw8d";
+  sha256 = "1jlibgg2nrgajw2ny0dq88f5mhrffi7kda9bb8sp9szf4a0kd4wd";
-  buildDepends = [
+  buildDepends = [ binary storableComplex vector ];
-    binary HUnit QuickCheck random storableComplex vector
-  ];
   extraLibraries = [ blas gsl liblapack ];
   configureFlags = "-fvector";
   meta = {

pkgs/development/libraries/haskell/http-conduit/default.nix

@@ -0,0 +1,31 @@
+{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
+, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
+, conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase
+, monadControl, network, text, tls, tlsExtra, transformers
+, transformersBase, utf8String, zlibConduit, zlibEnum
+}:
+
+cabal.mkDerivation (self: {
+  pname = "http-conduit";
+  version = "1.0.0";
+  sha256 = "1ix2qx6zqp8g7hjg2ygwivzg4hhz2ac22rbybh9adzvzw0q2yvgk";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
+    blazeBuilderConduit caseInsensitive certificate conduit cprngAes
+    dataDefault failure httpTypes liftedBase monadControl network text
+    tls tlsExtra transformers transformersBase utf8String zlibConduit
+    zlibEnum
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/http-enumerator";
+    description = "HTTP client package with conduit interface and HTTPS support";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/http-enumerator/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-enumerator";
-  version = "0.7.2";
+  version = "0.7.2.1";
-  sha256 = "096rwnfm8bqn0pq9cs4i2kr1ljmawk2l17afw301zqfg79q97crc";
+  sha256 = "1qbarxi9268yzb3phnfgvnszbkzs6r63gqzy63h69kpi0k0wl84i";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/http-types/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-types";
-  version = "0.6.7";
+  version = "0.6.8";
-  sha256 = "04bmw5k9gvlh7x4ggmwz7pdc1ik3va0v4icg7nv47ab2w2pn88pb";
+  sha256 = "0amjpn93wc7jhfy1n69mhiryi2yy40k5388ap3iwqi79mblkjf31";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeBuilder caseInsensitive text ];

pkgs/development/libraries/haskell/lifted-base/default.nix

@@ -0,0 +1,20 @@
+{ cabal, baseUnicodeSymbols, monadControl, transformersBase }:
+
+cabal.mkDerivation (self: {
+  pname = "lifted-base";
+  version = "0.1.0.2";
+  sha256 = "1j810pdkhl6kpc368081ar1k9342k3bl4cmx294zdyd0j00n23zx";
+  buildDepends = [
+    baseUnicodeSymbols monadControl transformersBase
+  ];
+  meta = {
+    homepage = "https://github.com/basvandijk/lifted-base";
+    description = "lifted IO operations from the base library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/monad-control/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-control";
-  version = "0.3.0.1";
+  version = "0.3.1";
-  sha256 = "0aa73cw82yssias0a9y237h9r4v4abvs0lv2lmhxaa4a4mdrj3ms";
+  sha256 = "0laqvbnj1dfcdxrybxdnzw5g95drv34ys0cbwkcw47nl9w801p45";
   buildDepends = [
     baseUnicodeSymbols transformers transformersBase
   ];

pkgs/development/libraries/haskell/monad-par/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par";
-  version = "0.1.0.2";
+  version = "0.1.0.3";
-  sha256 = "0ca5fbc92bmghg8pk40rwcf58jk3y7xcr0nwfhyhi67riqnwqrl8";
+  sha256 = "1c0yclil152hv06c2sbgam9amd63nnzh7a4xsnxb05wgy93qs2mg";
   buildDepends = [ deepseq HUnit ];
   meta = {
     homepage = "https://github.com/simonmar/monad-par";

pkgs/development/libraries/haskell/multirec/0.6.nix

@@ -1,18 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "multirec";
-  version = "0.6";
-  sha256 = "1k0icyz9i4hc5vfpwrv42l3q4lrnsb1bswhyyv63d9azffn5flys";
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
-    description = "Generic programming for families of recursive datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multirec";
-  version = "0.5.1";
+  version = "0.7.1";
-  sha256 = "0y62gb2ml0799a3f1ny5ydjc4rjwj1dgs48f5fj6hf2fpl4hk02l";
+  sha256 = "1a3snlv6lr9mi4nrl4cyc5ilk6flbdn0ck2sqla6dyb2zdlgf5ph";
   noHaddock = true;
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";

pkgs/development/libraries/haskell/network/2.3.0.5.nix

@@ -0,0 +1,18 @@
+{ cabal, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "network";
+  version = "2.3.0.5";
+  sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0";
+  buildDepends = [ parsec ];
+  meta = {
+    homepage = "http://github.com/haskell/network";
+    description = "Low-level networking interface";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/parallel/3.2.0.2.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "parallel";
-  version = "3.2.0.0";
+  version = "3.2.0.2";
-  sha256 = "1wqdy9p7xqq84ffgzdakvqydxq9668r9xq3wyay9wlgrk83wd1sq";
+  sha256 = "0sy67cdbwh17wng6b77h9hnkg59mgnyilwvirihmq9535jm9yml2";
   buildDepends = [ deepseq ];
   meta = {
     description = "Parallel programming library";

pkgs/development/libraries/haskell/path-pieces/0.1.0.nix

@@ -0,0 +1,18 @@
+{ cabal, text }:
+
+cabal.mkDerivation (self: {
+  pname = "path-pieces";
+  version = "0.1.0";
+  sha256 = "12dgiq2pz94pwa5v5wv96ps0nl5w23r44nnp4lm4cdhl063c9w8d";
+  buildDepends = [ text ];
+  meta = {
+    homepage = "http://github.com/snoyberg/path-pieces";
+    description = "Components of paths";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.6.4.3";
+  version = "0.6.4.4";
-  sha256 = "0j4agwm8hcphrmzmc7d7al57cwp3i5iy7d8yhqw9m8pcx61sqkg4";
+  sha256 = "0n4zl0r8nmp3pwsgc0kiy7fgk2dfvdvagv1gvjxrs8545c5ycggv";
   buildDepends = [
     blazeHtml dataObject enumerator monadControl mtl pathPieces pool
     text time transformers transformersBase

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "regular";
-  version = "0.3.3";
+  version = "0.3.4";
-  sha256 = "1xlpp60nvdiqkcn66dnpww72hcawyc1w7cd9zk9kk88x574kqzf7";
+  sha256 = "10gfid99xcqv3i9rp4x8hykk91qq3h7b7lxzsl7ii58vmifa4kgq";
   meta = {
     description = "Generic programming library for regular datatypes";
     license = self.stdenv.lib.licenses.bsd3;

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

@@ -0,0 +1,20 @@
+{ cabal, baseUnicodeSymbols, dstring, random, stringCombinators }:
+
+cabal.mkDerivation (self: {
+  pname = "repr";
+  version = "0.4.1.2";
+  sha256 = "09rv23p1hvvfw5wnhiawgrpqgqa4i0d00skyj9z1jj6bfxk5avjs";
+  buildDepends = [
+    baseUnicodeSymbols dstring random stringCombinators
+  ];
+  meta = {
+    homepage = "https://github.com/basvandijk/repr";
+    description = "Render overloaded expressions to their textual representation";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/shakespeare-css/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "0.10.4";
+  version = "0.10.5";
-  sha256 = "006ndbhzxkr2zw6gs13bm5pfq7i301bbg6nhagm3h9nnzp155snz";
+  sha256 = "1cnv9qgp1llrrvcqp64mq207wdsxpqza9yq5nzlsgrh6qlzvm4hs";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";

pkgs/development/libraries/haskell/shakespeare-i18n/default.nix

@@ -0,0 +1,18 @@
+{ cabal, parsec, shakespeare, text }:
+
+cabal.mkDerivation (self: {
+  pname = "shakespeare-i18n";
+  version = "0.0.0";
+  sha256 = "1zyr63ncd92c30afh0sf4lq7p253jd3gjvcv65f7i0njqpc1lg9y";
+  buildDepends = [ parsec shakespeare text ];
+  meta = {
+    homepage = "http://www.yesodweb.com/book/i18n";
+    description = "A type-based approach to internationalization";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/shakespeare-js/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "0.10.3";
+  version = "0.10.4";
-  sha256 = "1xz4jf91dfz60dji31d3hyy1k01hk0v41pb8qmi598jylk9iz1r2";
+  sha256 = "15mh93d38qpqnrgxvaq659zwl2mks9xhkynhlpjrf8zb234knxjw";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";

pkgs/development/libraries/haskell/simple-sendfile/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.1.3";
+  version = "0.2.0";
-  sha256 = "0n78d6bn2hsm3p6r2kc2cr5nf9v1vqs6v5i9x71f910r3kk2grm8";
+  sha256 = "1rsbmlnks4q8gsfzwqwcj901b8hzcrfb85z7wy3szj4h0axw4264";
   buildDepends = [ network ];
   meta = {
     description = "Cross platform library for the sendfile system call";

pkgs/development/libraries/haskell/snap/core.nix

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-core";
-  version = "0.7";
+  version = "0.7.0.1";
-  sha256 = "1rplv1pg531jfmvxlhl7lz9hdhbxllk59daik013i172wglggivp";
+  sha256 = "010w3ycwalz48288342rmwg87pdml7ixg9drw38k206q9s9a9cp9";
   buildDepends = [
     attoparsec attoparsecEnumerator base16Bytestring blazeBuilder
     blazeBuilderEnumerator bytestringMmap bytestringNums

pkgs/development/libraries/haskell/snap/server.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-server";
-  version = "0.7";
+  version = "0.7.0.1";
-  sha256 = "1zvijghk7597xbmxv2x3qk92jlckwpz73c57cmfl63as5x6psxhr";
+  sha256 = "149jgd9mcndw9sc051020y7yiai1fipjnqk4s3sbw4lmaysap673";
   buildDepends = [
     attoparsec attoparsecEnumerator binary blazeBuilder
     blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "split";
-  version = "0.1.4.1";
+  version = "0.1.4.2";
-  sha256 = "0cdn2sb3m62bnxdz59diwwaxysh3kj4kk1srn4m80p03fj60s0q5";
+  sha256 = "09vi7vw4i4r78gyp3bbvhvvyiqi8rgf678ppmq99qrfqm34c2fl9";
   meta = {
     homepage = "http://code.haskell.org/~byorgey/code/split";
     description = "Combinator library for splitting lists";

pkgs/development/libraries/haskell/string-combinators/default.nix

@@ -0,0 +1,18 @@
+{ cabal, baseUnicodeSymbols }:
+
+cabal.mkDerivation (self: {
+  pname = "string-combinators";
+  version = "0.6.0.2";
+  sha256 = "1bsnli6376nq5dmcx8da2fakj7h73plqz6v1myzhkz1f6r3qcjfi";
+  buildDepends = [ baseUnicodeSymbols ];
+  meta = {
+    homepage = "https://github.com/basvandijk/string-combinators";
+    description = "Polymorphic functions to build and combine stringlike values";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/syb/0.3.3.nix

@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "syb";
+  version = "0.3.3";
+  sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901";
+  meta = {
+    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
+    description = "Scrap Your Boilerplate";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/syb/syb-with-class.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "syb-with-class";
-  version = "0.6.1.2";
+  version = "0.6.1.3";
-  sha256 = "1hzwhfpl4w5nblkr2l4l4i7xxkvv7n5adr3i9miqmw1krlxs852d";
+  sha256 = "0dmj9ah7az5lckamvm46pff0595p6v4pvzdv0lqq97gjs5i59y9d";
   meta = {
     description = "Scrap Your Boilerplate With Class";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/system-filepath/default.nix

@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "system-filepath";
-  version = "0.4.3";
+  version = "0.4.4";
-  sha256 = "16a57dipz3aid5n22gzyd9yqmsxm98c3s6vb7minj82q9rbl5z67";
+  sha256 = "16904xwbcy82ghf1bckw8h63pfj9jfbdlqrr8jf91jzl27lqlwxf";
   buildDepends = [ deepseq text ];
   meta = {
-    homepage = "https://john-millikin.com/software/hs-filepath/";
+    homepage = "https://john-millikin.com/software/haskell-filesystem/";
     description = "High-level, byte-based file and directory path manipulations";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.5.0.3";
+  version = "0.5.0.4";
-  sha256 = "0pw3b5qvsngy0wdny8y3widkaphvjksg7mnpa8yzqfsw0rl36s0p";
+  sha256 = "0wi7zix10p73hb8aiyq47d27k5hi0l0ba5p6h7kdbhia9xm5w5w5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];

pkgs/development/libraries/haskell/text/0.11.1.12.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "text";
-  version = "0.11.1.9";
+  version = "0.11.1.12";
-  sha256 = "12lq9v1byrsan7rp7kywkbwp15qyganpkanmln43yylxdzdc8a2k";
+  sha256 = "0j2044whj3xckmxqmgdjbc2mpwdan481qzjslwplqbqwml2jvkml";
   buildDepends = [ deepseq ];
   meta = {
     homepage = "https://github.com/bos/text";

pkgs/development/libraries/haskell/text/0.11.1.5.nix

@@ -0,0 +1,18 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "text";
+  version = "0.11.1.5";
+  sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l";
+  buildDepends = [ deepseq ];
+  meta = {
+    homepage = "https://bitbucket.org/bos/text";
+    description = "An efficient packed Unicode text type";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/tls-extra/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls-extra";
-  version = "0.4.1";
+  version = "0.4.2";
-  sha256 = "0yimnq5p89jfbnk5cpa9w30zvfqs9dxxjxy2a86l8jvba5xb8068";
+  sha256 = "14zi5xzdyzdzw9qv6775li635x8i9rkp2z655ygzcwz5v3spjz9z";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "0.8.3.2";
+  version = "0.8.4";
-  sha256 = "1g30viz94qhwv3v16d9njrwyqmv0p1hs0r11xmzx0adp806w54z9";
+  sha256 = "1xd6cax4ldvahjjs5kdhcjmy4rx1ywp6r3alaifxbk2397zi7p1v";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/transformers-base/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "transformers-base";
-  version = "0.4.0.1";
+  version = "0.4.1";
-  sha256 = "0avnnxbxh59xgxzb8vldysrbw37sim9iaiiscgjhdlscxy6yasbb";
+  sha256 = "1d3w7k7smvdnnn4q6xpdhsj9zvj6372ihyhz4lrhdvgh72pfiaag";
   buildDepends = [ transformers ];
   meta = {
     homepage = "https://github.com/mvv/transformers-base";

pkgs/development/libraries/haskell/unordered-containers/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unordered-containers";
-  version = "0.1.4.4";
+  version = "0.1.4.6";
-  sha256 = "1fvicb2a8fnfg7579x6v4fpyz3dhjij8vmny4fa8x5g8ih608kb8";
+  sha256 = "1azwxbrzlzaw54idp3z2xx1xlywzsf1r893blbz51nnwcj9v550d";
   buildDepends = [ deepseq hashable ];
   meta = {
     description = "Efficient hashing-based container types";

pkgs/development/libraries/haskell/uu-parsinglib/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uu-parsinglib";
-  version = "2.7.3.1";
+  version = "2.7.3.2";
-  sha256 = "11lwf2b4l4sll6xvscv3c2n3kl6hs0s8rplw66cwskcck3mvs7ms";
+  sha256 = "0z53s9wvk57g3d9x3iswjydwm7nw5vfrj7k08v75fw6rwldkal60";
   buildDepends = [ ListLike time ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";

pkgs/development/libraries/haskell/wai-extra/default.nix

@@ -1,15 +1,15 @@
 { cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive
-, dataDefault, enumerator, httpTypes, network, text, time
+, dataDefault, enumerator, fastLogger, httpTypes, network, text
-, transformers, wai, zlibBindings, zlibEnum
+, time, transformers, wai, zlibBindings, zlibEnum
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "0.4.5.2";
+  version = "0.4.6";
-  sha256 = "05gq22il1jnvw5rcqr6gassxj29f8l4536zm6bpgk1kff8cxa3g1";
+  sha256 = "1wpdfzw5qzbd33iypgppp4822vn7vhja6y26dnkb17n08r83vvhv";
   buildDepends = [
     blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault
-    enumerator httpTypes network text time transformers wai
+    enumerator fastLogger httpTypes network text time transformers wai
     zlibBindings zlibEnum
   ];
   meta = {

pkgs/development/libraries/haskell/wai-logger/default.nix

@@ -0,0 +1,22 @@
+{ cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger
+, httpTypes, network, time, wai
+}:
+
+cabal.mkDerivation (self: {
+  pname = "wai-logger";
+  version = "0.1.2";
+  sha256 = "0pzbdjy0xkjqkzc5w1v0hh18jgbxlkllsjwxabswkh8gl73mp7d9";
+  buildDepends = [
+    blazeBuilder byteorder caseInsensitive fastLogger httpTypes network
+    time wai
+  ];
+  meta = {
+    description = "A logging system for WAI";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "0.4.6.2";
+  version = "0.4.6.3";
-  sha256 = "1ja9w3440j69w7638wrjd6067svqcsaqdl1zklr6jx20zyadww94";
+  sha256 = "1gfjhp1s42ynpi3kh8fr6fp5nwirxz0gasr7zs7q2qwwvlq9pzm6";
   buildDepends = [
     blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
     httpTypes network simpleSendfile transformers unixCompat wai