Merge branch 'master' into x-updates

Conflicts (both messed with mesa):
pkgs/top-level/all-packages.nix

pkgs/applications/graphics/xfig/default.nix

···
 
   patches =
     let
-      debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-2";
+      debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-3";
     in
     [
       (fetchurl {
-        url = "${debPrefix}/35_CVE-2010-4262.dpatch";
-        sha256 = "18741b3dbipgr55fyp5x0296za3336ylln639jw8yjcyd1call22";
+        url = "${debPrefix}/35_CVE-2010-4262.patch";
+        sha256 = "1pj669sz49wzjvvm96gwbnani7wqi0ijh21imqdzqw47qxdv7zp5";
       })
       (fetchurl {
-        url = "${debPrefix}/13_remove_extra_libs.dpatch";
-        sha256 = "0v3k30ib7xq5wfhd3yacnal4gbih7nqw0z0aycvc0hafffl97i46";
+        url = "${debPrefix}/13_remove_extra_libs.patch";
+        sha256 = "1qb14ay0c8xrjzhi21jl7sl8mdzxardldzpnflkzml774bbpn8av";
       })
       (fetchurl {
-        url = "${debPrefix}/36_libpng15.dpatch";
-        sha256 = "0ssmvlcpjn3iqj3l38db8j8qpqbzixlwpczq01m49r5w9l3viy8k";
+        url = "${debPrefix}/36_libpng15.patch";
+        sha256 = "0jd5bqj7sj9bbnxg2d0y6zmv4ka4qif2x4zc84ngdqga5433anvn";
       })
     ];
 

pkgs/applications/misc/taskjuggler/default.nix

···
 {stdenv, fetchurl,
 zlib, libpng, libjpeg, perl, expat, qt3,
 libX11, libXext, libSM, libICE,
-withKde, kdelibs, kdebase
 }:
 
 stdenv.mkDerivation rec {
···
 
   buildInputs =
     [zlib libpng libX11 libXext libSM libICE perl expat libjpeg]
-    ++ (if withKde then [kdelibs] else [])
     ;
 
   patches = [ ./timezone-glibc.patch ];
···
     --x-includes=${libX11}/include
     --x-libraries=${libX11}/lib
     --with-qt-dir=${qt3}
-    --with-kde-support=${if withKde then "yes" else "no"} --with-ical-support=${if withKde then "yes" else "no"}
   ";
 
   preInstall = ''
···
 
   installFlags =
     # kde_locale is not defined when installing without kde.
-    if withKde then "" else "kde_locale=\${out}/share/locale";
+    "kde_locale=\${out}/share/locale";
 
   meta = {
     homepage = "http://www.taskjuggler.org";

pkgs/applications/office/ledger/2.6.3.nix

···
-# Patchelf fails to hard-code the library paths to ledger's
-# libamounts.so and libledger-2.6.3 shared objects:
-#
-# $ ldd ~/.nix-profile/bin/ledger
-#         linux-vdso.so.1 =>  (0x00007fff513ff000)
-#         libamounts.so.0 => not found
-#         libledger-2.6.3.so => not found
-#         libstdc++.so.6 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libstdc++.so.6 (0x00007f1f0feee000)
-#         libpcre.so.0 => /nix/store/kfhy189arpj3wrfzpgw8p9ac4g4hfgca-pcre-8.10/lib/libpcre.so.0 (0x00007f1f0fcd3000)
-#         libgmp.so.3 => /nix/store/ji6py9m9w2ray1bmpkmgig9llj1i2ggf-gmp-4.3.2/lib/libgmp.so.3 (0x00007f1f0fa7f000)
-#         libm.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libm.so.6 (0x00007f1f0f7fd000)
-#         libgcc_s.so.1 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libgcc_s.so.1 (0x00007f1f0f5e8000)
-#         libc.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6 (0x00007f1f0f27d000)
-#         /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2 (0x00007f1f101ef000)
-#
-# Fortunately, libtools builds the program with proper paths hard-coded
-# alread, so we don't need patchelf. Phew!
+{ stdenv, fetchurl, emacs, gmp, pcre, expat }:
 
-{stdenv, fetchurl, emacs, gmp, pcre, expat}:
-
-let
+stdenv.mkDerivation rec {
   name = "ledger-2.6.3";
-in
-stdenv.mkDerivation {
-  inherit name;
 
   src = fetchurl {
-    url = "https://github.com/downloads/jwiegley/ledger/${name}.tar.gz";
+    url = "https://github.com/downloads/ledger/ledger/${name}.tar.gz";
     sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k";
   };
 
   buildInputs = [ emacs gmp pcre expat ];
 
   configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
-  dontPatchELF = true;
+
   doCheck = true;
+
+  # Patchelf breaks the hard-coded rpath to ledger's libamounts.0.so and
+  # libledger-2.6.3.so. Fortunately, libtool chooses proper rpaths to
+  # begin with, so we can just disable patchelf to avoid the issue.
+  dontPatchELF = true;
 
   meta = {
     homepage = "http://ledger-cli.org/";

pkgs/applications/office/openoffice/builder.sh

···
-source $stdenv/setup
-
-export nodep=TRUE
-export NO_HIDS=TRUE
-
-export PATH=$icu/sbin:$PATH
-
-postUnpack() {
-  tar xvjf $src_system
-}
-
-preConfigure() {
-    ./configure --help
-
-    for i in sysui/desktop/share/makefile.mk; do 
-	substituteInPlace $i --replace /bin/bash $shell
-    done
-
-    SRCDIR=
-
-    sed -e '/CURL_NO_OLDIES/d' -i ucb/source/ucp/ftp/makefile.mk
-}
-
-postConfigure() {
-    for i in LinuxX86*Env.Set; do
-	substituteInPlace $i --replace /usr /no-such-path
-    done
-    substituteInPlace solenv/inc/libs.mk \
-	--replace /usr/lib/libjpeg.so $libjpeg/lib/libjpeg.so \
-	--replace /usr/lib64/libjpeg.so $libjpeg/lib/libjpeg.so
-}
-
-buildPhase() {
-    source LinuxX86*Env.Set.sh
-    ./bootstrap
-    # bootstrap defines the alias 'build', that mostly runs this perl script:
-    (cd instsetoo_native; perl ../solenv/bin/build.pl --all) # wait a few hours... add -P4 for quadcores
-}
-
-wrapSOffice() {
-    local fn=$1
-    local arg=$2
-
-    # !!! should use makeWrapper for this.
-
-    cat > $out/bin/$fn <<EOF 
-#! $shell
-# Add fontconfig to the library search path; apparently OpenOffice
-# looks for it at runtime.
-export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$fontconfig/lib:$libjpeg/lib:$cups/lib
-export JAVA_HOME=$jdk
-exec $ooFiles/openoffice.org3/program/soffice $arg "\$@"
-EOF
-    chmod +x $out/bin/$fn
-}
-
-installPhase() {
-    ooFiles=$out/lib/openoffice
-
-    # This was all borrowed from ooo-build-2.2.1's bin/ooinstall.
-    # This needs the ./bootstrap having run in the buildPhase to get some env vars.
-    eval $(grep 'BUILD\|LAST_MINOR' $SOLARENV/inc/minor.mk)
-    export PYTHONPATH=$SOLARVERSION/$INPATH/lib:$SRC_ROOT/instsetoo_native/$INPATH/bin:$PYTHONPATH 
-    export OUT=../$INPATH
-    export LOCAL_OUT=../$INPATH
-    export LOCAL_COMMON_OUT=../$INPATH
-
-    # Do the actual installation into $out.
-    (cd $SRC_ROOT/instsetoo_native/util && perl -w $SOLARENV/bin/make_installer.pl \
-	-f openoffice.lst -l en-US -p OpenOffice \
-	-buildid $BUILD -simple $ooFiles)
-
-    mkdir -p $out/bin
-    for i in soffice ooffice; do wrapSOffice $i; done
-    
-    # Create some wrappers to start individual OpenOffice components.
-    for i in writer calc draw impress base math web; do wrapSOffice oo$i -$i; done
-    
-    # Create symlinks to desktop files, so that openoffice.org apps can be picked from
-    # the application menu in KDE and GNOME
-    mkdir -p $out/share
-    ln -s $out/lib/openoffice/openoffice.org3/share/xdg $out/share/applications
-
-    # Apply a minor correction to the *.desktop files in order to correctly address the icons
-    # The openoffice- prefix should be removed from the icon identifiers
-    for appl in $out/share/applications/*.desktop
-    do
-        chmod 644 $appl # What's wrong with the file permissions?
-        sed -i '/Icon/d' $appl
-        echo "Icon=$(echo $(basename $appl) | sed 's/.desktop//')" >> $appl    
-    done
-    
-    # Copy icons so that the menu items in KDE and GNOME will look much nicer
-    (cd $SRC_ROOT/sysui/desktop/icons
-     install -v -d $out/share/icons/{hicolor,locolor} -m 755
-     cp -rv hicolor/*x* $out/share/icons/hicolor
-     cp -rv locolor/*x* $out/share/icons/locolor
-    )
-        
-    # The desktop files expect a openoffice.org3 executable in the PATH, which is a symlink to soffice
-    ln -s $out/bin/soffice $out/bin/openoffice.org3
-}
-
-genericBuild
-

pkgs/applications/office/openoffice/default.nix

···
-{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip
-, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
-, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
-, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
-, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
-, libXinerama, openssl, gperf, cppunit, GConf, ORBit2
-}:
-
-let version = "3.2.1"; in
-
-stdenv.mkDerivation rec {
-  name = "openoffice.org-${version}";
-  builder = ./builder.sh;
-
-  downloadRoot = "http://openoffice.mirrorbrain.org/files/stable";
-  versionDirs = true;
-
-  src = fetchurl {
-      url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2";
-      sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i";
-    };
-
-  patches = [ ./oo.patch ./root-required.patch ./xlib.patch ];
-
-  postPatch =
-    /* Compiling with GCC 4.5 fails:
-
-         Compiling: cppu/source/AffineBridge/AffineBridge.cxx
-         [...]
-         ../../inc/uno/lbnames.h:67:2: error: #error "Supported gcc majors are 2 , 3 and 4 <= 4.4.  Unsupported gcc major version."
-
-       However, we can't compile with GCC 4.4 because then we'd end up with
-       two different versions of libstdc++ (because the deps are compiled
-       with 4.5), which isn't supported (link time error.)
-
-       Thus, force compilation with 4.5 and hope for the best.  */
-    '' sed -i "cppu/inc/uno/lbnames.h" \
-           -e 's/#[[:blank:]]*error "Supported.*$//g'
-    '';
-
-  src_system = fetchurl {
-      url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2";
-      sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc";
-    };
-
-  preConfigure = ''
-    PATH=$PATH:${icu}/sbin
-  '';
-
-  configureFlags = "
-    --with-package-format=native
-    --disable-epm
-    --disable-fontooo
-    --disable-gnome-vfs
-    --disable-gnome-vfs
-    --disable-mathmldtd
-    --disable-mozilla
-    --disable-odk
-    --disable-pasf
-    --with-cairo
-    --with-system-libs
-    --with-system-python
-    --with-system-boost
-    --with-system-db
-    --with-jdk-home=${jdk}
-    --with-ant-home=${ant}
-    --without-afms
-    --without-dict
-    --without-fonts
-    --without-myspell-dicts
-    --without-nas
-    --without-ppds
-    --without-system-agg
-    --without-system-beanshell
-    --without-system-hsqldb
-    --without-system-xalan
-    --without-system-xerces
-    --without-system-xml-apis
-    --without-system-xt
-    --without-system-jars
-    --without-system-hunspell
-    --without-system-altlinuxhyph
-    --without-system-lpsolve
-    --without-system-graphite
-  ";
-
-  LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
-
-  buildInputs = [
-    pam python tcsh libxslt perl ArchiveZip CompressZlib zlib 
-    libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl 
-    libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 
-    getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
-    cups libXinerama openssl gperf GConf ORBit2
-  ];
-
-  inherit icu fontconfig libjpeg jdk cups;
-
-  meta = {
-    description = "OpenOffice.org is a multiplatform and multilingual office suite";
-    homepage = http://www.openoffice.org/;
-    license = "LGPL";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-  };
-}

pkgs/applications/office/openoffice/oo.patch

···
-diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
-index 74c64bf..fbf8d21 100644
---- a/libtextcat/makefile.mk
-+++ b/libtextcat/makefile.mk
-@@ -57,7 +57,7 @@ ADDITIONAL_FILES= \
- #CONFIGURE_DIR=$(BUILD_DIR)
- 
- #relative to CONFIGURE_DIR
--CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
-+CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR)
- CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
- 
- BUILD_ACTION=make
-diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
-index 0d92de9..aae3b4f 100644
---- a/redland/raptor/makefile.mk
-+++ b/redland/raptor/makefile.mk
-@@ -130,7 +130,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
- CONFIGURE_DIR=
- CONFIGURE_ACTION=.$/configure
- # do not enable grddl parser (#i93768#)
--CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
-+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
- BUILD_ACTION=$(GNUMAKE)
- BUILD_FLAGS+= -j$(EXTMAXPROCESS)
- BUILD_DIR=$(CONFIGURE_DIR)
-diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
-index fba6460..fc70419 100644
---- a/redland/rasqal/makefile.mk
-+++ b/redland/rasqal/makefile.mk
-@@ -126,7 +126,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
- 
- CONFIGURE_DIR=
- CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
--CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
-+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
- BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
- BUILD_FLAGS+= -j$(EXTMAXPROCESS)
- BUILD_DIR=$(CONFIGURE_DIR)
-diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
-index 710d7d6..dd60f0d 100644
---- a/redland/redland/makefile.mk
-+++ b/redland/redland/makefile.mk
-@@ -132,7 +132,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
- 
- CONFIGURE_DIR=
- CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
--CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
-+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
- BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
- BUILD_FLAGS+= -j$(EXTMAXPROCESS)
- BUILD_DIR=$(CONFIGURE_DIR)
-diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch
-index 37b7964..e6fd962 100644
---- a/hunspell/hunspell-1.2.8.patch
-+++ b/hunspell/hunspell-1.2.8.patch
-@@ -619,3 +619,15 @@
-              p++;
-          }
-          if (i > 0 && buf[i - 1] == '\n') {
-+diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
-+index 90080f6..f069517 100755
-+--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh
-++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh
-+--- misc/hunspell-1.2.8/tests/test.sh	Sep  4 01:25:35 2007
-++++ misc/build/hunspell-1.2.8/tests/test.sh	Jun 18 11:53:11 2008
-+@@ -1,4 +1,4 @@
-+-#!/bin/bash
-++#!/bin/sh
-+ export LC_ALL="C"
-+ 
-+ function check_valgrind_log () {

pkgs/applications/office/openoffice/root-required.patch

···
-As nix chroot environment does not have the 'root' as owner, we have to disable
-the "owner=root" tar parameters when doing these tar files.
-They are built at openoffice build time.
-diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk
-index 3342aca..49679b1 100644
---- a/sysui/desktop/slackware/makefile.mk
-+++ b/sysui/desktop/slackware/makefile.mk
-@@ -100,7 +100,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
- 
- $(MISC)/$(TARGET)/empty.tar :
- 	@$(MKDIRHIER) $(@:d)/empty
--	@tar -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ .
-+	@tar -C $(MISC)/$(TARGET)/empty  -cf $@ .
- 
- 
- # --- packaging ---------------------------------------------------
-@@ -112,7 +112,7 @@ $(MENUFILES) : $(MISC)/$(TARGET)/empty.tar
- 	-$(RM) -r $(MISC)$/$(@:b)
- 	dmake $(MISC)$/$(@:b)$/usr/share/applications $(MISC)$/$(@:b)$/install$/slack-desc $(MISC)$/$(@:b)$/install$/doinst.sh
- 	@$(COPY) $(MISC)/$(TARGET)$/empty.tar $@.tmp
--	@tar -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt
-+	@tar -C $(MISC)/$(@:b) --exclude application.flag -rf $@.tmp install usr opt
- 	@gzip < $@.tmp > $@
- 	@$(RM) $@.tmp
- 	$(RM) -r $(MISC)$/$(@:b)

pkgs/applications/office/openoffice/xlib.patch

···
-https://bugs.freedesktop.org/show_bug.cgi?id=31322
-
-diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx
-*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx	2010-05-26 20:34:28.000000000 +0200
---- OOO320_m19//vcl/unx/inc/dtint.hxx	2011-02-15 17:04:32.134813676 +0100
-***************
-*** 36,42 ****
-  class SalDisplay;
-  class AllSettings;
-  
-! #ifndef _XLIB_H_
-  // forwards from X
-  struct Display;
-  struct XEvent;
---- 36,42 ----
-  class SalDisplay;
-  class AllSettings;
-  
-! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
-  // forwards from X
-  struct Display;
-  struct XEvent;

pkgs/applications/version-management/git-and-tools/git/default.nix

···
 , libxslt, tcl, tk, makeWrapper
 , svnSupport, subversionClient, perlLibs, smtpPerlLibs
 , guiSupport
+, withManual ? true
 , pythonSupport ? true
 , sendEmailSupport
 }:
···
   patches = [ ./docbook2texi.patch ];
 
   buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
-    ++ # documentation tools
-       [ asciidoc texinfo xmlto docbook2x
+    ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
          docbook_xsl docbook_xml_dtd_45 libxslt ]
     ++ stdenv.lib.optionals guiSupport [tcl tk];
 
···
         notSupported $out/libexec/git-core/git-send-email "reinstall with config git = { sendEmailSupport = true } set"
        '')
 
-   + ''# Install man pages and Info manual
+   + stdenv.lib.optionalString withManual ''# Install man pages and Info manual
        make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
          -C Documentation ''
 

pkgs/applications/video/mplayer2/default.nix

···
+{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass
+, python3, docutils, which
+, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null
+, xineramaSupport ? true, libXinerama ? null
+, xvSupport ? true, libXv ? null
+, alsaSupport ? true, alsaLib ? null
+, screenSaverSupport ? true, libXScrnSaver ? null
+, vdpauSupport ? true, libvdpau ? null
+, dvdnavSupport ? true, libdvdnav ? null
+, bluraySupport ? true, libbluray ? null
+, speexSupport ? true, speex ? null
+, theoraSupport ? true, libtheora ? null
+, jackaudioSupport ? false, jackaudio ? null
+, pulseSupport ? true, pulseaudio ? null
+# For screenshots
+, libpngSupport ? true, libpng ? null
+, useUnfreeCodecs ? false
+}:
+
+assert x11Support -> (libX11 != null && libXext != null && mesa != null);
+assert xineramaSupport -> (libXinerama != null && x11Support);
+assert xvSupport -> (libXv != null && x11Support);
+assert alsaSupport -> alsaLib != null;
+assert screenSaverSupport -> libXScrnSaver != null;
+assert vdpauSupport -> libvdpau != null;
+assert dvdnavSupport -> libdvdnav != null;
+assert bluraySupport -> libbluray != null;
+assert speexSupport -> speex != null;
+assert theoraSupport -> libtheora != null;
+assert jackaudioSupport -> jackaudio != null;
+assert pulseSupport -> pulseaudio != null;
+assert libpngSupport -> libpng != null;
+
+let
+
+  codecs_src =
+    let
+      dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/;
+    in
+    if stdenv.system == "i686-linux" then fetchurl {
+      url = "${dir}/essential-20071007.tar.bz2";
+      sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
+    } else if stdenv.system == "x86_64-linux" then fetchurl {
+      url = "${dir}/essential-amd64-20071007.tar.bz2";
+      sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x";
+    } else if stdenv.system == "powerpc-linux" then fetchurl {
+      url = "${dir}/essential-ppc-20071007.tar.bz2";
+      sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z";
+    } else null;
+
+  codecs = if codecs_src != null then stdenv.mkDerivation {
+    name = "MPlayer-codecs-essential-20071007";
+
+    src = codecs_src;
+
+    installPhase = ''
+      mkdir $out
+      cp -prv * $out
+    '';
+
+    meta.license = "unfree";
+  } else null;
+
+in
+
+stdenv.mkDerivation rec {
+  name = "mplayer2-20130130";
+
+  src = fetchgit {
+    url = "git://git.mplayer2.org/mplayer2.git";
+    rev = "d3c580156c0b8777ff082426ebd61bb7ffe0c225";
+    sha256 = "1akf2mb2zklz609ks555vjvcs1gw8nwg5kbb9jwra8c4v1dfyhys";
+  };
+
+  prePatch = ''
+    sed -i /^_install_strip/d configure
+  '';
+
+  buildInputs = with stdenv.lib;
+    [ freetype pkgconfig ffmpeg libass docutils which ]
+    ++ optionals x11Support [ libX11 libXext mesa ]
+    ++ optional alsaSupport alsaLib
+    ++ optional xvSupport libXv
+    ++ optional theoraSupport libtheora
+    ++ optional xineramaSupport libXinerama
+    ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
+    ++ optional bluraySupport libbluray
+    ++ optional jackaudioSupport jackaudio
+    ++ optional pulseSupport pulseaudio
+    ++ optional screenSaverSupport libXScrnSaver
+    ++ optional vdpauSupport libvdpau
+    ++ optional speexSupport speex
+    ++ optional libpngSupport libpng
+    ;
+
+  buildNativeInputs = [ yasm python3 ];
+
+  postConfigure = ''
+    patchShebangs TOOLS
+  '';
+
+  configureFlags = with stdenv.lib;
+    ''
+      ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
+      ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
+      ${optionalString dvdnavSupport "--extra-ldflags=-ldvdread"}
+      ${if xvSupport then "--enable-xv" else "--disable-xv"}
+      ${if x11Support then "--enable-x11 --enable-gl --extra-cflags=-I{libx11}/include"
+		else "--disable-x11 --disable-gl"}
+      --disable-xvid
+      --disable-ossaudio
+    '';
+
+  NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
+
+  enableParallelBuilding = true;
+
+  # Provide a reasonable standard font.  Maybe we should symlink here.
+  postInstall =
+    ''
+      mkdir -p $out/share/mplayer
+      cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
+    '';
+
+  meta = {
+    description = "A movie player that supports many video formats (MPlayer fork)";
+    homepage = "http://mplayer2.org";
+    license = "GPLv3+";
+    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/desktops/kde-3/kdelibs/default.nix

···
-{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre
-, pkgconfig, libtiff, libxml2, libxslt, libtool, expat
-, freetype, bzip2, cups, attr, acl
-}:
-
-let version = "3.5.10"; in
-
-stdenv.mkDerivation {
-  name = "kdelibs-${version}";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2";
-    sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1";
-  };
-
-  patches = [
-    # We're not supposed to use linux/inotify.h, use sys/inotify.h instead.
-    # Adapted from Gentoo.
-    ./inotify.patch
-    
-    # Fixes compilation issues with openssl-1.0.0
-    ./kdelibs-3.5.10-openssl_1.0.0.patch
-  ];
-
-  buildInputs = [
-    zlib perl qt3 openssl pcre pkgconfig libtiff libxml2
-    libxslt expat libtool freetype bzip2 cups
-    xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
-  ];
-
-  propagatedBuildInputs = [attr acl];
-
-  # Prevent configure from looking for pkg-config and freetype-config
-  # in the wrong location (it looks in /usr/bin etc. *before* looking
-  # in $PATH).
-  preConfigure = ''
-    substituteInPlace configure \
-      --replace /usr/bin /no-such-path \
-      --replace /usr/local/bin /no-such-path \
-      --replace /opt/local/bin /no-such-path
-  '';
-
-  configureFlags = ''
-    --without-arts 
-    --with-ssl-dir=${openssl}
-    --x-includes=${xlibs.libX11}/include
-    --x-libraries=${xlibs.libX11}/lib
-  '';
-
-  meta.platforms = stdenv.lib.platforms.linux;
-}

pkgs/desktops/kde-3/kdelibs/inotify.patch

···
-diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp
-*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp	2006-07-22 10:16:37.000000000 +0200
---- kdelibs-3.5.10/kio/kio/kdirwatch.cpp	2009-04-01 13:26:48.000000000 +0200
-***************
-*** 64,74 ****
-  // debug
-  #include <sys/ioctl.h>
-  
-! #ifdef HAVE_INOTIFY
-  #include <unistd.h>
-  #include <fcntl.h>
-  #include <sys/syscall.h>
-- #include <linux/types.h>
-  // Linux kernel headers are documented to not compile
-  #define _S390_BITOPS_H
-  #include <linux/inotify.h>
---- 64,76 ----
-  // debug
-  #include <sys/ioctl.h>
-  
-! #if 1
-! #include <sys/inotify.h>
-! #include <fcntl.h>
-! #elif HAVE_INOTIFY
-  #include <unistd.h>
-  #include <fcntl.h>
-  #include <sys/syscall.h>
-  // Linux kernel headers are documented to not compile
-  #define _S390_BITOPS_H
-  #include <linux/inotify.h>

pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch

···
-diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.cc kdelibs-3.5.10-new/kio/kssl/kopenssl.cc
---- kdelibs-3.5.10-old/kio/kssl/kopenssl.cc	2006-07-22 01:16:39.000000000 -0700
-+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc	2010-03-31 09:34:38.000000000 -0700
-@@ -96,9 +96,14 @@
- static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
-                                    const EVP_CIPHER *,unsigned char *,int ,
-                                             pem_password_cb *, void *) = 0L;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
-+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
-+#else
- static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
- static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
- static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
-+#endif
- static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
- static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
- static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
-@@ -404,9 +409,14 @@
-       K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
-       K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
-       K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
-+      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
-+#else
-       K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
-       K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
-       K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
-+#endif
-       K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
-       K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
-       K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
-@@ -568,7 +578,7 @@
-       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
-       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
-       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
--      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
-+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
- #endif
- 
- 
-@@ -956,7 +966,13 @@
-    else return -1;
- }
- 
--
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
-+   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
-+        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
-+   else return -1;
-+}
-+#else
- ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
-    if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
-    else return 0L;
-@@ -968,7 +984,7 @@
-         return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
-    else return -1;
- }
--
-+#endif
- 
- int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
-    if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
-diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.h kdelibs-3.5.10-new/kio/kssl/kopenssl.h
---- kdelibs-3.5.10-old/kio/kssl/kopenssl.h	2006-07-22 01:16:39.000000000 -0700
-+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.h	2010-03-31 09:35:20.000000000 -0700
-@@ -48,6 +48,9 @@
- #include <openssl/stack.h>
- #include <openssl/bn.h>
- #undef crypt
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define STACK _STACK
-+#endif
- #endif
- 
- #include <kstaticdeleter.h>
-@@ -446,12 +449,12 @@
-     */
-    int PEM_write_bio_X509(BIO *bp, X509 *x);
- 
--
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L
-    /*
-     *   X509_asn1_meth - used for netscape output
-     */
-    ASN1_METHOD *X509_asn1_meth();
--
-+#endif
- 
-    /*
-     *   ASN1_i2d_fp - used for netscape output
-@@ -531,6 +534,9 @@
-     */
-    void sk_free(STACK *s);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
-+#endif
- 
-    /* 
-     *  Number of elements in the stack
-@@ -543,6 +549,9 @@
-     */
-    char *sk_value(STACK *s, int n);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
-+#endif
- 
-    /* 
-     *  Create a new stack
-@@ -555,6 +564,9 @@
-     */
-    int sk_push(STACK *s, char *d);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
-+#endif
- 
-    /* 
-     *  Duplicate the stack
-diff -Naur kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc
---- kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc	2005-10-10 08:05:44.000000000 -0700
-+++ kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc	2010-03-31 09:34:38.000000000 -0700
-@@ -87,7 +87,7 @@
- 
- 
- STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
--    STACK_OF(X509) *x509 = sk_new(NULL);
-+    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
-     KSSLCertificate *cert = certs.first();
-     while(cert) {
- 	sk_X509_push(x509, cert->getCert());
-diff -Naur kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc
---- kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc	2006-01-19 09:06:12.000000000 -0800
-+++ kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc	2010-03-31 09:34:38.000000000 -0700
-@@ -1003,17 +1003,31 @@
- QByteArray KSSLCertificate::toNetscape() {
- QByteArray qba;
- #ifdef KSSL_HAVE_SSL
--ASN1_HEADER ah;
--ASN1_OCTET_STRING os;
--KTempFile ktf;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	NETSCAPE_X509 nx;
-+	ASN1_OCTET_STRING hdr;
-+#else
-+   ASN1_HEADER ah;
-+   ASN1_OCTET_STRING os;
-+#endif
-+	KTempFile ktf;
- 
--	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
--	os.length = strlen(NETSCAPE_CERT_HDR);
--	ah.header = &os;
--	ah.data = (char *)getCert();
--	ah.meth = d->kossl->X509_asn1_meth();
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+	hdr.length = strlen(NETSCAPE_CERT_HDR);
-+	nx.header = &hdr;
-+	nx.cert = getCert();
-+
-+	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
-+#else
-+   os.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+   os.length = strlen(NETSCAPE_CERT_HDR);
-+   ah.header = &os;
-+   ah.data = (char *)getCert();
-+   ah.meth = d->kossl->X509_asn1_meth();
- 
--	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+   d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+#endif
- 
- 	ktf.close();
- 

pkgs/development/compilers/ghc/7.6.2.nix

···
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
+
+stdenv.mkDerivation rec {
+  version = "7.6.2";
+
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
+    sha256 = "d5f45184abeacf7e9c6b4f63c7101a5c1d7b4fe9007901159e2287ecf38de533";
+  };
+
+  buildInputs = [ ghc perl gmp ncurses ];
+
+  enableParallelBuilding = true;
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '';
+
+  configureFlags = [
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags=["-S" "--keep-file-symbols"];
+
+  meta = {
+    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/ghc/head.nix

···
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "7.7.20121106";
+  version = "7.7.20121213";
   name = "ghc-${version}";
 
   src = fetchurl {
     url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "1n3xj8arkzfvs3q1ymxsnbzs23ndsp8pl67sqirl837pkgcmq263";
+    sha256 = "0z9ld6271jzv3mx02vqaakirj79pm2vzxnv5a178r6v874qbzx3p";
   };
 
   buildInputs = [ ghc perl gmp ncurses ];

pkgs/development/compilers/gwt/2.4.0.nix

···
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
   name = "gwt-java-2.4.0";
-  src = fetchurl { 
-    url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; 
-    sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; 
+
+  src = fetchurl {
+    url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip;
+    sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88";
   };
-  buildInputs = [unzip]; 
+
+  buildInputs = [ unzip ];
 
   installPhase = ''
     ensureDir $out
···
     homepage = http://code.google.com/webtoolkit/;
     description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications.";
   };
- }
+}

pkgs/development/compilers/gwt/builder.sh

···
-source $stdenv/setup
-
-tar xfvj $src
-mkdir -p $out
-cp -av $name $out
-
-# Create wrapper scripts so that the GWT compiler/host work
-
-libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12"
-
-mkdir -p $out/bin
-
-cat > $out/bin/gwt-compile <<EOF
-#!/bin/sh
-
-export LD_LIBRARY_PATH=$libPath
-export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation
-
-$jdk/bin/java -Xmx256m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.Compiler \$@
-EOF
-chmod 755 $out/bin/gwt-compile
-
-cat > $out/bin/gwt-shell <<EOF
-#!/bin/sh
-
-export LD_LIBRARY_PATH=$libPath
-export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation
-
-$jdk/bin/java -Xmx256m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.GWTShell \$@
-EOF
-chmod 755 $out/bin/gwt-shell

pkgs/development/compilers/gwt/default.nix

···
-{stdenv, fetchurl, glib, gtk, pango, atk, libX11, libXt, libstdcpp5, jdk}:
-
-stdenv.mkDerivation {
-  name = "gwt-linux-1.7.1";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://google-web-toolkit.googlecode.com/files/gwt-linux-1.7.1.tar.bz2;
-    sha256 = "0lgirr9lr0qsfvw61hqzracdllqklb4qkzbk5x3lc4r64mms5b3g";
-  };
-
-  inherit glib gtk pango atk libX11 libXt libstdcpp5 jdk;
-  buildInputs = [glib gtk pango atk libX11 libXt libstdcpp5];
-}

pkgs/development/compilers/opencxx/default.nix

···
-{stdenv, fetchurl, libtool, gcc, patches ? []}:
+{ stdenv, fetchurl, libtool, gcc, patches ? []}:
 
 stdenv.mkDerivation {
   name = "opencxx-2.8";

pkgs/development/interpreters/ruby/generated.nix

···
 g: # Get dependencies from patched gems
 {
   aliases = {
-    ZenTest = g.ZenTest_4_8_1;
-    actionmailer = g.actionmailer_3_2_6;
-    actionpack = g.actionpack_3_2_6;
-    activemodel = g.activemodel_3_2_6;
-    activerecord = g.activerecord_3_2_6;
-    activeresource = g.activeresource_3_2_6;
-    activesupport = g.activesupport_3_2_6;
-    addressable = g.addressable_2_2_8;
+    ZenTest = g.ZenTest_4_8_4;
+    actionmailer = g.actionmailer_3_2_11;
+    actionpack = g.actionpack_3_2_11;
+    activemodel = g.activemodel_3_2_11;
+    activerecord = g.activerecord_3_2_11;
+    activeresource = g.activeresource_3_2_11;
+    activesupport = g.activesupport_3_2_11;
     arel = g.arel_3_0_2;
-    atoulme_Antwrap = g.atoulme_Antwrap_0_7_2;
+    atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
     autotest_rails = g.autotest_rails_4_1_2;
-    builder = g.builder_3_0_0;
-    buildr = g.buildr_1_4_7;
-    bundler = g.bundler_1_1_4;
-    childprocess = g.childprocess_0_3_3;
+    builder = g.builder_3_1_4;
+    buildr = g.buildr_1_4_9;
+    bundler = g.bundler_1_2_3;
+    childprocess = g.childprocess_0_3_7;
     diff_lcs = g.diff_lcs_1_1_3;
     erubis = g.erubis_2_7_0;
     fakes3 = g.fakes3_0_1_5;
-    ffi = g.ffi_1_0_11;
+    ffi = g.ffi_1_3_1;
     highline = g.highline_1_6_2;
     hike = g.hike_1_2_1;
-    hoe = g.hoe_2_3_3;
-    i18n = g.i18n_0_6_0;
+    hoe = g.hoe_3_1_0;
+    i18n = g.i18n_0_6_1;
     journey = g.journey_1_0_4;
-    json = g.json_1_7_3;
-    json_pure = g.json_pure_1_7_3;
-    libwebsocket = g.libwebsocket_0_1_3;
+    jruby_pageant = g.jruby_pageant_1_1_1;
+    json = g.json_1_7_6;
+    json_pure = g.json_pure_1_7_6;
     mail = g.mail_2_4_4;
     mime_types = g.mime_types_1_19;
     minitar = g.minitar_0_5_3;
-    multi_json = g.multi_json_1_3_6;
+    multi_json = g.multi_json_1_5_0;
     net_sftp = g.net_sftp_2_0_5;
-    net_ssh = g.net_ssh_2_5_2;
+    net_ssh = g.net_ssh_2_6_3;
     nix = g.nix_0_1_1;
     polyglot = g.polyglot_0_3_3;
-    rack = g.rack_1_4_1;
+    rack = g.rack_1_5_1;
     rack_cache = g.rack_cache_1_2;
-    rack_ssl = g.rack_ssl_1_3_2;
-    rack_test = g.rack_test_0_6_1;
-    rails = g.rails_3_2_6;
-    railties = g.railties_3_2_6;
-    rake = g.rake_0_9_2_2;
-    rb_fsevent = g.rb_fsevent_0_9_1;
+    rack_ssl = g.rack_ssl_1_3_3;
+    rack_test = g.rack_test_0_6_2;
+    rails = g.rails_3_2_11;
+    railties = g.railties_3_2_11;
+    rake = g.rake_10_0_3;
+    rb_fsevent = g.rb_fsevent_0_9_3;
     rdoc = g.rdoc_3_12;
-    rjb = g.rjb_1_4_0;
-    rspec = g.rspec_2_9_0;
-    rspec_core = g.rspec_core_2_9_0;
-    rspec_expectations = g.rspec_expectations_2_9_1;
-    rspec_mocks = g.rspec_mocks_2_9_0;
+    rjb = g.rjb_1_4_6;
+    rspec = g.rspec_2_11_0;
+    rspec_core = g.rspec_core_2_11_1;
+    rspec_expectations = g.rspec_expectations_2_11_3;
+    rspec_mocks = g.rspec_mocks_2_11_3;
     rubyforge = g.rubyforge_2_0_4;
     rubyzip = g.rubyzip_0_9_9;
-    sass = g.sass_3_1_20;
-    selenium_webdriver = g.selenium_webdriver_2_24_0;
-    sprockets = g.sprockets_2_1_3;
-    thor = g.thor_0_15_4;
+    sass = g.sass_3_2_5;
+    selenium_webdriver = g.selenium_webdriver_2_29_0;
+    sprockets = g.sprockets_2_2_2;
+    thor = g.thor_0_17_0;
     tilt = g.tilt_1_3_3;
-    treetop = g.treetop_1_4_10;
-    tzinfo = g.tzinfo_0_3_33;
-    xml_simple = g.xml_simple_1_0_12;
+    treetop = g.treetop_1_4_12;
+    tzinfo = g.tzinfo_0_3_35;
+    websocket = g.websocket_1_0_7;
+    xml_simple = g.xml_simple_1_1_1;
   };
   gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ];
   gems = {
-    ZenTest_4_8_1 = {
+    ZenTest_4_8_4 = {
       basename = ''ZenTest'';
       meta = {
         description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby'';
···
 for compatibility checking! Use multiruby_setup to manage your
 installed versions.'';
       };
-      name = ''ZenTest-4.8.1'';
+      name = ''ZenTest-4.8.4'';
       requiredGems = [  ];
-      sha256 = ''0jp86czz16b0wamxvzs8p7pxwagj68h2zch9yjmjk7b069xrsg3v'';
+      sha256 = ''074k8smn2qfyyh32r0pja0wpcxbvlb6bhsc7rqrcjrisdjkngkrr'';
     };
-    actionmailer_3_2_6 = {
+    actionmailer_3_2_11 = {
       basename = ''actionmailer'';
       meta = {
         description = ''Email composition, delivery, and receiving framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
       };
-      name = ''actionmailer-3.2.6'';
+      name = ''actionmailer-3.2.11'';
       requiredGems = [ g.mail_2_4_4 ];
-      sha256 = ''1h9035i9rnh98pc4z073cpcjjkwcswjigg1a3a6ll0s9lb6dnk54'';
+      sha256 = ''12j8k1kfz5lqqlrxna88455hx62mbs638414dhnwsw358yf52qnn'';
     };
-    actionpack_3_2_6 = {
+    actionpack_3_2_11 = {
       basename = ''actionpack'';
       meta = {
         description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
       };
-      name = ''actionpack-3.2.6'';
-      requiredGems = [ g.activemodel_3_2_6 g.rack_cache_1_2 g.rack_test_0_6_1 g.journey_1_0_4 g.sprockets_2_1_3 g.erubis_2_7_0 ];
-      sha256 = ''1qwy7p353sp3x3crinfsx873vfrc84bfy61hz95qhy8anq03ay34'';
+      name = ''actionpack-3.2.11'';
+      requiredGems = [ g.activemodel_3_2_11 g.rack_cache_1_2 g.rack_1_4_4 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
+      sha256 = ''0ins0by3il1fkg5aslr7rb97ykkrrns7dsp6qr8wwvr1dvrzrnbq'';
     };
-    activemodel_3_2_6 = {
+    activemodel_3_2_11 = {
       basename = ''activemodel'';
       meta = {
         description = ''A toolkit for building modeling frameworks (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
       };
-      name = ''activemodel-3.2.6'';
-      requiredGems = [  ];
-      sha256 = ''18bvwpfxr6kp66b62n17qgn7bb02va6bvckips36cxrkznafsk6j'';
+      name = ''activemodel-3.2.11'';
+      requiredGems = [ g.builder_3_0_4 ];
+      sha256 = ''0q5f70wv76aprdawqgwa0ldsg3v45mqi36yicir336941lcs28nf'';
     };
-    activerecord_3_2_6 = {
+    activerecord_3_2_11 = {
       basename = ''activerecord'';
       meta = {
         description = ''Object-relational mapper framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
       };
-      name = ''activerecord-3.2.6'';
-      requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_33 ];
-      sha256 = ''1xc901m3a85j28bn2f96fh9c5y4wq4xivympm32xj4zr2ib20c2m'';
+      name = ''activerecord-3.2.11'';
+      requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_35 ];
+      sha256 = ''049h164hwd6j7p8rvb46h776rshmkk4dpvh9cynihaajvzmcj3lw'';
     };
-    activeresource_3_2_6 = {
+    activeresource_3_2_11 = {
       basename = ''activeresource'';
       meta = {
         description = ''REST modeling framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
       };
-      name = ''activeresource-3.2.6'';
+      name = ''activeresource-3.2.11'';
       requiredGems = [  ];
-      sha256 = ''1lyv64rccgrdfhzccxj9qm5dnjy212x4q1nc21mf2xf2nc4zi33a'';
+      sha256 = ''0pjxfl589an08pm29cqid8dsbn3f7dlr56kpr6bs3gbzg9k3b44h'';
     };
-    activesupport_3_2_6 = {
+    activesupport_3_2_11 = {
       basename = ''activesupport'';
       meta = {
         description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
-      name = ''activesupport-3.2.6'';
-      requiredGems = [ g.i18n_0_6_0 g.multi_json_1_3_6 ];
-      sha256 = ''00jlixc7pkifikdgkjmgxypx8rizj3jizhjcpi4v9hd72yw8m7j2'';
-    };
-    addressable_2_2_8 = {
-      basename = ''addressable'';
-      meta = {
-        description = ''URI Implementation'';
-        homepage = ''http://addressable.rubyforge.org/'';
-        longDescription = ''Addressable is a replacement for the URI implementation that is part of
-Ruby's standard library. It more closely conforms to the relevant RFCs and
-adds support for IRIs and URI templates.
-'';
-      };
-      name = ''addressable-2.2.8'';
-      requiredGems = [  ];
-      sha256 = ''1zrwrs5aji7ah2qh4x47f4j85s3sdsrrx4xayyhnrcykcg7s4n49'';
+      name = ''activesupport-3.2.11'';
+      requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_0 ];
+      sha256 = ''1dyi5vw118hfm88fxgrlfy3w5s6ka8505asw0nrrfma04jvpbq9s'';
     };
     arel_3_0_2 = {
       basename = ''arel'';
···
       requiredGems = [  ];
       sha256 = ''158bvrhammpblky9z9dgimjr55bdypfx6w5s1dm4vyj42h49qpkx'';
     };
-    atoulme_Antwrap_0_7_2 = {
+    atoulme_Antwrap_0_7_4 = {
       basename = ''atoulme_Antwrap'';
       meta = {
         description = ''A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.'';
···
 	Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to 
 	check out Buildr!'';
       };
-      name = ''atoulme-Antwrap-0.7.2'';
-      requiredGems = [  ];
-      sha256 = ''0r9l3cn0gjck5q00djas5h43pr64pjvafhz6f7zhki4qqkwbb6j3'';
+      name = ''atoulme-Antwrap-0.7.4'';
+      requiredGems = [ g.rjb_1_4_6 ];
+      sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4'';
     };
     autotest_rails_4_1_2 = {
       basename = ''autotest_rails'';
···
 rails support and extra plugins for migrations and fixtures.'';
       };
       name = ''autotest-rails-4.1.2'';
-      requiredGems = [ g.ZenTest_4_8_1 ];
+      requiredGems = [ g.ZenTest_4_8_4 ];
       sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
     };
-    builder_2_1_2 = {
+    builder_3_0_4 = {
       basename = ''builder'';
       meta = {
         description = ''Builders for MarkUp.'';
         homepage = ''http://onestepback.org'';
-        longDescription = ''Builder provides a number of builder objects that make creating structured data simple to do.  Currently the following builder objects are supported:  * XML Markup * XML Events'';
+        longDescription = ''Builder provides a number of builder objects that make creating structured data
+simple to do.  Currently the following builder objects are supported:
+
+* XML Markup
+* XML Events
+'';
       };
-      name = ''builder-2.1.2'';
+      name = ''builder-3.0.4'';
       requiredGems = [  ];
-      sha256 = ''0hp5gsvp63mqqvi7dl95zwci916vj6l1slgz4crip1rijk3v2806'';
+      sha256 = ''0hn41h249v82wj7d9vji2lm568jxv8pzq2czh2v0603hjv21r8x1'';
     };
-    builder_3_0_0 = {
+    builder_3_1_3 = {
       basename = ''builder'';
       meta = {
         description = ''Builders for MarkUp.'';
···
 * XML Events
 '';
       };
-      name = ''builder-3.0.0'';
+      name = ''builder-3.1.3'';
       requiredGems = [  ];
-      sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv'';
+      sha256 = ''0w6xsq9vyvzdy0xb52sajgipr9ml2bbpivk6dxm69c6987dk7him'';
     };
-    buildr_1_4_7 = {
+    builder_3_1_4 = {
+      basename = ''builder'';
+      meta = {
+        description = ''Builders for MarkUp.'';
+        homepage = ''http://onestepback.org'';
+        longDescription = ''Builder provides a number of builder objects that make creating structured data
+simple to do.  Currently the following builder objects are supported:
+
+* XML Markup
+* XML Events
+'';
+      };
+      name = ''builder-3.1.4'';
+      requiredGems = [  ];
+      sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p'';
+    };
+    buildr_1_4_9 = {
       basename = ''buildr'';
       meta = {
         description = ''Build like you code'';
···
 for those one-off tasks, with a language that's a joy to use.
 '';
       };
-      name = ''buildr-1.4.7'';
-      requiredGems = [ g.rake_0_9_2_2 g.builder_2_1_2 g.net_ssh_2_3_0 g.net_sftp_2_0_5 g.rubyzip_0_9_4 g.highline_1_6_2 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_4_0 g.atoulme_Antwrap_0_7_2 g.diff_lcs_1_1_3 g.rspec_expectations_2_9_0 g.rspec_mocks_2_9_0 g.rspec_core_2_9_0 g.rspec_2_9_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ];
-      sha256 = ''0ddb71xgdjxvkf485c16kvip8i26wy4l171pjbw04qmy3cank42h'';
+      name = ''buildr-1.4.9'';
+      requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 ];
+      sha256 = ''1ws8cdc7ylfq0aqbcmgwj3d8jxh8lp8zgxx0w0a7ippvvjjxb7az'';
     };
-    bundler_1_1_4 = {
+    bundler_1_2_3 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
         homepage = ''http://gembundler.com'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.1.4'';
+      name = ''bundler-1.2.3'';
       requiredGems = [  ];
-      sha256 = ''13pj4kk01xrdmdvgz1mvvhnbp1vi40gq50n8wdk3lpqp5za26gr0'';
+      sha256 = ''0bf6ync0901d9q4cg5ws4ra0qh9ssw2xgsip8dka34sbm59kav4w'';
     };
-    childprocess_0_3_3 = {
+    childprocess_0_3_7 = {
       basename = ''childprocess'';
       meta = {
         description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
         homepage = ''http://github.com/jarib/childprocess'';
         longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
       };
-      name = ''childprocess-0.3.3'';
-      requiredGems = [ g.ffi_1_0_11 ];
-      sha256 = ''0yqlbxnc427lnh1xw71qyzkic1pdpmacqxp8zw0gvx7yzkw3fjr0'';
+      name = ''childprocess-0.3.7'';
+      requiredGems = [ g.ffi_1_3_1 ];
+      sha256 = ''1dq7zyjm9fdivxm83nbhn8y5w9cc5wa458qlmkkcy52yvv0vsc84'';
     };
     diff_lcs_1_1_3 = {
       basename = ''diff_lcs'';
···
         longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3'';
       };
       name = ''fakes3-0.1.5'';
-      requiredGems = [ g.thor_0_15_4 g.builder_3_0_0 ];
+      requiredGems = [ g.thor_0_17_0 g.builder_3_1_4 ];
       sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
     };
-    ffi_1_0_11 = {
+    ffi_1_3_1 = {
       basename = ''ffi'';
       meta = {
-        description = ''Ruby-FFI is a ruby extension for programmatically loading dynamic libraries, binding functions within them, and calling those functions from Ruby code'';
+        description = ''Ruby FFI'';
         homepage = ''http://wiki.github.com/ffi/ffi'';
-        longDescription = ''Ruby-FFI is a ruby extension for programmatically loading dynamic
-libraries, binding functions within them, and calling those functions
-from Ruby code. Moreover, a Ruby-FFI extension works without changes
-on Ruby and JRuby. Discover why should you write your next extension
-using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].'';
+        longDescription = ''Ruby FFI library'';
       };
-      name = ''ffi-1.0.11'';
+      name = ''ffi-1.3.1'';
       requiredGems = [  ];
-      sha256 = ''177v6bwslyb7n961nw11i8x9j43k796s11bs98kynl58n0a3n99b'';
+      sha256 = ''0hbrfwgaw3ilmb47lvg9gzdnnfs0q0dzp6dki7rphcvsgirhp0sb'';
     };
     highline_1_6_2 = {
       basename = ''highline'';
···
       requiredGems = [  ];
       sha256 = ''1c78gja9i9nj76gdj65czhvwam6550l0w9ilnn8vysj9cwv0rg7b'';
     };
-    hoe_2_3_3 = {
+    hoe_3_1_0 = {
       basename = ''hoe'';
       meta = {
         description = ''Hoe is a rake/rubygems helper for project Rakefiles'';
-        homepage = ''http://rubyforge.org/projects/seattlerb/'';
-        longDescription = ''Hoe is a rake/rubygems helper for project Rakefiles. It helps generate
-rubygems and includes a dynamic plug-in system allowing for easy
-extensibility. Hoe ships with plug-ins for all your usual project
-tasks including rdoc generation, testing, packaging, and deployment.
-
-Plug-ins Provided:
+        homepage = ''http://www.zenspider.com/projects/hoe.html'';
+        longDescription = ''Hoe is a rake/rubygems helper for project Rakefiles. It helps you
+manage, maintain, and release your project and includes a dynamic
+plug-in system allowing for easy extensibility. Hoe ships with
+plug-ins for all your usual project tasks including rdoc generation,
+testing, packaging, deployment, and announcement..
 
-* Hoe::Clean
-* Hoe::Debug
-* Hoe::Deps
-* Hoe::Flay
-* Hoe::Flog
-* Hoe::Inline
-* Hoe::Package
-* Hoe::Publish
-* Hoe::RCov
-* Hoe::Signing
-* Hoe::Test
+See class rdoc for help. Hint: `ri Hoe` or any of the plugins listed
+below.
 
-See class rdoc for help. Hint: ri Hoe'';
+For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       };
-      name = ''hoe-2.3.3'';
-      requiredGems = [ g.rubyforge_2_0_4 ];
-      sha256 = ''06jlnbhimrn6znimaaxm7kh2269lapkbmnp3wssrjmw06ms7lq9m'';
+      name = ''hoe-3.1.0'';
+      requiredGems = [ g.rake_0_9_6 ];
+      sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp'';
     };
-    i18n_0_6_0 = {
+    i18n_0_6_1 = {
       basename = ''i18n'';
       meta = {
         description = ''New wave Internationalization support for Ruby'';
         homepage = ''http://github.com/svenfuchs/i18n'';
         longDescription = ''New wave Internationalization support for Ruby.'';
       };
-      name = ''i18n-0.6.0'';
+      name = ''i18n-0.6.1'';
       requiredGems = [  ];
-      sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0'';
+      sha256 = ''0x3lhp1vl1k4dfqx6k93hhxcpjkz57y8cf007ws7p845ywk6ibfl'';
     };
     journey_1_0_4 = {
       basename = ''journey'';
···
       requiredGems = [  ];
       sha256 = ''03y1xidg1rx1yjz8xb50083vfwcsfkgs4zmizc040y1h4mhvhm3l'';
     };
-    json_1_7_3 = {
+    jruby_pageant_1_1_1 = {
+      basename = ''jruby_pageant'';
+      meta = {
+        description = ''jruby-pageant allows Pageant access on JRuby + Windows'';
+        homepage = ''http://github.com/arturaz/jruby-pageant'';
+        longDescription = ''This is a convenience gem packaging required JNA/JSCH jars.'';
+      };
+      name = ''jruby-pageant-1.1.1'';
+      requiredGems = [  ];
+      sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
+    };
+    json_1_7_6 = {
       basename = ''json'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
       };
-      name = ''json-1.7.3'';
+      name = ''json-1.7.6'';
       requiredGems = [  ];
-      sha256 = ''1n969j5k0zb7dqfbnjhqm5hnxpsbi05rhsp5ww3cph7d5z6ycw0h'';
+      sha256 = ''025hdczzmj7zbwcdr53d8qc0bg8i7j5wpp1ps4cqkllz89snb82a'';
     };
-    json_pure_1_4_3 = {
+    json_pure_1_7_5 = {
       basename = ''json_pure'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation in pure Ruby.'';
       };
-      name = ''json_pure-1.4.3'';
+      name = ''json_pure-1.7.5'';
       requiredGems = [  ];
-      sha256 = ''1xw357gkmk6712c94lhpsrq8j9v91mgc2nxlr1m6n20yl6sz2g9r'';
+      sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap'';
     };
-    json_pure_1_7_3 = {
+    json_pure_1_7_6 = {
       basename = ''json_pure'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation in pure Ruby.'';
       };
-      name = ''json_pure-1.7.3'';
+      name = ''json_pure-1.7.6'';
       requiredGems = [  ];
-      sha256 = ''0m316halw0l1gd2lx811qhyfs9a98dfgxign8zij0a1wn9wsh2ci'';
-    };
-    libwebsocket_0_1_3 = {
-      basename = ''libwebsocket'';
-      meta = {
-        description = ''Universal Ruby library to handle WebSocket protocol'';
-        homepage = ''http://github.com/imanel/libwebsocket'';
-        longDescription = ''Universal Ruby library to handle WebSocket protocol'';
-      };
-      name = ''libwebsocket-0.1.3'';
-      requiredGems = [ g.addressable_2_2_8 ];
-      sha256 = ''12i3lyjd9dqvk9wpnrz9zzj7dgb6660dz8xlc7h1nixhsny1y83n'';
+      sha256 = ''1cjwg6f9gj7w2n9916w12i1g97ngqqar44sc2r1x9ib5jicspb00'';
     };
     mail_2_4_4 = {
       basename = ''mail'';
···
         longDescription = ''A really Ruby Mail handler.'';
       };
       name = ''mail-2.4.4'';
-      requiredGems = [ g.mime_types_1_19 g.treetop_1_4_10 ];
+      requiredGems = [ g.mime_types_1_19 g.treetop_1_4_12 ];
       sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3'';
     };
     mime_types_1_19 = {
···
       requiredGems = [  ];
       sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
     };
-    multi_json_1_3_6 = {
+    multi_json_1_5_0 = {
       basename = ''multi_json'';
       meta = {
         description = ''A gem to provide swappable JSON backends.'';
         homepage = ''http://github.com/intridea/multi_json'';
         longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
       };
-      name = ''multi_json-1.3.6'';
+      name = ''multi_json-1.5.0'';
       requiredGems = [  ];
-      sha256 = ''0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr'';
+      sha256 = ''0fk75m2496ghgv78yybzhrmf9izw65va3x90gdjkbsw8vfkghk79'';
     };
     net_sftp_2_0_5 = {
       basename = ''net_sftp'';
···
         longDescription = ''A pure Ruby implementation of the SFTP client protocol'';
       };
       name = ''net-sftp-2.0.5'';
-      requiredGems = [ g.net_ssh_2_5_2 ];
+      requiredGems = [ g.net_ssh_2_6_3 ];
       sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v'';
     };
-    net_ssh_2_3_0 = {
+    net_ssh_2_6_0 = {
       basename = ''net_ssh'';
       meta = {
         description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
         homepage = ''http://github.com/net-ssh/net-ssh'';
-        longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
+        longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.'';
       };
-      name = ''net-ssh-2.3.0'';
-      requiredGems = [  ];
-      sha256 = ''1q1fznl4nk2963czpzfby4m9jw9rs37k1rzgbjad5r1n7r6dv0sv'';
+      name = ''net-ssh-2.6.0'';
+      requiredGems = [ g.jruby_pageant_1_1_1 ];
+      sha256 = ''18fsgps4a9dfrjszkl3py8j7vw0xwi70bcp59ccj2rlr6i1jv5gw'';
     };
-    net_ssh_2_5_2 = {
+    net_ssh_2_6_3 = {
       basename = ''net_ssh'';
       meta = {
         description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
         homepage = ''http://github.com/net-ssh/net-ssh'';
         longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.'';
       };
-      name = ''net-ssh-2.5.2'';
+      name = ''net-ssh-2.6.3'';
       requiredGems = [  ];
-      sha256 = ''0kalahmwz9ypglrgg29wlvr4wx381pqwmx9fq3pk600v3j7j018l'';
+      sha256 = ''1gmrchx9cn7s7ca97kwhrdxvlw5vs3cxpprrvqmhmi3knmnqcp9m'';
     };
     nix_0_1_1 = {
       basename = ''nix'';
···
       requiredGems = [  ];
       sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v'';
     };
-    rack_1_4_1 = {
+    rack_1_4_4 = {
       basename = ''rack'';
       meta = {
         description = ''a modular Ruby webserver interface'';
-        homepage = ''http://rack.rubyforge.org'';
+        homepage = ''http://rack.github.com/'';
         longDescription = ''Rack provides a minimal, modular and adaptable interface for developing
 web applications in Ruby.  By wrapping HTTP requests and responses in
 the simplest way possible, it unifies and distills the API for web
 servers, web frameworks, and software in between (the so-called
 middleware) into a single method call.
 
-Also see http://rack.rubyforge.org.
+Also see http://rack.github.com/.
 '';
       };
-      name = ''rack-1.4.1'';
+      name = ''rack-1.4.4'';
       requiredGems = [  ];
-      sha256 = ''1cx3wzg48pn4sbb6a0iq726fjh3q7y77fly81mfnprrnwp7d0190'';
+      sha256 = ''1h0x50ng1s2jy6h5adw4a430vz8x28nskq099x3pjlpns6q632vz'';
+    };
+    rack_1_5_1 = {
+      basename = ''rack'';
+      meta = {
+        description = ''a modular Ruby webserver interface'';
+        homepage = ''http://rack.github.com/'';
+        longDescription = ''Rack provides a minimal, modular and adaptable interface for developing
+web applications in Ruby.  By wrapping HTTP requests and responses in
+the simplest way possible, it unifies and distills the API for web
+servers, web frameworks, and software in between (the so-called
+middleware) into a single method call.
+
+Also see http://rack.github.com/.
+'';
+      };
+      name = ''rack-1.5.1'';
+      requiredGems = [  ];
+      sha256 = ''113gzaha2qx74y0wl940zlzrn9357yww6zrbyva05d09l749d21r'';
     };
     rack_cache_1_2 = {
       basename = ''rack_cache'';
···
         longDescription = ''Rack::Cache is suitable as a quick drop-in component to enable HTTP caching for Rack-based applications that produce freshness (Expires, Cache-Control) and/or validation (Last-Modified, ETag) information.'';
       };
       name = ''rack-cache-1.2'';
-      requiredGems = [ g.rack_1_4_1 ];
+      requiredGems = [ g.rack_1_5_1 ];
       sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2'';
     };
-    rack_ssl_1_3_2 = {
+    rack_ssl_1_3_3 = {
       basename = ''rack_ssl'';
       meta = {
         description = ''Force SSL/TLS in your app.'';
···
         longDescription = ''    Rack middleware to force SSL/TLS.
 '';
       };
-      name = ''rack-ssl-1.3.2'';
+      name = ''rack-ssl-1.3.3'';
       requiredGems = [  ];
-      sha256 = ''1h9pfn5c95qigkm1vb5nbla7fwjl86q887w57iiqp4kdvrjh9wrn'';
+      sha256 = ''0rkmj71s87prswa8sqal42kdllgpfd35ir5m9ahhnlmrrpqd0hr5'';
     };
-    rack_test_0_6_1 = {
+    rack_test_0_6_2 = {
       basename = ''rack_test'';
       meta = {
         description = ''Simple testing API built on Rack'';
···
 to build on. Most of its initial functionality is an extraction of Merb 1.0's
 request helpers feature.'';
       };
-      name = ''rack-test-0.6.1'';
+      name = ''rack-test-0.6.2'';
       requiredGems = [  ];
-      sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0'';
+      sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky'';
     };
-    rails_3_2_6 = {
+    rails_3_2_11 = {
       basename = ''rails'';
       meta = {
         description = ''Full-stack web application framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
-      name = ''rails-3.2.6'';
-      requiredGems = [ g.activesupport_3_2_6 g.actionpack_3_2_6 g.activerecord_3_2_6 g.activeresource_3_2_6 g.actionmailer_3_2_6 g.railties_3_2_6 g.bundler_1_1_4 ];
-      sha256 = ''184ys6yfdclv59x0wk7dxx6ss60bv5vsi89nf8n85sh4mn19sf2m'';
+      name = ''rails-3.2.11'';
+      requiredGems = [ g.activesupport_3_2_11 g.actionpack_3_2_11 g.activerecord_3_2_11 g.activeresource_3_2_11 g.actionmailer_3_2_11 g.railties_3_2_11 g.bundler_1_2_3 ];
+      sha256 = ''0gk0wnydzb5dknk3d0n9vy51xixmwgcq5j6jqzr9m8wsi2cjkq7m'';
     };
-    railties_3_2_6 = {
+    railties_3_2_11 = {
       basename = ''railties'';
       meta = {
         description = ''Tools for creating, working with, and running Rails applications.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
       };
-      name = ''railties-3.2.6'';
-      requiredGems = [ g.rack_ssl_1_3_2 g.rdoc_3_12 ];
-      sha256 = ''1qyb4kcg2ld86qp411njr6cxfhv2ddw3jghk2rbr8d5f1ci7gfdh'';
+      name = ''railties-3.2.11'';
+      requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.rdoc_3_12 ];
+      sha256 = ''0gjna6jskckh35xp03sjlb7xq2cgabmjl7nvczh6kq8xb1vh09dw'';
     };
     rake_0_9_2_2 = {
       basename = ''rake'';
···
       requiredGems = [  ];
       sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q'';
     };
-    rb_fsevent_0_9_1 = {
+    rake_0_9_6 = {
+      basename = ''rake'';
+      meta = {
+        description = ''Ruby based make-like utility.'';
+        homepage = ''http://rake.rubyforge.org'';
+        longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
+      };
+      name = ''rake-0.9.6'';
+      requiredGems = [  ];
+      sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc'';
+    };
+    rake_10_0_3 = {
+      basename = ''rake'';
+      meta = {
+        description = ''Ruby based make-like utility.'';
+        homepage = ''http://rake.rubyforge.org'';
+        longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
+      };
+      name = ''rake-10.0.3'';
+      requiredGems = [  ];
+      sha256 = ''09vvf3ylhdkr10vz7ajl3c7ql6dsnzkh3qclpafar433bzadfbpf'';
+    };
+    rb_fsevent_0_9_3 = {
       basename = ''rb_fsevent'';
       meta = {
         description = ''Very simple & usable FSEvents API'';
         homepage = ''http://rubygems.org/gems/rb-fsevent'';
         longDescription = ''FSEvents API with Signals catching (without RubyCocoa)'';
       };
-      name = ''rb-fsevent-0.9.1'';
+      name = ''rb-fsevent-0.9.3'';
       requiredGems = [  ];
-      sha256 = ''02vgavzfsvzm0p9xvy314nnjixym82f2s58pw2i6d7p81yhvhsyh'';
+      sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1'';
     };
     rdoc_3_12 = {
       basename = ''rdoc'';
···
 See RDoc for a description of RDoc's markup and basic use.'';
       };
       name = ''rdoc-3.12'';
-      requiredGems = [ g.json_1_7_3 ];
+      requiredGems = [ g.json_1_7_6 ];
       sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp'';
     };
-    rjb_1_4_0 = {
+    rjb_1_4_2 = {
+      basename = ''rjb'';
+      meta = {
+        description = ''Ruby Java bridge'';
+        homepage = ''http://rjb.rubyforge.org/'';
+        longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
+'';
+      };
+      name = ''rjb-1.4.2'';
+      requiredGems = [  ];
+      sha256 = ''1cgbwpc45djs0mw05ydxf5apmb9ibj61n240ylqwzrajf13banzh'';
+    };
+    rjb_1_4_6 = {
       basename = ''rjb'';
       meta = {
         description = ''Ruby Java bridge'';
···
         longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
 '';
       };
-      name = ''rjb-1.4.0'';
+      name = ''rjb-1.4.6'';
       requiredGems = [  ];
-      sha256 = ''03ildf1k04a430mqdfggld4wjvca3xd0d4qn0dwcfa2zxs3vnbz3'';
+      sha256 = ''0q2czc3ghk32hnxf76xsf0jqcfrnx60aqarvdjhgsfdc9a5pmk20'';
     };
-    rspec_2_9_0 = {
+    rspec_2_11_0 = {
       basename = ''rspec'';
       meta = {
-        description = ''rspec-2.9.0'';
+        description = ''rspec-2.11.0'';
         homepage = ''http://github.com/rspec'';
         longDescription = ''BDD for Ruby'';
       };
-      name = ''rspec-2.9.0'';
-      requiredGems = [ g.rspec_expectations_2_9_1 ];
-      sha256 = ''02r1cg82xia5vls4zq2dchmgdig8rpky8rivsqbckczr5k9w0hwv'';
+      name = ''rspec-2.11.0'';
+      requiredGems = [  ];
+      sha256 = ''0k55akvs2xhs57kz81g37s4v56vybq46sjs7f8wpybrwxryg1vxs'';
     };
-    rspec_core_2_9_0 = {
+    rspec_core_2_11_1 = {
       basename = ''rspec_core'';
       meta = {
-        description = ''rspec-core-2.9.0'';
+        description = ''rspec-core-2.11.1'';
         homepage = ''http://github.com/rspec/rspec-core'';
         longDescription = ''BDD for Ruby. RSpec runner and example groups.'';
       };
-      name = ''rspec-core-2.9.0'';
-      requiredGems = [  ];
-      sha256 = ''17wc7mqrwl0zzrx3gywf4w931vfdig1spyvl46fyqakf36shyknd'';
-    };
-    rspec_expectations_2_9_0 = {
-      basename = ''rspec_expectations'';
-      meta = {
-        description = ''rspec-expectations-2.9.0'';
-        homepage = ''http://github.com/rspec/rspec-expectations'';
-        longDescription = ''rspec expectations (should[_not] and matchers)'';
-      };
-      name = ''rspec-expectations-2.9.0'';
+      name = ''rspec-core-2.11.1'';
       requiredGems = [  ];
-      sha256 = ''0pdws2zdi1h7mx0dqhkx6l5sqvrnpkrvqsnxvpmxk413db7li34x'';
+      sha256 = ''035ki561pryy05y8cvv3mkihjwp9r2ychnazb7s33gl7q0l0jni4'';
     };
-    rspec_expectations_2_9_1 = {
+    rspec_expectations_2_11_3 = {
       basename = ''rspec_expectations'';
       meta = {
-        description = ''rspec-expectations-2.9.1'';
+        description = ''rspec-expectations-2.11.3'';
         homepage = ''http://github.com/rspec/rspec-expectations'';
         longDescription = ''rspec expectations (should[_not] and matchers)'';
       };
-      name = ''rspec-expectations-2.9.1'';
+      name = ''rspec-expectations-2.11.3'';
       requiredGems = [  ];
-      sha256 = ''1vb7axdg76naml7i6zd45ry4gszs274xfqk1w617z0719mc557gc'';
+      sha256 = ''0vqqw4hkaff6v6i6kinki4jxp9xv8b2nbmz91qa1yhjd3wr14ai5'';
     };
-    rspec_mocks_2_9_0 = {
+    rspec_mocks_2_11_3 = {
       basename = ''rspec_mocks'';
       meta = {
-        description = ''rspec-mocks-2.9.0'';
+        description = ''rspec-mocks-2.11.3'';
         homepage = ''http://github.com/rspec/rspec-mocks'';
         longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking'';
       };
-      name = ''rspec-mocks-2.9.0'';
+      name = ''rspec-mocks-2.11.3'';
       requiredGems = [  ];
-      sha256 = ''10mp152j5l0r3mqqhxq35m3slamzdzwsm9qnf6chh0l3zx5dwifg'';
-    };
-    rubyforge_2_0_3 = {
-      basename = ''rubyforge'';
-      meta = {
-        description = ''A script which automates a limited set of rubyforge operations'';
-        homepage = ''http://codeforpeople.rubyforge.org/rubyforge/'';
-        longDescription = ''A script which automates a limited set of rubyforge operations.
-
-* Run 'rubyforge help' for complete usage.
-* Setup: For first time users AND upgrades to 0.4.0:
-  * rubyforge setup (deletes your username and password, so run sparingly!)
-  * edit ~/.rubyforge/user-config.yml
-  * rubyforge config
-* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
-      };
-      name = ''rubyforge-2.0.3'';
-      requiredGems = [ g.json_pure_1_7_3 ];
-      sha256 = ''1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p'';
+      sha256 = ''1rna3ii52rlhhca49zigk692hdcmz7qib42i4hhny478k04wx0qg'';
     };
     rubyforge_2_0_4 = {
       basename = ''rubyforge'';
···
 * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
       };
       name = ''rubyforge-2.0.4'';
-      requiredGems = [  ];
+      requiredGems = [ g.json_pure_1_7_6 ];
       sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1'';
     };
-    rubyzip_0_9_4 = {
-      basename = ''rubyzip'';
-      meta = {
-        description = ''rubyzip is a ruby module for reading and writing zip files'';
-        homepage = ''http://rubyzip.sourceforge.net/'';
-      };
-      name = ''rubyzip-0.9.4'';
-      requiredGems = [  ];
-      sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41'';
-    };
     rubyzip_0_9_9 = {
       basename = ''rubyzip'';
       meta = {
···
       requiredGems = [  ];
       sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2'';
     };
-    sass_3_1_20 = {
+    sass_3_2_5 = {
       basename = ''sass'';
       meta = {
         description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
···
       command line tool or a web-framework plugin.
 '';
       };
-      name = ''sass-3.1.20'';
+      name = ''sass-3.2.5'';
       requiredGems = [  ];
-      sha256 = ''1aw2n5vg82d7ajx9wpyfrx6v1ddxhk73j77dkwjgsmlgci5lab8a'';
+      sha256 = ''1ys7pfadw61dm09yyk28zrssi8zsyj99fyq6bdf2xmi8yp1avs6k'';
     };
-    selenium_webdriver_2_24_0 = {
+    selenium_webdriver_2_29_0 = {
       basename = ''selenium_webdriver'';
       meta = {
         description = ''The next generation developer focused tool for automated testing of webapps'';
         homepage = ''http://selenium.googlecode.com'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
-      name = ''selenium-webdriver-2.24.0'';
-      requiredGems = [ g.rubyzip_0_9_9 g.childprocess_0_3_3 g.libwebsocket_0_1_3 ];
-      sha256 = ''0iricx2gglza44s92jhk7w44g2pbvg23jr5s0g3nggq7dc5mh48f'';
+      name = ''selenium-webdriver-2.29.0'';
+      requiredGems = [ g.childprocess_0_3_7 g.websocket_1_0_7 ];
+      sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj'';
     };
-    sprockets_2_1_3 = {
+    sprockets_2_2_2 = {
       basename = ''sprockets'';
       meta = {
         description = ''Rack-based asset packaging system'';
         homepage = ''http://getsprockets.org/'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
-      name = ''sprockets-2.1.3'';
+      name = ''sprockets-2.2.2'';
       requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ];
-      sha256 = ''05q6qpskabl8v0vx1mwlzv5fhf48r9f4zvc7v3xdsygm2hbs3vzh'';
+      sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
     };
-    thor_0_15_4 = {
+    thor_0_17_0 = {
       basename = ''thor'';
       meta = {
         description = ''A scripting framework that replaces rake, sake and rubigen'';
-        homepage = ''http://github.com/wycats/thor'';
+        homepage = ''http://whatisthor.com/'';
         longDescription = ''A scripting framework that replaces rake, sake and rubigen'';
       };
-      name = ''thor-0.15.4'';
+      name = ''thor-0.17.0'';
       requiredGems = [  ];
-      sha256 = ''1q4y34p4v0ipr6z5wcnc6n1mwfysrgjcibc1ls7rbdfzx4sdcic8'';
+      sha256 = ''0gf46qafcfgmi20a2mnb3wkd9y6spgy2hq22h70377daj4zjxla2'';
     };
     tilt_1_3_3 = {
       basename = ''tilt'';
···
       requiredGems = [  ];
       sha256 = ''18qdl8nllbgwipa2ab9df3wlfgvsc8ml78hbypwc17b9qwv9bbs8'';
     };
-    treetop_1_4_10 = {
+    treetop_1_4_12 = {
       basename = ''treetop'';
       meta = {
         description = ''A Ruby-based text parsing and interpretation DSL'';
-        homepage = ''http://functionalform.blogspot.com'';
+        homepage = ''https://github.com/cjheath/treetop'';
       };
-      name = ''treetop-1.4.10'';
+      name = ''treetop-1.4.12'';
       requiredGems = [ g.polyglot_0_3_3 ];
-      sha256 = ''01f4w7fm6phhdbkx7bp0b58hrk3x4b0a63p2vvjbxm5gi2gv9ap2'';
+      sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8'';
     };
-    tzinfo_0_3_33 = {
+    tzinfo_0_3_35 = {
       basename = ''tzinfo'';
       meta = {
         description = ''Daylight-savings aware timezone library'';
         homepage = ''http://tzinfo.rubyforge.org/'';
         longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.'';
       };
-      name = ''tzinfo-0.3.33'';
+      name = ''tzinfo-0.3.35'';
+      requiredGems = [  ];
+      sha256 = ''1c52ndjqcxpgxhlclbxf98clcpni216xk5zgrkcd4px84riyjbmp'';
+    };
+    websocket_1_0_7 = {
+      basename = ''websocket'';
+      meta = {
+        description = ''Universal Ruby library to handle WebSocket protocol'';
+        homepage = ''http://github.com/imanel/websocket-ruby'';
+        longDescription = ''Universal Ruby library to handle WebSocket protocol'';
+      };
+      name = ''websocket-1.0.7'';
       requiredGems = [  ];
-      sha256 = ''0bgfbm2amclg6amf1g1pyw4bkpmavqzf2hq7w9466xz08z1zsv1p'';
+      sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0'';
     };
-    xml_simple_1_0_12 = {
+    xml_simple_1_1_1 = {
       basename = ''xml_simple'';
       meta = {
         description = ''A simple API for XML processing.'';
         homepage = ''http://xml-simple.rubyforge.org'';
       };
-      name = ''xml-simple-1.0.12'';
+      name = ''xml-simple-1.1.1'';
       requiredGems = [  ];
-      sha256 = ''0m7z3l8ccm3zd22gyx40fnfl0nah61jaigb4bkmplq0hdazyj60y'';
+      sha256 = ''0zlwz8kvpm45m227aazg369fapbqyhvd5v9aga8cvxyhqnq0b87i'';
     };
   };
 }

pkgs/development/libraries/arts/default.nix

···
-{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg
-, libpng, perl, qt3}:
-
-stdenv.mkDerivation {
-  name = "arts-1.5.10";
-
-  src = fetchurl {
-    url = mirror://kde/stable/3.5.10/src/arts-1.5.10.tar.bz2;
-    sha256 = "0ffcm24lkgg3sm89q4zsj8za5h5d9j1195pmbjhx4hj0xcwkiqlj";
-  };
-
-  KDEDIR = kdelibs;
-  
-  configureFlags = ''
-    --with-extra-includes=${libjpeg}/include
-    --with-extra-libs=${libjpeg}/lib
-    --x-includes=${libX11}/include
-    --x-libraries=${libX11}/lib
-    --disable-dependency-tracking
-    --enable-final
-  '';
-
-  buildNativeInputs = [ pkgconfig perl ];
-
-  buildInputs =
-    [glib kdelibs libX11 libXext zlib libjpeg libpng qt3];
-
-  meta = {
-    homepage = http://www.arts-project.org/;
-  };
-}

pkgs/development/libraries/directfb/default.nix

···
-{stdenv, fetchurl, perl, zlib, libjpeg, freetype, libpng, giflib
-, enableX11 ? true, libX11, xproto, xextproto, libXext, renderproto, libXrender
+{ stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib
+, enableX11 ? true, xlibs
 , enableSDL ? true, SDL }:
 
 let s = import ./src-for-default.nix; in
···
     sha256 = s.hash;
   };
 
-  patches = [ ./ftbfs.patch ];
-
   buildNativeInputs = [ perl ];
 
-  buildInputs = [ zlib libjpeg freetype giflib libpng ]
+  buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ]
     ++ stdenv.lib.optional enableSDL SDL
-    ++ stdenv.lib.optionals enableX11 [
-      xproto libX11 libXext xextproto
-      renderproto libXrender
-    ];
+    ++ stdenv.lib.optionals enableX11 (with xlibs; [
+      xproto libX11 libXext #xextproto
+      #renderproto libXrender
+    ]);
 
   NIX_LDFLAGS="-lgcc_s";
 
···
     "--enable-fbdev"
     "--enable-mmx"
     "--enable-sse"
-    "--enable-sysfs"
+    #"--enable-sysfs" # not recognized
     "--with-software"
     "--with-smooth-scaling"
     ] ++ stdenv.lib.optionals enableX11 [

pkgs/development/libraries/directfb/ftbfs.patch

···
-From: André Draszik <[e-mail]>
-Date: Wed, 28 Sep 2011 17:36:00 +0000 (+0100)
-Subject: generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871
-X-Git-Url: http://git.directfb.org/?p=core%2FDirectFB.git;a=commitdiff_plain;h=ef5e1398fe4037b63d6513e450f107fcfe91047f
-
-generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871
-
-../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c: In function 'stretch_hvx':
-../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: error: 'DSPF_ARGBF88871' undeclared (first use in this function)
-../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: note: each undeclared identifier is reported only once for each function it appears in
----
-
-diff --git a/src/gfx/generic/generic_stretch_blit.c b/src/gfx/generic/generic_stretch_blit.c
-index 65076f4..6dd987b 100644
---- a/src/gfx/generic/generic_stretch_blit.c
-+++ b/src/gfx/generic/generic_stretch_blit.c
-@@ -441,7 +441,7 @@ stretch_hvx( CardState *state, DFBRectangle *srect, DFBRectangle *drect )
-                     }
-                     break;
- 
--               case DSPF_ARGBF88871:
-+               case DSPF_RGBAF88871:
-                     if (state->blittingflags & DSBLIT_SRC_PREMULTIPLY) {
-                          for (i=0; i<gfxs->Blut->num_entries; i++) {
-                               int alpha = entries[i].a + 1;

pkgs/development/libraries/ffmpeg/1.1.nix

···
 , x264Support ? true, x264 ? null
 , xvidSupport ? true, xvidcore ? null
 , vdpauSupport ? true, libvdpau ? null
+, vaapiSupport ? true, libva ? null
 , faacSupport ? false, faac ? null
 , dc1394Support ? false, libdc1394 ? null
 , x11grabSupport ? false, libXext ? null, libXfixes ? null
···
 assert x264Support -> x264 != null;
 assert xvidSupport -> xvidcore != null;
 assert vdpauSupport -> libvdpau != null;
+assert vaapiSupport -> libva != null;
 assert faacSupport -> faac != null;
 assert x11grabSupport -> libXext != null && libXfixes != null;
 
···
     "--enable-swscale"
     "--disable-ffplay"
     "--enable-shared"
+    "--enable-avresample"
     "--enable-runtime-cpudetect"
   ]
     ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
···
     ++ stdenv.lib.optional x264Support x264
     ++ stdenv.lib.optional xvidSupport xvidcore
     ++ stdenv.lib.optional vdpauSupport libvdpau
+    ++ stdenv.lib.optional vaapiSupport libva
     ++ stdenv.lib.optional faacSupport faac
     ++ stdenv.lib.optional dc1394Support libdc1394
     ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];

pkgs/development/libraries/gnu-efi/default.nix

···
 , fetchurl
 }:
 
-stdenv.mkDerivation {
-  name = "gnu-efi-3.0r";
+let version = "3.0s"; in stdenv.mkDerivation {
+
+  name = "gnu-efi-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz";
-    sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5";
+    url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz";
+    sha256 = "18bpswzkj81dadq1b7n2s9g0cz60l34ggzxlq21mb8va10j9zmhh";
   };
 
   meta = {

pkgs/development/libraries/haskell/HTTP/4000.2.6.nix pkgs/development/libraries/haskell/HTTP/4000.2.7.nix

···
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.2.6";
-  sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92";
+  version = "4000.2.7";
+  sha256 = "0a5zjhrbdp8hwmkc709i2qwnxx4lafrp6wssdms6g5l97a52bdc2";
   buildDepends = [ mtl network parsec ];
   meta = {
     homepage = "https://github.com/haskell/HTTP";

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

···
 
 cabal.mkDerivation (self: {
   pname = "attoparsec";
-  version = "0.10.3.0";
-  sha256 = "1l4cnfgnynrprfvx0p3n6kca8arsmvb1yxb9ir782rrk537jci50";
+  version = "0.10.4.0";
+  sha256 = "0inkcrl40j9kgcmmi0xkcszayqjd5yn7i9fyvv0ywfqwpl6lxf5n";
   buildDepends = [ deepseq text ];
   meta = {
     homepage = "https://github.com/bos/attoparsec";
-    description = "Fast combinator parsing for bytestrings";
+    description = "Fast combinator parsing for bytestrings and text";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

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

···
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "1.3.2";
-  sha256 = "1bvgfri0c2nyz06r59rm3slpvm1b0s242s4mznmndpdclgg33d9m";
+  version = "1.3.2.1";
+  sha256 = "1r53mnj4b4x0prcqqf6y3gdia2j1l3155iw79jzlx0cnxbdsfnc7";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
     conduit httpConduit httpTypes monadControl network resourcet

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

···
-{ cabal, semigroupoids, semigroups }:
+{ cabal, semigroupoids, semigroups, tagged }:
 
 cabal.mkDerivation (self: {
   pname = "bifunctors";
-  version = "3.0.3";
-  sha256 = "1nmrwc9n9qkj9w9c38ja0had32isr6v35j1v19fhqdwk5ddbpxp4";
-  buildDepends = [ semigroupoids semigroups ];
+  version = "3.2";
+  sha256 = "03bszf1127iw5kimjbag5gmgzz7h2qzcd9f7jb53jpiadfhjfx0a";
+  buildDepends = [ semigroupoids semigroups tagged ];
   meta = {
     homepage = "http://github.com/ekmett/bifunctors/";
     description = "Haskell 98 bifunctors";

pkgs/development/libraries/haskell/case-insensitive/default.nix

···
-{ cabal, hashable, text }:
+{ cabal, deepseq, hashable, text }:
 
 cabal.mkDerivation (self: {
   pname = "case-insensitive";
-  version = "0.4.0.4";
-  sha256 = "1xzpri688vbd6fvvxczqx8bv53009ygzws7vbjmj2q97wcm8nmwd";
-  buildDepends = [ hashable text ];
+  version = "1.0";
+  sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk";
+  buildDepends = [ deepseq hashable text ];
   meta = {
     homepage = "https://github.com/basvandijk/case-insensitive";
     description = "Case insensitive string comparison";

pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude-conduit";
-  version = "0.4.3";
-  sha256 = "0ny4si6z6i6g6khcg9d3m9wks42sqh8i8kpgghhdwd37v32l3f34";
+  version = "0.4.4";
+  sha256 = "1xsqdifqm68mlrmpmj04nqd5r83psq5ffis2pm8k8vwl1n1jv8kn";
   buildDepends = [
     classyPrelude conduit monadControl resourcet transformers void
     xmlConduit

pkgs/development/libraries/haskell/classy-prelude/default.nix

···
-{ cabal, basicPrelude, hashable, systemFilepath, text, transformers
-, unorderedContainers, vector
+{ cabal, basicPrelude, hashable, liftedBase, systemFilepath, text
+, transformers, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.4.3";
-  sha256 = "1k2iszja03s8azypl8lpkdjvvqsgzg73cl1wp4jl2fqp1psqv36q";
+  version = "0.4.4";
+  sha256 = "0f49b07r5isz57wjmgpfvq4hg9m5q59ad918rk1v24xdvn4y3all";
   buildDepends = [
-    basicPrelude hashable systemFilepath text transformers
+    basicPrelude hashable liftedBase systemFilepath text transformers
     unorderedContainers vector
   ];
   meta = {

pkgs/development/libraries/haskell/diagrams/contrib.nix

···
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "0.6.0.2";
-  sha256 = "1lj99a46r12zjwmpkn7vj04wapfgdlmw05jwb5lnhy9hxqgcsgng";
+  version = "0.6.0.3";
+  sha256 = "0j0wmf2nksqh3rqmzyw468bp25zikc5icif5f3rfi1v06ghsk0i5";
   buildDepends = [
     colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
   ];

pkgs/development/libraries/haskell/digestive-functors-heist/default.nix

···
   version = "0.6.0.0";
   sha256 = "17qndqsk09fvnvyhhw3xbbjjhfyyp4sivc898vqllyyky0wqmrdk";
   buildDepends = [ digestiveFunctors heist mtl text xmlhtml ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/jaspervdj/digestive-functors";
     description = "Heist frontend for the digestive-functors library";

pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "distributed-process-simplelocalnet";
-  version = "0.2.0.8";
-  sha256 = "01kzqfbrkl9zzknw0gbdh1c1lss911lphagn2sw6nzl9xpnhjqk0";
+  version = "0.2.0.9";
+  sha256 = "0bkb26bfpmyhh26hgznnw073kvk78ws6lqi86pxrgnnm9sx5mi21";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/distributed-process/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "distributed-process";
-  version = "0.4.1";
-  sha256 = "1ysm2rq7ldxb5w6m04vf5q3zrgvg99z7kszjqj17r17ps61v898f";
+  version = "0.4.2";
+  sha256 = "16w8jp66903vn089ysqdn534v0744cr2m6wkqd77zri6a0caaa6c";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/edit-distance/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "edit-distance";
-  version = "0.2.1.1";
-  sha256 = "1d8h38cn3azvsp2dp5gycglm5bwwd8plbag8ypi38yj6c35a82yn";
+  version = "0.2.1.2";
+  sha256 = "08dxsp1ar8mr4xrjy37lzl0s1rjnqsdq30p09nclip5pyhcw7g44";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ random ];

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

···
-{ cabal, semigroupoids, semigroups, transformers }:
+{ cabal, MonadRandom, mtl, semigroupoids, semigroups, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "3.0.3";
-  sha256 = "02kpb8xd19n00ll61haqr6k3hy8qmbdf73gr4zs59q9xh0739qxc";
-  buildDepends = [ semigroupoids semigroups transformers ];
+  version = "3.1";
+  sha256 = "1paglfhd2xjr32sh5npl3kvamv4nps9fpy0wk9ya0l26w4c3bdsm";
+  buildDepends = [
+    MonadRandom mtl semigroupoids semigroups transformers
+  ];
   meta = {
     homepage = "http://github.com/ekmett/either/";
-    description = "Haskell 98 either monad transformer";
+    description = "An either monad transformer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

pkgs/development/libraries/haskell/ghc-heap-view/default.nix

···
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-heap-view";
+  version = "0.4.1.0";
+  sha256 = "1icq5620j37n85d08yfpln75f9944flbqyqhjqsf0qr72zsm3w11";
+  buildDepends = [ transformers ];
+  meta = {
+    description = "Extract the heap representation of Haskell values and thunks";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})

pkgs/development/libraries/haskell/ghc-vis/default.nix

···
+{ cabal, cairo, deepseq, fgl, ghcHeapView, graphviz, gtk, mtl
+, svgcairo, text, transformers, xdot
+}:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-vis";
+  version = "0.6";
+  sha256 = "0gvfs0f6fjg4bzq9q6rrhin6gk1pbyw9qbigi90cz1fg10nq7nzi";
+  buildDepends = [
+    cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
+    transformers xdot
+  ];
+  meta = {
+    homepage = "http://felsin9.de/nnis/ghc-vis";
+    description = "Live visualization of data structures in GHCi";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})

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

···
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.1.2.1";
-  sha256 = "1d9bbqy1dix60w72zc3g4y7454avngfyl2i8gj99bdqin2wwcgp8";
+  version = "4.1.4.0";
+  sha256 = "0nhr7ai03hx2qjxlqml0js43iwxhcbpdqkwdvw8pqs396yrjwxdj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
···
     filepath httpConduit httpTypes lrucache mtl pandoc parsec random
     regexBase regexTdfa snapCore snapServer tagsoup text time
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";

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

···
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.3.1";
-  sha256 = "04qqsjrn0fh9y4z7gjf3g60w69gqxhzq7dqkraq97p3w45fijm1i";
+  version = "1.1.5";
+  sha256 = "18rv53bqf07w0y1qs96v3krimvjx5salq9mn168l01vl98blwhvv";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
   ];

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

···
 
 cabal.mkDerivation (self: {
   pname = "heist";
-  version = "0.10.2.1";
-  sha256 = "14lp27vlzv6qqv325x2vqqvphw5ads5ywjqpjramv3hhd275fn3d";
+  version = "0.11.0";
+  sha256 = "1zbwbgabdj6x0vi7l8wfq7rx77p8b4zxz5wv43nr67irszyz1k7w";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
     filepath hashable MonadCatchIOTransformers mtl random text time

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

···
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.14";
-  sha256 = "1ymmf8zxp2nbygnavhr3ay0fidhd3vhrdqb7mg0qgk8y9kx25brj";
+  version = "4.2.15";
+  sha256 = "0mhxdbbzq7hl5zxz3dhxyrs5q08y8hxwsm19ba0gx47qvg3znzki";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

···
 
 cabal.mkDerivation (self: {
   pname = "hsemail";
-  version = "1.7.4";
-  sha256 = "0nigv0zbkm90m5jskfc5a4zx2d3gyqj1y472jplrgd76s15alsmw";
+  version = "1.7.5";
+  sha256 = "0ls6y48bndwgb7ng29wxim4h36rs6b07dqi6ic4hqgbb7lg6fma4";
   buildDepends = [ mtl parsec ];
   meta = {
     homepage = "http://gitorious.org/hsemail";

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

···
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.4.3";
-  sha256 = "0i963fxamyyi3afac67rkw4340i3xqs1q3lvcy69mq0czbdvgjmc";
+  version = "1.4.4";
+  sha256 = "09wrvdlqzpa3vjcnirnzpj8nsvqnn5xbilnxaqmjm2agbl8xfj5r";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
     silently time transformers
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://hspec.github.com/";
     description = "Behavior-Driven Development for Haskell";

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

···
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.8.7";
-  sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i";
+  version = "1.8.7.1";
+  sha256 = "1m0f9snc2zxj8hvxw3ngw0h78ckvdlxxfjvrryk93blfwbamssi5";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cookie

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

···
 
 cabal.mkDerivation (self: {
   pname = "http-types";
-  version = "0.7.3.0.1";
-  sha256 = "1s2dh75jpf2yllw503hjw0x2anhc4c71vz5yylri8nxzx1zs18rq";
+  version = "0.8.0";
+  sha256 = "14d1gzgwhinkwx3lmc6hvqj6ivjrvy4m6fm2walnyk1zv24zli75";
   buildDepends = [ blazeBuilder caseInsensitive text ];
   meta = {
     homepage = "https://github.com/aristidb/http-types";

pkgs/development/libraries/haskell/language-haskell-extract/default.nix

···
-{ cabal, haskellSrcExts, regexPosix }:
+{ cabal, regexPosix }:
 
 cabal.mkDerivation (self: {
   pname = "language-haskell-extract";
-  version = "0.2.3";
-  sha256 = "0fz1nin596ihlh77pafzpdf46br1k3pxcxyml2rvly6g0h3yjgpr";
-  buildDepends = [ haskellSrcExts regexPosix ];
+  version = "0.2.4";
+  sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl";
+  buildDepends = [ regexPosix ];
   meta = {
     homepage = "http://github.com/finnsson/template-helper";
     description = "Module to automatically extract functions from the local code";

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

···
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "3.8.2";
-  sha256 = "1spz4nyv1f7kf4bnw8qgqaks5kc4m0slzw0czj1wh1232w2sz15m";
+  version = "3.8.5";
+  sha256 = "09z2izh7mqj75yh9f0pb8ky9vnzs9zx2z2mz1ik7l8wid43gm6vn";
   buildDepends = [
     bifunctors comonad comonadsFd comonadTransformers contravariant
     distributive filepath genericDeriving hashable

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

···
 
 cabal.mkDerivation (self: {
   pname = "mime-types";
-  version = "0.1.0.2";
-  sha256 = "1pkhr8k23386qwa1wmlrcilz75di2l8n5kc4n8pnia05p49akfcs";
+  version = "0.1.0.3";
+  sha256 = "0mzhkqcjlnrs9mwn2crsr1m2mf6pgygs1s3ks8akz1618v6jm6y1";
   buildDepends = [ text ];
   meta = {
     homepage = "https://github.com/yesodweb/wai";

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

···
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.10.0.5";
-  sha256 = "05mjgvxk3wxfssf4aviigdm6jb73a6bp8lwz86aabdgkgh2i6n54";
+  version = "1.10.1";
+  sha256 = "127pxs1w99nr6hdancaajm20w3vgmch4xlj0v7221y7i9qcr1y1y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/postgresql-libpq/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "postgresql-libpq";
-  version = "0.8.2.1";
-  sha256 = "0fjy451gc9lg3kcglq4s5s3hja8ni3adh4jmxd01kfyvyhwggv4d";
+  version = "0.8.2.2";
+  sha256 = "1mmsfgia318p34l8jx8hihb160sx2wpg2h5r741akcs50v6p5878";
   extraLibraries = [ postgresql ];
   meta = {
     homepage = "http://github.com/lpsmith/postgresql-libpq";

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

···
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.1.1";
-  sha256 = "1xzhb3ipax2489311hmiaxp9i44099bsbclcj3ds0rhdfa62xarg";
+  version = "1.1.2";
+  sha256 = "0iwajn0d0yngzp10j9qbb2gpq1g7r390yqd7pj5dri35rjc6mr8n";
   buildDepends = [ aeson shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";

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

···
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.0.2";
-  sha256 = "1n7qymrn2f83a11zdh2950pf8rsqnc52blwi02amjxsvy2piidzm";
+  version = "1.0.3";
+  sha256 = "0js56njy5rbviavga5qlp8d989wdpqf7lcyhwrjf1clf3k4f8anl";
   buildDepends = [ parsec text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";

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

···
     MonadCatchIOTransformers mtl random regexPosix text time unixCompat
     unorderedContainers vector zlibEnum
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://snapframework.com/";
     description = "Snap: A Haskell Web Framework (core interfaces and types)";

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

···
     caseInsensitive enumerator MonadCatchIOTransformers mtl network
     snapCore text time unixCompat
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://snapframework.com/";
     description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";

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

···
 { cabal, aeson, attoparsec, cereal, clientsession, comonad
-, configurator, directoryTree, dlist, errors, filepath, hashable
-, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom
-, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text
-, time, transformers, unorderedContainers, vector, vectorAlgorithms
-, xmlhtml
+, configurator, directoryTree, dlist, either, errors, filepath
+, hashable, heist, lens, logict, MonadCatchIOTransformers, mtl
+, mwcRandom, pwstoreFast, regexPosix, snapCore, snapServer, stm
+, syb, text, time, transformers, unorderedContainers, vector
+, vectorAlgorithms, xmlhtml
 }:
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.10.0.1";
-  sha256 = "14j9lgcdyxh7n4yidfvn1r94nziljiqz6nsqgq114v34bnn6l2yn";
+  version = "0.11.0";
+  sha256 = "0mw1fxjijd3z9bz1znrc5vfxa4mc1by481gxfmk2hdlcsib9sp7n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson attoparsec cereal clientsession comonad configurator
-    directoryTree dlist errors filepath hashable heist lens logict
-    MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix
-    snapCore snapServer stm syb text time transformers
+    directoryTree dlist either errors filepath hashable heist lens
+    logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast
+    regexPosix snapCore snapServer stm syb text time transformers
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
   jailbreak = true;

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

···
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "split";
+  version = "0.2.1.2";
+  sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi";
+  meta = {
+    description = "Combinator library for splitting lists";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})

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

···
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "string-qq";
+  version = "0.0.2";
+  sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp";
+  meta = {
+    description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

···
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.1.2";
-  sha256 = "1izsjy30saz2il16dwx8sh2s30b1pfgcpq6023v135w1bdrzrnmq";
+  version = "0.6.1.3";
+  sha256 = "1f2hka9jwlrm9dvw7z3896yfpdzxs2vaw0vbcmj5p401mvzc8w05";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];

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

···
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.1.1";
-  sha256 = "0ji83b5z3v6f6a6rgyj5xkjh9vvsqckr7ymzjnhb4zqf0mgymypq";
+  version = "1.1.2";
+  sha256 = "1vg1mnz6cxxgs48pbpjp4hwyvsysxyzvjfy4p1vd23lwc32cdjqg";
   buildDepends = [
     cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl
     network

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

···
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.3.2";
-  sha256 = "1089sfb4jyi17rw6nivpy96gbc90nyawr35jzwlzl41gzxxmv503";
+  version = "1.3.2.1";
+  sha256 = "13w3nhz59h4j25fsy95221y71k300plhs4vjqz2wxaigpv9sc2y7";
   buildDepends = [
     ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
     conduit dataDefault dateCache fastLogger httpTypes network

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

···
 
 cabal.mkDerivation (self: {
   pname = "wai-test";
-  version = "1.3.0";
-  sha256 = "15y0aw5c4sh1mns4ss39l0wsxrd1b6yq6m5r638x23zl6y7d9j40";
+  version = "1.3.0.1";
+  sha256 = "0yy0bvkrny4kj77wvn0cflwha6yijfxvnj530ps7xnzv1qm8qn1l";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
     httpTypes HUnit text transformers wai

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

···
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "1.3.0.1";
-  sha256 = "0z6byx71awhjb7fycz1ixsyzzlsrv1i69qwjrfzh9y5wnbchj9yl";
+  version = "1.3.0.2";
+  sha256 = "1ijxdnl76kkm2qck5qiwdwqvwkbpw8zbilfaz67sfbz3ccwls2fc";
   buildDepends = [
     blazeBuilder conduit httpTypes network text transformers vault
   ];

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

···
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.7.1";
-  sha256 = "0kabcxzjc686iayhxln2cmnxm3vk3h0685n4d4ybprv5h1nc6ghl";
+  version = "1.3.7.2";
+  sha256 = "06cwc0lmzgna939svdw7v5s822safkfy3wd4n21f9ml20iskzqm6";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpTypes liftedBase network networkConduit simpleSendfile

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

···
+{ cabal, cairo, graphviz, gtk, mtl, polyparse, text }:
+
+cabal.mkDerivation (self: {
+  pname = "xdot";
+  version = "0.2.2";
+  sha256 = "1n7lwshfn5rzbk4fxlkn02fxki2xh5m0304hnb1d5mchxyzhfdan";
+  buildDepends = [ cairo graphviz gtk mtl polyparse text ];
+  meta = {
+    description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})

pkgs/development/libraries/haskell/yesod-auth/default.nix

···
 { cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet
-, httpConduit, liftedBase, mimeMail, network, persistent
+, httpConduit, httpTypes, liftedBase, mimeMail, network, persistent
 , persistentTemplate, pureMD5, pwstoreFast, random, SHA
 , shakespeareCss, shakespeareJs, text, transformers
 , unorderedContainers, wai, yesodCore, yesodForm, yesodJson
···
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.1.3";
-  sha256 = "0rlp56jsb0cwm1z303b7l9iy5hbip18vlm7fisna4agbf4rj2k0z";
+  version = "1.1.4";
+  sha256 = "060548zbjsvf6zvixiyic729fd9862z3qwz349ric60jfa20cdpx";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
-    liftedBase mimeMail network persistent persistentTemplate pureMD5
-    pwstoreFast random SHA shakespeareCss shakespeareJs text
+    httpTypes liftedBase mimeMail network persistent persistentTemplate
+    pureMD5 pwstoreFast random SHA shakespeareCss shakespeareJs text
     transformers unorderedContainers wai yesodCore yesodForm yesodJson
     yesodPersistent
   ];

pkgs/development/libraries/haskell/yesod-core/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.1.7.1";
-  sha256 = "07rh6yy8hz660hxz60gvminm166cb5was8qb1l24lrmzchigbf3r";
+  version = "1.1.8";
+  sha256 = "03yk9ypd314830bk3jjwkzi87bn04lqkh6hq91izn1prvijjiqjm";
   buildDepends = [
     aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
     clientsession conduit cookie failure fastLogger hamlet httpTypes

pkgs/development/libraries/haskell/yesod-form/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.2.0.2";
-  sha256 = "0a3172rgvma420l98hkgvl17ks2a2jkys3rh4qd2bbm9p7qknv3y";
+  version = "1.2.1";
+  sha256 = "10xjpky7dglqbhc6i49q9ckkhq23wyyqd7karlp0byhprmspnifq";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent shakespeareCss

pkgs/development/libraries/haskell/yesod-routes/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "yesod-routes";
-  version = "1.1.1.1";
-  sha256 = "10cy50dnhbhwi0yspq0x06gzqpmhkalqq1sww2wjpv13hp53pq3m";
+  version = "1.1.2";
+  sha256 = "17yv2z7k1s958xyn552wpk0cwpivsnkvia8477yhgbp4n2d1i5jv";
   buildDepends = [ pathPieces text vector ];
   meta = {
     homepage = "http://www.yesodweb.com/";

pkgs/development/libraries/haskell/yesod-static/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.1.1.2";
-  sha256 = "0x3vrzqqddi4fmbivmy5pi66jmnc5fh68j5fjfxn5nyhp4n6z0sw";
+  version = "1.1.2";
+  sha256 = "0rh5vdpiq1ryw7isyaqqw3sif833k8j32m47lvr0dj46lj2jz0a0";
   buildDepends = [
     base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
     httpTypes systemFilepath text transformers unixCompat wai

pkgs/development/libraries/haskell/yesod-test/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "0.3.3";
-  sha256 = "1jb410r905wd26swh2rk59nbyy389gcfz261adhb69awmsyql5x3";
+  version = "0.3.3.1";
+  sha256 = "052dc68r2k56jzl9yh72kwcgdp35rm9w9vyj6xprqk506i43x7m1";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network

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

···
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.1.7.2";
-  sha256 = "0mxxzcmp63sdn7g30ilp40dsj2iccajc9gpxycnqxqabdzhqkbm0";
+  version = "1.1.8";
+  sha256 = "0ygcsrq8nf1jvksig72r3i13qz1d3hgh5476fy6l4wl33idk6jb1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/liboil/default.nix

···
-{stdenv, fetchurl, pkgconfig, glib }:
+{stdenv, fetchurl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "liboil-0.3.15";
+  name = "liboil-0.3.17";
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "1m3zcl54sf21cf2ckzny16ihymz8whi60ymyrhmd3m1dlw1knpmf";
+    sha256 = "0sgwic99hxlb1av8cm0albzh8myb7r3lpcwxfm606l0bkc3h4pqh";
   };
 
-  buildInputs = [pkgconfig glib];
+  buildInputs = [ pkgconfig ];
+
+  patches = [ ./x86_64-cpuid.patch ];
 
   meta = {
     homepage = http://liboil.freedesktop.org;
     description = "A library of simple functions that are optimized for various CPUs";
+    license = "BSD-2";
   };
 }

pkgs/development/libraries/liboil/x86_64-cpuid.patch

···
+From 705916007fba0a845229a02dc6474cb523eff150 Mon Sep 17 00:00:00 2001
+From: David Schleef <[e-mail]>
+Date: Tue, 20 Jul 2010 21:05:26 +0000
+Subject: x86: Fix cpuid function on x86-64
+
+Fixes: #28956.
+---
+diff --git a/liboil/liboilcpu-x86.c b/liboil/liboilcpu-x86.c
+index e7a1978..ef4d3f2 100644
+--- a/liboil/liboilcpu-x86.c
++++ b/liboil/liboilcpu-x86.c
+@@ -162,13 +162,10 @@ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d)
+ static void
+ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d)
+ {
++  *a = op;
+   __asm__ (
+-      "  pushq %%rbx\n"
+       "  cpuid\n"
+-      "  mov %%ebx, %%esi\n"
+-      "  popq %%rbx\n"
+-      : "=a" (*a), "=S" (*b), "=c" (*c), "=d" (*d)
+-      : "0" (op));
++      : "+a" (*a), "=b" (*b), "=c" (*c), "=d" (*d));
+ }
+ #endif
+ 
+@@ -185,7 +182,7 @@ oil_cpu_detect_cpuid (void)
+ {
+   uint32_t eax, ebx, ecx, edx;
+   uint32_t level;
+-  char vendor[13] = { 0 };
++  char vendor[13+4] = { 0 };
+   int ret;
+ 
+   oil_fault_check_enable ();
+--
+cgit v0.9.0.2-2-gbebe

pkgs/development/libraries/libva/default.nix

···
-{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, intelgen4asm }:
+{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }:
 
 stdenv.mkDerivation rec {
-  name = "libva-1.0.12";
+  name = "libva-1.1.0";
   
   src = fetchurl {
-    url = "http://cgit.freedesktop.org/libva/snapshot/${name}.tar.bz2";
-    sha256 = "1xg8zvmh75w63sc8ykagzrbzswph6g9jardy8v83glkqzilaw2p8";
+    url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
+    sha256 = "1a7g7i96ww8hmim2pq2a3xc89073lzacxn1xh9526bzhlqjdqsnv";
   };
 
-  buildInputs = [ autoconf automake libtool libX11 libXext pkgconfig mesa libdrm
-    libXfixes intelgen4asm ];
+  buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ];
 
-  configureFlags = [ "--enable-i965-driver" "--enable-glx" ];
-
-  preConfigure = "sh autogen.sh";
+  configureFlags = [ "--enable-glx" ];
 
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/vaapi;

pkgs/development/libraries/stlport/default.nix

···
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "STLport-5.2.0";
+stdenv.mkDerivation rec {
+  name = "STLport-5.2.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/stlport/STLport-5.2.0.tar.bz2;
-    md5 = "448d74859407912c0087adcf51bf109a";
+    url = "mirror://sourceforge/stlport/${name}.tar.bz2";
+    sha256 = "1jbgak1m1qk7d4gyn1p2grbws2icsf7grbs3dh44ai9ck1xh0nvm";
+  };
+
+  # fix hardcoded /usr/bin; not recognizing the standard --disable-static flag
+  configurePhase = ''
+    echo Preconf: build/Makefiles/gmake/*/sys.mak
+    for f in build/Makefiles/gmake/*/sys.mak; do
+      substituteInPlace "$f" --replace /usr/bin/ ""
+    done
+    ./configure --prefix=$out
+  '';
+
+  meta = {
+    description = "An implementation of the C++ Standard Library";
+    homepage = http://sourceforge.net/projects/stlport/;
+    license = "free"; # seems BSD-like
   };
 }

pkgs/development/libraries/vaapi-intel/default.nix

···
+{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig
+, intelgen4asm }:
+
+stdenv.mkDerivation rec {
+  name = "libva-intel-driver-1.0.19";
+  
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
+    sha256 = "14m7krah3ajkwj190q431lqqa84hdljcdmrcrqkbgaffyjlqvdid";
+  };
+
+  buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 intelgen4asm ];
+
+  preConfigure = ''
+    sh autogen.sh
+    sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
+  '';
+
+  meta = {
+    homepage = http://cgit.freedesktop.org/vaapi/intel-driver/;
+    license = "MIT";
+    description = "Intel driver for the VAAPI library";
+  };
+}

pkgs/development/libraries/vaapi-vdpau/default.nix

···
+{ stdenv, fetchurl, libvdpau, mesa, libva, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libva-vdpau-driver-0.7.4";
+  
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2";
+    sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m";
+  };
+
+  buildInputs = [ libvdpau mesa libva pkgconfig ];
+
+  preConfigure = ''
+    sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
+  '';
+
+  meta = {
+    homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/;
+    license = "GPLv2+";
+    description = "VDPAU driver for the VAAPI library";
+  };
+}

pkgs/development/tools/documentation/docutils/default.nix

···
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "0.5" a; 
+  version = a.lib.attrByPath ["version"] "0.10" a; 
   buildInputs = with a; [
     python pil makeWrapper 
   ];
···
 rec {
   src = fetchurl {
     url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz";
-    sha256 = "03k1dakb5j1xi1xd62vqqy7dkgd1fhr4ahmvvmd5g87wxn2gjz3l";
+    sha256 = "0gk0733w34zibzvi6paqqfbbajzaxajc4z5i5wpxlwv73gk281ip";
   };
 
   inherit buildInputs;

pkgs/development/tools/haskell/hlint/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.42";
-  sha256 = "03myq4wagx5d9g6v8znw4l67f1irami0fnlw48rxlqhfn33y5mgc";
+  version = "1.8.43";
+  sha256 = "0wffswyx60qig1is3ki5asp8i4wvd3gqg2r811rw0zxwi3nrjiv6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/games/simutrans/default.nix

···
-{ stdenv, fetchurl, unzip, zlib, libpng, bzip2, SDL, SDL_mixer } :
+{ stdenv, fetchurl, unzip, zlib, libpng, bzip2, SDL, SDL_mixer, makeWrapper } :
 
 let
-  # This is the default "pakset" of objects, images, text, music, etc.
+  result = withPak (mkPak pak128);
+
+  ver_1 = "112";
+  ver_2 = "1";
+  ver_h2 = "${ver_1}-${ver_2}";
+
+  # "pakset" of objects, images, text, music, etc.
+  mkPak = src: stdenv.mkDerivation {
+    name = "simutrans-pakset";
+    inherit src;
+    unpackPhase = "true";
+    buildInputs = [ unzip ];
+    installPhase = ''
+      mkdir -p $out
+      cd $out
+      unzip ${src}
+      mv simutrans/*/* .
+      rm -rf simutrans
+    '';
+  };
   pak64 = fetchurl {
-    url = http://sourceforge.net/projects/simutrans/files/pak64/110-0-1/simupak64-110-0-1.zip/download;
-    name = "pak64.zip";
-    sha256 = "0gs6k9dbbhh60g2smsx2jza65vyss616bpngwpvilrvb5rzzrxcq";
+    url = "mirror://sourceforge/simutrans/pak64/${ver_h2}/simupak64-${ver_h2}.zip";
+    sha256 = "1197rl2534wx9wdafarlr42qjw6pyghz4bynq2g68pi10h8csypw";
   };
-
-  # The source distribution seems to be missing some text files.
-  # So we will get them from the binary Linux release (which apparently has them).
-  langtab = fetchurl {
-    url = http://sourceforge.net/projects/simutrans/files/simutrans/110-0-1/simulinux-110-0-1.zip/download;
-    name = "simulinux-110-0-1.zip";
-    sha256 = "15z13kazdzhfzwxry7a766xkkdzaidvscylzrjkx3nnbcq6461s4";
+  pak128 = fetchurl {
+    url = "mirror://sourceforge/simutrans/pak128/pak128%20for%20${ver_1}/pak128-2.2.0--${ver_1}.0.zip";
+    sha256 = "13rwv9q3fa3ac0k11ds7zkpd00k4mn14rb0cknknvyz46icb9n80";
   };
-in
-stdenv.mkDerivation rec {
-  pname = "simutrans";
-  version = "110.0.1";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "http://github.com/aburch/simutrans/tarball/v110.0.1";
-    name = "${name}.tar.gz";
-    sha256 = "ab0e42e5013d6d2fd5d3176b39dc45e482583b3bad178aac1188bf2ec88feb51";
+  withPak = pak: stdenv.mkDerivation {
+    inherit (binaries) name;
+    unpackPhase = "true";
+    buildInputs = [ makeWrapper ];
+    installPhase = ''makeWrapper "${binaries}/bin/simutrans" "$out/bin/simutrans" --add-flags -objects --add-flags "${pak}"'';
+    inherit (binaries) meta;
   };
 
-  buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ];
+  binaries = stdenv.mkDerivation rec {
+    pname = "simutrans";
+    name = "${pname}-${ver_1}.${ver_2}";
 
-  prePatch = ''
-    # Use ~/.simutrans instead of ~/simutrans
-    sed -i 's@%s/simutrans@%s/.simutrans@' simsys_s.cc
-  '';
-
-  preConfigure = ''
-    # Configuration as per the readme.txt
-    sed -i 's@#BACKEND = sdl@BACKEND = sdl@' config.template
-    sed -i 's@#COLOUR_DEPTH = 16@COLOUR_DEPTH = 16@' config.template
-    sed -i 's@#OSTYPE = linux@OSTYPE = linux@' config.template
-    sed -i 's@#OPTIMISE = 1@OPTIMISE = 1@' config.template
+    src = fetchurl {
+      url = "mirror://sourceforge/simutrans/simutrans/${ver_h2}/simutrans-src-${ver_h2}.zip";
+      sha256 = "1xrxpd5m2dc9bk8w21smfj28r41ji1qaihjwkwrifgz6rhg19l5c";
+    };
+    sourceRoot = ".";
 
-    cp config.template config.default
-  '';
+    buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ];
 
-  installPhase = ''
-    # Erase the source distribution object definitions, will be replaced with langtab.
-    rm -r simutrans
+    preConfigure = ''
+      # Configuration as per the readme.txt
+      sed \
+        -e 's@#BACKEND = sdl@BACKEND = sdl@' \
+        -e 's@#COLOUR_DEPTH = 16@COLOUR_DEPTH = 16@' \
+        -e 's@#OSTYPE = linux@OSTYPE = linux@' \
+        < config.template > config.default
 
-    # Default pakset and binary release core objects.
-    unzip ${pak64}
-    unzip ${langtab}
+      # Different default data dir
+      sed -i -e 's:argv\[0\]:"'$out'/share/simutrans/":' \
+        simmain.cc
 
-    mv sim simutrans/
+      # Use ~/.simutrans instead of ~/simutrans ##not working
+      #sed -i -e 's@%s/simutrans@%s/.simutrans@' simsys_s.cc
 
-    mkdir -p $out/simutrans
-    cp -r simutrans $out
+      # No optimization overriding
+      sed -i -e '/-O$/d' Makefile
+    '';
 
-    mkdir -p $out/bin
-    ln -s $out/simutrans/sim $out/bin/simutrans
-  '';
+    installPhase = ''
+      mkdir -p $out/share/
+      mv simutrans $out/share/
 
-  meta = {
-    description = "Simutrans is a simulation game in which the player strives to run a successful transport system.";
-    longDescription = ''
-      Simutrans is a cross-platform simulation game in which the
-      player strives to run a successful transport system by
-      transporting goods, passengers, and mail between
-      places. Simutrans is an open source remake of Transport Tycoon.
+      mkdir -p $out/bin/
+      mv build/default/sim $out/bin/simutrans
     '';
 
-    homepage = http://www.simutrans.com/;
-    license = "Artistic";
-    maintainers = [ stdenv.lib.maintainers.kkallio ];
-    platforms = stdenv.lib.platforms.linux;
+    meta = {
+      description = "A simulation game in which the player strives to run a successful transport system";
+      longDescription = ''
+        Simutrans is a cross-platform simulation game in which the
+        player strives to run a successful transport system by
+        transporting goods, passengers, and mail between
+        places. Simutrans is an open source remake of Transport Tycoon.
+      '';
+
+      homepage = http://www.simutrans.com/;
+      license = "Artistic";
+      maintainers = [ stdenv.lib.maintainers.kkallio ];
+      platforms = stdenv.lib.platforms.linux;
+    };
   };
-}
+
+in result

pkgs/games/six/default.nix

···
-{ stdenv, fetchurl, arts, kdelibs, libX11, libXext, libXt, perl, qt3, zlib }:
-
-let
-
-    versionNumber = "0.5.3";
-
-in
-
-stdenv.mkDerivation {
-
-  name = "six-${versionNumber}";
-
-  src = fetchurl {
-    url = "http://six.retes.hu/download/six-${versionNumber}.tar.gz";
-    sha256 = "0hialm0kxr11rp5z452whjmxp2vaqqj668d0dfs32fd10ggi8wj4";
-  };
-
-  meta = {
-    description = "Six - A Hex playing program for KDE";
-    homepage = http://six.retes.hu/;
-    license = "GPLv2";
-    platforms = stdenv.lib.platforms.linux;
-  };
-
-  buildInputs = [ arts kdelibs libX11 libXext libXt perl qt3 zlib ];
-
-  # Supress some warnings which are less useful to us when making packages.
-  NIX_CFLAGS_COMPILE = "-Wno-conversion -Wno-parentheses";
-
-  # Without "--x-libraries=", we get the error
-  # "impure path `/usr/lib' used in link".
-  configureFlags = "--x-libraries=";
-
-  patches = [ ./gcc43-includes.patch ];
-}

pkgs/games/six/gcc43-includes.patch

···
-This patch makes six compile with gcc 4.3 by including more header files.  It
-is based on the advice at <http://gcc.gnu.org/gcc-4.3/porting_to.html>.
-
---- a/six/carrier.h
-+++ b/six/carrier.h
-@@ -2,6 +2,7 @@
- #ifndef CARRIER_H
- #define CARRIER_H
-
-+#include <cstring>
- #include <iostream>
- #include <vector>
-
-diff --git a/six/hexgame.cpp b/six/hexgame.cpp
-index 720e977..5d0dafe 100644
---- a/six/hexgame.cpp
-+++ b/six/hexgame.cpp
-@@ -3,6 +3,7 @@
- #include <cassert>
- #include <cctype>
- #include <cstdio>
-+#include <cstdlib>
-
- #include <string>
-
-diff --git a/six/main.cpp b/six/main.cpp
-index 7fb5c21..b925a0c 100644
---- a/six/main.cpp
-+++ b/six/main.cpp
-@@ -4,6 +4,8 @@
- #include "carrier.h"
- #include "misc.h"
-
-+#include <cstdlib>
-+
- #include <kapp.h>
- #include <dcopclient.h>
- #include <kaboutdata.h>

pkgs/lib/attrsets.nix

···
   inherit (import ./trivial.nix) or;
   inherit (import ./default.nix) fold;
   inherit (import ./strings.nix) concatStringsSep;
-  inherit (import ./lists.nix) concatMap concatLists all;
+  inherit (import ./lists.nix) concatMap concatLists all deepSeqList;
   inherit (import ./misc.nix) maybeAttr;
 };
 
···
   overrideExisting = old: new:
     old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old));
 
+  deepSeqAttrs = x: y: deepSeqList (attrValues x) y;
 }

pkgs/lib/lists.nix

···
 # General list operations.
+with {
+  inherit (import ./trivial.nix) deepSeq;
+};
 
 rec {
   inherit (builtins) head tail length isList add sub lessThan;
···
       ++ zipTwoLists (tail xs) (tail ys)
     else [];
 
+  deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;
 }

pkgs/lib/trivial.nix

···
+with {
+  inherit (import ./lists.nix) deepSeqList;
+  inherit (import ./attrsets.nix) deepSeqAttrs;
+};
+
 rec {
 
   # Identity function.
···
   # evaluation of its first argument.
   seq = x: y: if x == null then y else y;
   
+  deepSeq = x: y:
+    if builtins.isList x
+      then deepSeqList x y
+    else if builtins.isAttrs x
+      then deepSeqAttrs x y
+      else seq x y;
 }

pkgs/misc/cups/default.nix

···
     description = "A standards-based printing system for UNIX";
     license = stdenv.lib.licenses.gpl2; # actually LGPL for the library and GPL for the rest
     maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/emulators/wine/default.nix

···
 assert stdenv.gcc.gcc != null;
 
 stdenv.mkDerivation rec {
-  name = "wine-${meta.version}";
+  version = "1.5.23";
+  name = "wine-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/wine/${name}.tar.bz2";
-    sha256 = "0l5kr3iq1lkv3gcw8ljzfjcfnsh9b5crdd4i0dzwdk1i3bfw2xxc";
+    sha256 = "1wgs2bdl3sn3j0za7fk9zfjlii1x6qkvmyw4jxzz1mfw6nizswzr";
   };
 
   gecko = fetchurl {
-    url = "mirror://sourceforge/wine/wine_gecko-1.5-x86.msi";
-    sha256 = "2e372a1b87ff2a22ad5127400ece4b09e55591d9f84e00bb562d294898a49b5c";
+    url = "mirror://sourceforge/wine/wine_gecko-1.9-x86.msi";
+    sha256 = "10p7djsf85xjk8rzg3hgw5fskrn8402y2aijy701xwm4hy9ga79g";
   };
 
   buildInputs = [
···
   enableParallelBuilding = true;
 
   meta = {
-    version = "1.5.21";
     homepage = "http://www.winehq.org/";
     license = "LGPL";
     description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";

pkgs/os-specific/darwin/native-x11-and-opengl/default.nix

···
+{ stdenv, writeScript }:
+
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation rec {
+  name = "darwin-native-x11-and-opengl";
+
+  builder = writeScript "${name}-builder.sh" ''
+    /bin/mkdir -p $out
+    /bin/ln -sv /usr/X11/{bin,lib,include,share} $out/
+  '';
+}

pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix

···
   name = "iwlwifi-2030-ucode-18.168.6.1";
 
   src = fetchurl {
-    url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
+    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
+    name = "${name}.tgz";
     sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8";
   };
 

pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix

···
-{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
-
-let
-  configWithPlatform = kernelPlatform:
-    ''
-      # Don't include any debug features.
-      DEBUG_KERNEL n
-
-      # Support drivers that need external firmware.
-      STANDALONE n
-
-      # Make /proc/config.gz available.
-      IKCONFIG_PROC y
-
-      # Optimize with -O2, not -Os.
-      CC_OPTIMIZE_FOR_SIZE n
-
-      # Enable the kernel's built-in memory tester.
-      MEMTEST y
-
-      # Include the CFQ I/O scheduler in the kernel, rather than as a
-      # module, so that the initrd gets a good I/O scheduler.
-      IOSCHED_CFQ y
-
-      # Disable some expensive (?) features.
-      FTRACE n
-      KPROBES n
-      NUMA? n
-      PM_TRACE_RTC n
-
-      # Enable various subsystems.
-      ACCESSIBILITY y # Accessibility support
-      AUXDISPLAY y # Auxiliary Display support
-      DONGLE y # Serial dongle support
-      HIPPI y
-      MTD_COMPLEX_MAPPINGS y # needed for many devices
-      NET_POCKET y # enable pocket and portable adapters
-      SCSI_LOWLEVEL y # enable lots of SCSI devices
-      SCSI_LOWLEVEL_PCMCIA y
-      SPI y # needed for many devices
-      SPI_MASTER y
-      WAN y
-
-      # Networking options.
-      IP_PNP n
-      IPV6_PRIVACY y
-      NETFILTER_ADVANCED y
-      IP_VS_PROTO_TCP y
-      IP_VS_PROTO_UDP y
-      IP_VS_PROTO_ESP y
-      IP_VS_PROTO_AH y
-      IP_DCCP_CCID3 n # experimental
-      CLS_U32_PERF y
-      CLS_U32_MARK y
-
-      # Wireless networking.
-      IPW2100_MONITOR y # support promiscuous mode
-      IPW2200_MONITOR y # support promiscuous mode
-      IWLWIFI_LEDS? y
-      IWLWIFI_SPECTRUM_MEASUREMENT y
-      IWL3945_SPECTRUM_MEASUREMENT y
-      IWL4965 y # Intel Wireless WiFi 4965AGN
-      IWL5000 y # Intel Wireless WiFi 5000AGN
-      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
-      HOSTAP_FIRMWARE_NVRAM y
-
-      # Some settings to make sure that fbcondecor works - in particular,
-      # disable tileblitting and the drivers that need it.
-
-      # Enable various FB devices.
-      FB y
-      FB_EFI y
-      FB_NVIDIA_I2C y # Enable DDC Support
-      FB_RIVA_I2C y
-      FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
-      FB_ATY_GX y # Mach64 GX support
-      FB_SAVAGE_I2C y
-      FB_SAVAGE_ACCEL y
-      FB_SIS_300 y
-      FB_SIS_315 y
-      FB_3DFX_ACCEL y
-      FB_GEODE y
-
-      # Video configuration
-      # The intel drivers already require KMS
-      DRM_I915_KMS y
-
-      # Sound.
-      SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
-      SND_HDA_INPUT_BEEP y # Support digital beep via input layer
-      SND_USB_CAIAQ_INPUT y
-      PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
-
-      # USB serial devices.
-      USB_SERIAL_GENERIC y # USB Generic Serial Driver
-      USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
-      USB_SERIAL_KEYSPAN_USA28 y
-      USB_SERIAL_KEYSPAN_USA28X y
-      USB_SERIAL_KEYSPAN_USA28XA y
-      USB_SERIAL_KEYSPAN_USA28XB y
-      USB_SERIAL_KEYSPAN_USA19 y
-      USB_SERIAL_KEYSPAN_USA18X y
-      USB_SERIAL_KEYSPAN_USA19W y
-      USB_SERIAL_KEYSPAN_USA19QW y
-      USB_SERIAL_KEYSPAN_USA19QI y
-      USB_SERIAL_KEYSPAN_USA49W y
-      USB_SERIAL_KEYSPAN_USA49WLC y
-
-      # Filesystem options - in particular, enable extended attributes and
-      # ACLs for all filesystems that support them.
-      EXT2_FS_XATTR y # Ext2 extended attributes
-      EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
-      EXT2_FS_SECURITY y # Ext2 Security Labels
-      EXT2_FS_XIP y # Ext2 execute in place support
-      EXT4_FS_POSIX_ACL y
-      EXT4_FS_SECURITY y
-      REISERFS_FS_XATTR y
-      REISERFS_FS_POSIX_ACL y
-      REISERFS_FS_SECURITY y
-      JFS_POSIX_ACL y
-      JFS_SECURITY y
-      XFS_QUOTA y
-      XFS_POSIX_ACL y
-      XFS_RT y # XFS Realtime subvolume support
-      OCFS2_DEBUG_MASKLOG n
-      OCFS2_FS_POSIX_ACL y
-      BTRFS_FS_POSIX_ACL y
-      UBIFS_FS_XATTR y
-      UBIFS_FS_ADVANCED_COMPR y
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
-      CIFS_XATTR y
-      CIFS_POSIX y
-
-      # Security related features.
-      STRICT_DEVMEM y # Filter access to /dev/mem
-      SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
-
-      # Misc. options.
-      8139TOO_8129 y
-      8139TOO_PIO n # PIO is slower
-      AIC79XX_DEBUG_ENABLE n
-      AIC7XXX_DEBUG_ENABLE n
-      AIC94XX_DEBUG n
-      B43_PCMCIA y
-      BLK_DEV_BSG n
-      BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
-      BLK_DEV_IDEACPI y # IDE ACPI support
-      BLK_DEV_INTEGRITY y
-      BSD_PROCESS_ACCT_V3 y
-      BT_HCIUART_BCSP y
-      BT_HCIUART_H4 y # UART (H4) protocol support
-      BT_HCIUART_LL y
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CPU_FREQ_DEBUG n
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS y # we use udev
-      FUSION y # Fusion MPT device support
-      IDE_GD_ATAPI y # ATAPI floppy support
-      IRDA_ULTRA y # Ultra (connectionless) protocol
-      JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
-      JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
-      JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
-      JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
-      KALLSYMS_EXTRA_PASS n
-      LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
-      LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
-      LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
-      LOGO n # not needed
-      MEDIA_ATTACH y
-      MEGARAID_NEWGEN y
-      MICROCODE_AMD y
-      MODVERSIONS y
-      MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
-      MTRR_SANITIZER y
-      NET_FC y # Fibre Channel driver support
-      PCI_LEGACY y
-      PPP_MULTILINK y # PPP multilink support
-      REGULATOR y # Voltage and Current Regulator Support
-      SCSI_LOGGING y # SCSI logging facility
-      SERIAL_8250 y # 8250/16550 and compatible serial support
-      SLIP_COMPRESSED y # CSLIP compressed headers
-      SLIP_SMART y
-      THERMAL_HWMON y # Hardware monitoring support
-      USB_DEBUG n
-      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-
-      # Enable Xen Dom0 support.
-      XEN_DOM0 y
-      XEN_PCI_PASSTHROUGH y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "2.6.32.24-xen-179eca5";
-    localVersion = "-xen-179eca5";
-  
-    src = fetchurl {
-      url = "http://nixos.org/tarballs/linux-${version}.tar.bz2";
-      sha256 = "09a7xh4hvw0hzq67dqdxn8p4rkd907937xvshx30rg4ab6717scf";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-
-    meta.description = "Linux kernel suitable for Xen Domain 0";
-  }
-
-  // removeAttrs args ["extraConfig"]
-)

pkgs/os-specific/linux/modutils/default.nix

···
-{stdenv, fetchurl, bison, flex}:
-
-stdenv.mkDerivation {
-  name = "modutils-2.4.27";
-  src = fetchurl {
-    url = mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-2.4.27.tar.bz2;
-    md5 = "bac989c74ed10f3bf86177fc5b4b89b6";
-  };
-  buildInputs = [bison flex];
-}

pkgs/os-specific/linux/ov511/default.nix

···
-import ./ov511-2.30-default.nix

pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh

···
-source $stdenv/setup
-
-hashname=$(basename $kernel)
-echo $hashname
-if echo "$hashname" | grep -q '^[a-z0-9]\{32\}-'; then
-  hashname=$(echo "$hashname" | cut -c -32)
-fi
-
-stripHash $kernel
-version=$(echo $strippedName | cut -c 7-)-$hashname
-
-echo "version $version"
-
-export version
-
-mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/
-
-genericBuild

pkgs/os-specific/linux/ov511/ov511-2.30-default.nix

···
-{stdenv, fetchurl, kernel}:
-
-stdenv.mkDerivation {
-  name = "ov511-2.30-${kernel.version}";
-  builder = ./ov511-2.30-builder.sh;
-  src = fetchurl {
-    url = http://nixos.org/tarballs/ov511-2.30.tar.bz2;
-    md5 = "9eacf9e54f2f54a59ddbf14221a53f2a";
-  };
-  patches = [./ov511-kernel.patch ./ov511-2.32-kdir.patch];
-  inherit kernel;
-  NIX_GLIBC_FLAGS_SET=1;
-}

pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch

···
-diff -rc ov511-2.32/Makefile ov511-2.32.new/Makefile
-*** ov511-2.32/Makefile	2006-03-28 17:47:31.000000000 +0200
---- ov511-2.32.new/Makefile	2006-07-17 09:46:17.000000000 +0200
-***************
-*** 114,120 ****
-  
-  else  # We were called from command line
-  
-! KDIR := /lib/modules/$(shell uname -r)/build
-  PWD  := $(shell pwd)
-  
-  default:
---- 114,120 ----
-  
-  else  # We were called from command line
-  
-! KDIR := $(kernel)/lib/modules/$(version)/build
-  PWD  := $(shell pwd)
-  
-  default:

pkgs/os-specific/linux/ov511/ov511-kernel.patch

···
-diff -rc ov511-2.32/do_install.sh ov511-2.32.new/do_install.sh
-*** ov511-2.32/do_install.sh	2003-11-12 09:24:29.000000000 +0100
---- ov511-2.32.new/do_install.sh	2006-07-16 19:44:56.000000000 +0200
-***************
-*** 8,15 ****
-  
-  UNAME=`uname -r`
-  
-! INSTALL_PATH_2_4=/lib/modules/$UNAME/kernel/drivers/usb/
-! INSTALL_PATH_2_6=/lib/modules/$UNAME/kernel/drivers/usb/media/
-  
-  MAJMIN=`echo $UNAME | cut -d . -f 1-2`
-  
---- 8,15 ----
-  
-  UNAME=`uname -r`
-  
-! INSTALL_PATH_2_4=$out/lib/modules/$version/kernel/drivers/usb/
-! INSTALL_PATH_2_6=$out/lib/modules/$version/kernel/drivers/usb/media/
-  
-  MAJMIN=`echo $UNAME | cut -d . -f 1-2`
-  
-***************
-*** 35,41 ****
-  	install $MODULE $INSTALL_PATH
-  done
-  
-! echo Finding module dependencies
-! /sbin/depmod -ae
-  
-  echo All done!
---- 35,41 ----
-  	install $MODULE $INSTALL_PATH
-  done
-  
-! #echo Finding module dependencies
-! #/sbin/depmod -ae
-  
-  echo All done!

pkgs/os-specific/linux/powertop/default.nix

···
 { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "powertop-2.1";
+  name = "powertop-2.2";
 
   src = fetchurl {
     url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz";
-    sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x";
+    sha256 = "0a5haxawcjrlwwxx4j5kd4ad05gjmcr13v8gswfwfxcn7fyf2f8k";
   };
 
   buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ];

pkgs/os-specific/linux/wpa_supplicant/default.nix

···
-{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }:
+{ stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl
+, readlineSupport ? true, readline
+}:
+
+assert readlineSupport -> readline != null;
 
 stdenv.mkDerivation rec {
   version = "1.1";
···
     sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5";
   };
 
+  extraConfig =
+    ''
+      CONFIG_DEBUG_SYSLOG=y
+      CONFIG_CTRL_IFACE_DBUS=y
+      CONFIG_CTRL_IFACE_DBUS_NEW=y
+      CONFIG_CTRL_IFACE_DBUS_INTRO=y
+      CONFIG_DRIVER_NL80211=y
+      CONFIG_LIBNL32=y
+      ${stdenv.lib.optionalString readlineSupport "CONFIG_READLINE=y"}
+    '';
+
   preBuild = ''
     cd wpa_supplicant
     cp -v defconfig .config
-    echo CONFIG_DEBUG_SYSLOG=y | tee -a .config
-    echo CONFIG_CTRL_IFACE_DBUS=y | tee -a .config
-    echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config
-    echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config
-    echo CONFIG_DRIVER_NL80211=y | tee -a .config
-    echo CONFIG_LIBNL32=y | tee -a .config
+    echo "$extraConfig" >> .config
+    cat .config
     substituteInPlace Makefile --replace /usr/local $out
   '';
 
-  buildInputs = [ openssl dbus_libs libnl ];
+  buildInputs = [ openssl dbus_libs libnl ]
+    ++ lib.optional readlineSupport readline;
 
   buildNativeInputs = [ pkgconfig ];
 

pkgs/shells/bash-completion/default.nix

···
-{ stdenv, fetchurl }:
+{ stdenv, fetchgit, autoconf, automake }:
 
-let
-  version = "2.0";
-in
 stdenv.mkDerivation {
-  name = "bash-completion-${version}";
+  name = "bash-completion-2.0-95-gd08b9f2";
 
-  src = fetchurl {
-    url = "http://bash-completion.alioth.debian.org/files/bash-completion-${version}.tar.bz2";
-    sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804";
+  src = fetchgit {
+    url = "http://anonscm.debian.org/git/bash-completion/bash-completion.git";
+    rev = "d08b9f233559b3dced20050ba312b08fe0de53b4";
+    sha256 = "0jybaib2bmpk5qd80y1l6wmfcd0b95cmf1l3hcb0ckpj0pjff0bn";
   };
+
+  buildInputs = [ autoconf automake ];
+
+  preConfigure = "autoreconf -i";
 
   doCheck = true;
 
···
     description = "Programmable completion for the bash shell";
     license = "GPL";
 
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/tools/misc/cowsay/default.nix

···
 
 stdenv.mkDerivation {
   name = "cowsay-3.03";
+
   src = fetchurl {
     url = http://www.nog.net/~tony/warez/cowsay-3.03.tar.gz;
-    sha256 = "1bxj802na2si2bk5zh7n0b7c33mg8a5n2wnvh0vihl9bmjkp51hb";
+    sha256 = "1s3c0g5vmsadicc4lrlkmkm8znm4y6wnxd8kyv9xgm676hban1il";
   };
-  buildInputs = [perl];
+
+  buildInputs = [ perl ];
+
   installPhase = ''
     bash ./install.sh $out
   '';
 
   meta = {
-    description = "cowsay is a program which generates ASCII pictures of a cow with a message.";
+    description = "A program which generates ASCII pictures of a cow with a message";
     homepage = http://www.nog.net/~tony/warez/cowsay.shtml;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.rob ];
   };
 }

pkgs/tools/misc/gummiboot/default.nix

···
+{ stdenv, fetchurl, gnu_efi }:
+
+stdenv.mkDerivation rec {
+  name = "gummiboot-16";
+
+  patches = [ ./no-usr.patch ];
+
+  buildFlags = [
+    "GNU_EFI=${gnu_efi}"
+  ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") "ARCH=ia32";
+
+  installPhase = "mkdir -p $out/bin; mv gummiboot.efi $out/bin";
+
+  src = fetchurl {
+    url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.tar.gz";
+    sha256 = "1znvbxrhc7pkbhbw9bvg4zhfkp81q7fy4mq2jsw6vimccr7h29a0";
+  };
+
+  meta = {
+    description = "A simple UEFI boot manager which executes configured EFI images";
+
+    homepage = http://freedesktop.org/wiki/Software/gummiboot;
+
+    license = stdenv.lib.licenses.lgpl21Plus;
+
+    platforms = [ "x86_64-linux" "i686-linux" ];
+
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
+}

pkgs/tools/misc/gummiboot/no-usr.patch

···
+diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile
+--- gummiboot-16-orig/Makefile	2013-01-24 04:20:58.000000000 -0500
++++ gummiboot-16/Makefile	2013-02-01 17:27:42.922371399 -0500
+@@ -1,13 +1,13 @@
+ VERSION=16
+ 
+ ARCH=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//")
+-LIBDIR=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd))
++LIBDIR=$(GNU_EFI)/lib
+ LIBEFIDIR=$(or $(wildcard $(LIBDIR)/gnuefi), $(LIBDIR))
+ 
+ CPPFLAGS = \
+ 	-I. \
+-	-I/usr/include/efi \
+-	-I/usr/include/efi/$(ARCH)
++	-I$(GNU_EFI)/include/efi \
++	-I$(GNU_EFI)/include/efi/$(ARCH)
+ 
+ CFLAGS = \
+ 	-DVERSION=$(VERSION) \

pkgs/tools/networking/wget/default.nix

···
 { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.13.4";
+  name = "wget-1.14";
 
   src = fetchurl {
-    url = "mirror://gnu/wget/${name}.tar.gz";
-    sha256 = "1kadjg63x1mm741dxdidwsn1rz0f7dkzbq59v0iww87jr45p3ir4";
+    url = "mirror://gnu/wget/${name}.tar.xz";
+    sha256 = "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p";
   };
 
   preConfigure = stdenv.lib.optionalString doCheck

pkgs/tools/system/fdisk/default.nix

···
-{ fetchurl, stdenv, parted, libuuid, gettext }:
+{ fetchurl, stdenv, parted, libuuid, gettext, guile }:
 
 stdenv.mkDerivation rec {
-  name = "fdisk-1.3.0a";
+  name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see http://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html
 
   src = fetchurl {
-    url = "mirror://gnu/fdisk/${name}.tar.bz2";
-    sha256 = "1g2zvl560f7p1hd4q50d1msy6qp7949mdkagfy8ki8cayp8fp267";
+    url = "mirror://gnu/fdisk/${name}.tar.gz";
+    sha256 = "04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3";
   };
 
-  buildInputs = [ parted libuuid gettext ];
+  buildInputs = [ parted libuuid gettext guile ];
 
   doCheck = true;
 
   meta = {
-    description = "GNU fdisk, a command-line disk partitioning tool";
+    description = "A command-line disk partitioning tool";
 
     longDescription = ''
       GNU fdisk provides alternatives to util-linux fdisk and util-linux
···
     homepage = http://www.gnu.org/software/fdisk/;
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.linux;
+    #platforms = stdenv.lib.platforms.linux; # was failing for long without anyone complaining
   };
 }

pkgs/tools/text/podiff/default.nix

···
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "podiff-${version}";
+  version = "1.1";
+
+  src = fetchurl {
+    url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.1.tar.gz";
+    sha256 = "1zz6bcmka5zvk2rq775qv122lqh54aijkxlghvx7z0r6kh880x59";
+  };
+
+  patchPhase = ''
+    sed "s#PREFIX=/usr#PREFIX=$out#g" -i Makefile
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Finds differences in translations between two PO files, or revisions";
+    homepage = http://puszcza.gnu.org.ua/software/podiff;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}

pkgs/tools/text/sgml/openjade/default.nix

···
-{stdenv, fetchurl, opensp, perl}:
+{ stdenv, fetchurl, opensp, perl }:
 
-stdenv.mkDerivation {
-  # OpenJade-1.3.2 requires gcc 3.3 to build.  
-  # The next release is likely to be compatible with newer gccs.
-  # If so the overrideGCC in top-level/all-packages should be removed.
-  name = "OpenJade-1.3.2";
+stdenv.mkDerivation rec {
+  name = "openjade-1.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openjade/openjade-1.3.2.tar.gz";
+    url = "mirror://sourceforge/openjade/${name}.tar.gz";
     sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x";
   };
 
-  buildInputs = [opensp perl];
+  buildInputs = [ opensp perl ];
 
   configureFlags = [
     "--enable-spincludedir=${opensp}/include/OpenSP"
     "--enable-splibdir=${opensp}/lib"
-  ]; 
+  ];
 
   meta = {
     description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents";

pkgs/top-level/all-packages.nix

···
 
   ### Symbolic names.
 
-
-  x11 = xlibsWrapper;
+  x11 = if stdenv.isDarwin then darwinX11AndOpenGL else xlibsWrapper;
 
   # `xlibs' is the set of X library components.  This used to be the
   # old modular X llibraries project (called `xlibs') but now it's just
···
 
   fcron = callPackage ../tools/system/fcron { };
 
-  fdisk = callPackage ../tools/system/fdisk { };
-
   fdm = callPackage ../tools/networking/fdm {};
 
   figlet = callPackage ../tools/misc/figlet { };
···
     inherit (xorg) libXpm;
   };
 
+  gnufdisk = callPackage ../tools/system/fdisk {
+    guile = guile_1_8;
+  };
+
   gnugrep =
     # Use libiconv only on non-GNU platforms (we can't test with
     # `stdenv ? glibc' at this point.)
···
   gtkvnc = callPackage ../tools/admin/gtk-vnc {};
 
   gtmess = callPackage ../applications/networking/instant-messengers/gtmess { };
+
+  gummiboot = callPackage ../tools/misc/gummiboot { };
 
   gupnp = callPackage ../development/libraries/gupnp {
     inherit (gnome) libsoup;
···
 
   opendkim = callPackage ../development/libraries/opendkim { };
 
-  openjade = callPackage ../tools/text/sgml/openjade {
-    stdenv = overrideGCC stdenv gcc33;
-    opensp = opensp.override { stdenv = overrideGCC stdenv gcc33; };
-  };
+  openjade = callPackage ../tools/text/sgml/openjade { };
 
   openobex = callPackage ../tools/bluetooth/openobex { };
 
···
   pngtoico = callPackage ../tools/graphics/pngtoico {
     libpng = libpng12;
   };
+
+  podiff = callPackage ../tools/text/podiff { };
 
   polipo = callPackage ../servers/polipo { };
 
···
   # profiling and non-profiling versions; the final respects the user-configured
   # default setting.
   haskellPackages_ghc741              =                   haskell.packages_ghc741;
-  haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling);
-  haskellPackages_ghc742_profiling    = recurseIntoAttrs (haskell.packages_ghc741.profiling);
+  haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc742.noProfiling);
+  haskellPackages_ghc742_profiling    = recurseIntoAttrs (haskell.packages_ghc742.profiling);
   haskellPackages_ghc742              = recurseIntoAttrs (haskell.packages_ghc742.highPrio);
   haskellPackages_ghc761              =                   haskell.packages_ghc761;
+  haskellPackages_ghc762              = recurseIntoAttrs (haskell.packages_ghc762);
   # Reasonably current HEAD snapshot.
   haskellPackages_ghcHEAD             =                   haskell.packages_ghcHEAD;
 
···
 
   gprolog = callPackage ../development/compilers/gprolog { };
 
-  gwt = callPackage ../development/compilers/gwt {
-    libstdcpp5 = gcc33.gcc;
-  };
   gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
 
   ikarus = callPackage ../development/compilers/ikarus { };
···
 
   stalin = callPackage ../development/compilers/stalin { };
 
-  strategoPackages = strategoPackages018;
+  strategoPackages = recurseIntoAttrs strategoPackages018;
 
   strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix {
     stdenv = overrideInStdenv stdenv [gnumake380];
···
 
   freealut = callPackage ../development/libraries/freealut { };
 
-  freeglut = callPackage ../development/libraries/freeglut { };
+  freeglut = if stdenv.isDarwin then darwinX11AndOpenGL else
+    callPackage ../development/libraries/freeglut { };
 
   freetype = callPackage ../development/libraries/freetype { };
 
···
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
   mesa_noglu = callPackage ../development/libraries/mesa { };
-  mesa = callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h
+  mesa = if stdenv.isDarwin then darwinX11AndOpenGL
+    else callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h
+  darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { };
+
+  mesa = if stdenv.isDarwin then darwinX11AndOpenGL else
+    callPackage ../development/libraries/mesa { };
 
   metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
     sdfLibrary    = callPackage ../development/libraries/sdf-library { aterm = aterm28; };
···
 
   ucommon = callPackage ../development/libraries/ucommon { };
 
+  vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
+
+  vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { };
+
   vamp = callPackage ../development/libraries/audio/vamp { };
 
   vcdimager = callPackage ../development/libraries/vcdimager { };
···
       ];
   };
 
-  linux_2_6_32_xen = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32-xen.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
-    kernelPatches =
-      [ kernelPatches.fbcondecor_2_6_31
-        kernelPatches.sec_perm_2_6_24
-        # kernelPatches.aufs2_2_6_32
-        kernelPatches.cifs_timeout_2_6_29
-        kernelPatches.no_xsave
-        kernelPatches.dell_rfkill
-      ];
-  };
-
   linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
···
     */
     ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { };
 
-    ov511 = callPackage ../os-specific/linux/ov511 {
-      stdenv = overrideGCC stdenv gcc34;
-    };
-
     perf = callPackage ../os-specific/linux/kernel/perf.nix { };
 
     spl = callPackage ../os-specific/linux/spl/default.nix { };
···
 
   # Build the kernel modules for the some of the kernels.
   linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32);
-  linuxPackages_2_6_32_xen = linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen;
   linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35);
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0);
   linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1);
···
     import ../os-specific/linux/module-init-tools/aggregator.nix {
       inherit stdenv module_init_tools modules buildEnv;
     };
-
-  modutils = callPackage ../os-specific/linux/modutils {
-    stdenv = overrideGCC stdenv gcc34;
-  };
 
   multipath_tools = callPackage ../os-specific/linux/multipath-tools { };
 
···
 
   librecad2 = callPackage ../applications/misc/librecad/2.0.nix { };
 
-  libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix {
+  libreoffice = callPackage ../applications/office/libreoffice {
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2 gnome_vfs;
     zip = zip.override { enableNLS = false; };
···
     pulseSupport = config.pulseaudio or false;
   };
 
+  mplayer2 = callPackage ../applications/video/mplayer2 {
+    ffmpeg = ffmpeg_1_1;
+  };
+
   MPlayerPlugin = browser:
     import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {
       inherit browser;
···
   openbox = callPackage ../applications/window-managers/openbox { };
 
   openjump = callPackage ../applications/misc/openjump { };
-
-  openoffice = callPackage ../applications/office/openoffice {
-    inherit (perlPackages) ArchiveZip CompressZlib;
-    inherit (gnome) GConf ORBit2;
-    neon = neon029;
-    libwpd = libwpd_08;
-    zip = zip.override { enableNLS = false; };
-  };
 
   openscad = callPackage ../applications/graphics/openscad {};
 
···
 
   teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
 
-  taskjuggler = callPackage ../applications/misc/taskjuggler {
-    # KDE support is not working yet.
-    inherit (kde3) kdelibs kdebase;
-    withKde = config.taskJuggler.kde or false;
-  };
+  taskjuggler = callPackage ../applications/misc/taskjuggler { };
 
   taskwarrior = callPackage ../applications/misc/taskwarrior { };
 
···
 
   xfe = callPackage ../applications/misc/xfe { };
 
-  xfig = callPackage ../applications/graphics/xfig {
-    stdenv = overrideGCC stdenv gcc34;
-  };
+  xfig = callPackage ../applications/graphics/xfig { };
 
   xineUI = callPackage ../applications/video/xine-ui { };
 
···
   };
 
   simutrans = callPackage ../games/simutrans { };
-
-  six = callPackage ../games/six {
-    inherit (kde3) arts kdelibs;
-  };
 
   soi = callPackage ../games/soi {};
 
···
   };
 
   gnome = recurseIntoAttrs gnome2;
-
-  kde3 = recurseIntoAttrs {
-
-    kdelibs = callPackage ../desktops/kde-3/kdelibs {
-      stdenv = overrideGCC stdenv gcc43;
-    };
-
-    arts = callPackage ../development/libraries/arts {
-      inherit (pkgs.kde3) kdelibs;
-    };
-
-  };
 
   kde4 = recurseIntoAttrs pkgs.kde47;
 

pkgs/top-level/haskell-defaults.nix

···
                prefFun = ghcHEADPrefs;
              };
 
+  packages_ghc762 =
+    packages { ghcPath = ../development/compilers/ghc/7.6.2.nix;
+               ghcBinary = ghc704Binary;
+               prefFun = ghcHEADPrefs;
+             };
+
   # Reasonably current HEAD snapshot. Should *always* be lowPrio.
   packages_ghcHEAD =
     packages { ghcPath = ../development/compilers/ghc/head.nix;

pkgs/top-level/haskell-packages.nix

···
     GLUT         = self.GLUT_2_3_1_0;           # 7.6 ok
     haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.6 ok
     html         = self.html_1_0_1_2;           # 7.6 ok
-    HTTP         = self.HTTP_4000_2_6;          # 7.6 ok
+    HTTP         = self.HTTP_4000_2_7;          # 7.6 ok
     HUnit        = self.HUnit_1_2_5_1;          # 7.6 ok
     mtl          = self.mtl_2_1_2;              # 7.6 ok
     network      = self.network_2_4_1_0;        # 7.6 ok
···
     regexBase    = self.regexBase_0_93_2;       # 7.6 ok
     regexCompat  = self.regexCompat_0_95_1;     # 7.6 ok
     regexPosix   = self.regexPosix_0_95_2;      # 7.6 ok
-    split        = self.split_0_2_1_1;          # 7.6 ok
+    split        = self.split_0_2_1_2;          # 7.6 ok
     stm          = self.stm_2_4_2;              # 7.6 ok
     syb          = self.syb_0_3_7;              # 7.6 ok
     text         = self.text_0_11_2_3;          # 7.6 ok
···
 
   ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
 
+  ghcHeapView = callPackage ../development/libraries/haskell/ghc-heap-view {
+    cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled
+  };
+
   ghcMod = callPackage ../development/libraries/haskell/ghc-mod {
     inherit (pkgs) emacs;
   };
···
   ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {};
 
   ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {};
+
+  ghcVis = callPackage ../development/libraries/haskell/ghc-vis {
+    cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled
+  };
 
   gio = callPackage ../development/libraries/haskell/gio {};
 
···
   HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {};
   HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
   HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {};
-  HTTP_4000_2_6 = callPackage ../development/libraries/haskell/HTTP/4000.2.6.nix {};
-  HTTP = self.HTTP_4000_2_6;
+  HTTP_4000_2_7 = callPackage ../development/libraries/haskell/HTTP/4000.2.7.nix {};
+  HTTP = self.HTTP_4000_2_7;
 
   httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {};
 
···
 
   stringCombinators = callPackage ../development/libraries/haskell/string-combinators {};
 
+  stringQq = callPackage ../development/libraries/haskell/string-qq {};
+
   stringsearch = callPackage ../development/libraries/haskell/stringsearch {};
 
   strptime = callPackage ../development/libraries/haskell/strptime {};
···
   SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
 
   split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {};
-  split = self.split_0_2_1_1;
+  split_0_2_1_2 = callPackage ../development/libraries/haskell/split/0.2.1.2.nix {};
+  split = self.split_0_2_1_2;
 
   stbImage = callPackage ../development/libraries/haskell/stb-image {};
 
···
   X11 = callPackage ../development/libraries/haskell/X11 {};
 
   X11Xft = callPackage ../development/libraries/haskell/X11-xft {};
+
+  xdot = callPackage ../development/libraries/haskell/xdot {
+    polyparse = self.polyparse_1_7;
+  };
 
   xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {};
   xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {};

pkgs/top-level/make-tarball.nix

···
     mkdir ../$releaseName
     cp -prd . ../$releaseName
     echo nixpkgs > ../$releaseName/channel-name
-    (cd .. && tar cfa $out/tarballs/$releaseName.tar.bz2 $releaseName) || false
-    (cd .. && tar cfa $out/tarballs/$releaseName.tar.lzma $releaseName) || false
+    (cd .. && tar cfa $out/tarballs/$releaseName.tar.xz $releaseName) || false
 
     mkdir -p $out/release-notes
     cp doc/NEWS.html $out/release-notes/index.html

pkgs/top-level/perl-packages.nix

···
       url = mirror://cpan/authors/id/P/PE/PERIGRIN/JSON-Any-1.29.tar.gz;
       sha256 = "15v2j9dh58r7r4s7rnnmgnzzbyz61bhyxwpx1z7r811ixs9bkks2";
     };
-    buildInputs = [ JSON ];
+    propagatedBuildInputs = [ JSON ];
     meta = {
       description = "Wrapper Class for the various JSON classes";
       license = "perl";

pkgs/top-level/python-packages.nix

···
     };
   });
 
+  awscli = buildPythonPackage rec {
+    name = "awscli-0.5.0";
+    namePrefix = "";
+
+    src = fetchurl {
+      url = https://github.com/aws/aws-cli/archive/0.5.0.tar.gz;
+      sha256 = "0smgcisl2p7p2y2i299x7g271kdmgs0hnzngw5030phvh0lq202i";
+    };
+
+    propagatedBuildInputs = [ argparse botocore ];
+
+  };
 
   logilab_astng = buildPythonPackage rec {
     name = "logilab-astng-0.24.1";
···
         future infrastructural services offered by Amazon Web
         Services.  This includes S3, SQS, EC2, among others.
       '';
+    };
+  };
+
+
+  botocore = buildPythonPackage rec {
+    name = "botocore-0.5.2";
+
+    src = fetchurl {
+      url = https://github.com/boto/botocore/archive/0.5.2.tar.gz;
+      sha256 = "18073mydin0mwk1d7vdlmsiz3rvhjzxkaaqrmxw440acbipnngq2";
+    };
+
+    propagatedBuildInputs = [ dateutil requests014 ];
+
+    meta = {
+      homepage = https://github.com/boto/botocore;
+
+      license = "bsd";
+
+      description = "A low-level interface to a growing number of Amazon Web Services";
+
     };
   };
 
···
 
 
   dateutil = buildPythonPackage (rec {
-    name = "dateutil-1.5";
+    name = "dateutil-2.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz";
-      sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg";
+      sha256 = "1vlx0lpsxjxz64pz87csx800cwfqznjyr2y7nk3vhmzhkwzyqi2c";
     };
+
+    propagatedBuildInputs = [ six ];
 
     meta = {
       description = "Powerful extensions to the standard datetime module";
···
     meta = {
       description = "The ReportLab Toolkit. An Open Source Python library for generating PDFs and graphics.";
       homepage = http://www.reportlab.com/;
+    };
+  };
+
+
+  requests = buildPythonPackage rec {
+    name = "requests-1.1.0";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
+      md5 = "a0158815af244c32041a3147ee09abf3";
+    };
+
+    meta = {
+      description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings..";
+      homepage = http://docs.python-requests.org/en/latest/;
+    };
+  };
+
+  requests014 = buildPythonPackage rec {
+    name = "requests-0.14.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
+      md5 = "3de30600072cbc7214ae342d1d08aa46";
+    };
+
+    meta = {
+      description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings..";
+      homepage = http://docs.python-requests.org/en/latest/;
     };
   };
 

pkgs/top-level/release-cross.nix

···
     coreutils.hostDrv = nativePlatforms;
     dropbear.hostDrv = nativePlatforms;
     tigervnc.hostDrv = nativePlatforms;
-    #openoffice.hostDrv = nativePlatforms;
     wxGTK.hostDrv = nativePlatforms;
     #firefox = nativePlatforms;
     xorg = {

pkgs/top-level/release-python.nix

···
   gv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gwenhywfar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gwrap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  gwt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gxneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   hadoop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   harfbuzz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
···
     nvidia_x11_legacy96 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     openafsClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     openiscsi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-    ov511 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     perf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     spl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     sysprof = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
···
   openfire = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   openlierox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   openobex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  openoffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   opensc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   openscad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   opensc_dnie_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };

pkgs/top-level/release.nix

···
   ntp = linux;
   ocaml = linux;
   octave = linux;
-  openoffice = linux;
   openssh = linux;
   openssl = all;
   pam_console = linux;